mirror of
https://github.com/JustinZeus/Wholphin.git
synced 2026-07-08 23:51:21 +02:00
Theme tweaks
This commit is contained in:
parent
8903b77bf3
commit
14de2442bd
5 changed files with 9 additions and 9 deletions
|
|
@ -1,6 +1,5 @@
|
||||||
package com.github.damontecres.dolphin.ui.components
|
package com.github.damontecres.dolphin.ui.components
|
||||||
|
|
||||||
import androidx.compose.material3.MaterialTheme
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.getValue
|
import androidx.compose.runtime.getValue
|
||||||
import androidx.compose.ui.Modifier
|
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
|
import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun LicenseInfo(modifier: Modifier) {
|
fun LicenseInfo(modifier: Modifier = Modifier) {
|
||||||
val libraries by rememberLibraries()
|
val libraries by rememberLibraries()
|
||||||
MaterialTheme {
|
|
||||||
LibrariesContainer(libraries, modifier)
|
LibrariesContainer(libraries, modifier)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -182,7 +182,9 @@ fun HomePageContent(
|
||||||
name = item?.data?.seriesName ?: item?.name,
|
name = item?.data?.seriesName ?: item?.name,
|
||||||
imageUrl = item?.imageUrl,
|
imageUrl = item?.imageUrl,
|
||||||
aspectRatio = (2f / 3f),
|
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,
|
played = item?.data?.userData?.played ?: false,
|
||||||
playPercent = item?.data?.userData?.playedPercentage ?: 0.0,
|
playPercent = item?.data?.userData?.playedPercentage ?: 0.0,
|
||||||
onClick = onClick,
|
onClick = onClick,
|
||||||
|
|
|
||||||
|
|
@ -516,7 +516,7 @@ class PlaybackViewModel
|
||||||
if (segments.items.isNotEmpty()) {
|
if (segments.items.isNotEmpty()) {
|
||||||
while (isActive) {
|
while (isActive) {
|
||||||
delay(500L)
|
delay(500L)
|
||||||
val currentTicks = player.currentPosition.milliseconds.inWholeTicks
|
val currentTicks = withContext(Dispatchers.Main) { player.currentPosition.milliseconds.inWholeTicks }
|
||||||
val currentSegment =
|
val currentSegment =
|
||||||
segments.items
|
segments.items
|
||||||
.firstOrNull {
|
.firstOrNull {
|
||||||
|
|
|
||||||
|
|
@ -198,6 +198,6 @@ val BlueThemeColors =
|
||||||
inverseSurface = inverseSurfaceDark,
|
inverseSurface = inverseSurfaceDark,
|
||||||
inverseOnSurface = inverseOnSurfaceDark,
|
inverseOnSurface = inverseOnSurfaceDark,
|
||||||
inversePrimary = inversePrimaryDark,
|
inversePrimary = inversePrimaryDark,
|
||||||
border = inversePrimaryDark.copy(alpha = .75f),
|
border = inversePrimaryDark,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ val PurpleThemeColors =
|
||||||
val onSecondaryDark = Color(0xFF3B167D)
|
val onSecondaryDark = Color(0xFF3B167D)
|
||||||
val secondaryContainerDark = Color(0xFF533295)
|
val secondaryContainerDark = Color(0xFF533295)
|
||||||
val onSecondaryContainerDark = Color(0xFFC2A6FF)
|
val onSecondaryContainerDark = Color(0xFFC2A6FF)
|
||||||
val tertiaryDark = Color(0xFFFFACE7)
|
val tertiaryDark = Color(0xFFC071F8)
|
||||||
val onTertiaryDark = Color(0xFF5E0052)
|
val onTertiaryDark = Color(0xFF5E0052)
|
||||||
val tertiaryContainerDark = Color(0xFFB800A3)
|
val tertiaryContainerDark = Color(0xFFB800A3)
|
||||||
val onTertiaryContainerDark = Color(0xFFFFD7F0)
|
val onTertiaryContainerDark = Color(0xFFFFD7F0)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue