diff --git a/android/src/main/java/com/tailscale/ipn/ui/model/TailCfg.kt b/android/src/main/java/com/tailscale/ipn/ui/model/TailCfg.kt index 33eba9e..f8d82aa 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/model/TailCfg.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/model/TailCfg.kt @@ -5,9 +5,9 @@ package com.tailscale.ipn.ui.model import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable -import androidx.compose.ui.graphics.Color import com.tailscale.ipn.R -import com.tailscale.ipn.ui.theme.success +import com.tailscale.ipn.ui.theme.off +import com.tailscale.ipn.ui.theme.on import com.tailscale.ipn.ui.util.ComposableStringFormatter import com.tailscale.ipn.ui.util.DisplayAddress import com.tailscale.ipn.ui.util.TimeUtil @@ -103,7 +103,7 @@ class Tailcfg { @Composable fun connectedColor(nm: Netmap.NetworkMap?) = - if (connectedOrSelfNode(nm)) MaterialTheme.colorScheme.success else Color.Gray + if (connectedOrSelfNode(nm)) MaterialTheme.colorScheme.on else MaterialTheme.colorScheme.off val displayAddresses: List get() { 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 695b1e3..95b4f02 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 @@ -116,6 +116,12 @@ val ColorScheme.successContainer: Color val ColorScheme.onSuccessContainer: Color get() = Color(0xFF0E4B3B) // green-600 +val ColorScheme.on: Color + get() = Color(0xFF84D996) // green-100 + +val ColorScheme.off: Color + get() = Color(0xFFD9D6D5) // gray-300 + /** * Main color scheme for list items, uses onPrimaryContainer color for leading and trailing icons. */ diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 3a1ecf7..4c7d716 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -65,10 +65,10 @@ Open Support - Loading… + Starting… -- Login Required - Stopped + Not Connected expired