Complete rebranding from jellypig to jellyflood including:
- Renamed all jellypig references to jellyflood
- Updated store implementations (jellypigstore -> jellyfloodstore)
- Moved jellypig tvOS to Swiftfin tvOS structure
- Updated service configurations and defaults
- Preserved all Xtream plugin support and EPG functionality
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude <noreply@anthropic.com>
* off recursive
* pr feedback
* Cleanup
Instantiate the collectionType in the `if let` since failure to cast `as? BaseItemDto` should count as false as well. Only set `parameters.isRecursive` once in if/else opposed to if -> override.
* wip
* fix recursive and item kinds
* rename, fix folders
---------
Co-authored-by: Quang <quang.ha@a2:3c:68:56:26:8d.home>
Co-authored-by: Joe <jpkribs@outlook.com>
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
Co-authored-by: Quang <quang.ha@QrM3P.local>
* Very Very WIP
* Details page.
TODOs:
- Duplicate ViewModels are initialized.
- Routing Cleanup
- Localizations for fields
- Get Played Item Details (See ActiveSessionDetails)
- Move all details to ActivityDetailsViewModel for Users & Items
- Localizations for enums
- Enum the types if possible
* Details View complete. TODO:
- Filters
- Default with No Filters
* Ready
* Fix localization
* cleanup
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Buildable!
* Update file names.
* Default sort to sort name NOT name.
* SessionInfoDto vs SessionInfo
* Targetting
* Fix many invalid `ItemSortBy` existing. Will need to revisit later to see which can still be used!
* ExtraTypes Patch.
* Move from Binding to OnChange. Tested and Working.
* Update README.md
Update README to use 10.10.6. Bumped up from 10.8.13
* Update to Main on https://github.com/jellyfin/jellyfin-sdk-swift.git
* Now using https://github.com/jellyfin/jellyfin-sdk-swift.git again!
* Paths.getUserViews() userId moved to parameters
* Fix ViewModels where -Dto suffixes were removed by https://github.com/jellyfin/Swiftfin/pull/1465 auto-merge.
* SupportedCaseIterable
* tvOS supportedCases fixes for build issue.
* cleanup
* update API to 0.5.1 and correct VideoRangeTypes.
* Remove deviceProfile.responseProfiles = videoPlayer.responseProfiles
* Second to last adjustment:
Resolved: // TODO: 10.10 - Filter to only valid SortBy's for each BaseItemKind.
Last outstanding item: // TODO: 10.10 - What should authenticationProviderID & passwordResetProviderID be?
* Trailers itemID must precede userID
* Force User Policy to exist.
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Added add user button to select user bottom bar
* Replaced AddUserButton with NoUserView
This commit removes the AddUserButton as it is no longer required.
Also when no user is logged in the GridView shows a new NoUserView
* Added multi server support
- When no user is logged in. Grid view shows the original AddUserButton.
- When there is a logged in user AddUserButton is replaced with AddUserBottomButton
- AddUserBottomButton will show a menu when in all server mode (just like AddUserbutton)
- Removed NoUserView as it isn't required anymore
- changed bottom bar layout to allow for a larger service selection button
* cleaned up AddUserBottomButton
* cleaned up AddUserBottomButton
fixed formatting
* cleanup
* fix conflict
* cleaned up unused localisation
* cleanup
* removed debug background
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* ItemViewModel Trailers
* iOS done.
* Sections >>> Divider
* tvOS kind of.
* Button/Menu cleanup
* Huge ActionButton overhaul
* Error Handling, ActionButton/Menu standardization, and ActionButtonLayout cleanup part 1.
* cleanup
* cleanup
* Combine ActionButton logic. Complete ActionButton rework and animation/style rework. Should this be 3 files??
* Dumb sizing error. Get size from WIDTH not HEIGHT! Height is always 100 and Width is larger.
* Pressed buttons are but focused buttons but slight less. Pressed buttons are still bigger than default, unfocused buttons. TIL.
* Cleanup / Structure
* Remove Test.
* New Setting. Version on PlayButton Row. Complete TrailerMenu revamp. Make ActionButtonLayout a single row.
* Spacing & remove test logic
* VERY WIP
* Fix the compact-ness
* Linting.
* Remove Testing logic.
* Pre-Cleanup - WIP
* Finalized. Moved ScrollingText to tvOS Only.
* MediaURL? = nil but it's already nil by default.
* Error on the View not the button. This was NOT showing for the button since it lived on the Menu. This resolves this.
* wip
* Update VersionMenu.swift
* Remove scrollingText from this PR.
* Remove labels & iOS Action Button cleanup / no foregroundStyle on de-selected.
* ActionButtonScaling
* .card all buttons in ActionButton
* Slow and less bounce-i-fy the menu animations. Also, slight padding
* Wait, don't add this padding this isn't needed.
* localize
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* WIP
* Other Menu inits and AppSettingsView
* Linting & a touch of spacing.
* cleanup
* Init from CaseIterable
* User a Picker instead of just a ForEach
* Remove InlineEnumToggle.
* cleanup
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* `VideoRangeType` "Extension" for now it's an enum until 10.10. Otherwise, done.
* Limit lines to 1 and variable width as needed.
* CodeFactor issue resolution
* AttributeViewModifier -> AttributeBadge
* change API
* `WrappingHStack`
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Ensure selectionViewModel is a valid season.
* Scolling issue
* Fix Scrolling! But fails to set button color...
* Move HStacks into their own folder.
* CollectionHStack
* SeasonHStack FINALLY done!
* ScrollToIndex NOT Element
* Remove refocus work
* Undo extra changes not for this PR
* Fix Episode Scrolling on iOS as well.
* Add the `.mask` in... Whatever that actually does??? Just trying to mirror the older version
* Linting
* Use playButtonItem instead
* Season ScrollTo
* Cleanup.
* Even more cleanup.
* Even more cleanup and comments
* LInting
* Catch empty episodes
* Linting.
* Mirror iOS more. Remove unused imports. Turn non-used cards into buttons to allow focus.
* Allow focusing on Empty / Error cards.
* Make ErrorCard Selectable
* cleanup
* Focusable Loading Card.
* Fall back to empty season.
* Last of the MacOS Catalyst stuff
* Force Unwrap.
* Don't force unwrap.
* Remove unneeded `focusedSection` from `EpisodeSelector`.
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Move Series Button to the About Section IF the item is an episode. Otherwise, continue using that image as just an image. tvOS & iOS.
* use posterbutton
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Button cleanup & errorViews
* Change the Sign Out button to be `ListRowButton`. Sets a better height value using `maxHeight` to ensure that it doesn't exceed the `ListRow` sizing.
* deleteUsersButton needs to be manually set back to 75
* wip
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Move ItemType to Filter
* Init but normally...
* filter on people?
* Default to easiest / least change solution.
* Reset `.collectionFolder`, `.folder`, and `.BaseItemPerson` in `PagingLibraryView` to have the default filters. This was originally in place. This Commit just ensures that iOS and tvOS have the same implementation.
* wip
* Update ItemLibraryViewModel.swift
* Update ItemLibraryViewModel.swift
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Update missing strings. Mirror iOS setting changes to make sure tvOS PagingLIbraryView updates with changes as well. Lay the groundwork for filtering.
* Revert back to rows over offset
* Reorder a bit.
* Move default layout to no values in closure. For whatever reason, I cannot do this to the non-defaults.
* 95% there
* Move `onChange`s to the `innerContent` to alleviate Type Checker issues
* All Value-less closures are moved with teh exception of viewModel.filterViewModel?.currentFilters
* Prepare for future letter picker location
* Good start but some missing items:
- Upload image isn't working
- Only a single image is shown per section. Need to make this the HCollection of all images for the group
* Upload still failing but now update and set are 2 different processes because I think that's better. Spacing on the add screen is still all wrong but we're getting closer
* ~70% Complete
TODO:
- Spacing for remote portrait images is wrong & cramped
- Upload image from file browser never works & produces 400 error
- Show all images for an item.imageType opposed to just the first
- Setting image works but produces a 400 error
- Error alert looks bad
* Merge with Main
* URL Changes
* Updating logic and confirmation screen
* Lots of changes:
Selecting a Remote image is now working without error and works consistently!
Upload a local file is still broken
Item types with multiple images is working as intended now!
Overriding an image on index doesn't seem to work but it doesn't work for Web either so........
UI is way more jank but the hard parts are getting solved!
* Breaking this even more with the hopes of a better tomorrow.
* Getting better?
* Refreshing is working but I might need to make this work mroe effiently...
* 90% There!
* Ability to cancel the update
* Still no luck uploading images?
* Stop reordering on deletion/addition
* 2025 disclaimers
* Uploading finally works!
* Functional but messy.
TODO:
- Figure out better resizing if too big?
- Upload from Photos
- Move upload logic to imageViewModel and make RemtoeImageViewModel PagingLibraryViewModel conformant
- Create a ImageInfoView for Selection & Deletion.
* Now conforms to PagingLIbraryViewModel but everything else is a mess
* Close!
* First no all appears
* Fix double pop/routerdismiss
* Uploading from Photos is (Finally) Ready!
* wip
* Reuse PhotoPicker and Crop code.
* 4/6 of the codefactor changes
* Pass around the URL NOT the UIImage
* Clean up ItemImageDetails types.
* Make sure the ImageView mirrors the real shape of the image. Posters should be uniform but this is the selection for the image so the dimensions are important to demonstrate.
* Rating Type label.
* Delete confirmation dialog.
* Remove double sizing. Remove Unused ViewModel. Change PhotoPicker to a checkmark instead a 1. Since there is only ever one picture selected, no need to count the images.
* Get the image URL as needed. No more Truples. Localize ImageTypes.
* Remove attempt at ImageInfo Poster Comformance.
* Even more cleanup
* Delete vs Save flip
* Hide delete button
* Even more cleanup
* Fix tvOS build issues.
* Reduce delay & remove unused comment. Should finally be ready again.
* wip
* Update ItemImagesView.swift
* Event Only on upload failures.
* Remove unnecessary ViewModel's from tvOS.
* Add dismiss action to RemoteSearchResultView. While I am doing this here, fix it there.
* Move From Coordinator -> .Sheet. This fixes the popping issue / delay requirement!
* wip
* wip
* wip
* wip
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Add pin prompt to sign-in screen
* Bring over security views from iOS
* silence tvOS 17 warnings
* Add user profile and security views to routing
* Changes
* revert and remove commented code
* cleanup
* CodeFactor fixes
* Joe's Suggestions:
- Move UserProfileSettings to their own Coordinator
- Make Views Modal to better reflect existing items
- Fix CustomizeSettingsCoordinator (This is on me!)
- Change PINs to use SecureField
- Move all Settings View to use SplitFormWindowView to mirror existing Settings
- Use user profile image for SplitFormWindowView Icon
- Change Profile Security to use LearnMoreModal
- Use suggestion from https://forums.developer.apple.com/forums/thread/739545
- Tag Alert > TextFields with TODO so we can check this on tvOS 18
* Fix PIN for https://forums.developer.apple.com/forums/thread/739545 on SelectUserView
* Fix Build Issue.
* use user
---------
Co-authored-by: chickdan <=>
Co-authored-by: Joe <jpkribs@outlook.com>
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Edit View. Still need to make an Add View
* Finished with EditPage. Need labels tho
* Deletion deletes TOO many records. Also, need to search existing tags
* Fin
* Fix merge issues
* Check for exisitng Access Tags before allowing saving
* 2025 Disclaimer / Build Fixes
* update
* Update EditServerUserAccessTagsView.swift
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Extract handlers into function
* Color Improvements to move away from UIColor
* Bring over edit user feature from iOS
* Fix UserGridButton overlay when editing
* Move advanced menu to be near server select menu
* Re-enable context menu
* Add bottom button bar
* hook up user deletion
* improvements
* Refactor buttons for highlight hover effect
* Pass in user count
* Don't cancel editing if delete alert is cancelled
* cleanup
* Pad bottom of buttons
* Cancel editing after user deletion
* Revert ServerSelectionMenu back to button
* Remove padding that pushed the server selection menu up too far
* Make delete button red to match iOS
* Update SelectUserView.swift
* workaround Menu layout issues
* Bring select/deselect all users behavior from iOS
* Fixes after merge with main
* Fix vertical focus
---------
Co-authored-by: chickdan <=>
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Make user profile more generic. Still need to make it work for the reset image / other stuff like delete & username.
* Username Changing and PFP deletion.
* Functional, refreshing, and good to go!
* Clean up localizations
* Migrate [UserDto] -> IdentifiedArrayOf<UserDto>
* Solve "Username should probably be at the top of this section."
* allow notification filter
* WIP:
Created `UserProfileHeroImage` but I haven't used it anywhere.
* Centralize UserProfileHeroImages
* Rename UserProfileImages
* Fix Merge Issue?
* Move to UserProfileImage
* Merge with Main
* Fix Merge?
* Clear the cache on update.
* Delete duplicate `UserProfileImage`
* wip
* wip
* Update ImagePipeline.swift
* fix tvOS build issue and update comment to be more accurate
* clean up
* fix string
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Automate String Organization.
* Comment the script so it's easier to maintain? Or messier?
* Linting post comments
* Rename ShellScript -> Alphabetize Strings for tvOS
* use swift regex, add error messages, clean up separators
* Only search for ./Translations/en.lproj/Localizable.strings
* Purge Unused Strings Script
* Organize Translation Scripts into a Folder. Update references at the project level.
* clean up
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Selection & Fix ServerSelectionMenu padding
* ButtonStyle
* Move from `FullScreenMenu` to just use `Menu` Remove usages of `FullScreenMenu` since it's no longer used anywhere else.
* Remove unused `FullScreenMenu`
* Remove unused `SelectServerView` since it's now in the `ServerSelectionMenu`
* Selection menu fixes
* Focus issues
* clean up
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* UserSignInView and ConnectToServerView Cleanup
* Public User icon changes, move the Jellyfin 'NavigationBar' to a `View Modifier` for easier re-use.
* A better solution
* isLoading == isLoading NOT isLoading == true
* clean up
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Mirror tvOS to iOS
* Fix router dismiss. Remove redundent viewModel.refresh from itemView
* reset dev team info
* View Modifier and ViewModel cleanup
* Remove testing comments / events
* Cleanup `.errorMessage($error)`
* Cleanup all viewModel.states for item editing, add errorViews if the data fails to load, and add errorMessage on failed events.
MARK sections: Var/Func always unless only Body and Var/Lets only if there are several of varying types / functions.
* Cleanup / Genre & Tag Management
* Move searching to a backgroundState. Fix the font Color when bulk editing tags / genres should be secondary when editing & not selected
* Cleanup
* Now that cancelling is handled better this should prevent the issue where the suggestions fails to update on a letter entry
* Change from using an event for searchResults to using a published searchResults var
* Moved all logic to a local list where all genres/tags are populated on refresh then filterd locally instead of calling the server for changes.
* Inheritance
* Split metadata from components then alphabetize. Also, fix but where you can't add a people
* People & Permissions
* Functional but dirty. TODO: Cleanup + Trie? Trei?
* nil coalescing operator is only evaluated if the lhs is nil, coalescing operator with nil as rhs is redundant
* TODO: Search improvements & Delay search on name change
* Cleanup & reordering
* Debouncing
* Trie implementation
* Permissions Cleanup Squeezing in: https://github.com/jellyfin/jellyfin-web/issues/6361
* enhance Trie
* cleanup
* cleanup
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* ServerUserAdminViewModel cleanup & testing. ServerUserAccessView.
* Change the enableAllLibraries to use the binding extensions
* Use coalesce for enableAllFolders & enableContentDeletion
* use contains binding
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Playback Quality - Learn More
* TODO: Fix leading not working on second line.
* Remove layoutDirection.
* Implement for tvOS. Slightly different spacing.
* VStack
* WIP - tvOS Implementaiton. SUBJECT TO CHANGE / ELIMINATION.
* Background Icon & formatting
* wip
* Review Changes. Remove unused Strings, clean up comments.
* Remove duplicate items used for testing
* Remove tvOS scrollIfLargerThanContainer for now.
* Edit Text-based Metadata
* ViewModel Cleanup
* use binding extensions
* Huge overhaul:
- Fix the notification when metadata was updated to work with 100% consistency
- Flip the locking to be true -> lock like server
- Redo the whole itemEditorViewModel to be more in-line with other viewModels | also fixes iPad weirdness
- Use itemViewModel for the edit view so I can just reuse those existing notifications instead of recreating the wheel
- More human dates for people - Date of death instead of "End date" (yikes)
* String fixes & overview size
* Fix build issues & String cleanup
* fix overview sizing, cleanup
* itemMetadataWasEdited -> temMetadataDidChange
* Creation of the NavigationBarMenuButtonModifier for an "ellipsis.circle" menu object in the toolbar. Makes it easier to ensure that this format looks the same throughout.
* Custom vs Official Rating + Menu Button Label change
* Menu button spacing and groundwork for other menu items (canDownload) since we already have the bool available. Currently disabled.
* Linting
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* WIP
* WIP
* Localization and better planning. Remove the Username as this will end up in another section. Updated planning here: https://github.com/jellyfin/Swiftfin/discussions/1283 | 5 more views required!
* Initializing an optional variable with nil is redundant line
* Remove Live TV since that will go in another section
* Cleanup Coordinator / Merge with Main
* Remove all 'Allows' from strings
* Fix Merge Issues
* Use CaseIterablePicker, Binding.map
* BackgroundState == updating, change all of the buttons to visible when custom by process of elimination opposed to the default custom value. Make all of the input fields use temp values to make it less jarring.
* Update SessionsSection.swift
* Learn more!
* Validate > 0, don't allow inputs to be less than 1 and reset tempValues when the enum is updated.
* use new binding extensions
* String fixes
* Don't test against adminDefault for users or userDefault for admins.
* Linting indentation
* Default vs UserDefault + no more reason to have temporary variables.
* cleanup
* format
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* [iOS] Creation of the enableItemEditor & enableItemDeletion settings. Creation of the ItemEditorView. Creation of Refresh/Deletion Logic and Buttons. Wrap buttons in permissions.
* You can make delete permissions without edit (admin) permissions. So, flip this so you can get to the edit page but editing is disabled if you're not an admin. The Delete option requires that the delete toggle is enabled and the user has permissions.
* Move deletion from the editView to the ItemView
* Delete from PagingLibraryView on Deletion
* Only enable delete if the user can delete something. Check deletion permission on Item level. Only allow editing for admins.
* Review Changes: ec33a6b63c
* wip
* Update RefreshMetadataButton.swift
* Update Shared/ViewModels/ItemEditorViewModel/RefreshMetadataViewModel.swift
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Update Shared/Coordinators/ItemEditorCoordinator.swift
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* Reviews minus a learn more button
* LearnMoreAttempt v1
* Learn more v2 - Much better
* Learn More v3
* Learn More comments cleanup
* Learn More: https://github.com/jellyfin/Swiftfin/pull/1310#discussion_r1843149572
* clean up
* Remove Replace since it's already covered. Localize.
* clean up
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
* resetUserPassword Adjustments
* Nest the Password in Advanced because I dunno it looks nicer.
* Dismiss Coordinator instead of pop.
* Build issues
* Rename my local xcode to xcode_16???
* Build plz
* Comments
* clean up
---------
Co-authored-by: Ethan Pippin <ethanpippin2343@gmail.com>
Ashik K
Quang
Ethan Pippin
Joe Kribs
Glenn Hevey
Daniel Chick
samglt