From c21f5c5a21cd00d87ad85734e29d219b7ad3c1a9 Mon Sep 17 00:00:00 2001 From: Jonathan Nobels Date: Thu, 9 May 2024 12:55:59 -0400 Subject: [PATCH] android/ui: fix theming for the exit node picker button (#382) Fixes tailscale/corp#19881 Exit node picker button is now grey-200 in light mode and grey-700 in dark mode for the disabled state. Signed-off-by: Jonathan Nobels (cherry picked from commit b615eb38b47df92bda5ee78a45d7c2ed30ce89fe) --- .../java/com/tailscale/ipn/ui/theme/Theme.kt | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/android/src/main/java/com/tailscale/ipn/ui/theme/Theme.kt b/android/src/main/java/com/tailscale/ipn/ui/theme/Theme.kt index 6383199..38f00e8 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/theme/Theme.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/theme/Theme.kt @@ -345,11 +345,19 @@ val ColorScheme.exitNodeToggleButton: ButtonColors @Composable get() { val defaults = ButtonDefaults.buttonColors() - return ButtonColors( - containerColor = Color(0xFF4B70CC), // blue-500 - contentColor = Color(0xFFFFFFFF), // white - disabledContainerColor = defaults.disabledContainerColor, - disabledContentColor = defaults.disabledContentColor) + return if (isSystemInDarkTheme()) { + ButtonColors( + containerColor = Color(0xFF444342), // grey-600 + contentColor = Color(0xFFFFFFFF), // white + disabledContainerColor = defaults.disabledContainerColor, + disabledContentColor = defaults.disabledContentColor) + } else { + ButtonColors( + containerColor = Color(0xFFEDEBEA), // grey-300 + contentColor = Color(0xFF000000), // black + disabledContainerColor = defaults.disabledContainerColor, + disabledContentColor = defaults.disabledContentColor) + } } val ColorScheme.disabled: Color