From 2fc2ec48c99d0a161bda2d019935b1b337833176 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 28 Feb 2021 09:32:21 +0100
Subject: [PATCH] Dark theme for EULA

---
 app/src/main/java/eu/faircode/email/ActivityBase.java | 6 ++----
 app/src/main/java/eu/faircode/email/ActivityMain.java | 5 ++++-
 app/src/main/java/eu/faircode/email/Helper.java       | 7 +++++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index b46a49918f..e2f1bfc798 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -100,10 +100,8 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
         if (!this.getClass().equals(ActivityMain.class)) {
             String theme = prefs.getString("theme", "blue_orange_system");
 
-            // https://developer.android.com/guide/topics/ui/look-and-feel/darktheme#configuration_changes
-            int uiMode = getResources().getConfiguration().uiMode;
-            boolean night = ((uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES);
-            EntityLog.log(this, "Activity theme=" + theme + " UI mode=" + uiMode + " night=" + night);
+            boolean night = Helper.isNight(this);
+            EntityLog.log(this, "Activity theme=" + theme + " night=" + night);
 
             switch (theme) {
                 // Light
diff --git a/app/src/main/java/eu/faircode/email/ActivityMain.java b/app/src/main/java/eu/faircode/email/ActivityMain.java
index fd8cc5c007..c38af4d424 100644
--- a/app/src/main/java/eu/faircode/email/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/email/ActivityMain.java
@@ -181,7 +181,10 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
             else
                 prefs.edit().putBoolean("compact", true).apply();
 
-            setTheme(R.style.AppThemeBlueOrangeLight);
+            if (Helper.isNight(this))
+                setTheme(R.style.AppThemeBlueOrangeDark);
+            else
+                setTheme(R.style.AppThemeBlueOrangeLight);
             super.onCreate(savedInstanceState);
             setContentView(R.layout.activity_main);
 
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index fb7dd549ea..fc4e6ed687 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -861,6 +861,13 @@ public class Helper {
         view.setLayoutParams(lparam);
     }
 
+    static boolean isNight(Context context) {
+        // https://developer.android.com/guide/topics/ui/look-and-feel/darktheme#configuration_changes
+        int uiMode = context.getResources().getConfiguration().uiMode;
+        Log.i("UI mode=" + uiMode);
+        return ((uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES);
+    }
+
     static boolean isDarkTheme(Context context) {
         TypedValue tv = new TypedValue();
         context.getTheme().resolveAttribute(R.attr.themeName, tv, true);