From 4bb5dc2fa58eda4aa1eb6c07c4a62a1ae37d7d28 Mon Sep 17 00:00:00 2001
From: Bob <timetobuildbob@gmail.com>
Date: Tue, 22 Sep 2026 23:57:04 +0000
Subject: [PATCH 1/2] fix(android): follow system theme so WebView sees correct
 prefers-color-scheme

With Theme.AppCompat.Light.NoActionBar the Activity always ran in light mode,
so Android WebView reported prefers-color-scheme: light even when the OS was
in dark mode. Choosing 'System' in aw-webui's theme setting therefore always
resolved to light.

Fix:
- Add AWApplication that calls AppCompatDelegate.setDefaultNightMode(
  MODE_NIGHT_FOLLOW_SYSTEM) before any Activity starts. This wires the
  Activity's effective night mode to the OS setting without triggering any
  Activity recreation (the mode is set at process start, not at runtime).
- Change AppTheme parent to Theme.AppCompat.DayNight.NoActionBar so the
  theme properly responds to the night mode configuration.
- Add default_text_color night override so the existing android:textColor
  override doesn't produce black text on dark backgrounds.

Closes #300

Git-Session-Id: dc18
---
 mobile/src/main/AndroidManifest.xml           |  1 +
 .../activitywatch/android/AWApplication.kt    | 16 +++++++++++++
 mobile/src/main/res/values-night/colors.xml   |  3 +++
 mobile/src/main/res/values/styles.xml         |  7 ++++--
 .../android/AWApplicationTest.kt              | 23 +++++++++++++++++++
 5 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 mobile/src/main/java/net/activitywatch/android/AWApplication.kt
 create mode 100644 mobile/src/test/java/net/activitywatch/android/AWApplicationTest.kt

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 4e90ab11..4d8c24bd 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -21,6 +21,7 @@
     <meta-data android:name="com.samsung.android.vr.application.mode" android:value="dual" />
 
     <application
+        android:name=".AWApplication"
         android:allowBackup="true"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/aw_launcher_round"
diff --git a/mobile/src/main/java/net/activitywatch/android/AWApplication.kt b/mobile/src/main/java/net/activitywatch/android/AWApplication.kt
new file mode 100644
index 00000000..c331efb7
--- /dev/null
+++ b/mobile/src/main/java/net/activitywatch/android/AWApplication.kt
@@ -0,0 +1,16 @@
+package net.activitywatch.android
+
+import android.app.Application
+import androidx.appcompat.app.AppCompatDelegate
+
+class AWApplication : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        // Follow the OS dark/light setting from process start so that:
+        // - WebView correctly reports prefers-color-scheme: dark when system is dark
+        // - The initial chrome (applyWebUiChrome in MainActivity) matches the system
+        // Without this, Theme.AppCompat.Light keeps the Activity in light mode and
+        // WebView always sees prefers-color-scheme: light (aw-android#300).
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+    }
+}
diff --git a/mobile/src/main/res/values-night/colors.xml b/mobile/src/main/res/values-night/colors.xml
index 195850df..d980fff0 100644
--- a/mobile/src/main/res/values-night/colors.xml
+++ b/mobile/src/main/res/values-night/colors.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Text color override to match AppCompat DayNight defaults in dark mode. -->
+    <color name="default_text_color">#FFFFFF</color>
+
     <!-- Widget theme colors (dark mode overrides) -->
     <color name="widget_background">#2A2A2A</color>
     <color name="widget_text_primary">#FFFFFF</color>
