justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-09 08:01:20 +02:00
Code Issues Projects Packages Wiki Activity Actions

Better colors for prefs

Browse source
This commit is contained in:
Damontecres 2025-09-30 17:33:29 -04:00
parent 60de501851
commit 70d579eea4
No known key found for this signature in database
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/github/damontecres/dolphin/ui/preferences/PreferencesContent.kt
View file

@ -36,6 +36,7 @@ import androidx.compose.ui.unit.dp
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.tv.material3.MaterialTheme import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text import androidx.tv.material3.Text
import androidx.tv.material3.surfaceColorAtElevation
import com.github.damontecres.dolphin.R import com.github.damontecres.dolphin.R
import com.github.damontecres.dolphin.preferences.AppPreferences import com.github.damontecres.dolphin.preferences.AppPreferences
import com.github.damontecres.dolphin.ui.ifElse import com.github.damontecres.dolphin.ui.ifElse
@ -133,7 +134,7 @@ fun PreferencesContent(
horizontalAlignment = Alignment.Start, horizontalAlignment = Alignment.Start,
verticalArrangement = Arrangement.spacedBy(0.dp), verticalArrangement = Arrangement.spacedBy(0.dp),
contentPadding = PaddingValues(16.dp), contentPadding = PaddingValues(16.dp),
modifier = Modifier.background(MaterialTheme.colorScheme.secondaryContainer), modifier = Modifier.background(MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp)),
) { ) {
stickyHeader { stickyHeader {
Text( Text(
@ -152,7 +153,7 @@ fun PreferencesContent(
Text( Text(
text = stringResource(group.title), text = stringResource(group.title),
style = MaterialTheme.typography.titleMedium, style = MaterialTheme.typography.titleMedium,
color = MaterialTheme.colorScheme.border, color = MaterialTheme.colorScheme.onSurface,
textAlign = TextAlign.Start, textAlign = TextAlign.Start,
modifier = modifier =
Modifier Modifier

11
app/src/main/java/com/github/damontecres/dolphin/ui/preferences/SliderPreference.kt
View file

@ -22,6 +22,7 @@ import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.tv.material3.MaterialTheme import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.ProvideTextStyle import androidx.tv.material3.ProvideTextStyle
import androidx.tv.material3.contentColorFor
import com.github.damontecres.dolphin.ui.components.SliderBar import com.github.damontecres.dolphin.ui.components.SliderBar
@Composable @Composable
@ -40,16 +41,12 @@ fun SliderPreference(
val focused = interactionSource.collectIsFocusedAsState().value val focused = interactionSource.collectIsFocusedAsState().value
val background = val background =
if (focused) { if (focused) {
MaterialTheme.colorScheme.onBackground MaterialTheme.colorScheme.inverseSurface
} else { } else {
Color.Unspecified Color.Unspecified
} }
val contentColor = val contentColor = contentColorFor(background)
if (focused) {
Color.Unspecified
} else {
MaterialTheme.colorScheme.onSurface
}
Column( Column(
verticalArrangement = Arrangement.spacedBy(8.dp), verticalArrangement = Arrangement.spacedBy(8.dp),
modifier = modifier =