Merge pull request #277 from HelloVolla/dev

Fixes for icon and name mapping
HelloVolla · Dec 22, 2024 · ff0674b · ff0674b
2 parents bda6199 + 1d806ce
commit ff0674b
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 130 deletions.
diff --git a/AppGrid.qml b/AppGrid.qml
@@ -14,126 +14,6 @@ LauncherPage {
 
     property string textInput
     property real labelPointSize: 16
-    property var iconMap: {
-        "com.simplemobiletools.dialer": "/icons/[email protected]",
-        "com.simplemobiletools.smsmessenger": "/icons/[email protected]",
-        "com.simplemobiletools.gallery.pro": "/icons/[email protected]",
-        "com.simplemobiletools.contacts.pro": "/icons/[email protected]",
-        "com.simplemobiletools.clock": "/icons/[email protected]",
-        "com.simplemobiletools.calendar.pro": "/icons/[email protected]",
-        "com.simplemobiletools.filemanager.pro": "/icons/[email protected]",
-        "com.simplemobiletools.notes.pro": "/icons/[email protected]",
-        "com.simplemobiletools.calculator": "/icons/calculator@4x_104x104px.png",
-        "org.fossify.phone": "/icons/[email protected]",
-        "org.fossify.smsmessenger": "/icons/[email protected]",
-        "org.fossify.gallery": "/icons/[email protected]",
-        "org.fossify.contacts": "/icons/[email protected]",
-        "org.fossify.clock": "/icons/[email protected]",
-        "org.fossify.calendar": "/icons/[email protected]",
-        "org.fossify.filemanager": "/icons/[email protected]",
-        "org.fossify.notes": "/icons/[email protected]",
-        "org.fossify.calculator": "/icons/calculator@4x_104x104px.png",
-        "org.fossify.musicplayer": "/icons/[email protected]",
-        "com.volla.messages": "/icons/[email protected]",
-        "com.contactoffice.mailfence": "/icons/[email protected]",
-        "com.emclient.mailclient": "/icons/[email protected]",  
-        "net.thunderbird.android": "/icons/[email protected]",
-        "be.engie.smart": "/icons/[email protected]",
-        "be.bmid.itsme": "/icons/[email protected]",
-        "com.facebook.lite": "/icons/[email protected]",
-        "nl.apcreation.woolsocks": "/icons/[email protected]",
-        "com.zhiliaoapp.musically": "/icons/[email protected]",
-        "com.proximus.proximusplus": "/icons/[email protected]",
-        "mobi.inthepocket.bcmc.bancontact": "/icons/[email protected]",
-        "com.symantec.mobilesecurity": "/icons/[email protected]",
-        "be.nexuzhealth.mobile.mynexuz": "/icons/[email protected]",
-        "com.bookmark.money": "/icons/[email protected]",
-        "be.bpost.mybpost": "/icons/[email protected]",
-        "be.ixor.doccle.android": "/icons/[email protected]",
-        "com.themobilecompany.delijn": "/icons/[email protected]",
-        "com.x8bit.bitwarden": "/icons/[email protected]",
-        "com.beeper.android": "/icons/[email protected]",
-        "be.argenta.bankieren": "/icons/[email protected]",
-        "com.android.dialer": "/icons/[email protected]",
-        "com.android.mms" : "/icons/[email protected]",
-        "com.android.messaging": "/icons/[email protected]",
-        "com.google.android.apps.messaging" : "/icons/[email protected]",
-        "net.osmand.plus": "/icons/[email protected]",
-        "com.mediatek.camera": "/icons/[email protected]",
-        "com.android.camera2": "/icons/[email protected]",
-        "com.android.gallery3d": "/icons/[email protected]",
-        "com.android.deskclock": "/icons/[email protected]",
-        "com.android.settings": "/icons/[email protected]",
-        "com.android.documentsui": "/icons/[email protected]",
-        "org.telegram.messenger": "/icons/[email protected]",
-        "com.android.email": "/icons/[email protected]",
-        "com.fsck.k9": "/icons/[email protected]",
-        "com.google.android.gm": "/icons/[email protected]",
-        "com.Slack": "/icons/[email protected]",
-        "org.mozilla.fennec_fdroid": "/icons/[email protected]",
-        "com.maxfour.music": "/icons/[email protected]",
-        "com.instagram.android": "/icons/[email protected]",
-        "com.github.yeriomin.yalpstore": "/icons/[email protected]",
-        "com.aurora.store": "/icons/[email protected]",
-        "com.amazon.mShop.android.shopping": "/icons/[email protected]",
-        "de.hafas.android.db": "/icons/[email protected]",
-        "com.dropbox.android": "/icons/[email protected]",
-        "org.fdroid.fdroid": "/icons/[email protected]",
-        "com.facebook.katana": "/icons/[email protected]",
-        "de.gmx.mobile.android.mail": "/icons/[email protected]",
-        "hideme.android.vpn.noPlayStore": "/icons/[email protected]",
-        "com.linkedin.android": "/icons/[email protected]",
-        "com.nextcloud.client": "/icons/[email protected]",
-        "com.paypal.android.p2pmobile": "/icons/[email protected]",
-        "com.skype.raider": "/icons/[email protected]",
-        "com.spotify.music": "/icons/[email protected]",
-        "de.tutao.tutanota": "/icons/[email protected]",
-        "com.volla.launcher": "/icons/[email protected]",
-        "de.web.mobile.android.mail": "/icons/[email protected]",
-        "com.wetter.androidclient": "/icons/[email protected]",
-        "com.whatsapp": "/icons/[email protected]",
-        "com.android.fmradio": "/icons/radio@4x_104x104px.png",
-        "at.bitfire.davdroid": "/icons/sync@4x_104x104px.png",
-        "org.thoughtcrime.securesms": "/icons/signal@4x_104x104px.png",
-        "de.baumann.weather": "/icons/weather@4x_104x104px.png",
-        "com.android.calculator2": "/icons/calculator@4x_104x104px.png",
-        "eu.siacs.conversations": "/icons/xmpp@4x_104x104px.png",
-        "one.socializer.android": "/icons/[email protected]",
-        "im.status.ethereum": "/icons/[email protected]",
-        "org.liberty.android.freeotpplus": "/icons/[email protected]",
-        "com.kickstarter.kickstarter": "/icons/[email protected]",
-        "com.ebay.kleinanzeigen": "/icons/[email protected]",
-        "com.secuso.privacyFriendlyCodeScanner": "/icons/[email protected]",
-        "com.twitter.android": "/icons/[email protected]",
-        "com.commerzbank.photoTAN": "/icons/[email protected]"
-    }
-    property var labelMap: {
-        "com.simplemobiletools.filemanager.pro": qsTr("Files"),
-        "com.simplemobiletools.smsmessenger": qsTr("Messages"),
-        "org.fossify.filemanager": qsTr("Files"),
-        "org.fossify.smsmessenger": qsTr("Messages"),
-        "org.fossify.musicplayer": qsTr("Music"),
-        "mobi.inthepocket.bcmc.bancontact": qsTr("Bancontact"),
-        "be.sncbnmbs.b2cmobapp": qsTr("De Trein"),
-        "be.nexuzhealth.mobile.mynexuz": qsTr("Mynexuzhealth"),
-        "com.codesynd.cashfree": qsTr("Bonsai"),
-        "be.introlution.myonlinecalendar": qsTr("MijnOnlineAgenda"),
-        "com.facebook.lite": qsTr("Facebook"),
-        "org.mozilla.fennec_fdroid": qsTr("Browser"),
-        "com.google.android.gm" : qsTr("Mail"),
-        "eu.faircode.email" : qsTr("Mail"),
-        "com.emclient.mailclient" : qsTr("Mail"),
-        "net.thunderbird.android" : qsTr("Mail"),
-        "com.fsck.k9": qsTr("Mail"),
-        "at.bitfire.davdroid": qsTr("Sync"),
-        "hideme.android.vpn.noPlayStore": qsTr("VPN"),
-        "com.aurora.store": qsTr("Store"),
-        "com.aurora.adroid": qsTr("A-Droid"),
-        "net.osmand.plus": qsTr("Maps"),
-        "com.volla.launcher": qsTr("Settings"),
-        "com.android.fmradio" : qsTr("Radio"),
-        "de.baumann.weather": qsTr("Weather")
-    }
 
     property var appGroups: [] // QML elements with app grids
     property var pinnedShortcuts: []
@@ -253,7 +133,7 @@ LauncherPage {
                                "selectedGroupIndex": appLauncher.selectedGroup,
                                "textInput": appLauncher.textInput,
                                "iconMap": mainView.iconMap,
-                               "labelMap": appLauncher.labelMap,
+                               "labelMap": mainView.labelMap,
                                "phoneApp": mainView.phoneApp,
                                "messageApp": mainView.messageApp,
                                "labelPointSize": appLauncher.labelPointSize,

diff --git a/AppGroup.qml b/AppGroup.qml
@@ -186,7 +186,7 @@ Item {
                     id: gridButton
                     anchors.top: parent.top
                     anchors.centerIn: gridCell
-                    topPadding: groupItem.innerSpacing / 2
+                    topPadding: (gridCircle.height - buttonIcon.height) / 2 //groupItem.innerSpacing / 2
                     width: parent.width
                     text: model.label
                     contentItem: Column {

diff --git a/Settings.qml b/Settings.qml
@@ -918,10 +918,16 @@ LauncherPage {
                     function setData(data) {
                         console.log("Settings | Menu size is " + data.length)
                         clear()
+                        data.forEach(function(app, i) {
+                            data[i].label = app.package in mainView.labelMap && app.shortcutId === undefined
+                                    ? qsTr(mainView.labelMap[app.package]) : app.label
+                            data[i].itemId = app.shortcutId !== undefined ? app.shortcutId : app.package
+                        })
                         for (var i = 0; i < data.length; i++) {
                             append(data[i])
                         }
                     }
+
                 }
             }
 

diff --git a/Springboard.qml b/Springboard.qml
@@ -927,8 +927,6 @@ LauncherPage {
                             font.pointSize: mainView.smallFontSize
                             opacity: 0.6
                         }
-
-
                     }
 
                     onClicked: {
@@ -1129,8 +1127,8 @@ LauncherPage {
             Timer {
                 id: weather30MinuteTimer
                 interval: 1800000  // 30 minutes in milliseconds (30 * 60 * 1000)
-                repeat: true       // Set to true to repeat every 30 minutes
-                running: true      // Start the timer immediately
+                repeat: widgetsFlow.visible      // Set to true to repeat every 30 minutes
+                running: widgetsFlow.visible     // Start the timer immediately
                 onTriggered: {
                     weatherWidget.getWeather();  // Call the function to execute service
                 }

diff --git 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="3.0.3" android:versionCode="403" android:installLocation="auto">
+<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="3.0.4" android:versionCode="404" 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
@@ -251,11 +251,15 @@ ApplicationWindow {
             "org.fossify.gallery": "/icons/[email protected]",
             "org.fossify.contacts": "/icons/[email protected]",
             "org.fossify.clock": "/icons/[email protected]",
-            "org.fossify.calendar.": "/icons/[email protected]",
+            "org.fossify.calendar": "/icons/[email protected]",
             "org.fossify.filemanager": "/icons/[email protected]",
             "org.fossify.notes": "/icons/[email protected]",
             "org.fossify.calculator": "/icons/calculator@4x_104x104px.png",
+            "org.fossify.musicplayer": "/icons/[email protected]",
+            "com.volla.messages": "/icons/[email protected]",
             "com.contactoffice.mailfence": "/icons/[email protected]",
+            "com.emclient.mailclient": "/icons/[email protected]",
+            "net.thunderbird.android": "/icons/[email protected]",
             "be.engie.smart": "/icons/[email protected]",
             "be.bmid.itsme": "/icons/[email protected]",
             "com.facebook.lite": "/icons/[email protected]",
@@ -270,7 +274,7 @@ ApplicationWindow {
             "be.ixor.doccle.android": "/icons/[email protected]",
             "com.themobilecompany.delijn": "/icons/[email protected]",
             "com.x8bit.bitwarden": "/icons/[email protected]",
-            "com.beeper.chat": "/icons/[email protected]",
+            "com.beeper.android": "/icons/[email protected]",
             "be.argenta.bankieren": "/icons/[email protected]",
             "com.android.dialer": "/icons/[email protected]",
             "com.android.mms" : "/icons/[email protected]",
@@ -323,7 +327,35 @@ ApplicationWindow {
             "com.ebay.kleinanzeigen": "/icons/[email protected]",
             "com.secuso.privacyFriendlyCodeScanner": "/icons/[email protected]",
             "com.twitter.android": "/icons/[email protected]",
-            "com.commerzbank.photoTAN": "/icons/[email protected]"
+            "com.commerzbank.photoTAN": "/icons/[email protected]",
+            "com.volla.messages": "/icons/[email protected]"
+        }
+        property var labelMap: {
+            "com.simplemobiletools.filemanager.pro": qsTr("Files"),
+            "com.simplemobiletools.smsmessenger": qsTr("Messages"),
+            "org.fossify.filemanager": qsTr("Files"),
+            "org.fossify.smsmessenger": qsTr("Messages"),
+            "org.fossify.musicplayer": qsTr("Music"),
+            "mobi.inthepocket.bcmc.bancontact": qsTr("Bancontact"),
+            "be.sncbnmbs.b2cmobapp": qsTr("De Trein"),
+            "be.nexuzhealth.mobile.mynexuz": qsTr("Mynexuzhealth"),
+            "com.codesynd.cashfree": qsTr("Bonsai"),
+            "be.introlution.myonlinecalendar": qsTr("MijnOnlineAgenda"),
+            "com.facebook.lite": qsTr("Facebook"),
+            "org.mozilla.fennec_fdroid": qsTr("Browser"),
+            "com.google.android.gm" : qsTr("Mail"),
+            "eu.faircode.email" : qsTr("Mail"),
+            "com.emclient.mailclient" : qsTr("Mail"),
+            "net.thunderbird.android" : qsTr("Mail"),
+            "com.fsck.k9": qsTr("Mail"),
+            "at.bitfire.davdroid": qsTr("Sync"),
+            "hideme.android.vpn.noPlayStore": qsTr("VPN"),
+            "com.aurora.store": qsTr("Store"),
+            "com.aurora.adroid": qsTr("A-Droid"),
+            "net.osmand.plus": qsTr("Maps"),
+            "com.volla.launcher": qsTr("Settings"),
+            "com.android.fmradio" : qsTr("Radio"),
+            "de.baumann.weather": qsTr("Weather")
         }
 
         property string cacheName: "VollaCacheDB"