From 14de2442bd0c537a524604d01867dd58842eb5e3 Mon Sep 17 00:00:00 2001 From: Damontecres Date: Sat, 11 Oct 2025 15:43:04 -0400 Subject: [PATCH] Theme tweaks --- .../damontecres/dolphin/ui/components/LicenseInfo.kt | 8 +++----- .../com/github/damontecres/dolphin/ui/main/HomePage.kt | 4 +++- .../damontecres/dolphin/ui/playback/PlaybackViewModel.kt | 2 +- .../dolphin/ui/theme/colors/BlueThemeColors.kt | 2 +- .../dolphin/ui/theme/colors/PurpleThemeColors.kt | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/github/damontecres/dolphin/ui/components/LicenseInfo.kt b/app/src/main/java/com/github/damontecres/dolphin/ui/components/LicenseInfo.kt index 6d607c63..9ff85d4e 100644 --- a/app/src/main/java/com/github/damontecres/dolphin/ui/components/LicenseInfo.kt +++ b/app/src/main/java/com/github/damontecres/dolphin/ui/components/LicenseInfo.kt @@ -1,6 +1,5 @@ package com.github.damontecres.dolphin.ui.components -import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier @@ -8,9 +7,8 @@ import com.mikepenz.aboutlibraries.ui.compose.android.rememberLibraries import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer @Composable -fun LicenseInfo(modifier: Modifier) { +fun LicenseInfo(modifier: Modifier = Modifier) { val libraries by rememberLibraries() - MaterialTheme { - LibrariesContainer(libraries, modifier) - } + + LibrariesContainer(libraries, modifier) } diff --git a/app/src/main/java/com/github/damontecres/dolphin/ui/main/HomePage.kt b/app/src/main/java/com/github/damontecres/dolphin/ui/main/HomePage.kt index 36a487ae..010bd969 100644 --- a/app/src/main/java/com/github/damontecres/dolphin/ui/main/HomePage.kt +++ b/app/src/main/java/com/github/damontecres/dolphin/ui/main/HomePage.kt @@ -182,7 +182,9 @@ fun HomePageContent( name = item?.data?.seriesName ?: item?.name, imageUrl = item?.imageUrl, aspectRatio = (2f / 3f), - cornerText = item?.data?.indexNumber?.let { "E$it" }, + cornerText = + item?.data?.indexNumber?.let { "E$it" } + ?: item?.data?.childCount?.let { if (it > 0) it.toString() else null }, played = item?.data?.userData?.played ?: false, playPercent = item?.data?.userData?.playedPercentage ?: 0.0, onClick = onClick, diff --git a/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackViewModel.kt b/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackViewModel.kt index ad0c4dd3..df3ac97e 100644 --- a/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackViewModel.kt +++ b/app/src/main/java/com/github/damontecres/dolphin/ui/playback/PlaybackViewModel.kt @@ -516,7 +516,7 @@ class PlaybackViewModel if (segments.items.isNotEmpty()) { while (isActive) { delay(500L) - val currentTicks = player.currentPosition.milliseconds.inWholeTicks + val currentTicks = withContext(Dispatchers.Main) { player.currentPosition.milliseconds.inWholeTicks } val currentSegment = segments.items .firstOrNull { diff --git a/app/src/main/java/com/github/damontecres/dolphin/ui/theme/colors/BlueThemeColors.kt b/app/src/main/java/com/github/damontecres/dolphin/ui/theme/colors/BlueThemeColors.kt index 99bb865a..ba563184 100644 --- a/app/src/main/java/com/github/damontecres/dolphin/ui/theme/colors/BlueThemeColors.kt +++ b/app/src/main/java/com/github/damontecres/dolphin/ui/theme/colors/BlueThemeColors.kt @@ -198,6 +198,6 @@ val BlueThemeColors = inverseSurface = inverseSurfaceDark, inverseOnSurface = inverseOnSurfaceDark, inversePrimary = inversePrimaryDark, - border = inversePrimaryDark.copy(alpha = .75f), + border = inversePrimaryDark, ) } diff --git a/app/src/main/java/com/github/damontecres/dolphin/ui/theme/colors/PurpleThemeColors.kt b/app/src/main/java/com/github/damontecres/dolphin/ui/theme/colors/PurpleThemeColors.kt index 5b579b60..c6a73fa9 100644 --- a/app/src/main/java/com/github/damontecres/dolphin/ui/theme/colors/PurpleThemeColors.kt +++ b/app/src/main/java/com/github/damontecres/dolphin/ui/theme/colors/PurpleThemeColors.kt @@ -42,7 +42,7 @@ val PurpleThemeColors = val onSecondaryDark = Color(0xFF3B167D) val secondaryContainerDark = Color(0xFF533295) val onSecondaryContainerDark = Color(0xFFC2A6FF) - val tertiaryDark = Color(0xFFFFACE7) + val tertiaryDark = Color(0xFFC071F8) val onTertiaryDark = Color(0xFF5E0052) val tertiaryContainerDark = Color(0xFFB800A3) val onTertiaryContainerDark = Color(0xFFFFD7F0)