From 6c08bfc9b1afc39def06b2d87f1dd08430ab3e64 Mon Sep 17 00:00:00 2001 From: Artem Chepurnoy Date: Sun, 18 Feb 2024 11:47:17 +0200 Subject: [PATCH] Prefer normal surface color over High surface color for navigation bars #167 --- .../keyguard/ui/surface/BackgroundManager.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/common/src/commonMain/kotlin/com/artemchep/keyguard/ui/surface/BackgroundManager.kt b/common/src/commonMain/kotlin/com/artemchep/keyguard/ui/surface/BackgroundManager.kt index 59c85bc..5468801 100644 --- a/common/src/commonMain/kotlin/com/artemchep/keyguard/ui/surface/BackgroundManager.kt +++ b/common/src/commonMain/kotlin/com/artemchep/keyguard/ui/surface/BackgroundManager.kt @@ -14,14 +14,16 @@ class BackgroundManager { val colorHighest: Color @Composable get() { + val surfaceContainer = MaterialTheme.colorScheme.surfaceContainer val surfaceContainerHigh = MaterialTheme.colorScheme.surfaceContainerHigh val surfaceContainerHighest = MaterialTheme.colorScheme.surfaceContainerHighest var maxPriority = 0 surfaceColorsState.values.forEach { color -> val priority = when (color) { - surfaceContainerHigh -> 1 - surfaceContainerHighest -> 2 + surfaceContainer -> 1 + surfaceContainerHigh -> 2 + surfaceContainerHighest -> 3 else -> 0 } if (maxPriority < priority) { @@ -30,8 +32,9 @@ class BackgroundManager { } return when (maxPriority) { - 0 -> surfaceContainerHigh - 1 -> surfaceContainerHighest + 0 -> surfaceContainer + 1 -> surfaceContainerHigh + 2 -> surfaceContainerHighest else -> surfaceContainerHighest } }