Skip to content

Commit

Permalink
Merge pull request #226 from HelloVolla/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
wurzer committed May 12, 2024
2 parents eefbc53 + 1e7f1a2 commit 264969a
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 6 deletions.
1 change: 1 addition & 0 deletions AppGrid.qml
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,7 @@ LauncherPage {
}
}
mainView.updateSpinner(false)
mainView.checkDefaultApps(getAllApps())
} else if (type === "volla.launcher.receivedShortcut") {
console.log("AppGrid | New pinned shortcut: " + message["shortcutId"])

Expand Down
2 changes: 1 addition & 1 deletion android/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -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.3" android:versionCode="300" android:installLocation="auto">
<manifest package="com.volla.launcher" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.4" android:versionCode="301" 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.
Expand Down
17 changes: 12 additions & 5 deletions main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -239,12 +239,12 @@ ApplicationWindow {
property bool useVibration: settings.useHapticMenus
property int maxTitleLength: 120

property string galleryApp: "com.simplemobiletools.gallery.pro"
property string calendarApp: "com.simplemobiletools.calendar.pro"
property string galleryApp: "org.fossify.gallery"
property string calendarApp: "org.fossify.calendar"
property string cameraApp: "com.mediatek.camera"
property string phoneApp: "com.simplemobiletools.dialer" // "com.android.dialer"
property string notesApp: "com.simplemobiletools.notes.pro"
property var messageApp: ["com.android.mms", "com.simplemobiletools.smsmessenger", "com.android.messaging"];
property string phoneApp: "com.android.dialer"
property string notesApp: "org.fossify.notes"
property var messageApp: ["com.android.mms", "org.fossify.messages", "com.android.messaging"];

property string cacheName: "VollaCacheDB"
property string cacheDescription: "Messages cache"
Expand Down Expand Up @@ -937,6 +937,13 @@ 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.fossiry.calendar" ).length > 0 ?
"org.fossiry.calendar" : "com.simplemobiletools.calendar.pro"
}

WorkerScript {
id: contactsWorker
source: "scripts/contacts.mjs"
Expand Down
3 changes: 3 additions & 0 deletions qtquickcontrols2.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
[Controls]
Style=Universal

[Default]
Font\Family=Noto Sans

[Universal\Font]
Family=Noto Sans

Expand Down

0 comments on commit 264969a

Please sign in to comment.