[tvOS] HomeView - Error Handling & Refreshing

Shared/Services/SwiftfinDefaults.swift

@@ -115,6 +115,7 @@ extension Defaults.Keys {
         static let itemViewType: Key<ItemViewType> = UserKey("itemViewType", default: .compactLogo)
 
         static let showPosterLabels: Key<Bool> = UserKey("showPosterLabels", default: true)
+        static let resumePosterType: Key<PosterDisplayType> = UserKey("resumePosterType", default: .landscape)
         static let nextUpPosterType: Key<PosterDisplayType> = UserKey("nextUpPosterType", default: .portrait)
         static let recentlyAddedPosterType: Key<PosterDisplayType> = UserKey("recentlyAddedPosterType", default: .portrait)
         static let latestInLibraryPosterType: Key<PosterDisplayType> = UserKey("latestInLibraryPosterType", default: .portrait)

Shared/Strings/Strings.swift

@@ -834,6 +834,8 @@ internal enum L10n {
   }
   /// No title
   internal static let noTitle = L10n.tr("Localizable", "noTitle", fallback: "No title")
+  /// This Jellyfin server does not have any libraries that are active in Swiftfin. Swiftfin only supports Shows & Movies at this time.
+  internal static let noValidLibrariesError = L10n.tr("Localizable", "noValidLibrariesError", fallback: "This Jellyfin server does not have any libraries that are active in Swiftfin. Swiftfin only supports Shows & Movies at this time.")
   /// Official Rating
   internal static let officialRating = L10n.tr("Localizable", "officialRating", fallback: "Official Rating")
   /// Offset
@@ -972,6 +974,8 @@ internal enum L10n {
   internal static let red = L10n.tr("Localizable", "red", fallback: "Red")
   /// The number of reference frames is not supported
   internal static let refFramesNotSupported = L10n.tr("Localizable", "refFramesNotSupported", fallback: "The number of reference frames is not supported")
+  /// Refresh
+  internal static let refresh = L10n.tr("Localizable", "refresh", fallback: "Refresh")
   /// Refresh Metadata
   internal static let refreshMetadata = L10n.tr("Localizable", "refreshMetadata", fallback: "Refresh Metadata")
   /// Regional

Shared/ViewModels/HomeViewModel.swift

@@ -24,7 +24,7 @@ final class HomeViewModel: ViewModel, Stateful {
         case refresh
     }
 
-    // MARK: BackgroundState
+    // MARK: Background State
 
     enum BackgroundState: Hashable {
         case refresh
@@ -39,29 +39,39 @@ final class HomeViewModel: ViewModel, Stateful {
         case refreshing
     }
 
+    // MARK: - Published Variables
+
     @Published
     private(set) var libraries: [LatestInLibraryViewModel] = []
     @Published
     var resumeItems: OrderedSet<BaseItemDto> = []
 
+    // MARK: - Stateful Variables
+
     @Published
     var backgroundStates: OrderedSet<BackgroundState> = []
     @Published
     var lastAction: Action? = nil
     @Published
     var state: State = .initial
 
+    private var backgroundRefreshTask: AnyCancellable?
+    private var refreshTask: AnyCancellable?
+
+    // MARK: - Notification Handler
+
     // TODO: replace with views checking what notifications were
     //       posted since last disappear
     @Published
     var notificationsReceived: NotificationSet = .init()
 
-    private var backgroundRefreshTask: AnyCancellable?
-    private var refreshTask: AnyCancellable?
+    // MARK: - Child View Models
 
     var nextUpViewModel: NextUpLibraryViewModel = .init()
     var recentlyAddedViewModel: RecentlyAddedLibraryViewModel = .init()
 
+    // MARK: - Initializer
+
     override init() {
         super.init()
 
@@ -78,6 +88,8 @@ final class HomeViewModel: ViewModel, Stateful {
             .store(in: &cancellables)
     }
 
+    // MARK: - Respond to Action
+
     func respond(to action: Action) -> State {
         switch action {
         case .backgroundRefresh:
@@ -114,9 +126,11 @@ final class HomeViewModel: ViewModel, Stateful {
             .asAnyCancellable()
 
             return state
+
         case let .error(error):
             return .error(error)
-        case let .setIsPlayed(isPlayed, item): ()
+
+        case let .setIsPlayed(isPlayed, item):
             Task {
                 try await setIsPlayed(isPlayed, for: item)
 
@@ -125,6 +139,7 @@ final class HomeViewModel: ViewModel, Stateful {
             .store(in: &cancellables)
 
             return state
+
         case .refresh:
             backgroundRefreshTask?.cancel()
             refreshTask?.cancel()
@@ -152,10 +167,12 @@ final class HomeViewModel: ViewModel, Stateful {
             }
             .asAnyCancellable()
 
-            return .refreshing
+            return state
         }
     }
 
+    // MARK: - Refresh
+
     private func refresh() async throws {
 
         await nextUpViewModel.send(.refresh)
@@ -174,6 +191,8 @@ final class HomeViewModel: ViewModel, Stateful {
         }
     }
 
+    // MARK: - Get Resume Items
+
     private func getResumeItems() async throws -> [BaseItemDto] {
         var parameters = Paths.GetResumeItemsParameters()
         parameters.enableUserData = true
@@ -187,6 +206,8 @@ final class HomeViewModel: ViewModel, Stateful {
         return response.value.items ?? []
     }
 
+    // MARK: - Get Libraries
+
     private func getLibraries() async throws -> [LatestInLibraryViewModel] {
 
         let userViewsPath = Paths.getUserViews(userID: userSession.user.id)
@@ -200,6 +221,8 @@ final class HomeViewModel: ViewModel, Stateful {
             .map { LatestInLibraryViewModel(parent: $0) }
     }
 
+    // MARK: - Get Excluded Libraries
+
     // TODO: use the more updated server/user data when implemented
     private func getExcludedLibraries() async throws -> [String] {
         let currentUserPath = Paths.getCurrentUser
@@ -208,6 +231,8 @@ final class HomeViewModel: ViewModel, Stateful {
         return response.value.configuration?.latestItemsExcludes ?? []
     }
 
+    // MARK: - Toggle Played Status
+
     private func setIsPlayed(_ isPlayed: Bool, for item: BaseItemDto) async throws {
         let request: Request<UserItemDataDto>
 

Swiftfin tvOS/Components/CinematicItemSelector.swift

@@ -29,6 +29,7 @@ struct CinematicItemSelector<Item: Poster>: View {
     private var onSelect: (Item) -> Void
 
     let items: [Item]
+    let type: PosterDisplayType
 
     var body: some View {
         ZStack(alignment: .bottomLeading) {
@@ -46,7 +47,7 @@ struct CinematicItemSelector<Item: Poster>: View {
                         .transition(.opacity)
                 }
 
-                PosterHStack(type: .landscape, items: items)
+                PosterHStack(type: type, items: items)
                     .content(itemContent)
                     .imageOverlay(itemImageOverlay)
                     .contextMenu(itemContextMenu)
@@ -98,15 +99,16 @@ struct CinematicItemSelector<Item: Poster>: View {
 
 extension CinematicItemSelector {
 
-    init(items: [Item]) {
+    init(items: [Item], type: PosterDisplayType) {
         self.init(
             topContent: { _ in EmptyView() },
             itemContent: { _ in EmptyView() },
             itemImageOverlay: { _ in EmptyView() },
             itemContextMenu: { _ in EmptyView() },
             trailingContent: { EmptyView() },
             onSelect: { _ in },
-            items: items
+            items: items,
+            type: type
         )
     }
 }

Swiftfin tvOS/Components/ErrorView.swift

@@ -0,0 +1,47 @@
+//
+// Swiftfin is subject to the terms of the Mozilla Public
+// License, v2.0. If a copy of the MPL was not distributed with this
+// file, you can obtain one at https://mozilla.org/MPL/2.0/.
+//
+// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
+//
+
+import SwiftUI
+
+// TODO: should use environment refresh instead?
+struct ErrorView<ErrorType: Error>: View {
+
+    private let error: ErrorType
+    private var onRetry: (() -> Void)?
+
+    var body: some View {
+        VStack(spacing: 30) {
+            Image(systemName: "xmark.circle.fill")
+                .font(.system(size: 100))
+                .foregroundColor(Color.red)
+
+            Text(error.localizedDescription)
+                .frame(maxWidth: 500)
+                .multilineTextAlignment(.center)
+
+            if let onRetry {
+                PrimaryButton(title: L10n.retry)
+                    .onSelect(onRetry)
+            }
+        }
+    }
+}
+
+extension ErrorView {
+
+    init(error: ErrorType) {
+        self.init(
+            error: error,
+            onRetry: nil
+        )
+    }
+
+    func onRetry(_ action: @escaping () -> Void) -> Self {
+        copy(modifying: \.onRetry, with: action)
+    }
+}

Swiftfin tvOS/Components/PosterHStack.swift

@@ -59,7 +59,7 @@ struct PosterHStack<Element: Poster & Identifiable, Data: Collection>: View wher
             .clipsToBounds(false)
             .dataPrefix(20)
             .insets(horizontal: EdgeInsets.edgePadding, vertical: 20)
-            .itemSpacing(EdgeInsets.edgePadding - 20)
+            .itemSpacing(EdgeInsets.edgePadding - (type == .landscape ? 15 : 20))
             .scrollBehavior(.continuousLeadingEdge)
         }
         .focusSection()

Swiftfin tvOS/Components/PrimaryButton.swift

@@ -0,0 +1,56 @@
+//
+// Swiftfin is subject to the terms of the Mozilla Public
+// License, v2.0. If a copy of the MPL was not distributed with this
+// file, you can obtain one at https://mozilla.org/MPL/2.0/.
+//
+// Copyright (c) 2025 Jellyfin & Jellyfin Contributors
+//
+
+import Defaults
+import SwiftUI
+
+struct PrimaryButton: View {
+
+    // MARK: - Accent Color
+
+    @Default(.accentColor)
+    private var accentColor
+
+    // MARK: - Focus State
+
+    @FocusState
+    private var isFocused
+
+    // MARK: - Primary Button Variables
+
+    private let title: String
+    private var onSelect: () -> Void
+
+    // MARK: - body
+
+    var body: some View {
+        ZStack {
+            ListRowButton(title) {
+                onSelect()
+            }
+            .focused($isFocused)
+            .foregroundStyle(accentColor.overlayColor, isFocused ? Color.jellyfinPurple : Color.gray)
+        }
+        .frame(maxWidth: 500)
+        .frame(height: 75)
+    }
+}
+
+extension PrimaryButton {
+
+    init(title: String) {
+        self.init(
+            title: title,
+            onSelect: {}
+        )
+    }
+
+    func onSelect(_ action: @escaping () -> Void) -> Self {
+        copy(modifying: \.onSelect, with: action)
+    }
+}

Swiftfin tvOS/Views/ChannelLibraryView/ChannelLibraryView.swift

@@ -40,7 +40,7 @@ struct ChannelLibraryView: View {
     }
 
     var body: some View {
-        WrappedView {
+        ZStack {
             switch viewModel.state {
             case .content:
                 if viewModel.elements.isEmpty {
@@ -49,7 +49,10 @@ struct ChannelLibraryView: View {
                     contentView
                 }
             case let .error(error):
-                Text(error.localizedDescription)
+                ErrorView(error: error)
+                    .onRetry {
+                        viewModel.send(.refresh)
+                    }
             case .initial, .refreshing:
                 ProgressView()
             }