mirror of
https://github.com/meshtastic/Meshtastic-Android.git
synced 2026-05-14 01:36:09 -04:00
fix(UI): update send and receive colors (#2666)
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
@@ -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}")
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user