Merge pull request #187 from HelloVolla/dev

Fix for dialog background color
HelloVolla · Oct 30, 2023 · 6b37add · 6b37add
2 parents 8d06df8 + dd7dabd
commit 6b37add
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Settings.qml b/Settings.qml
@@ -433,7 +433,8 @@ LauncherPage {
                             // Check, if password is set
                             AN.SystemDispatcher.dispatch("volla.launcher.checkSecurityPasswordAction", {})
                         } else if (selectedMenuItem.text === securityModeOffOption.text) {
-                            passwordDialog.backgroundColor = mainView.fontColor.toString() === "white"  ? "#292929" : "#CCCCCC"
+                            passwordDialog.backgroundColor = mainView.fontColor.toString() === "white" || mainView.fontColor.toString() === "#ffffff"
+                                    ? "#292929" : "#CCCCCC"
                             passwordDialog.definePasswordMode = false
                             passwordDialog.isPasswordSet = true
                             passwordDialog.open()
@@ -500,7 +501,8 @@ LauncherPage {
                             placeholderTextColor: "darkgrey"
                             font.pointSize: mainView.mediumFontSize
                             background: Rectangle {
-                                color: mainView.fontColor.toString() === "white"  ? "black" : "white"
+                                color: mainView.fontColor.toString() === "white" || mainView.fontColor.toString() === "#ffffff"
+                                       ? "black" : "white"
                                 border.color: "transparent"
                             }
                         }
@@ -528,7 +530,8 @@ LauncherPage {
                             font.pointSize: mainView.mediumFontSize
                             visible: passwordDialog.definePasswordMode
                             background: Rectangle {
-                                color: mainView.fontColor.toString() === "white"  ? "black" : "white"
+                                color: mainView.fontColor.toString() === "white" || mainView.fontColor.toString() === "#ffffff"
+                                       ? "black" : "white"
                                 border.color: "transparent"
                             }
                         }
@@ -638,7 +641,8 @@ LauncherPage {
                             securitySettingsItem.visible = message["error"] === undefined && message["isInstalled"]
                         } else if (type === "volla.launcher.checkSecurityPasswordResponse") {
                             console.log("Settings | Password is set: " + message["isPasswordSet"])
-                            passwordDialog.backgroundColor = mainView.fontColor.toString() === "white"  ? "#292929" : "#CCCCCC"
+                            passwordDialog.backgroundColor = mainView.fontColor.toString() === "white" || mainView.fontColor.toString() === "#ffffff"
+                                    ? "#292929" : "#CCCCCC"
                             passwordDialog.definePasswordMode = true
                             passwordDialog.isPasswordSet = message["isPasswordSet"]
                             passwordDialog.open()

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.2.18" android:versionCode="288" android:installLocation="auto">
+<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.2.19" android:versionCode="289" 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.