Fix for theme switch

Settings.qml

@@ -16,6 +16,11 @@ LauncherPage {
         pluginSettingsItemColumn.loadAvailablePlugins()
     }
 
+//    Component.onCompleted: {
+//        var fonts = Qt.fontFamilies()
+//        for (var i = 0; i < fonts.length; i++) console.debug("Settings | Font: " + fonts[i])
+//    }
+
     Flickable {
         anchors.fill: parent
         contentWidth: parent.width

android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.1.3" android:versionCode="443" android:installLocation="auto">
+<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="4.1.4" android:versionCode="444" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="29"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.

android/src/com/volla/launcher/activity/ReceiveTextActivity.java

@@ -18,6 +18,8 @@
 import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.graphics.fonts.SystemFonts;
+import android.graphics.fonts.Font;
 import android.util.Log;
 import android.os.Bundle;
 import android.os.Build;
@@ -30,6 +32,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Set;
 import java.io.ByteArrayOutputStream;
 import androidnative.SystemDispatcher;
 import androidnative.AndroidNativeActivity;
@@ -97,6 +101,13 @@ public void onCreate (Bundle savedInstanceState) {
 
         Log.d(TAG, "onCreated() called");
 
+//        Set<Font> sfs = SystemFonts.getAvailableFonts();
+//        Iterator<Font> fontIterator = sfs.iterator();
+//        while(fontIterator.hasNext()) {
+//           Font f = fontIterator.next();
+//           Log.d(TAG, "Font: " + f.getFile());
+//        }
+
         // Workaround for blank activity
         // https://forum.qt.io/topic/90189/android-e-qt-java-surface-1-not-found/2
         if (instance != null) {

android/src/com/volla/launcher/util/LayoutUtil.java

@@ -36,6 +36,8 @@ public class LayoutUtil {
     public static final String SET_COLOR = "volla.launcher.colorAction";
     public static final String GET_NAVBAR_HEIGHT = "volla.launcher.navBarAction";
     public static final String GOT_NAVBAR_HEIGHT = "volla.launcher.navBarResponse";
+    public static final String GET_SYSTEM_FONT = "volla.launcher.fontAction";
+    public static final String GOT_SYSTEM_FONT = "volla.launcher.fontResponse";
 
     static {
         SystemDispatcher.addListener(new SystemDispatcher.Listener() {
@@ -150,6 +152,23 @@ public void run() {
                     };
 
                     activity.runOnUiThread(runnable);
+                } else if (type.equals(GET_SYSTEM_FONT)) {
+                    final Activity activity = QtNative.activity();
+
+                    Runnable runnable = new Runnable () {
+                        public void run() {
+                            int resId = Resources.getSystem().getIdentifier("config_bodyFontFamily", "string", "android");
+                            String systemFont;
+                            if (resId == 0) systemFont = "";
+                            else systemFont = Resources.getSystem().getString(resId);
+                            Map responseMessage = new HashMap();
+                            responseMessage.put("font", systemFont);
+                            SystemDispatcher.dispatch(GOT_SYSTEM_FONT, responseMessage);
+                        }
+                    };
+
+                    Thread thread = new Thread(runnable);
+                    thread.start();
                 } else if (type.equals(GET_NAVBAR_HEIGHT)) {
                     final Activity activity = QtNative.activity();
 

main.qml

@@ -55,6 +55,8 @@ ApplicationWindow {
               if (mainView.isTablet) AN.SystemDispatcher.dispatch("volla.launcher.runningAppsAction", {})
               // Start onboarding for the first start of the app
               console.log("MainView | First start: " + settings.firstStart)
+              // Check system fint
+              AN.SystemDispatcher.dispatch("volla.launcher.fontAction", {})
               // Check new pinned shortcut
               AN.SystemDispatcher.dispatch("volla.launcher.checkNewShortcut", {})
               // Update app grid
@@ -589,7 +591,7 @@ ApplicationWindow {
             if (settings.sync) {
                 settings.sync()
             }
-            console.log("MainView | Swith theme to " + theme + ", " + settings.theme)
+            console.log("MainView | Switch theme to " + theme + ", " + settings.theme)
             switch (theme) {
             case mainView.theme.Dark:
                 Universal.theme = Universal.Dark
@@ -608,7 +610,7 @@ ApplicationWindow {
                 mainView.backgroundOpacity = 0.3
                 mainView.backgroundColor = "transparent"
                 mainView.fontColor = "white"
-            break
+                break
             case mainView.theme.LightTranslucent:
                 Universal.theme = Universal.Light
                 mainView.backgroundOpacity = 0.3
@@ -1198,6 +1200,7 @@ ApplicationWindow {
                         console.log("MainView | Invalid RSS feed url")
                     }
                 } else if (type === "volla.launcher.uiModeResponse") {
+                    console.debug("MainView | volla.launcher.uiModeResponse")
                     mainView.switchTheme(message["uiMode"], false)
                 } else if (type === "volla.launcher.messageResponse") {
                     console.log("MainView | onDispatched: " + type)
@@ -1208,21 +1211,27 @@ ApplicationWindow {
                         mainView.showToast(qsTr(mainView.notifications[message["text"]]))
                     }
                 } else if (type === "volla.launcher.uiModeChanged") {
+                    console.debug("MainView | volla.launcher.uiModeChanged")
                     if (message["uiMode"] !== settings.theme) {
-                        settings.theme = message["uiMode"]
-                        settings.sync()
                         if (message["uiMode"] === mainView.theme.Light) {
-                            if (settings.theme === mainView.theme.LightTranslucent || settings.theme === mainView.theme.DarkTranslucent) {
+                            if (settings.theme === mainView.theme.DarkTranslucent) {
                                 mainView.switchTheme(mainView.theme.LightTranslucent, false)
-                            } else {
+                                settings.theme = mainView.theme.LightTranslucent
+                                settings.sync()
+                            } else if (settings.theme === mainView.theme.Dark) {
                                 mainView.switchTheme(mainView.theme.Light, true)
+                                settings.theme = mainView.theme.Light
+                                settings.sync()
                             }
-
                         } else if (message["uiMode"] === mainView.theme.Dark) {
-                            if (settings.theme === mainView.theme.LightTranslucent || settings.theme === mainView.theme.DarkTranslucent) {
+                            if (settings.theme === mainView.theme.LightTranslucent) {
                                 mainView.switchTheme(mainView.theme.DarkTranslucent, false)
-                            } else {
+                                settings.theme = mainView.theme.DarkTranslucent
+                                settings.sync()
+                            } else if (settings.theme === mainView.theme.Light) {
                                 mainView.switchTheme(mainView.theme.Dark, true)
+                                settings.theme = mainView.theme.Dark
+                                settings.sync()
                             }
                         }
                     }
@@ -1238,6 +1247,8 @@ ApplicationWindow {
                         var object = component.createObject(mainView, properties)
                         object.open()
                     }
+                } else if (type === "volla.launcher.fontResponse") {
+                    console.debug("MainView | System font: " + message["font"])
                 }
             }
         }