Merge pull request #261 from HelloVolla/dev

Prepare default Fossify calender app
HelloVolla · Sep 22, 2024 · e3aeead · e3aeead
2 parents 03f7cb7 + 49d4a0f
commit e3aeead
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/AppGrid.qml b/AppGrid.qml
@@ -28,7 +28,7 @@ LauncherPage {
         "org.fossify.gallery": "/icons/photo-gallery@4x.png",
         "org.fossify.contacts": "/icons/people-contacts-agenda@4x.png",
         "org.fossify.clock": "/icons/clock@4x.png",
-        "org.fossify.calendar.": "/icons/calendar@4x.png",
+        "org.fossify.calendar": "/icons/calendar@4x.png",
         "org.fossify.filemanager": "/icons/folder@4x.png",
         "org.fossify.notes": "/icons/notes@4x.png",
         "org.fossify.calculator": "/icons/calculator@4x_104x104px.png",

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.18" android:versionCode="315" android:installLocation="auto">
+<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">
     <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
@@ -186,6 +186,9 @@ static void getSomeContacts(Cursor c, int blockStart, int contactsCount, Content
             while (cp.moveToNext()) {
                 String number = cp.getString(cp.getColumnIndex(Phone.NUMBER)).replace(" ","");
                 int numberType = cp.getInt(cp.getColumnIndex(Phone.TYPE));
+
+
+
                 switch (numberType) {
                     case Phone.TYPE_HOME:
                         contact.put("phone.home", number);

diff --git a/main.qml b/main.qml
@@ -922,6 +922,8 @@ ApplicationWindow {
         function checkDefaultApp(apps) {
             mainView.galleryApp = apps.filter( el => el.package !== "org.fossify.gallery" ).length > 0 ?
                         "org.fossify.gallery" : "com.simplemobiletools.gallery.pro"
+            mainView.calendarApp = apps.filter( el => el.package !== "org.fossify.calendar" ).length > 0 ?
+                        "org.fossify.calendar" : "com.simplemobiletools.calendar.pro"
         }
 
         function isActiveSignal() {