Fix für springboard as start view

HelloVolla · Feb 8, 2023 · d1c230d · d1c230d
1 parent 4763c23
commit d1c230d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/AppGroup.qml b/AppGroup.qml
@@ -83,7 +83,6 @@ Item {
         width: parent.width
         topPadding: groupItem.groupIndex === 0 ? 0 : groupItem.groupIndex === 1 && groupItem.selectedGroupIndex === 0 ?
                                                      groupItem.innerSpacing / 2 : groupItem.innerSpacing
-
         Component.onCompleted: {
             groupHeader.visible = !groupGrid.visible
             groupHeader2.visible = groupGrid.visible && groupItem.groupIndex > 0 && groupItem.groupLabel.toLowerCase() !== "apps"
@@ -138,9 +137,6 @@ Item {
             cellWidth: parent.width * 0.25
             visible: groupItem.groupIndex === groupItem.selectedGroupIndex
             interactive: false
-//            add: Transition {
-//                NumberAnimation { properties: "opacity"; from: 0.0; to: 1.0; duration: 1000 }
-//            }
 
             model: groupModel
 

diff --git a/Settings.qml b/Settings.qml
@@ -1318,6 +1318,7 @@ Page {
                 rightPadding: mainView.innerSpacing
                 text: qsTr("Background blur")
                 font.pointSize: mainView.mediumFontSize
+                visible: false
             }
 
             Slider {
@@ -1329,6 +1330,7 @@ Page {
                 from: 0
                 to: 100
                 value: designSettings.blurEffect
+                visible: false
 
                 handle: Rectangle {
                     x: blurSlider.leftPadding + blurSlider.visualPosition * (blurSlider.availableWidth - width)

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.1.12" android:versionCode="257" android:installLocation="auto">
+<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.1.13" android:versionCode="258" 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
@@ -29,17 +29,17 @@ ApplicationWindow {
               // Application go in active state
               console.log("MainView | Application became active")
               settings.sync()
-              appGridLoader.active = true
-              springboardLoader.active = true
-              settingsPageLoader.active = true
+              if (!appGridLoader.active) appGridLoader.active = true
+              if (!springboardLoader.active) springboardLoader.active = true
+              if (!settingsPageLoader.active) settingsPageLoader.active = true
               if (mainView.keepLastIndex) {
                   if (mainView.currentIndex === mainView.swipeIndex.ConversationOrNewsOrDetails) {
                       console.log("MainView | Switch to conversation page")
                       mainView.currentIndex = mainView.swipeIndex.ConversationOrNewsOrDetails
                   }
                   mainView.keepLastIndex = false
               } else {
-                  mainView.currentIndex === settings.showAppsAtStartup ? mainView.swipeIndex.Apps : mainView.swipeIndex.Springboard
+                  mainView.currentIndex = settings.showAppsAtStartup ? mainView.swipeIndex.Apps : mainView.swipeIndex.Springboard
               }
               // Start onboarding for the first start of the app
               console.log("MainView | First start: " + settings.firstStart)
@@ -77,7 +77,7 @@ ApplicationWindow {
     SwipeView {
         id: mainView
         anchors.fill: parent
-        currentIndex: settings.showAppsAtStartup ? mainView.swipeIndex.Apps : mainView.swipeIndex.Springboard
+        currentIndex: 2
         interactive: true
 
         background: Item {
@@ -996,6 +996,7 @@ ApplicationWindow {
             if (fullscreen) {
                 appWindow.visibility = 5
             }
+            mainView.useVibration = useHapticMenus
             settings.sync()
         }
     }