From a365fdc6a36e0b74d3486f7633b7e0bba42f4020 Mon Sep 17 00:00:00 2001
From: Piotrek Marciniak <piotrek@ptrm.eu>
Date: Sat, 24 Sep 2022 13:13:51 +0200
Subject: [PATCH] Add white e-ink oriented theme (#193)

* Add white e-ing oriented theme

Co-authored-by: Jules Aguillon <jules@j3s.fr>
---
 res/values-fr/strings.xml        |  1 +
 res/values/arrays.xml            |  2 ++
 res/values/strings.xml           |  1 +
 res/values/themes.xml            | 12 ++++++++++++
 srcs/juloo.keyboard2/Config.java | 11 +----------
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 10eb93a..7d501e6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -31,6 +31,7 @@
   <string name="pref_theme_e_dark">Sombre</string>
   <string name="pref_theme_e_light">Clair</string>
   <string name="pref_theme_e_black">Noir</string>
+  <string name="pref_theme_e_white">Blanc</string>
   <string name="pref_swipe_dist_e_very_short">Très courte</string>
   <string name="pref_swipe_dist_e_short">Courte</string>
   <string name="pref_swipe_dist_e_default">Normale</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 797147e..d19ad54 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -71,12 +71,14 @@
     <item>@string/pref_theme_e_dark</item>
     <item>@string/pref_theme_e_light</item>
     <item>@string/pref_theme_e_black</item>
+    <item>@string/pref_theme_e_white</item>
   </string-array>
   <string-array name="pref_theme_values">
     <item>system</item>
     <item>dark</item>
     <item>light</item>
     <item>black</item>
+    <item>white</item>
   </string-array>
   <string-array name="pref_swipe_dist_entries">
     <item>@string/pref_swipe_dist_e_very_short</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 513b88f..aef3b2d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -40,6 +40,7 @@
   <string name="pref_theme_e_dark">Dark</string>
   <string name="pref_theme_e_light">Light</string>
   <string name="pref_theme_e_black">Black</string>
+  <string name="pref_theme_e_white">White</string>
   <string name="pref_swipe_dist_e_very_short">Very short</string>
   <string name="pref_swipe_dist_e_short">Short</string>
   <string name="pref_swipe_dist_e_default">Normal</string>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 8aa27d7..1c42740 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -69,4 +69,16 @@
     <item name="emoji_button_bg">#000000</item>
     <item name="emoji_color">#ffffff</item>
   </style>
+  <style name="White" parent="BaseTheme">
+    <item name="android:isLightTheme">true</item>
+    <item name="colorKeyboard">#ffffff</item>
+    <item name="colorKey">#ffffff</item>
+    <item name="colorKeyActivated">#cccccc</item>
+    <item name="colorLabel">#000000</item>
+    <item name="colorLabelActivated">#0066cc</item>
+    <item name="colorLabelLocked">#33cc33</item>
+    <item name="colorSubLabel">#333333</item>
+    <item name="emoji_button_bg">#ffffff</item>
+    <item name="emoji_color">#000000</item>
+  </style>
 </resources>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index fd226ed..3a8d15f 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -228,6 +228,7 @@ final class Config
       case "light": return R.style.Light;
       case "black": return R.style.Black;
       case "dark": return R.style.Dark;
+      case "white": return R.style.White;
       default:
       case "system":
         if (Build.VERSION.SDK_INT >= 8)
@@ -267,16 +268,6 @@ final class Config
     }
   }
 
-  public static int themeId_of_string(String name)
-  {
-    switch (name)
-    {
-      case "light": return R.style.Light;
-      case "black": return R.style.Black;
-      default: case "dark": return R.style.Dark;
-    }
-  }
-
   private static Config _globalConfig = null;
 
   public static void initGlobalConfig(Context context, IKeyEventHandler handler)