Merge pull request #212 from HelloVolla/dev

Dev
HelloVolla · Jan 15, 2024 · 40da0cc · 40da0cc
2 parents d2601b3 + f9877ba
commit 40da0cc
Show file tree

Hide file tree

Showing 10 changed files with 719 additions and 724 deletions.
diff --git a/AppGrid.qml b/AppGrid.qml
@@ -331,7 +331,7 @@ LauncherPage {
             function openContextMenu(app, gridCell, gridView) {
                 contextMenu.app = app
                 contextMenu.gridView = gridView
-                contextMenu.isPinnedShortcut = app.shortcutId !== undefined
+                contextMenu.isPinnedShortcut = app.shortcutId !== undefined && app.shortcutId.length > 0
                 contextMenu.popup(gridCell)
             }
 
@@ -344,6 +344,8 @@ LauncherPage {
 
     Menu {
         id: contextMenu
+        implicitHeight: addShortCutItem.height + openAppItem.height + removeAppItem.height + removePinnedShortcutItem.height + mainView.innerSpacing
+        topPadding: mainView.innerSpacing / 2
 
         property double menuWidth: 250.0
         property var app
@@ -361,6 +363,7 @@ LauncherPage {
 
         MenuItem {
             id: addShortCutItem
+            anchors.margins: mainView.innerSpacing
             text: qsTr("Add to shortcuts")
             font.pointSize: appLauncher.labelPointSize
             contentItem: Label {
@@ -369,9 +372,6 @@ LauncherPage {
                 font: addShortCutItem.font
                 horizontalAlignment: Text.AlignHCenter
             }
-            leftPadding: mainView.innerSpacing
-            rightPadding: mainView.innerSpacing
-            topPadding: mainView.innerSpacing
             background: Rectangle {
                 anchors.fill: parent
                 color: "transparent"
@@ -389,15 +389,13 @@ LauncherPage {
         }
         MenuItem {
             id: openAppItem
+            anchors.margins: mainView.innerSpacing
             font.pointSize: appLauncher.labelPointSize
             contentItem: Label {
                 width: contextMenu.menuWidth
                 text: contextMenu.isPinnedShortcut ? qsTr("Open Shortcut") : qsTr("Open App")
                 horizontalAlignment: Text.AlignHCenter
             }
-            leftPadding: mainView.innerSpacing
-            rightPadding: mainView.innerSpacing
-            bottomPadding: removeAppItem.visible ? 0 : mainView.innerSpacing
             background: Rectangle {
                 anchors.fill: parent
                 color: "transparent"
@@ -423,16 +421,14 @@ LauncherPage {
         }
         MenuItem {
             id: removeAppItem
+            anchors.margins: mainView.innerSpacing
             height: removeAppItem.visible ? contextMenu.menuItemHeight : 0
             font.pointSize: appLauncher.labelPointSize
             contentItem: Label {
                 width: contextMenu.menuWidth
                 text: qsTr("Remove App")
                 horizontalAlignment: Text.AlignHCenter
             }
-            leftPadding: mainView.innerSpacing
-            rightPadding: mainView.innerSpacing
-            bottomPadding: mainView.innerSpacing
             background: Rectangle {
                 anchors.fill: parent
                 color: "transparent"
@@ -444,16 +440,14 @@ LauncherPage {
         }
         MenuItem {
             id: removePinnedShortcutItem
+            anchors.margins: mainView.innerSpacing
             height: removePinnedShortcutItem.visible ? contextMenu.menuItemHeight : 0
             font.pointSize: appLauncher.labelPointSize
             contentItem: Label {
                 width: contextMenu.menuWidth
                 text: qsTr("Remove Bookmark")
                 horizontalAlignment: Text.AlignHCenter
             }
-            leftPadding: mainView.innerSpacing
-            rightPadding: mainView.innerSpacing
-            bottomPadding: mainView.innerSpacing
             background: Rectangle {
                 anchors.fill: parent
                 color: "transparent"

diff --git a/Settings.qml b/Settings.qml
@@ -309,10 +309,6 @@ LauncherPage {
                             color: securitySettingsItem.menuState === true ? Universal.accent : "transparent"
                         }
 
-                        Component.onCompleted: {
-                            AN.SystemDispatcher.dispatch("volla.launcher.securityStateAction", {})
-                        }
-
                         onTextChanged: {
                             securitySettingsItemTitleIcon.visible = text === securityModeOnOption.text
                         }

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="2.3.2" android:versionCode="293" android:installLocation="auto">
+<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.3.3" android:versionCode="294" 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
@@ -276,6 +276,7 @@ ApplicationWindow {
                     break
                 case swipeIndex.Preferences:
                     settingsPage.children[0].item.updateAvailablePlugins()
+                    AN.SystemDispatcher.dispatch("volla.launcher.securityStateAction", {})
                     break
                 default:
                     // Nothing to do