fix: subtitles not being selected

Mochi-Team · Dec 28, 2023 · 27b58ce · 27b58ce
1 parent 8d384b7
commit 27b58ce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/Sources/Clients/PlayerClient/Extension/AVMediaSelectionGroup+Struct.swift b/Sources/Clients/PlayerClient/Extension/AVMediaSelectionGroup+Struct.swift
@@ -50,7 +50,6 @@ public struct MediaSelectionGroup: Hashable, Sendable {
   }
 
   public func hash(into hasher: inout Hasher) {
-    hasher.combine(_ref)
     hasher.combine(displayName)
     hasher.combine(selected)
     hasher.combine(options)
@@ -59,12 +58,11 @@ public struct MediaSelectionGroup: Hashable, Sendable {
   }
 
   public static func == (lhs: Self, rhs: Self) -> Bool {
-    lhs._ref.isEqual(rhs._ref) &&
-      lhs.displayName == rhs.displayName &&
-      lhs.selected == rhs.selected &&
-      lhs.options == rhs.options &&
-      lhs.defaultOption == rhs.defaultOption &&
-      lhs.allowsEmptySelection == rhs.allowsEmptySelection
+    lhs.displayName == rhs.displayName &&
+    lhs.selected == rhs.selected &&
+    lhs.options == rhs.options &&
+    lhs.defaultOption == rhs.defaultOption &&
+    lhs.allowsEmptySelection == rhs.allowsEmptySelection
   }
 }
 
@@ -96,15 +94,14 @@ public struct MediaSelectionOption: Hashable, Sendable {
   }
 
   public func hash(into hasher: inout Hasher) {
-    hasher.combine(_ref)
+    hasher.combine(mediaType)
     hasher.combine(displayName)
     hasher.combine(isPlayable)
   }
 
   public static func == (lhs: Self, rhs: Self) -> Bool {
-    lhs._ref.isEqual(rhs._ref) &&
-      lhs.mediaType == rhs.mediaType &&
-      lhs.displayName == rhs.displayName &&
-      lhs.isPlayable == rhs.isPlayable
+    lhs.mediaType == rhs.mediaType &&
+    lhs.displayName == rhs.displayName &&
+    lhs.isPlayable == rhs.isPlayable
   }
 }
diff --git a/Sources/Features/VideoPlayer/VideoPlayerFeature+View.swift b/Sources/Features/VideoPlayer/VideoPlayerFeature+View.swift
@@ -674,7 +674,7 @@ extension VideoPlayerFeature.View {
             ForEach(viewStore.state ?? [], id: \.`self`) { group in
               MoreListingRow(
                 title: group.displayName,
-                selected: { $0 == group.selected || $0 == group.defaultOption },
+                selected: { $0 == group.selected },
                 items: group.options,
                 itemTitle: \.displayName,
                 noneCallback: !group.allowsEmptySelection ? nil : {
@@ -684,6 +684,7 @@ extension VideoPlayerFeature.View {
                   viewStore.send(.view(.didTapGroupOption(option, for: group)))
                 }
               )
+              .animation(.easeInOut, value: group.selected)
             }
           }
         }