diff --git a/mobile/src/main/res/values/styles.xml b/mobile/src/main/res/values/styles.xml
index 3c10b77e..7e4c15da 100644
--- a/mobile/src/main/res/values/styles.xml
+++ b/mobile/src/main/res/values/styles.xml
@@ -1,7 +1,10 @@
 <resources>
 
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <!-- Base application theme. DayNight lets Android WebView see the correct
+         prefers-color-scheme value when the user chooses "System" in aw-webui.
+         The AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM call in AWApplication
+         ensures the mode is set before any Activity starts. -->
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/mobile/src/test/java/net/activitywatch/android/AWApplicationTest.kt b/mobile/src/test/java/net/activitywatch/android/AWApplicationTest.kt
new file mode 100644
index 00000000..682dc2d2
--- /dev/null
+++ b/mobile/src/test/java/net/activitywatch/android/AWApplicationTest.kt
@@ -0,0 +1,23 @@
+package net.activitywatch.android
+
+import androidx.appcompat.app.AppCompatDelegate
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class AWApplicationTest {
+    @Test
+    fun applicationClassExists() {
+        // AWApplication must exist; Application.onCreate sets MODE_NIGHT_FOLLOW_SYSTEM
+        // so that WebView reports the correct prefers-color-scheme from the very first
+        // frame (aw-android#300).
+        val clazz = AWApplication::class.java
+        val superClass = clazz.superclass
+        assertEquals("android.app.Application", superClass?.name)
+    }
+
+    @Test
+    fun modeNightFollowSystemConstantValue() {
+        // Sanity-check that the constant we rely on is stable across AppCompat versions.
+        assertEquals(-1, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+    }
+}

From 0121fec39b7a7513a9d3c372f77603d911e4047a Mon Sep 17 00:00:00 2001
From: Bob <timetobuildbob@gmail.com>
Date: Wed, 23 Sep 2026 00:03:51 +0000
Subject: [PATCH 2/2] fix(android): keep native-screen text readable on light
 chrome

DayNight follows the system for WebView prefers-color-scheme, but
Auth/Sync/Onboarding still paint light chrome. A night-mode white
default_text_color made that text unreadable.

Git-Session-Id: 84ac7667-43de-5e02-bfe2-7f38d9d3f6f9
---
 mobile/src/main/res/values-night/colors.xml            |  5 +++--
 .../net/activitywatch/android/AWApplicationTest.kt     | 10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/mobile/src/main/res/values-night/colors.xml b/mobile/src/main/res/values-night/colors.xml
index d980fff0..ebb4e548 100644
--- a/mobile/src/main/res/values-night/colors.xml
+++ b/mobile/src/main/res/values-night/colors.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Text color override to match AppCompat DayNight defaults in dark mode. -->
-    <color name="default_text_color">#FFFFFF</color>
+    <!-- Do not override default_text_color here. Native Auth/Sync/Onboarding
+         keep light chrome via applySafeWindowInsets(); a night white text
+         color would be unreadable on that background (aw-android#301 P1). -->
 
     <!-- Widget theme colors (dark mode overrides) -->
     <color name="widget_background">#2A2A2A</color>
diff --git a/mobile/src/test/java/net/activitywatch/android/AWApplicationTest.kt b/mobile/src/test/java/net/activitywatch/android/AWApplicationTest.kt
index 682dc2d2..6fae162b 100644
--- a/mobile/src/test/java/net/activitywatch/android/AWApplicationTest.kt
+++ b/mobile/src/test/java/net/activitywatch/android/AWApplicationTest.kt
@@ -2,7 +2,9 @@ package net.activitywatch.android
 
 import androidx.appcompat.app.AppCompatDelegate
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
 import org.junit.Test
+import java.io.File
 
 class AWApplicationTest {
     @Test
@@ -20,4 +22,12 @@ class AWApplicationTest {
         // Sanity-check that the constant we rely on is stable across AppCompat versions.
         assertEquals(-1, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
     }
+
+    @Test
+    fun nightColorsDoNotOverrideDefaultTextColor() {
+        // Native screens stay on light chrome. White night text would be
+        // unreadable there (Greptile P1 on aw-android#301).
+        val night = File("src/main/res/values-night/colors.xml").readText()
+        assertFalse(night.contains("name=\"default_text_color\""))
+    }
 }