From e0d50baf15d1a5e2d727250c86c3443b435aeef8 Mon Sep 17 00:00:00 2001 From: damontecres <154766448+damontecres@users.noreply.github.com> Date: Sat, 6 Dec 2025 21:28:29 -0500 Subject: [PATCH] Fix bugs in #380 & #381 (#391) Just a few minor bugs fixes introduced in recent PRs --- .../damontecres/wholphin/services/DatePlayedService.kt | 6 +++--- .../wholphin/ui/detail/episode/EpisodeDetails.kt | 1 + .../damontecres/wholphin/ui/detail/movie/MovieDetails.kt | 1 + .../wholphin/ui/detail/series/FocusedEpisodeFooter.kt | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/github/damontecres/wholphin/services/DatePlayedService.kt b/app/src/main/java/com/github/damontecres/wholphin/services/DatePlayedService.kt index 0a83c1c3..205e12bf 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/services/DatePlayedService.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/services/DatePlayedService.kt @@ -62,12 +62,12 @@ class DatePlayedService ).content.items .firstOrNull() ?.userData - ?.lastPlayedDate - if (premiereDate != null && premiereDate.isAfter(result)) { + ?.lastPlayedDate ?: LocalDateTime.MIN + if (premiereDate != null && result.isBefore(premiereDate)) { premiereDate } else { result - } ?: LocalDateTime.MIN + } } catch (ex: InvalidStatusException) { Timber.w( "Error fetching series=%s, item=%s: %s", diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/episode/EpisodeDetails.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/episode/EpisodeDetails.kt index c9b627ee..cd83bde4 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/episode/EpisodeDetails.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/episode/EpisodeDetails.kt @@ -329,6 +329,7 @@ fun EpisodeDetailsContent( }, modifier = Modifier + .fillMaxWidth() .padding(bottom = 16.dp) .focusRequester(focusRequesters[HEADER_ROW]), ) diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/movie/MovieDetails.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/movie/MovieDetails.kt index d180c9c7..aafc4c03 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/movie/MovieDetails.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/movie/MovieDetails.kt @@ -430,6 +430,7 @@ fun MovieDetailsContent( }, modifier = Modifier + .fillMaxWidth() .padding(bottom = 16.dp) .focusRequester(focusRequesters[HEADER_ROW]), ) diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/FocusedEpisodeFooter.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/FocusedEpisodeFooter.kt index 34a671ab..ddaedd88 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/FocusedEpisodeFooter.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/detail/series/FocusedEpisodeFooter.kt @@ -2,6 +2,7 @@ package com.github.damontecres.wholphin.ui.detail.series import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Alignment @@ -44,7 +45,7 @@ fun FocusedEpisodeFooter( watchOnClick = watchOnClick, favoriteOnClick = favoriteOnClick, buttonOnFocusChanged = buttonOnFocusChanged, - modifier = Modifier, + modifier = Modifier.fillMaxWidth(), ) } }