From b2b475d56963ba44b54ced4be2f4eacd4f017af4 Mon Sep 17 00:00:00 2001 From: Owm Date: Sun, 18 Oct 2026 19:30:49 +0530 Subject: [PATCH 1/2] caption_contrast Signed-off-by: Owm --- .../java/be/scri/ui/common/components/AboutPageItemComp.kt | 5 ++--- .../java/be/scri/ui/common/components/ClickableItemComp.kt | 3 +-- .../java/be/scri/ui/common/components/SwitchableItemComp.kt | 3 +-- app/src/main/java/be/scri/ui/theme/Colors.kt | 1 + app/src/main/java/be/scri/ui/theme/ScribeTheme.kt | 1 + 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/be/scri/ui/common/components/AboutPageItemComp.kt b/app/src/main/java/be/scri/ui/common/components/AboutPageItemComp.kt index a7165de26..4711b6d8e 100644 --- a/app/src/main/java/be/scri/ui/common/components/AboutPageItemComp.kt +++ b/app/src/main/java/be/scri/ui/common/components/AboutPageItemComp.kt @@ -18,7 +18,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -85,7 +84,7 @@ fun AboutPageItemComp( if (descText != null) { Text( text = descText, - color = Color.Gray, + color = MaterialTheme.colorScheme.onSurfaceVariant, style = MaterialTheme.typography.bodySmall, modifier = Modifier.padding(top = 4.dp), ) @@ -98,7 +97,7 @@ fun AboutPageItemComp( .padding(start = 6.dp) .size(24.dp), contentDescription = stringResource(R.string.i18n_app_accessibility_trailing_icon), - tint = Color.Gray, + tint = MaterialTheme.colorScheme.onSurfaceVariant, ) } } diff --git a/app/src/main/java/be/scri/ui/common/components/ClickableItemComp.kt b/app/src/main/java/be/scri/ui/common/components/ClickableItemComp.kt index bc720fbe3..68aef41e0 100644 --- a/app/src/main/java/be/scri/ui/common/components/ClickableItemComp.kt +++ b/app/src/main/java/be/scri/ui/common/components/ClickableItemComp.kt @@ -17,7 +17,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.contentDescription @@ -81,7 +80,7 @@ fun ClickableItemComp( if (!desc.isNullOrEmpty()) { Text( text = desc, - color = Color.Gray, + color = MaterialTheme.colorScheme.onSurfaceVariant, style = MaterialTheme.typography.bodySmall, modifier = Modifier.padding(top = 4.dp), ) diff --git a/app/src/main/java/be/scri/ui/common/components/SwitchableItemComp.kt b/app/src/main/java/be/scri/ui/common/components/SwitchableItemComp.kt index e785a8c52..6c1687af9 100644 --- a/app/src/main/java/be/scri/ui/common/components/SwitchableItemComp.kt +++ b/app/src/main/java/be/scri/ui/common/components/SwitchableItemComp.kt @@ -24,7 +24,6 @@ import androidx.compose.ui.semantics.Role import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.dp -import be.scri.ui.screens.Alpha /** * A composable component that displays a switch alongside a title and description. @@ -104,7 +103,7 @@ fun SwitchableItemComp( desc?.let { description -> Text( text = description, - color = Color.Gray.copy(alpha = Alpha.MEDIUM), + color = MaterialTheme.colorScheme.onSurfaceVariant, style = MaterialTheme.typography.bodySmall, modifier = Modifier.padding(top = 4.dp), ) diff --git a/app/src/main/java/be/scri/ui/theme/Colors.kt b/app/src/main/java/be/scri/ui/theme/Colors.kt index 7c4299896..8e5c9ef7e 100644 --- a/app/src/main/java/be/scri/ui/theme/Colors.kt +++ b/app/src/main/java/be/scri/ui/theme/Colors.kt @@ -15,6 +15,7 @@ val theme_light_switch_selector_color = Color(color = 0xFFFEDE9E) val theme_light_unchecked_switch_selector_color = Color(color = 0xFFEEEEEE) val theme_light_corner_button_color = Color(color = 0xFFFDAD0D) val theme_light_success_color = Color(color = 0xFF9BC53D) +val theme_light_caption_color = Color(color = 0xFF58564B) val theme_dark_card_view_color = Color(color = 0xFF000000) val theme_dark_button_color = Color(color = 0xFFD17B0F) diff --git a/app/src/main/java/be/scri/ui/theme/ScribeTheme.kt b/app/src/main/java/be/scri/ui/theme/ScribeTheme.kt index 1e6a76af5..644648cbb 100644 --- a/app/src/main/java/be/scri/ui/theme/ScribeTheme.kt +++ b/app/src/main/java/be/scri/ui/theme/ScribeTheme.kt @@ -22,6 +22,7 @@ private val LightColors = outlineVariant = theme_light_unchecked_switch_selector_color, surfaceContainer = theme_light_corner_button_color, surfaceVariant = theme_light_success_color, + onSurfaceVariant = theme_light_caption_color, ) private val DarkColors = From eed6f8226c3015b937f1650cf4bbf22022145827 Mon Sep 17 00:00:00 2001 From: angrezichatterbox Date: Sun, 18 Oct 2026 22:49:11 +0530 Subject: [PATCH 2/2] fix: update theme_light_caption_color for improved contrast --- app/src/main/java/be/scri/ui/theme/Colors.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/be/scri/ui/theme/Colors.kt b/app/src/main/java/be/scri/ui/theme/Colors.kt index 8e5c9ef7e..86c72bfe0 100644 --- a/app/src/main/java/be/scri/ui/theme/Colors.kt +++ b/app/src/main/java/be/scri/ui/theme/Colors.kt @@ -15,7 +15,7 @@ val theme_light_switch_selector_color = Color(color = 0xFFFEDE9E) val theme_light_unchecked_switch_selector_color = Color(color = 0xFFEEEEEE) val theme_light_corner_button_color = Color(color = 0xFFFDAD0D) val theme_light_success_color = Color(color = 0xFF9BC53D) -val theme_light_caption_color = Color(color = 0xFF58564B) +val theme_light_caption_color = Color(color = 0xE558564B) val theme_dark_card_view_color = Color(color = 0xFF000000) val theme_dark_button_color = Color(color = 0xFFD17B0F)