fix: skip actions now properly skip

App/Shared/Assets.xcassets/search.badge.questionmark.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "search.badge.questionmark.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Sources/Features/Search/SearchFeature+View.swift

@@ -25,84 +25,87 @@ extension SearchFeature.View: View {
       showStatusBarBackground = offset.y <= -2.9 // FIXME: SafeAreaInset affects the offset of this
     } content: {
       WithViewStore(store, observe: \.searchResult) { viewStore in
-        LoadableView(loadable: viewStore.state) { searchResult in
-          if searchResult.items.isEmpty {
-            WithViewStore(store, observe: \.query) { queryStore in
-              StatusView(
-                title: "No Results",
-                description: "for \"\(queryStore.state)\"",
-                assetImage: "search"
-              )
-            }
-          } else {
-            LazyVGrid(
-              columns: [.init(.adaptive(minimum: 120), alignment: .top)],
-              alignment: .leading
-            ) {
-              ForEach(searchResult.items) { item in
-                VStack(alignment: .leading) {
-                  FillAspectImage(url: item.posterImage)
-                    .aspectRatio(2 / 3, contentMode: .fit)
-                    .cornerRadius(12)
+        ZStack {
+          LoadableView(loadable: viewStore.state) { searchResult in
+            if searchResult.items.isEmpty {
+              WithViewStore(store, observe: \.query) { queryStore in
+                StatusView(
+                  title: "No Results",
+                  description: "for \"\(queryStore.state)\"",
+                  assetImage: "search.badge.questionmark"
+                )
+              }
+            } else {
+              LazyVGrid(
+                columns: [.init(.adaptive(minimum: 120), alignment: .top)],
+                alignment: .leading
+              ) {
+                ForEach(searchResult.items) { item in
+                  VStack(alignment: .leading) {
+                    FillAspectImage(url: item.posterImage)
+                      .aspectRatio(2 / 3, contentMode: .fit)
+                      .cornerRadius(12)
 
-                  Text(item.title ?? "Title Unavailable")
-                    .font(.footnote)
-                }
-                .contentShape(Rectangle())
-                .onTapGesture {
-                  viewStore.send(.didTapPlaylist(item))
+                    Text(item.title ?? "Title Unavailable")
+                      .font(.footnote)
+                  }
+                  .contentShape(Rectangle())
+                  .onTapGesture {
+                    viewStore.send(.didTapPlaylist(item))
+                  }
                 }
               }
-            }
-            .padding(.horizontal)
+              .padding(.horizontal)
 
-            if let nextPage = searchResult.nextPage {
-              LoadableView(loadable: nextPage) { nextPageId in
-                LazyView {
-                  Spacer()
-                    .frame(height: 1)
-                    .onAppear {
-                      store.send(.view(.didShowNextPageIndicator(nextPageId)))
-                    }
-                }
-              } failedView: { _ in
-                Button {
-                  // TODO: Allow refetch when paging failed
-                } label: {
-                  Image(systemName: "arrow.clockwise")
-                    .font(.body)
-                    .padding(4)
+              if let nextPage = searchResult.nextPage {
+                LoadableView(loadable: nextPage) { nextPageId in
+                  LazyView {
+                    Spacer()
+                      .frame(height: 1)
+                      .onAppear {
+                        store.send(.view(.didShowNextPageIndicator(nextPageId)))
+                      }
+                  }
+                } failedView: { _ in
+                  Button {
+                      // TODO: Allow refetch when paging failed
+                  } label: {
+                    Image(systemName: "arrow.clockwise")
+                      .font(.body)
+                      .padding(4)
+                  }
+                  .contentShape(Rectangle())
+                } waitingView: {
+                  ProgressView()
+                    .padding(.vertical, 8)
                 }
-                .contentShape(Rectangle())
-              } waitingView: {
-                ProgressView()
-                  .padding(.vertical, 8)
               }
             }
-          }
-        } failedView: { _ in
-          // TODO: Make error more explicit
-          StatusView(
-            title: .init(localizable: "Search Failed"),
-            description: .init(localizable: "Failed to retrieve items."),
-            image: .asset("search.trianglebadge.exclamationmark"),
-            foregroundColor: .red
-          )
-        } loadingView: {
-          WithViewStore(store, observe: \.query) { queryStore in
+          } failedView: { _ in
+              // TODO: Make error more explicit
+            StatusView(
+              title: .init(localizable: "Search Failed"),
+              description: .init(localizable: "Failed to retrieve items."),
+              image: .asset("search.trianglebadge.exclamationmark"),
+              foregroundColor: .red
+            )
+          } loadingView: {
+            WithViewStore(store, observe: \.query) { queryStore in
+              StatusView(
+                title: "Searching...",
+                description: "for \"\(queryStore.state)\"",
+                assetImage: "search.badge.clock"
+              )
+            }
+          } pendingView: {
             StatusView(
-              title: "Searching...",
-              description: "for \"\(queryStore.state)\"",
-              assetImage: "search.badge.clock"
+              title: .init(localizable: "Search Empty"),
+              description: "Type to start searching.",
+              systemImage: "magnifyingglass"
             )
           }
-        } pendingView: {
-          StatusView(
-            title: .init(localizable: "Search Empty"),
-            description: "Type to start searching.",
-            systemImage: "magnifyingglass"
-          )
         }
+        .animation(.easeInOut(duration: 0.2), value: viewStore.state.didFinish)
       }
       .frame(maxWidth: .infinity, maxHeight: .infinity)
     }

Sources/Features/VideoPlayer/Components/ProgressBar.swift

@@ -99,7 +99,7 @@ struct ProgressBar: View {
               let percentageX = value.location.x / proxy.size.width
 
               dragged = dragged ?? .init(progress: progress, initial: percentageX)
-              viewState.send(.didSkipTo(time: dragged?.progress ?? .zero))
+              viewState.send(.didSeekTo(time: dragged?.progress ?? .zero))
               dragged?(percentageX)
             }
             .onEnded { _ in

Sources/Features/VideoPlayer/VideoPlayerFeature+Reducer.swift

@@ -71,14 +71,21 @@ extension VideoPlayerFeature: Reducer {
       case let .view(.didTapLink(linkId)):
         return state.clearForChangedLinkIfNeeded(linkId)
 
-      case let .view(.didSkipTo(time)):
+      case let .view(.didSeekTo(time)):
         return .merge(
           state.delayDismissOverlayIfNeeded(),
-          .run { _ in
-            await playerClient.seek(time)
-          }
+          .run { await playerClient.seek(time) }
         )
 
+      case let .view(.didSkipTo(time)):
+        if let totalDuration = state.player.playback?.totalDuration, totalDuration != .zero {
+          let progress = time / totalDuration
+          return .merge(
+            state.delayDismissOverlayIfNeeded(),
+            .run {  await playerClient.seek(progress) }
+          )
+        }
+
       case .view(.didTogglePlayback):
         let isPlaying = state.player.playback?.state == .playing
         let playRate = state.playerSettings.speed

Sources/Features/VideoPlayer/VideoPlayerFeature.swift

@@ -137,6 +137,7 @@ public struct VideoPlayerFeature: Feature {
       case didSkipBackwards
       case didChangePlaybackRate(Double)
       case didSkipTo(time: CGFloat)
+      case didSeekTo(time: CGFloat)
       case didTapGroupOption(MediaSelectionOption?, for: MediaSelectionGroup)
       case didTapSource(Playlist.EpisodeSource.ID)
       case didTapServer(Playlist.EpisodeServer.ID)
@@ -167,13 +168,9 @@ public struct VideoPlayerFeature: Feature {
     @Dependency(\.playerClient.player) var player
 
     @SwiftUI.State var enablePiP = false
-
     @SwiftUI.State var gravity = AVLayerVideoGravity.resizeAspect
-
     @SwiftUI.State var pipSupported = true
-
     @SwiftUI.State var pipPossible = true
-
     @SwiftUI.State var pipStatus = PiPStatus.restoreUI
 
     @MainActor
@@ -183,9 +180,7 @@ public struct VideoPlayerFeature: Feature {
   }
 
   @Dependency(\.dismiss) var dismiss
-
   @Dependency(\.moduleClient) var moduleClient
-
   @Dependency(\.playerClient) var playerClient
 
   public init() {}
@@ -322,15 +317,14 @@ extension VideoPlayerFeature.State {
 
 extension VideoPlayerFeature.View {
   struct SkipActionViewState: Equatable {
+    @CasePathable
+    @dynamicMemberLookup
     enum Action: Hashable, CustomStringConvertible {
       case times(Playlist.EpisodeServer.SkipTime)
       case next(Double, Playlist.Group.ID, Playlist.Group.Variant.ID, PagingID, Playlist.Item.ID)
 
       var isEnding: Bool {
-        if case let .times(time) = self {
-          return time.type == .ending
-        }
-        return false
+        self.times?.type == .ending
       }
 
       var action: VideoPlayerFeature.Action {
@@ -397,7 +391,8 @@ extension VideoPlayerFeature.View {
 
       if let currentEpisode = state.selectedItem.value,
          let episodes = state.selectedPage.value?.items.value,
-         let index = episodes.firstIndex(where: { $0.id == currentEpisode.id }), (index + 1) < episodes.endIndex {
+         let index = episodes.firstIndex(where: \.id == currentEpisode.id),
+         (index + 1) < episodes.endIndex {
         let nextEpisode = episodes[index + 1]
 
         if let ending = actions.first(where: \.isEnding), case let .times(type) = ending {