From 3b4aa33ff3744c5de77dc90c0962e7540f1e2afc Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sun, 18 Jan 2026 17:28:10 +0100
Subject: Fix crash when using the Monet themes on Android 9 (#1155)

The color resources starting with `@android:color/system_` are not
available on API < 31.

No effort is made to implement the Monet feature on Android 9. Instead,
the monet themes look like the Dark and Light themes.---
 res/values-v31/values.xml | 13 +++++++++++++
 res/values/themes.xml     | 24 ++++++++++++------------
 res/values/values.xml     | 11 +++++++++++
 3 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 res/values-v31/values.xml

(limited to 'res')

diff --git a/res/values-v31/values.xml b/res/values-v31/values.xml
new file mode 100644
index 0000000..cc31327
--- /dev/null
+++ b/res/values-v31/values.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!-- Colors for the Monet themes. -->
+  <color name="system_accent1_400">@android:color/system_accent1_400</color>
+  <color name="system_accent1_600">@android:color/system_accent1_600</color>
+  <color name="system_neutral1_0">@android:color/system_neutral1_0</color>
+  <color name="system_neutral1_100">@android:color/system_neutral1_100</color>
+  <color name="system_neutral1_400">@android:color/system_neutral1_400</color>
+  <color name="system_neutral1_50">@android:color/system_neutral1_50</color>
+  <color name="system_neutral1_500">@android:color/system_neutral1_500</color>
+  <color name="system_neutral1_800">@android:color/system_neutral1_800</color>
+  <color name="system_neutral1_900">@android:color/system_neutral1_900</color>
+</resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 84a4d6b..566c875 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -181,25 +181,25 @@
   </style>
   <style name="MonetLight" parent="@style/BaseTheme">
     <item name="android:isLightTheme">true</item>
-    <item name="colorKeyboard">@android:color/system_neutral1_100</item>
-    <item name="colorKey">@android:color/system_neutral1_50</item>
+    <item name="colorKeyboard">@color/system_neutral1_100</item>
+    <item name="colorKey">@color/system_neutral1_50</item>
     <item name="colorKeyActivated">?colorKeyboard</item>
-    <item name="colorLabel">@android:color/system_neutral1_800</item>
-    <item name="colorLabelActivated">@android:color/system_accent1_400</item>
-    <item name="colorLabelLocked">@android:color/system_accent1_600</item>
-    <item name="colorSubLabel">@android:color/system_neutral1_500</item>
+    <item name="colorLabel">@color/system_neutral1_800</item>
+    <item name="colorLabelActivated">@color/system_accent1_400</item>
+    <item name="colorLabelLocked">@color/system_accent1_600</item>
+    <item name="colorSubLabel">@color/system_neutral1_500</item>
     <item name="emoji_button_bg">?colorKeyActivated</item>
     <item name="emoji_color">?colorKeyboard</item>
   </style>
   <style name="MonetDark" parent="@style/BaseTheme">
     <item name="android:isLightTheme">false</item>
-    <item name="colorKeyboard">@android:color/system_neutral1_900</item>
-    <item name="colorKey">@android:color/system_neutral1_800</item>
+    <item name="colorKeyboard">@color/system_neutral1_900</item>
+    <item name="colorKey">@color/system_neutral1_800</item>
     <item name="colorKeyActivated">?colorKeyboard</item>
-    <item name="colorLabel">@android:color/system_neutral1_0</item>
-    <item name="colorLabelActivated">@android:color/system_accent1_400</item>
-    <item name="colorLabelLocked">@android:color/system_accent1_600</item>
-    <item name="colorSubLabel">@android:color/system_neutral1_400</item>
+    <item name="colorLabel">@color/system_neutral1_0</item>
+    <item name="colorLabelActivated">@color/system_accent1_400</item>
+    <item name="colorLabelLocked">@color/system_accent1_600</item>
+    <item name="colorSubLabel">@color/system_neutral1_400</item>
     <item name="emoji_button_bg">?colorKeyActivated</item>
     <item name="emoji_color">?colorKeyboard</item>
   </style>
diff --git a/res/values/values.xml b/res/values/values.xml
index 18155a8..9f23212 100644
--- a/res/values/values.xml
+++ b/res/values/values.xml
@@ -9,4 +9,15 @@
   <dimen name="candidates_spacing">8dp</dimen>
   <!-- Will be overwritten automatically by Gradle for the debug build variant -->
   <bool name="debug_logs">false</bool>
+  <!-- Color fallback for the Monet themes on Android API < 31. This makes the
+       Monet themes very similar to the "Dark" and "Light" themes. -->
+  <color name="system_accent1_400">#3399ff</color>
+  <color name="system_accent1_600">#33cc33</color>
+  <color name="system_neutral1_0">#ffffff</color>
+  <color name="system_neutral1_100">#e3e3e3</color>
+  <color name="system_neutral1_400">#cccccc</color>
+  <color name="system_neutral1_50">#cccccc</color>
+  <color name="system_neutral1_500">#333333</color>
+  <color name="system_neutral1_800">#333333</color>
+  <color name="system_neutral1_900">#1b1b1b</color>
 </resources>
-- 
cgit v1.2.3