From 6050b38d777ecabcd8b260732fd1c6898c597915 Mon Sep 17 00:00:00 2001
From: Damontecres <damontecres@gmail.com>
Date: Fri, 2 Jan 2026 17:15:59 -0500
Subject: [PATCH] Fixes after merge

---
 .../damontecres/wholphin/MainActivity.kt      |  3 ---
 .../wholphin/ui/components/PlayButtons.kt     |  1 -
 .../detail/discover/DiscoverMovieViewModel.kt |  2 +-
 .../detail/discover/DiscoverSeriesDetails.kt  |  1 -
 .../wholphin/ui/seerr/SeerrDiscoverPage.kt    | 25 ++++++++++---------
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt b/app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt
index c449a4d3..fb3e88ed 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt
@@ -106,9 +106,6 @@ class MainActivity : AppCompatActivity() {
     @Inject
     lateinit var refreshRateService: RefreshRateService
 
-    @Inject
-    lateinit var datePlayedInvalidationService: DatePlayedInvalidationService
-
     @Inject
     lateinit var userSwitchListener: UserSwitchListener
 
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/components/PlayButtons.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/components/PlayButtons.kt
index 0d825f13..2856f319 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/components/PlayButtons.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/components/PlayButtons.kt
@@ -245,7 +245,6 @@ fun ExpandableFaButton(
             ),
         contentPadding = DefaultButtonPadding,
         interactionSource = interactionSource,
-        enabled = enabled,
     ) {
         Box(
             modifier =
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieViewModel.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieViewModel.kt
index 3ae97ba7..37b91816 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieViewModel.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverMovieViewModel.kt
@@ -155,7 +155,7 @@ class DiscoverMovieViewModel
                         ?.filter { it.type == RelatedVideo.Type.TRAILER }
                         ?.filter { it.name.isNotNullOrBlank() && it.url.isNotNullOrBlank() }
                         ?.map {
-                            RemoteTrailer(it.name!!, it.url!!)
+                            RemoteTrailer(it.name!!, it.url!!, null)
                         }.orEmpty()
                 this@DiscoverMovieViewModel.trailers.setValueOnMain(trailers)
             }
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt
index ce71fa3a..5ef26aa4 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/discover/DiscoverSeriesDetails.kt
@@ -61,7 +61,6 @@ import com.github.damontecres.wholphin.ui.components.LoadingPage
 import com.github.damontecres.wholphin.ui.components.OverviewText
 import com.github.damontecres.wholphin.ui.data.ItemDetailsDialog
 import com.github.damontecres.wholphin.ui.data.ItemDetailsDialogInfo
-import com.github.damontecres.wholphin.ui.detail.movie.TrailerRow
 import com.github.damontecres.wholphin.ui.letNotEmpty
 import com.github.damontecres.wholphin.ui.nav.Destination
 import com.github.damontecres.wholphin.ui.rememberInt
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/seerr/SeerrDiscoverPage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/seerr/SeerrDiscoverPage.kt
index 6b70c5e5..9f81c866 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/seerr/SeerrDiscoverPage.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/seerr/SeerrDiscoverPage.kt
@@ -16,6 +16,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
@@ -161,14 +162,14 @@ fun SeerrDiscoverPage(
                         onClick = onClick,
                         onLongClick = onLongClick,
                         showOverlay = false,
-                        modifier = mod,
+                        modifier =
+                            mod.onFocusChanged {
+                                if (it.isFocused) {
+                                    position = RowColumn(0, index)
+                                }
+                            },
                     )
                 },
-                cardOnFocus = { isFocused, index ->
-                    if (isFocused) {
-                        position = RowColumn(0, index)
-                    }
-                },
                 modifier = Modifier.focusRequester(focusRequester),
             )
             ItemRow(
@@ -193,14 +194,14 @@ fun SeerrDiscoverPage(
                         onClick = onClick,
                         onLongClick = onLongClick,
                         showOverlay = false,
-                        modifier = mod,
+                        modifier =
+                            mod.onFocusChanged {
+                                if (it.isFocused) {
+                                    position = RowColumn(1, index)
+                                }
+                            },
                     )
                 },
-                cardOnFocus = { isFocused, index ->
-                    if (isFocused) {
-                        position = RowColumn(1, index)
-                    }
-                },
             )
         }
     }