From c485b8206ab661663b91fcb797cba45ef6ccdcad Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 27 Jan 2021 17:22:01 +0300
Subject: deprecate isNightMode(); set dark parameters on initial webview setup

---
 org.fox.epube/build.gradle                                |  4 ++--
 .../src/main/java/org/fox/epube/MainActivity.java         | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/org.fox.epube/build.gradle b/org.fox.epube/build.gradle
index d524f2b..282aec1 100644
--- a/org.fox.epube/build.gradle
+++ b/org.fox.epube/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "org.fox.epube"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 4
-        versionName "1.3"
+        versionCode 5
+        versionName "1.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java b/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java
index 78a8090..ce1db12 100644
--- a/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java
+++ b/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java
@@ -70,7 +70,14 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei
         settings.setAppCacheEnabled(true);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            settings.setForceDark(WebSettings.FORCE_DARK_OFF);
+            //settings.setForceDark(WebSettings.FORCE_DARK_OFF);
+
+            int nightModeFlags = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+
+            if (nightModeFlags == Configuration.UI_MODE_NIGHT_YES)
+                settings.setForceDark(WebSettings.FORCE_DARK_ON);
+            else
+                settings.setForceDark(WebSettings.FORCE_DARK_OFF);
         }
 
         m_loadingBar = findViewById(R.id.loading_progress);
@@ -399,9 +406,11 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei
         }
 
         @JavascriptInterface
+        @Deprecated
         public boolean isNightMode() {
-            int nightModeFlags = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
-            return nightModeFlags == Configuration.UI_MODE_NIGHT_YES;
+            /*int nightModeFlags = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
+            return nightModeFlags == Configuration.UI_MODE_NIGHT_YES;*/
+            return false;
         }
 
         @JavascriptInterface
-- 
cgit v1.2.3