Focusable Loading Card.

jellyfin · Feb 26, 2025 · acbe3a1 · acbe3a1
1 parent a7f6019
commit acbe3a1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/Swiftfin tvOS/Views/ItemView/Components/EpisodeSelector/Components/EpisodeContent.swift b/Swiftfin tvOS/Views/ItemView/Components/EpisodeSelector/Components/EpisodeContent.swift
@@ -11,7 +11,9 @@ import JellyfinAPI
 import SwiftUI
 
 extension SeriesEpisodeSelector {
+
     struct EpisodeContent: View {
+
         @Default(.accentColor)
         private var accentColor
 

diff --git a/Swiftfin tvOS/Views/ItemView/Components/EpisodeSelector/Components/EpisodeHStack.swift b/Swiftfin tvOS/Views/ItemView/Components/EpisodeSelector/Components/EpisodeHStack.swift
@@ -76,7 +76,7 @@ extension SeriesEpisodeSelector {
                 case let .error(error):
                     ErrorHStack(viewModel: viewModel, error: error, focusedEpisodeID: $focusedEpisodeID)
                 case .initial, .refreshing:
-                    LoadingHStack()
+                    LoadingHStack(focusedEpisodeID: $focusedEpisodeID)
                 }
             }
             .padding(.bottom, 45)
@@ -95,7 +95,7 @@ extension SeriesEpisodeSelector {
                     case .error:
                         focusedEpisodeID = "ErrorCard"
                     case .initial, .refreshing:
-                        focusedEpisodeID = lastFocusedEpisodeID
+                        focusedEpisodeID = "LoadingCard"
                     }
                 },
                 top: "seasons"
@@ -168,12 +168,15 @@ extension SeriesEpisodeSelector {
 
     struct LoadingHStack: View {
 
+        let focusedEpisodeID: FocusState<String?>.Binding
+
         var body: some View {
             CollectionHStack(
-                count: Int.random(in: 2 ..< 5),
+                count: 1,
                 columns: 3.5
             ) { _ in
                 SeriesEpisodeSelector.LoadingCard()
+                    .focused(focusedEpisodeID, equals: "LoadingCard")
                     .padding(.horizontal, 4)
             }
             .allowScrolling(false)

diff --git a/Swiftfin tvOS/Views/ItemView/Components/EpisodeSelector/Components/ErrorCard.swift b/Swiftfin tvOS/Views/ItemView/Components/EpisodeSelector/Components/ErrorCard.swift
@@ -33,7 +33,7 @@ extension SeriesEpisodeSelector {
                         .opacity(0.75)
                         .posterStyle(.landscape)
                         .overlay {
-                            Image(systemName: "arrow.clockwise.circle.fill")
+                            Image(systemName: "arrow.clockwise")
                                 .font(.system(size: 40))
                         }
                 }

diff --git a/Swiftfin tvOS/Views/ItemView/Components/EpisodeSelector/EpisodeSelector.swift b/Swiftfin tvOS/Views/ItemView/Components/EpisodeSelector/EpisodeSelector.swift
@@ -12,21 +12,34 @@ import SwiftUI
 
 struct SeriesEpisodeSelector: View {
 
+    // MARK: - Observed & Environment Objects
+
     @ObservedObject
     var viewModel: SeriesItemViewModel
 
     @EnvironmentObject
     private var parentFocusGuide: FocusGuide
 
+    // MARK: - State Variables
+
     @State
     private var didSelectPlayButtonSeason = false
     @State
     private var selection: SeasonItemViewModel.ID?
 
+    // MARK: - Focus States
+
+    @FocusState
+    private var focusedSection: String?
+
+    // MARK: - Calculated Variables
+
     private var selectionViewModel: SeasonItemViewModel? {
         viewModel.seasons.first(where: { $0.id == selection })
     }
 
+    // MARK: - Body
+
     var body: some View {
         VStack(spacing: 0) {
             SeasonsHStack(viewModel: viewModel, selection: $selection)
@@ -36,7 +49,9 @@ struct SeriesEpisodeSelector: View {
                 EpisodeHStack(viewModel: selectionViewModel, playButtonItem: viewModel.playButtonItem)
                     .environmentObject(parentFocusGuide)
             } else {
-                LoadingHStack()
+                LoadingHStack(focusedEpisodeID: $focusedSection)
+                    .environmentObject(parentFocusGuide)
+                    .focused($focusedSection, equals: "LoadingCard")
             }
         }
         .onReceive(viewModel.playButtonItem.publisher) { newValue in