From 27258bae5eae53d8a525b2fa61934adb506af08a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 9 Sep 2019 09:31:55 +0200
Subject: [PATCH] Added grey light theme

---
 .../main/java/eu/faircode/email/ActivityBase.java  |  6 ++++--
 .../main/java/eu/faircode/email/ApplicationEx.java |  6 ++++++
 .../eu/faircode/email/FragmentOptionsDisplay.java  | 14 ++++++++++----
 app/src/main/res/layout/dialog_theme.xml           | 13 +++++++++++--
 app/src/main/res/values/strings.xml                |  3 ++-
 app/src/main/res/values/styles.xml                 | 11 ++++++++++-
 6 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index 16f5cadbb8..6e8cbf24d3 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -78,8 +78,10 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
                 setTheme(R.style.AppThemeDark);
             else if ("black".equals(theme))
                 setTheme(R.style.AppThemeBlack);
-            else if ("grey".equals(theme))
-                setTheme(R.style.AppThemeGrey);
+            else if ("grey_light".equals(theme))
+                setTheme(R.style.AppThemeGreyLight);
+            else if ("grey_dark".equals(theme))
+                setTheme(R.style.AppThemeGreyDark);
             else if ("system".equals(theme)) {
                 int uiMode = getResources().getConfiguration().uiMode;
                 Log.i("UI mode=" + uiMode);
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index f5457b067d..25e0e20a40 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -130,9 +130,15 @@ public class ApplicationEx extends Application {
             if (prefs.getBoolean("autonext", false))
                 editor.putString("onclose", "next");
             editor.remove("autonext");
+
         } else if (version < 693) {
             editor.remove("message_swipe");
             editor.remove("message_select");
+
+        } else if (version < 696) {
+            String theme = prefs.getString("theme", "light");
+            if ("grey".equals(theme))
+                editor.putString("theme", "grey_dark");
         }
 
         if (BuildConfig.DEBUG && false) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index a47805f990..0f4c396488 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -392,8 +392,11 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
                 case "black":
                     rgTheme.check(R.id.rbThemeBlack);
                     break;
-                case "grey":
-                    rgTheme.check(R.id.rbThemeGrey);
+                case "grey_light":
+                    rgTheme.check(R.id.rbThemeGreyLight);
+                    break;
+                case "grey_dark":
+                    rgTheme.check(R.id.rbThemeGreyDark);
                     break;
                 case "system":
                     rgTheme.check(R.id.rbThemeSystem);
@@ -417,8 +420,11 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
                         case R.id.rbThemeBlack:
                             prefs.edit().putString("theme", "black").apply();
                             break;
-                        case R.id.rbThemeGrey:
-                            prefs.edit().putString("theme", "grey").apply();
+                        case R.id.rbThemeGreyLight:
+                            prefs.edit().putString("theme", "grey_light").apply();
+                            break;
+                        case R.id.rbThemeGreyDark:
+                            prefs.edit().putString("theme", "grey_dark").apply();
                             break;
                         case R.id.rbThemeSystem:
                             prefs.edit().putString("theme", "system").apply();
diff --git a/app/src/main/res/layout/dialog_theme.xml b/app/src/main/res/layout/dialog_theme.xml
index b5c7a55aaf..953770d503 100644
--- a/app/src/main/res/layout/dialog_theme.xml
+++ b/app/src/main/res/layout/dialog_theme.xml
@@ -40,12 +40,21 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
         <RadioButton
-            android:id="@+id/rbThemeGrey"
+            android:id="@+id/rbThemeGreyLight"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:padding="6dp"
-            android:text="@string/title_setup_grey_theme"
+            android:text="@string/title_setup_grey_light_theme"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+        <RadioButton
+            android:id="@+id/rbThemeGreyDark"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:padding="6dp"
+            android:text="@string/title_setup_grey_dark_theme"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
         <RadioButton
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 02acf62cd2..92b083cc4d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -182,7 +182,8 @@
     <string name="title_setup_light_theme">Light theme</string>
     <string name="title_setup_dark_theme">Dark theme</string>
     <string name="title_setup_black_theme">Black theme</string>
-    <string name="title_setup_grey_theme">Grey theme</string>
+    <string name="title_setup_grey_light_theme">Grey light theme</string>
+    <string name="title_setup_grey_dark_theme">Grey dark theme</string>
     <string name="title_setup_system_theme">System theme</string>
     <string name="title_setup_advanced">Advanced</string>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 261e6fe55d..baf586cebe 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -81,7 +81,16 @@
         <item name="colorDrawerBackground">@android:color/black</item>
     </style>
 
-    <style name="AppThemeGrey" parent="AppThemeDark">
+    <style name="AppThemeGreyLight" parent="AppThemeLight">
+        <item name="themeName">light</item>
+        <item name="colorPrimary">@color/greyPrimary</item>
+        <item name="colorPrimaryDark">@color/greyPrimaryDark</item>
+        <item name="colorAccent">@color/greyAccent</item>
+
+        <item name="colorUnread">@color/greyAccent</item>
+    </style>
+
+    <style name="AppThemeGreyDark" parent="AppThemeDark">
         <item name="themeName">black</item>
         <item name="colorPrimary">@color/greyPrimary</item>
         <item name="colorPrimaryDark">@color/greyPrimaryDark</item>