Merge pull request #133 from HelloVolla/dev

Dev
HelloVolla · Apr 7, 2023 · ae9b716 · ae9b716
2 parents 02d8b86 + 512a1d6
commit ae9b716
Show file tree

Hide file tree

Showing 15 changed files with 82 additions and 68 deletions.
diff --git a/AppGrid.qml b/AppGrid.qml
@@ -61,7 +61,15 @@ Page {
         "de.baumann.weather": "/icons/weather@4x_104x104px.png",
         "com.simplemobiletools.calculator": "/icons/calculator@4x_104x104px.png",
         "com.android.calculator2": "/icons/calculator@4x_104x104px.png",
-        "eu.siacs.conversations": "/icons/xmpp@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: {
         "org.mozilla.fennec_fdroid": "Browser",

diff --git a/Springboard.qml b/Springboard.qml
@@ -53,10 +53,6 @@ Page {
 
         onKeyboardRectangleChanged: {
             console.log("Springboard | Keyboard rectangle: " + Qt.inputMethod.keyboardRectangle)
-
-            if (Qt.inputMethod.keyboardRectangle.height === 0) {
-                shortcutMenu.forceActiveFocus()
-            }
         }
     }
 
@@ -118,71 +114,69 @@ Page {
             Row {
                 width: parent.width
 
-            Flickable {
-                id: flickable
-                width: parent.width - mainView.innerSpacing * 2
-                height: Math.min(contentHeight, 200)
-                contentWidth: width
-                contentHeight: textArea.implicitHeight
-                clip: true
-                flickableDirection: Flickable.VerticalFlick
-
-                TextArea.flickable: TextArea {
-                    id: textArea
-                    padding: mainView.innerSpacing
-                    x: mainView.innerSpacing
-                    width: parent.width
-                    placeholderText: qsTr("Type anything")
-                    color: mainView.fontColor
-                    placeholderTextColor: "darkgrey"
-                    font.pointSize: mainView.largeFontSize
-                    wrapMode: Text.WordWrap
-                    leftPadding: 0.0
-                    inputMethodHints: Qt.ImhEmailCharactersOnly
-
-                    background: Rectangle {
-                        color:  mainView.backgroundOpacity === 1.0 ? mainView.backgroundColor : "transparent"
-                        border.color: "transparent"
-                    }
+                Flickable {
+                    id: flickable
+                    width: parent.width - mainView.innerSpacing * 2
+                    height: Math.min(contentHeight, 200)
+                    contentWidth: width
+                    contentHeight: textArea.implicitHeight
+                    clip: true
+                    flickableDirection: Flickable.VerticalFlick
+
+                    TextArea.flickable: TextArea {
+                        id: textArea
+                        padding: mainView.innerSpacing
+                        x: mainView.innerSpacing
+                        width: parent.width
+                        placeholderText: qsTr("Type anything")
+                        color: mainView.fontColor
+                        placeholderTextColor: "darkgrey"
+                        font.pointSize: mainView.largeFontSize
+                        wrapMode: Text.WordWrap
+                        leftPadding: 0.0
+                        inputMethodHints: Qt.ImhEmailCharactersOnly //Qt.ImhNoPredictiveText
+
+                        background: Rectangle {
+                            color:  mainView.backgroundOpacity === 1.0 ? mainView.backgroundColor : "transparent"
+                            border.color: "transparent"
+                        }
 
-                    Binding {
-                        target: springBoard
-                        property: "textInput"
-                        value: textArea.text
-                    }
-                    Binding {
-                        target: springBoard
-                        property: "textFocus"
-                        value: activeFocus
-                    }
-                    Binding {
-                        target: springBoard
-                        property: "textInputArea"
-                        value: textArea
-                    }
+                        Binding {
+                            target: springBoard
+                            property: "textInput"
+                            value: textArea.text
+                        }
+                        Binding {
+                            target: springBoard
+                            property: "textFocus"
+                            value: activeFocus
+                        }
+                        Binding {
+                            target: springBoard
+                            property: "textInputArea"
+                            value: textArea
+                        }
 
-                    onActiveFocusChanged: {
-                        headline.color = textArea.activeFocus ? "grey" : mainView.fontColor
+                        onActiveFocusChanged: {
+                            headline.color = textArea.activeFocus ? "grey" : mainView.fontColor
+                        }
                     }
+                    ScrollBar.vertical: ScrollBar {}
                 }
-                ScrollBar.vertical: ScrollBar {}
-            }
 
-            Button {
-                id: deleteButton
-                text: "<font color='#808080'>×</font>"
-                font.pointSize: mainView.largeFontSize * 2
-                flat: true
-                topPadding: 0.0
-//                anchors.top: flickable.top
-//                anchors.right: flickable.right
-                visible: textArea.preeditText !== "" || textArea.text !== ""
+                Button {
+                    id: deleteButton
+                    text: "<font color='#808080'>×</font>"
+                    font.pointSize: mainView.largeFontSize * 2
+                    flat: true
+                    topPadding: 0.0
+                    visible: textArea.preeditText !== "" || textArea.text !== ""
 
-                onClicked: {
-                    textArea.text = ""
-                    textArea.focus = false
+                    onClicked: {
+                        textArea.text = ""
+                        textArea.focus = false
+                    }
                 }
-            }
 
             }
 
@@ -638,7 +632,7 @@ Page {
                 topPadding: model.index === 0 || model.isFirstSuggestion ? mainView.innerSpacing : 0
                 bottomPadding: model.index === listModel.count - 1 || model.action === mainView.actionType.SearchWeb ? mainView.innerSpacing : mainView.innerSpacing / 2
                 anchors.top: parent.top
-                text: styledText(model.text, textInput.substring(1, textInput.length))
+                text: styledText(model.text, textInput.substring(textInput.indexOf("@") === 0 ? 1 : 0, textInput.length))
                 flat: model.action >= 20000 ? false : true
                 contentItem: Text {
                     text: button.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.1.20" android:versionCode="265" android:installLocation="auto">
+<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.1.22" android:versionCode="267" 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/android/src/com/volla/launcher/worker/AppWorker.java b/android/src/com/volla/launcher/worker/AppWorker.java
@@ -57,7 +57,8 @@ public void run() {
                                 "com.mediatek.cellbroadcastreceiver", "com.conena.navigation.gesture.control", "rkr.simplekeyboard.inputmethod",
                                 "com.android.quicksearchbox", "com.android.dialer", "com.android.deskclock", "com.pri.pressure",
                                 "com.mediatek.gnss.nonframeworklbs", "system.volla.startup", "com.volla.startup", "com.aurora.services",
-                                "com.android.soundrecorder", "com.google.android.dialer", "com.simplemobiletools.thankyou");
+                                "com.android.soundrecorder", "com.google.android.dialer", "com.simplemobiletools.thankyou",
+                                "com.elishaazaria.sayboard");
 
                             final List<String> mostUsed = Arrays.asList("com.android.dialer", "com.mediatek.camera",
                                 "com.simplemobiletools.dialer", "com.simplemobiletools.gallery.pro", "com.android.messaging",

diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/icons/[email protected] b/icons/[email protected]
diff --git a/qml.qrc b/qml.qrc
@@ -77,5 +77,14 @@
         <file>AppGroup.qml</file>
         <file>scripts/apps.mjs</file>
         <file>OnBoarding.qml</file>
+        <file>icons/[email protected]</file>
+        <file>icons/[email protected]</file>
+        <file>icons/[email protected]</file>
+        <file>icons/[email protected]</file>
+        <file>icons/[email protected]</file>
+        <file>icons/[email protected]</file>
+        <file>icons/[email protected]</file>
+        <file>icons/[email protected]</file>
+        <file>icons/[email protected]</file>
     </qresource>
 </RCC>
diff --git a/scripts/springboard.mjs b/scripts/springboard.mjs
@@ -138,12 +138,14 @@ WorkerScript.onMessage = function(message) {
     } else if (textInput.length > 1) {
         filteredSuggestionObj[0] = [actionName.SearchWeb, actionType.SearchWeb]
 
-        lastToken = textInput.substring(1, textInput.length).toLowerCase()
+        lastToken = textInput.substring(0, textInput.length).toLowerCase()
+        var isFirstSuggestion = true
         for (i = 0; i < contacts.length; i++) {
             contact = contacts[i]
             name = contact["name"].toLowerCase()
             if (lastToken.length === 0 || name.includes(lastToken)) {
-                filteredSuggestionObj[i+1] = [contact["name"], actionType.SuggestContact, JSON.parse(JSON.stringify(contact)), i === 0]
+                filteredSuggestionObj[i+1] = [contact["name"], actionType.SuggestContact, JSON.parse(JSON.stringify(contact)), isFirstSuggestion]
+                isFirstSuggestion = false
             }
         }
     }