From 17107077c24f6c1285b205ef8a6c6da1b0859ba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dr=2E=20J=C3=B6rg=20Wurzer?= <github@online.de>
Date: Sun, 12 May 2024 18:04:29 +0200
Subject: [PATCH 1/2] Prepare fossify apps

---
 AppGrid.qml                 |  1 +
 android/AndroidManifest.xml |  2 +-
 main.qml                    | 17 ++++++++++++-----
 qtquickcontrols2.conf       |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/AppGrid.qml b/AppGrid.qml
index 3a2434b6..9361e597 100644
--- a/AppGrid.qml
+++ b/AppGrid.qml
@@ -540,6 +540,7 @@ LauncherPage {
                     }
                 }
                 mainView.updateSpinner(false)
+                mainView.checkDefaultApps(getAllApps())
             } else if (type === "volla.launcher.receivedShortcut") {
                 console.log("AppGrid | New pinned shortcut: " + message["shortcutId"])
 
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index df5b14b4..cf65541d 100644
--- a/android/AndroidManifest.xml
+++ b/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="2.4.3" android:versionCode="300" android:installLocation="auto">
+<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.4" android:versionCode="301" 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.
diff --git a/main.qml b/main.qml
index 70edec9e..c8d1e5ff 100644
--- a/main.qml
+++ b/main.qml
@@ -239,12 +239,12 @@ ApplicationWindow {
         property bool useVibration: settings.useHapticMenus
         property int maxTitleLength: 120
 
-        property string galleryApp: "com.simplemobiletools.gallery.pro"
-        property string calendarApp: "com.simplemobiletools.calendar.pro"
+        property string galleryApp: "org.fossify.gallery"
+        property string calendarApp: "org.fossify.calendar"
         property string cameraApp: "com.mediatek.camera"
-        property string phoneApp: "com.simplemobiletools.dialer" // "com.android.dialer"
-        property string notesApp: "com.simplemobiletools.notes.pro"
-        property var messageApp: ["com.android.mms", "com.simplemobiletools.smsmessenger", "com.android.messaging"];
+        property string phoneApp: "com.android.dialer"
+        property string notesApp: "org.fossify.notes"
+        property var messageApp: ["com.android.mms", "org.fossify.messages", "com.android.messaging"];
 
         property string cacheName: "VollaCacheDB"
         property string cacheDescription: "Messages cache"
@@ -937,6 +937,13 @@ ApplicationWindow {
             }
         }
 
+        function checkDefaultApp(apps) {
+            mainView.galleryApp = apps.filter( el => el.package !== "org.fossify.gallery" ).length > 0 ?
+                        "org.fossify.gallery" : "com.simplemobiletools.gallery.pro"
+            mainView.calendarApp = apps.filter( el => el.package !== "org.fossiry.calendar" ).length > 0 ?
+                        "org.fossiry.calendar" : "com.simplemobiletools.calendar.pro"
+        }
+
         WorkerScript {
             id: contactsWorker
             source: "scripts/contacts.mjs"
diff --git a/qtquickcontrols2.conf b/qtquickcontrols2.conf
index 645a3a07..6bf21ed9 100644
--- a/qtquickcontrols2.conf
+++ b/qtquickcontrols2.conf
@@ -6,7 +6,7 @@
 Style=Universal
 
 [Universal\Font]
-Family=Noto Sans
+Family=sans-serif
 
 [Universal]
 Theme=Dark

From 1e7f1a2ab82e6873a67a8302a77f4653a10a40c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dr=2E=20J=C3=B6rg=20Wurzer?= <github@online.de>
Date: Sun, 12 May 2024 18:28:02 +0200
Subject: [PATCH 2/2] Font fix

---
 qtquickcontrols2.conf | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/qtquickcontrols2.conf b/qtquickcontrols2.conf
index 6bf21ed9..cf5bd51e 100644
--- a/qtquickcontrols2.conf
+++ b/qtquickcontrols2.conf
@@ -5,8 +5,11 @@
 [Controls]
 Style=Universal
 
+[Default]
+Font\Family=Noto Sans
+
 [Universal\Font]
-Family=sans-serif
+Family=Noto Sans
 
 [Universal]
 Theme=Dark