From 1a7684b458a6c771eb521b507c98234b69639cb0 Mon Sep 17 00:00:00 2001
From: damontecres <154766448+damontecres@users.noreply.github.com>
Date: Mon, 27 Oct 2025 10:17:50 -0400
Subject: [PATCH] Minor UI changes (#75)

* Revert transparent cards from #61
* Don't show queue during playback if playing the final item
* Fix nav drawer collection page from showing everything recursively
* Immediately hide the skip intro button when pressed
---
 .../com/github/damontecres/wholphin/data/model/Playlist.kt     | 2 +-
 .../com/github/damontecres/wholphin/ui/cards/BannerCard.kt     | 3 +--
 .../github/damontecres/wholphin/ui/nav/DestinationContent.kt   | 2 +-
 .../github/damontecres/wholphin/ui/playback/PlaybackPage.kt    | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/github/damontecres/wholphin/data/model/Playlist.kt b/app/src/main/java/com/github/damontecres/wholphin/data/model/Playlist.kt
index 78a17d3d..00e99902 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/data/model/Playlist.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/data/model/Playlist.kt
@@ -24,7 +24,7 @@ class Playlist(
 
     fun hasPrevious(): Boolean = index > 0
 
-    fun hasNext(): Boolean = index < items.size
+    fun hasNext(): Boolean = (index + 1) < items.size
 
     fun getPreviousAndReverse(): BaseItem = items[--index]
 
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/cards/BannerCard.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/cards/BannerCard.kt
index 257430c7..eedc8d81 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/cards/BannerCard.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/cards/BannerCard.kt
@@ -21,7 +21,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.style.TextAlign
@@ -62,7 +61,7 @@ fun BannerCard(
         interactionSource = interactionSource,
         colors =
             CardDefaults.colors(
-                containerColor = Color.Transparent,
+//                containerColor = Color.Transparent,
             ),
     ) {
         Box(
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/nav/DestinationContent.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/nav/DestinationContent.kt
index feba06f2..bd88f329 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/nav/DestinationContent.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/nav/DestinationContent.kt
@@ -124,7 +124,7 @@ fun DestinationContent(
                                 preferences,
                                 destination.itemId,
                                 destination.item,
-                                true,
+                                false,
                                 modifier,
                             )
 
diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackPage.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackPage.kt
index 6412b2a4..c8fc6bb8 100644
--- a/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackPage.kt
+++ b/app/src/main/java/com/github/damontecres/wholphin/ui/playback/PlaybackPage.kt
@@ -392,6 +392,7 @@ fun PlaybackPage(
                         }
                         Button(
                             onClick = {
+                                segmentCancelled = true
                                 player.seekTo(segment.endTicks.ticks.inWholeMilliseconds)
                             },
                             modifier = Modifier.focusRequester(focusRequester),