From c9f0649ff7cdb3e79fdc1f9c8095ea66997d4422 Mon Sep 17 00:00:00 2001 From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com> Date: Mon, 13 Jan 2025 17:39:40 -0800 Subject: [PATCH] fix: surface colors Material3 changed surface color calculations --- .../aliucord/manager/ui/components/SegmentedButton.kt | 2 +- .../ui/screens/patching/components/StepGroupCard.kt | 2 +- .../patchopts/components/options/TextPatchOption.kt | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/components/SegmentedButton.kt b/app/src/main/kotlin/com/aliucord/manager/ui/components/SegmentedButton.kt index bb4b238..f0f10a7 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/components/SegmentedButton.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/components/SegmentedButton.kt @@ -24,7 +24,7 @@ fun RowScope.SegmentedButton( verticalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterVertically), modifier = Modifier .clickable(onClick = onClick) - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(LocalAbsoluteTonalElevation.current + 2.dp)) + .background(MaterialTheme.colorScheme.surfaceContainerHigh) .weight(1f) .padding(12.dp) ) { diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepGroupCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepGroupCard.kt index 7735de7..00f33f1 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepGroupCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patching/components/StepGroupCard.kt @@ -58,7 +58,7 @@ fun StepGroupCard( Column( modifier = modifier .clip(MaterialTheme.shapes.large) - .background(MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp)) + .background(MaterialTheme.colorScheme.surfaceContainerLow) ) { Row( verticalAlignment = Alignment.CenterVertically, diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/components/options/TextPatchOption.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/components/options/TextPatchOption.kt index f59c3fd..611f274 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/components/options/TextPatchOption.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/components/options/TextPatchOption.kt @@ -24,18 +24,15 @@ fun TextPatchOption( description = description, modifier = modifier, ) { - val containerColor = MaterialTheme.colorScheme - .surfaceColorAtElevation(LocalAbsoluteTonalElevation.current + .5.dp) - OutlinedTextField( value = value, onValueChange = onValueChange, isError = valueIsError, singleLine = true, colors = OutlinedTextFieldDefaults.colors( - unfocusedContainerColor = containerColor, - focusedContainerColor = containerColor, - errorContainerColor = containerColor, + unfocusedContainerColor = MaterialTheme.colorScheme.surfaceContainerLow, + focusedContainerColor = MaterialTheme.colorScheme.surfaceContainerLow, + errorContainerColor = MaterialTheme.colorScheme.surfaceContainerLow, ), trailingIcon = { ResetToDefaultButton(