Add Desert and Jungle themes

4 files changed, 46 insertions, 0 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 2bbb9b6..42e1738 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -26,6 +26,8 @@
     <item>@string/pref_theme_e_altblack</item>
     <item>@string/pref_theme_e_white</item>
     <item>@string/pref_theme_e_epaper</item>
+    <item>@string/pref_theme_e_desert</item>
+    <item>@string/pref_theme_e_jungle</item>
   </string-array>
   <string-array name="pref_theme_values">
     <item>system</item>
@@ -35,6 +37,8 @@
     <item>altblack</item>
     <item>white</item>
     <item>epaper</item>
+    <item>desert</item>
+    <item>jungle</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 8a4c79a..7a80d76 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -60,6 +60,8 @@
   <string name="pref_theme_e_altblack">Alternative Black</string>
   <string name="pref_theme_e_white">White</string>
   <string name="pref_theme_e_epaper">ePaper</string>
+  <string name="pref_theme_e_desert">Desert</string>
+  <string name="pref_theme_e_jungle">Jungle</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 b2791cc..5eac562 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -137,4 +137,42 @@
     <item name="emoji_button_bg">#ffffff</item>
     <item name="emoji_color">#000000</item>
   </style>
+  <style name="Desert" parent="@style/BaseTheme">
+    <item name="android:isLightTheme">true</item>
+    <item name="colorKeyboard">#ffe0b2</item>
+    <item name="colorKey">#fff3e0</item>
+    <item name="colorKeyActivated">#ffcc80</item>
+    <item name="colorLabel">#000000</item>
+    <item name="colorLabelActivated">#ffffff</item>
+    <item name="colorLabelLocked">#e65100</item>
+    <item name="secondaryLightOffset">0.1</item>
+    <item name="colorSubLabel">#333333</item>
+    <item name="keyBorderWidth">0.0dip</item>
+    <item name="keyBorderWidthActivated">0.0dip</item>
+    <item name="keyBorderColorLeft">#000000</item>
+    <item name="keyBorderColorTop">#000000</item>
+    <item name="keyBorderColorRight">#000000</item>
+    <item name="keyBorderColorBottom">#000000</item>
+    <item name="emoji_button_bg">?colorKeyActivated</item>
+    <item name="emoji_color">#000000</item>
+  </style>
+  <style name="Jungle" parent="@style/BaseTheme">
+    <item name="android:isLightTheme">true</item>
+    <item name="colorKeyboard">#4db6ac</item>
+    <item name="colorKey">#e0f2f1</item>
+    <item name="colorKeyActivated">#00695c</item>
+    <item name="colorLabel">#000000</item>
+    <item name="colorLabelActivated">#ffffff</item>
+    <item name="colorLabelLocked">#64ffda</item>
+    <item name="secondaryLightOffset">0.0</item>
+    <item name="colorSubLabel">#004d40</item>
+    <item name="keyBorderWidth">0.0dip</item>
+    <item name="keyBorderWidthActivated">0.0dip</item>
+    <item name="keyBorderColorLeft">#00f0f0f0</item>
+    <item name="keyBorderColorTop">#00f0f0f0</item>
+    <item name="keyBorderColorRight">#00eeeeee</item>
+    <item name="keyBorderColorBottom">#00eeeeee</item>
+    <item name="emoji_button_bg">?colorKeyActivated</item>
+    <item name="emoji_color">#000000</item>
+  </style>
 </resources>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index bde4aea..e24f339 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -324,6 +324,8 @@ final class Config
       case "dark": return R.style.Dark;
       case "white": return R.style.White;
       case "epaper": return R.style.ePaper;
+      case "desert": return R.style.Desert;
+      case "jungle": return R.style.Jungle;
       default:
       case "system":
         if (Build.VERSION.SDK_INT >= 8)