Android: Handle light/dark mode changes

Update Theme's style according to current UiMode.

New style.json file for dark mode was added (stored in separate
subdirectory 'darkUiMode/'). Theme_DeviceDefault_DayNight[0] is used for
extraction for API 29 or higher. Style is updated each time when UiMode
is changed.

[0]https://developer.android.com/reference/android/R.style#Theme_DeviceDefault_DayNight

Task-number: QTBUG-83185
Pick-to: 6.4 6.2
Change-Id: Id26059231f41761d822d494ac6c641bf3cba3322
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

4 files changed, 55 insertions, 10 deletions

diff --git a/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
index 6792247eeb..672a2e28d3 100644
--- a/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
+++ b/src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java
@@ -34,6 +34,7 @@ import android.graphics.drawable.ScaleDrawable;
 import android.graphics.drawable.StateListDrawable;
 import android.graphics.drawable.VectorDrawable;
 import android.os.Build;
+import android.os.Bundle;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.TypedValue;
@@ -135,6 +136,42 @@ public class ExtractStyle {
     Context m_context;
     private final HashMap<String, DrawableCache> m_drawableCache = new HashMap<>();
 
+    private static final String EXTRACT_STYLE_KEY = "extract.android.style";
+    private static final String EXTRACT_STYLE_MINIMAL_KEY = "extract.android.style.option";
+
+    private static boolean m_missingNormalStyle = false;
+    private static boolean m_missingDarkStyle = false;
+    private static String  m_stylePath = null;
+    private static boolean m_extractMinimal = false;
+
+    public static void setup(Bundle loaderParams) {
+        if (loaderParams.containsKey(EXTRACT_STYLE_KEY)) {
+            m_stylePath = loaderParams.getString(EXTRACT_STYLE_KEY);
+
+            boolean darkModeFileMissing = !(new File(m_stylePath + "darkUiMode/style.json").exists());
+            m_missingDarkStyle = Build.VERSION.SDK_INT > 28 && darkModeFileMissing;
+
+            m_missingNormalStyle = !(new File(m_stylePath + "style.json").exists());
+
+            m_extractMinimal = loaderParams.containsKey(EXTRACT_STYLE_MINIMAL_KEY) &&
+                               loaderParams.getBoolean(EXTRACT_STYLE_MINIMAL_KEY);
+        }
+    }
+
+    public static void runIfNeeded(Context context, boolean extractDarkMode) {
+        if (m_stylePath == null)
+            return;
+        if (extractDarkMode) {
+            if (m_missingDarkStyle) {
+                new ExtractStyle(context, m_stylePath + "darkUiMode/", m_extractMinimal);
+                m_missingDarkStyle = false;
+            }
+        } else if (m_missingNormalStyle) {
+            new ExtractStyle(context, m_stylePath, m_extractMinimal);
+            m_missingNormalStyle = false;
+        }
+    }
+
     public ExtractStyle(Context context, String extractPath, boolean minimal) {
         m_minimal = minimal;
         m_extractPath = extractPath + "/";
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
index 63298c0730..ec890d1d61 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
@@ -84,8 +84,6 @@ public class QtActivityDelegate
     private static final String ENVIRONMENT_VARIABLES_KEY = "environment.variables";
     private static final String APPLICATION_PARAMETERS_KEY = "application.parameters";
     private static final String STATIC_INIT_CLASSES_KEY = "static.init.classes";
-    private static final String EXTRACT_STYLE_KEY = "extract.android.style";
-    private static final String EXTRACT_STYLE_MINIMAL_KEY = "extract.android.style.option";
 
     public static final int SYSTEM_UI_VISIBILITY_NORMAL = 0;
     public static final int SYSTEM_UI_VISIBILITY_FULLSCREEN = 1;
@@ -707,11 +705,8 @@ public class QtActivityDelegate
             libraries.remove(libraries.size() - 1);
         }
 
-        if (loaderParams.containsKey(EXTRACT_STYLE_KEY)) {
-            String path = loaderParams.getString(EXTRACT_STYLE_KEY);
-            new ExtractStyle(m_activity, path, loaderParams.containsKey(EXTRACT_STYLE_MINIMAL_KEY) &&
-                                               loaderParams.getBoolean(EXTRACT_STYLE_MINIMAL_KEY));
-        }
+        ExtractStyle.setup(loaderParams);
+        ExtractStyle.runIfNeeded(m_activity, isUiModeDark(m_activity.getResources().getConfiguration()));
 
         QtNative.setEnvironmentVariables(loaderParams.getString(ENVIRONMENT_VARIABLES_KEY));
         QtNative.setEnvironmentVariable("QT_ANDROID_FONTS_MONOSPACE",
@@ -971,13 +966,20 @@ public class QtActivityDelegate
             updateFullScreen();
     }
 
+    boolean isUiModeDark(Configuration config)
+    {
+        return (config.uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
+    }
+
     private void handleUiModeChange(int uiMode)
     {
         switch (uiMode) {
             case Configuration.UI_MODE_NIGHT_NO:
+                ExtractStyle.runIfNeeded(m_activity, false);
                 QtNative.handleUiDarkModeChanged(0);
                 break;
             case Configuration.UI_MODE_NIGHT_YES:
+                ExtractStyle.runIfNeeded(m_activity, true);
                 QtNative.handleUiDarkModeChanged(1);
                 break;
         }
diff --git a/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
index 9cef8146fd..94d3c2dee1 100644
--- a/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
@@ -65,8 +65,14 @@ public class QtActivity extends Activity
     public QtActivity()
     {
         m_loader = new QtActivityLoader(this);
-        QT_ANDROID_THEMES = new String[] {"Theme_Holo_Light"};
-        QT_ANDROID_DEFAULT_THEME = "Theme_Holo_Light";
+
+        if (Build.VERSION.SDK_INT < 29) {
+            QT_ANDROID_THEMES = new String[] {"Theme_Holo_Light"};
+            QT_ANDROID_DEFAULT_THEME = "Theme_Holo_Light";
+        } else {
+            QT_ANDROID_THEMES = new String[] {"Theme_DeviceDefault_DayNight"};
+            QT_ANDROID_DEFAULT_THEME = "Theme_DeviceDefault_DayNight";
+        }
     }
 
 
diff --git a/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java b/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java
index 883c0d6478..fea193a4db 100644
--- a/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java
+++ b/src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java
@@ -331,7 +331,7 @@ public abstract class QtLoader {
                     }
                 }
 
-                if (!(new File(stylePath)).exists() && !extractOption.equals("none")) {
+                if (!extractOption.equals("none")) {
                     loaderParams.putString(EXTRACT_STYLE_KEY, stylePath);
                     loaderParams.putBoolean(EXTRACT_STYLE_MINIMAL_KEY, extractOption.equals("minimal"));
                 }