From d444275c18ebe5b4e55719d4516dccd3455051f6 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Fri, 8 Aug 2025 17:40:29 -0500 Subject: [PATCH] fix(UI): update send and receive colors (#2666) Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com> --- app/src/main/java/com/geeksville/mesh/ui/Main.kt | 6 +++--- .../com/geeksville/mesh/ui/common/theme/CustomColors.kt | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/Main.kt b/app/src/main/java/com/geeksville/mesh/ui/Main.kt index ddfba0441..23a4e5a88 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/Main.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/Main.kt @@ -113,8 +113,8 @@ import com.geeksville.mesh.ui.TopLevelDestination.Companion.isTopLevel import com.geeksville.mesh.ui.common.components.MultipleChoiceAlertDialog import com.geeksville.mesh.ui.common.components.ScannedQrCodeDialog import com.geeksville.mesh.ui.common.components.SimpleAlertDialog +import com.geeksville.mesh.ui.common.theme.StatusColors.StatusBlue import com.geeksville.mesh.ui.common.theme.StatusColors.StatusGreen -import com.geeksville.mesh.ui.common.theme.StatusColors.StatusOrange import com.geeksville.mesh.ui.common.theme.StatusColors.StatusRed import com.geeksville.mesh.ui.common.theme.StatusColors.StatusYellow import com.geeksville.mesh.ui.debug.DebugMenuActions @@ -242,8 +242,8 @@ fun MainScreen( val coroutineScope = rememberCoroutineScope() val capturedColorScheme = colorScheme // Capture current colorScheme instance for LaunchedEffect - val sendColor = capturedColorScheme.StatusOrange - val receiveColor = capturedColorScheme.StatusYellow + val sendColor = capturedColorScheme.StatusGreen + val receiveColor = capturedColorScheme.StatusBlue LaunchedEffect(uIViewModel.meshActivity, capturedColorScheme) { uIViewModel.meshActivity.collectLatest { activity -> debug("MeshActivity Event: $activity, Current Alpha: ${animatedGlowAlpha.value}") diff --git a/app/src/main/java/com/geeksville/mesh/ui/common/theme/CustomColors.kt b/app/src/main/java/com/geeksville/mesh/ui/common/theme/CustomColors.kt index 09157340a..9d57b8dea 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/common/theme/CustomColors.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/common/theme/CustomColors.kt @@ -89,6 +89,15 @@ object StatusColors { } else { Color(0xFFF44336) } + + val ColorScheme.StatusBlue: Color + @Composable + get() = // If it might change based on theme + if (isSystemInDarkTheme()) { + Color(0xFF2196F3) + } else { + Color(0xFF42A5F5) + } } object MessageItemColors {