From 7e5625d30cb0850e32292dc8850c02a17cb25215 Mon Sep 17 00:00:00 2001
From: Percy Wegmann <percy@tailscale.com>
Date: Mon, 1 Apr 2024 09:12:03 -0500
Subject: [PATCH] Use light colors even in dark mode

Signed-off-by: Percy Wegmann <percy@tailscale.com>
---
 android/src/main/AndroidManifest.xml           |  6 ++++++
 .../java/com/tailscale/ipn/ui/theme/Theme.kt   | 18 +-----------------
 android/src/main/res/values/strings.xml        |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index baaac9c..20a0142 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -48,6 +48,12 @@
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="tailscale" />
+            </intent-filter>
         </activity>
         <activity
             android:name="ShareActivity"
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 519b81d..b45957d 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
@@ -14,7 +14,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.TopAppBarColors
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.Typography
-import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
@@ -24,12 +23,7 @@ import com.google.accompanist.systemuicontroller.rememberSystemUiController
 
 @Composable
 fun AppTheme(useDarkTheme: Boolean = isSystemInDarkTheme(), content: @Composable() () -> Unit) {
-  val colors =
-      if (!useDarkTheme) {
-        LightColors
-      } else {
-        DarkColors
-      }
+  val colors = LightColors
 
   val typography =
       Typography(
@@ -83,16 +77,6 @@ private val LightColors =
         scrim = Color(0xFF000000), // black
     )
 
-private val DarkColors =
-    darkColorScheme(
-        primary = Color(0xFFFAF9F8),
-        onPrimary = Color(0xFFAFACAB),
-        secondary = Color(0xFF232222),
-        onSecondary = Color(0xFF2E2D2D),
-        secondaryContainer = Color(0xFF4B70CC),
-        surface = Color(0xFF33C27F),
-    )
-
 val ColorScheme.warning: Color
   get() = Color(0xFFD97916) // yellow-300
 
diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml
index c29e37e..5cd8256 100644
--- a/android/src/main/res/values/strings.xml
+++ b/android/src/main/res/values/strings.xml
@@ -85,7 +85,7 @@
     <string name="logout_failed">Unable to logout at this time. Please try again.</string>
     <string name="error">Error</string>
     <string name="accounts">Accounts</string>
-    <string name="add_account">Add Another Account…</string>
+    <string name="add_account">Add another account…</string>
     <string name="reauthenticate">Reauthenticate</string>
     <string name="switch_user_failed">Unable to switch users. Please try again.</string>
     <string name="add_profile_failed">Unable to add a new profile. Please try again.</string>