From c12c35164a75d733ac3b014d8040fc8126922333 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sun, 30 Nov 2025 14:40:06 +0100 Subject: [PATCH] fix colors in high contrast theme --- .../java/de/mm20/launcher2/ui/component/SearchActionIcon.kt | 4 ++-- .../mm20/launcher2/ui/launcher/searchbar/SearchBarActions.kt | 3 +++ .../settings/unitconverter/UnitConverterHelpSettingsScreen.kt | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/component/SearchActionIcon.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/SearchActionIcon.kt index 3fc5d9f65..a4767759b 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/component/SearchActionIcon.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/SearchActionIcon.kt @@ -5,7 +5,7 @@ import android.content.pm.PackageManager import android.graphics.drawable.Drawable import androidx.compose.foundation.layout.size import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.LocalContentColor import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue @@ -39,7 +39,7 @@ fun SearchActionIcon( size: Dp = 20.dp ) { val tint = when (color) { - 0 -> MaterialTheme.colorScheme.primary + 0 -> LocalContentColor.current 1 -> Color.Unspecified else -> Color(color) } diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarActions.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarActions.kt index 1308315c7..550a5a477 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarActions.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarActions.kt @@ -50,6 +50,9 @@ fun ColumnScope.SearchBarActions( colors = if (it == highlightedAction) { AssistChipDefaults.assistChipColors( containerColor = MaterialTheme.colorScheme.secondaryContainer, + labelColor = MaterialTheme.colorScheme.onSecondaryContainer, + leadingIconContentColor = MaterialTheme.colorScheme.onSecondaryContainer, + trailingIconContentColor = MaterialTheme.colorScheme.onSecondaryContainer, ) } else AssistChipDefaults.assistChipColors(), border = if (it == highlightedAction) { diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterHelpSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterHelpSettingsScreen.kt index 10f99f721..da281cc58 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterHelpSettingsScreen.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/unitconverter/UnitConverterHelpSettingsScreen.kt @@ -59,7 +59,7 @@ fun UnitConverterHelpSettingsScreen() { .background(MaterialTheme.colorScheme.secondaryContainer, MaterialTheme.shapes.extraSmall), contentAlignment = Alignment.Center, ) { - Text(unit.symbol, style = MaterialTheme.typography.labelSmall) + Text(unit.symbol, style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSecondaryContainer) } }, )