From 86a9e07f31ab187dd340e0c2777c1da1f105511d Mon Sep 17 00:00:00 2001 From: SessionHero01 <180888785+SessionHero01@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:05:42 +1100 Subject: [PATCH] Alert text color --- .../thoughtcrime/securesms/groups/compose/Components.kt | 5 ++++- .../org/thoughtcrime/securesms/ui/theme/ThemeColors.kt | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/compose/Components.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/compose/Components.kt index d2df499aa6..055dc56e32 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/compose/Components.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/compose/Components.kt @@ -66,7 +66,10 @@ fun GroupMinimumVersionBanner(modifier: Modifier = Modifier) { style = LocalType.current.small, maxLines = 2, textAlign = TextAlign.Center, - modifier = Modifier.padding(horizontal = 24.dp, vertical = 4.dp) + modifier = Modifier.padding( + horizontal = LocalDimensions.current.spacing, + vertical = LocalDimensions.current.xxxsSpacing + ) ) } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/theme/ThemeColors.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/theme/ThemeColors.kt index 233f3472aa..eb060da11c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ui/theme/ThemeColors.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/ui/theme/ThemeColors.kt @@ -116,7 +116,7 @@ data class ClassicDark(override val primary: Color = primaryGreen) : ThemeColors override val qrCodeBackground = text override val primaryButtonFill = primary override val primaryButtonFillText = Color.Black - override val textAlert: Color = classicDark6 + override val textAlert: Color = classicDark0 } data class ClassicLight(override val primary: Color = primaryGreen) : ThemeColors { @@ -156,7 +156,7 @@ data class OceanDark(override val primary: Color = primaryBlue) : ThemeColors { override val qrCodeBackground = text override val primaryButtonFill = primary override val primaryButtonFillText = Color.Black - override val textAlert: Color = oceanDark7 + override val textAlert: Color = oceanDark0 } data class OceanLight(override val primary: Color = primaryBlue) : ThemeColors { @@ -211,5 +211,8 @@ private fun ThemeColors() { Box(Modifier.background(LocalColors.current.borders)) { Text("border", style = LocalType.current.base) } + Box(Modifier.background(LocalColors.current.warning)) { + Text("alertOnWarning", style = LocalType.current.base, color = LocalColors.current.textAlert) + } } } \ No newline at end of file