abouttreesummaryrefslogcommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-cs/strings.xml3
-rw-r--r--res/values-de/strings.xml3
-rw-r--r--res/values-es/strings.xml3
-rw-r--r--res/values-fa/strings.xml3
-rw-r--r--res/values-fr/strings.xml3
-rw-r--r--res/values-it/strings.xml3
-rw-r--r--res/values-ko/strings.xml3
-rw-r--r--res/values-lv/strings.xml3
-rw-r--r--res/values-pl/strings.xml3
-rw-r--r--res/values-pt/strings.xml3
-rw-r--r--res/values-ro/strings.xml3
-rw-r--r--res/values-ru/strings.xml3
-rw-r--r--res/values-tr/strings.xml3
-rw-r--r--res/values-uk/strings.xml3
-rw-r--r--res/values-vi/strings.xml3
-rw-r--r--res/values-zh-rCN/strings.xml3
-rw-r--r--res/values/arrays.xml6
-rw-r--r--res/values/strings.xml3
-rw-r--r--res/values/themes.xml24
-rw-r--r--srcs/juloo.keyboard2/Config.java8
20 files changed, 88 insertions, 1 deletions
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4e7c785..8e2c122 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -68,6 +68,9 @@ Tato aplikace neobsahuje žádné reklamy, nevyužívá připojení k síti a je
<string name="pref_theme_e_epaper">ePapír</string>
<string name="pref_theme_e_desert">Poušťě</string>
<string name="pref_theme_e_jungle">Džungle</string>
+ <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
<string name="pref_swipe_dist_e_very_short">Velmi krátká</string>
<string name="pref_swipe_dist_e_short">Krátká</string>
<string name="pref_swipe_dist_e_default">Běžná</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 890d8af..08dbafa 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -68,6 +68,9 @@ Diese App enthält keine Werbung, benötigt keinen Netzwerkzugriff und ist quell
<string name="pref_theme_e_epaper">ePaper</string>
<string name="pref_theme_e_desert">Wüste</string>
<string name="pref_theme_e_jungle">Dschungel</string>
+ <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
<string name="pref_swipe_dist_e_very_short">Sehr kurz</string>
<string name="pref_swipe_dist_e_short">Kurz</string>
<string name="pref_swipe_dist_e_default">Normal</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index dc8578f..a82feaa 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -68,6 +68,9 @@ La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y
<string name="pref_theme_e_epaper">ePaper</string>
<string name="pref_theme_e_desert">Desierto</string>
<string name="pref_theme_e_jungle">Selva</string>
+ <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
<string name="pref_swipe_dist_e_very_short">Muy corta</string>
<string name="pref_swipe_dist_e_short">Corta</string>
<string name="pref_swipe_dist_e_default">Normal</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 46e9310..f61c4ac 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -68,6 +68,9 @@ This application contains no ads, doesn't make any network requests and is Open
<string name="pref_theme_e_epaper">ای-پیپر</string>
<!-- <string name="pref_theme_e_desert">Desert</string> -->
<!-- <string name="pref_theme_e_jungle">Jungle</string> -->
+ <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
<string name="pref_swipe_dist_e_very_short">بسیار کوتاه</string>
<string name="pref_swipe_dist_e_short">کوتاه</string>
<string name="pref_swipe_dist_e_default">عادی</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 93d7ff0..0d348c9 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -68,6 +68,9 @@ Cette application ne contient pas de publicité, n'accède pas au réseau et est
<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_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</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-it/strings.xml b/res/values-it/strings.xml
index 0d58124..43c2184 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -68,6 +68,9 @@ This application contains no ads, doesn't make any network requests and is Open
<!-- <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_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
<string name="pref_swipe_dist_e_very_short">Veramente breve</string>
<string name="pref_swipe_dist_e_short">Breve</string>
<string name="pref_swipe_dist_e_default">Normale</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c2036f2..3e70996 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -68,6 +68,9 @@ This application contains no ads, doesn't make any network requests and is Open
<!-- <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_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
<string name="pref_swipe_dist_e_very_short">매우 짧음</string>
<string name="pref_swipe_dist_e_short">짧음</string>
<string name="pref_swipe_dist_e_default">보통</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index db6eded..a9693bc 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -68,6 +68,9 @@ Tagad lieliski piemērota izmantošanai ikdienā.
<string name="pref_theme_e_epaper">ePapīrs</string>
<string name="pref_theme_e_desert">Tuksnesis</string>
<string name="pref_theme_e_jungle">Džungļi</string>
+ <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
<string name="pref_swipe_dist_e_very_short">Ļoti tuvs</string>
<string name="pref_swipe_dist_e_short">Tuvs</string>
<string name="pref_swipe_dist_e_default">Vidējs</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index dff1b05..b1e4bec 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -68,6 +68,9 @@ Aplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źród
<string name="pref_theme_e_epaper">e-paper</string>
<string name="pref_theme_e_desert">Pustynny</string>
<string name="pref_theme_e_jungle">Dżunglowy</string>
+ <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
<string name="pref_swipe_dist_e_very_short">Bardzo mała</string>
<string name="pref_swipe_dist_e_short">Mała</string>
<string name="pref_swipe_dist_e_default">Normalna</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 651eb0b..60a584b 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -68,6 +68,9 @@ Este aplicativo não contém anúncios, não faz nenhuma solicitação de rede e
<string name="pref_theme_e_epaper">Papel Eletrônico</string>
<string name="pref_theme_e_desert">Deserto</string>
<string name="pref_theme_e_jungle">Selva</string>
+ <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
<string name="pref_swipe_dist_e_very_short">Bem curto</string>
<string name="pref_swipe_dist_e_short">Curto</string>
<string name="pref_swipe_dist_e_default">Normal</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 13086c5..0ba2e21 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -68,6 +68,9 @@ Această aplicație nu conține publicitate, nu folosește rețeaua deloc și e
<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_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
<string name="pref_swipe_dist_e_very_short">Foarte apropiată</string>
<string name="pref_swipe_dist_e_short">Apropiată</string>
<string name="pref_swipe_dist_e_default">Normală</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 982dcb3..6c38443 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -68,6 +68,9 @@
<string name="pref_theme_e_epaper">Электронная бумага</string>
<string name="pref_theme_e_desert">Пустыня</string>
<string name="pref_theme_e_jungle">Джунгли</string>
+ <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
<string name="pref_swipe_dist_e_very_short">Очень короткая</string>
<string name="pref_swipe_dist_e_short">Короткая</string>
<string name="pref_swipe_dist_e_default">Обычная</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index ce8c205..ebf5ab6 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -68,6 +68,9 @@ Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz."</str
<string name="pref_theme_e_epaper">E-Kağıt</string>
<string name="pref_theme_e_desert">Çöl</string>
<string name="pref_theme_e_jungle">Orman</string>
+ <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
<string name="pref_swipe_dist_e_very_short">Çok kısa</string>
<string name="pref_swipe_dist_e_short">Kısa</string>
<string name="pref_swipe_dist_e_default">Normal</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0f7e81f..6a027ad 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -68,6 +68,9 @@
<string name="pref_theme_e_epaper">ePaper</string>
<string name="pref_theme_e_desert">Пустеля</string>
<string name="pref_theme_e_jungle">Джунглі</string>
+ <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
<string name="pref_swipe_dist_e_very_short">Дуже коротка</string>
<string name="pref_swipe_dist_e_short">Коротка</string>
<string name="pref_swipe_dist_e_default">Звичайна</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a97068a..5e6c724 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -68,6 +68,9 @@ Bây giờ đã hoàn hảo cho việc sử dụng hàng ngày.
<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_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
<string name="pref_swipe_dist_e_very_short">Rất gần</string>
<string name="pref_swipe_dist_e_short">Gần</string>
<string name="pref_swipe_dist_e_default">Trungbình</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8809ff2..99aa7bd 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -68,6 +68,9 @@
<string name="pref_theme_e_epaper">白色带边框</string>
<string name="pref_theme_e_desert">沙漠</string>
<string name="pref_theme_e_jungle">雨林</string>
+ <!-- <string name="pref_theme_e_monet">Monet (System)</string> -->
+ <!-- <string name="pref_theme_e_monetlight">Monet (Light)</string> -->
+ <!-- <string name="pref_theme_e_monetdark">Monet (Dark)</string> -->
<string name="pref_swipe_dist_e_very_short">非常短</string>
<string name="pref_swipe_dist_e_short">短</string>
<string name="pref_swipe_dist_e_default">中（默认）</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 9176882..9fe5b38 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -28,6 +28,9 @@
<item>@string/pref_theme_e_epaper</item>
<item>@string/pref_theme_e_desert</item>
<item>@string/pref_theme_e_jungle</item>
+ <item>@string/pref_theme_e_monet</item>
+ <item>@string/pref_theme_e_monetlight</item>
+ <item>@string/pref_theme_e_monetdark</item>
</string-array>
<string-array name="pref_theme_values">
<item>system</item>
@@ -39,6 +42,9 @@
<item>epaper</item>
<item>desert</item>
<item>jungle</item>
+ <item>monet</item>
+ <item>monetlight</item>
+ <item>monetdark</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 75df689..edd9a10 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -68,6 +68,9 @@ This application contains no ads, doesn't make any network requests and is Open
<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_theme_e_monet">Monet (System)</string>
+ <string name="pref_theme_e_monetlight">Monet (Light)</string>
+ <string name="pref_theme_e_monetdark">Monet (Dark)</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 aa30080..4aba4e3 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -179,4 +179,28 @@
<item name="emoji_button_bg">?colorKeyActivated</item>
<item name="emoji_color">#000000</item>
</style>
+ <style name="MonetLight" parent="@style/BaseTheme">
+ <item name="android:isLightTheme">true</item>
+ <item name="colorKeyboard">@android:color/system_accent1_100</item>
+ <item name="colorKey">@android:color/system_accent1_0</item>
+ <item name="colorKeyActivated">@android:color/system_accent1_300</item>
+ <item name="colorLabel">@android:color/system_accent1_1000</item>
+ <item name="colorLabelActivated">@android:color/system_accent1_1000</item>
+ <item name="colorLabelLocked">@android:color/system_accent1_500</item>
+ <item name="colorSubLabel">@android:color/system_accent1_900</item>
+ <item name="emoji_button_bg">?colorKeyActivated</item>
+ <item name="emoji_color">@android:color/system_accent1_1000</item>
+ </style>
+ <style name="MonetDark" parent="@style/BaseTheme">
+ <item name="android:isLightTheme">false</item>
+ <item name="colorKeyboard">@android:color/system_accent1_900</item>
+ <item name="colorKey">@android:color/system_accent1_800</item>
+ <item name="colorKeyActivated">@android:color/system_accent1_600</item>
+ <item name="colorLabel">@android:color/system_neutral1_0</item>
+ <item name="colorLabelActivated">@android:color/system_accent2_300</item>
+ <item name="colorLabelLocked">@android:color/system_accent2_100</item>
+ <item name="colorSubLabel">@android:color/system_neutral1_300</item>
+ <item name="emoji_button_bg">?colorKeyActivated</item>
+ <item name="emoji_color">@android:color/system_accent1_900</item>
+ </style>
</resources>
diff --git a/srcs/juloo.keyboard2/Config.java b/srcs/juloo.keyboard2/Config.java
index 061183c..2afe5ef 100644
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -405,6 +405,7 @@ public final class Config
private int getThemeId(Resources res, String theme_name)
{
+ int night_mode = res.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
switch (theme_name)
{
case "light": return R.style.Light;
@@ -415,9 +416,14 @@ public final class Config
case "epaper": return R.style.ePaper;
case "desert": return R.style.Desert;
case "jungle": return R.style.Jungle;
+ case "monetlight": return R.style.MonetLight;
+ case "monetdark": return R.style.MonetDark;
+ case "monet":
+ if ((night_mode & Configuration.UI_MODE_NIGHT_NO) != 0)
+ return R.style.MonetLight;
+ return R.style.MonetDark;
default:
case "system":
- int night_mode = res.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
if ((night_mode & Configuration.UI_MODE_NIGHT_NO) != 0)
return R.style.Light;
return R.style.Dark;
generated by ps-cgit (a fork of cgit), using a theme by hackitude