Merge pull request #264 from HelloVolla/dev

Dev
HelloVolla · Oct 20, 2024 · f77b012 · f77b012
2 parents e3aeead + 74b279e
commit f77b012
Show file tree

Hide file tree

Showing 22 changed files with 1,155 additions and 734 deletions.
diff --git a/AppGrid.qml b/AppGrid.qml
@@ -32,6 +32,8 @@ LauncherPage {
         "org.fossify.filemanager": "/icons/folder@4x.png",
         "org.fossify.notes": "/icons/notes@4x.png",
         "org.fossify.calculator": "/icons/calculator@4x_104x104px.png",
+        "org.fossify.musicplayer": "/icons/music@4x.png",
+        "com.volla.messages": "/icons/volla-messages@4x.png",
         "com.contactoffice.mailfence": "/icons/email@4x.png",
         "be.engie.smart": "/icons/engie@4x.png",
         "be.bmid.itsme": "/icons/itsme@4x.png",
@@ -107,6 +109,7 @@ LauncherPage {
         "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"),

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.4.19" android:versionCode="316" android:installLocation="auto">
+<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.21" android:versionCode="317" 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/ContactWorker.java b/android/src/com/volla/launcher/worker/ContactWorker.java
@@ -29,6 +29,12 @@ public class ContactWorker {
 
     private static final String TAG = "ContactWorker";
 
+    private static final String[] mobilePreDialNumbers = new String[] {
+        "+49152", "+49162", "+49172", "+49173", "+49174", "+49157", "+49159", "+49163", "+49176", "+49177", "+49178", "+49179", "+4915566",
+        "+4915888", "+43699", "+43680", "+43688", "+43681", "+43699", "+43664", "+43681", "+43681", "+43681", "+43681", "+43667", "+43676",
+        "+43650", "+43678", "+43650", "+43677", "+43677", "+43677", "+43676", "+43660", "+43699", "+43690", "+43678", "+43665", "+43686",
+        "+43670", "+43670", "+43670", "+4176", "+4177", "+4178", "+4179", "+4175"};
+
     static {
         SystemDispatcher.addListener(new SystemDispatcher.Listener() {
 
@@ -187,7 +193,9 @@ static void getSomeContacts(Cursor c, int blockStart, int contactsCount, Content
                 String number = cp.getString(cp.getColumnIndex(Phone.NUMBER)).replace(" ","");
                 int numberType = cp.getInt(cp.getColumnIndex(Phone.TYPE));
 
-
+                if (startsWithAny(number, mobilePreDialNumbers)) {
+                    numberType = Phone.TYPE_MOBILE;
+                }
 
                 switch (numberType) {
                     case Phone.TYPE_HOME:
@@ -310,4 +318,19 @@ static void checkContacts(Map message, Activity activity) {
 
         SystemDispatcher.dispatch("volla.launcher.checkContactResponse", responseMessage);
     }
+
+    static boolean startsWithAny(String number, String... preDialNumbers) {
+        if (number != null && number.length() > 0) {
+            int length = preDialNumbers.length;
+
+            for (int i = 0; i < length; ++i) {
+                String preDialNumber = preDialNumbers[i];
+                if (number.startsWith(preDialNumber)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
 }
diff --git a/icons/volla-messages@4x.png b/icons/volla-messages@4x.png
diff --git a/qml.qrc b/qml.qrc
@@ -101,5 +101,6 @@
         <file>images/open-in-signal_light_2x.png</file>
         <file>SttSetup.qml</file>
         <file>images/Summer_Mode_2x.png</file>
+        <file>icons/volla-messages@4x.png</file>
     </qresource>
 </RCC>
diff --git a/translations/Volla_be.ts b/translations/Volla_be.ts
@@ -115,6 +115,26 @@
         <source>Remove App</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Music</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>De Trein</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mynexuzhealth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bonsai</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MijnOnlineAgenda</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Checkbox</name>

diff --git a/translations/Volla_bg.ts b/translations/Volla_bg.ts
@@ -115,6 +115,26 @@
         <source>Remove App</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Music</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>De Trein</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mynexuzhealth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bonsai</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MijnOnlineAgenda</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Browser</name>

diff --git a/translations/Volla_cn.ts b/translations/Volla_cn.ts
@@ -111,6 +111,26 @@
         <source>Remove App</source>
         <translation>卸载应用</translation>
     </message>
+    <message>
+        <source>Music</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>De Trein</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mynexuzhealth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bonsai</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MijnOnlineAgenda</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Checkbox</name>

diff --git a/translations/Volla_cs.ts b/translations/Volla_cs.ts
@@ -115,6 +115,26 @@
         <source>Remove App</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Music</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>De Trein</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mynexuzhealth</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bonsai</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>MijnOnlineAgenda</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Checkbox</name>