Skip to content

Commit

Permalink
Merge pull request #224 from HelloVolla/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@wurzer
wurzer authored May 5, 2024
2 parents 7eb3b93 + 14233b2 commit eefbc53
Show file tree
Hide file tree
Showing 17 changed files with 49 additions and 31 deletions.
34 changes: 23 additions & 11 deletions AppGrid.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,24 @@ LauncherPage {
property string textInput
property real labelPointSize: 16
property var iconMap: {
"com.simplemobiletools.dialer": "/icons/dial-phone@4x.png",
"com.simplemobiletools.smsmessenger": "/icons/message@4x.png",
"com.simplemobiletools.gallery.pro": "/icons/photo-gallery@4x.png",
"com.simplemobiletools.contacts.pro": "/icons/people-contacts-agenda@4x.png",
"com.simplemobiletools.clock": "/icons/clock@4x.png",
"com.simplemobiletools.calendar.pro": "/icons/calendar@4x.png",
"com.simplemobiletools.filemanager.pro": "/icons/folder@4x.png",
"com.simplemobiletools.notes.pro": "/icons/notes@4x.png",
"com.simplemobiletools.calculator": "/icons/calculator@4x_104x104px.png",
"org.fossify.phone": "/icons/dial-phone@4x.png",
"org.fossify.smsmessenger": "/icons/message@4x.png",
"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.filemanager": "/icons/folder@4x.png",
"org.fossify.notes": "/icons/notes@4x.png",
"org.fossify.calculator": "/icons/calculator@4x_104x104px.png",
"com.contactoffice.mailfence": "/icons/email@4x.png",
"be.engie.smart": "/icons/engie@4x.png",
"be.bmid.itsme": "/icons/itsme@4x.png",
Expand All @@ -31,29 +49,22 @@ LauncherPage {
"com.x8bit.bitwarden": "/icons/bitwarden@4x.png",
"com.beeper.chat": "/icons/beeper@4x.png",
"be.argenta.bankieren": "/icons/argenta@4x.png",
"com.simplemobiletools.dialer": "/icons/dial-phone@4x.png",
"com.android.dialer": "/icons/dial-phone@4x.png",
"com.simplemobiletools.smsmessenger": "/icons/message@4x.png",
"com.android.mms" : "/icons/message@4x.png",
"com.android.messaging": "/icons/message@4x.png",
"com.google.android.apps.messaging" : "/icons/message@4x.png",
"net.osmand.plus": "/icons/route-directions-map@4x.png",
"com.mediatek.camera": "/icons/camera@4x.png",
"com.simplemobiletools.gallery.pro": "/icons/photo-gallery@4x.png",
"com.android.camera2": "/icons/camera@4x.png",
"com.android.gallery3d": "/icons/photo-gallery@4x.png",
"com.simplemobiletools.contacts.pro": "/icons/people-contacts-agenda@4x.png",
"com.simplemobiletools.clock": "/icons/clock@4x.png",
"com.android.deskclock": "/icons/clock@4x.png",
"com.android.settings": "/icons/settings@4x.png",
"com.simplemobiletools.calendar.pro": "/icons/calendar@4x.png",
"com.simplemobiletools.filemanager.pro": "/icons/folder@4x.png",
"com.android.documentsui": "/icons/folder@4x.png",
"org.telegram.messenger": "/icons/telegram@4x.png",
"com.android.email": "/icons/email@4x.png",
"com.fsck.k9": "/icons/email@4x.png",
"com.google.android.gm": "/icons/email@4x.png",
"com.Slack": "/icons/slack@4x.png",
"com.simplemobiletools.notes.pro": "/icons/notes@4x.png",
"org.mozilla.fennec_fdroid": "/icons/browser@4x.png",
"com.maxfour.music": "/icons/music@4x.png",
"com.instagram.android": "/icons/instagram@4x.png",
Expand All @@ -80,7 +91,6 @@ LauncherPage {
"at.bitfire.davdroid": "/icons/sync@4x_104x104px.png",
"org.thoughtcrime.securesms": "/icons/signal@4x_104x104px.png",
"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",
"one.socializer.android": "/icons/socializer@4x.png",
Expand All @@ -93,19 +103,21 @@ LauncherPage {
"com.commerzbank.photoTAN": "/icons/photoTAN@4x.png"
}
property var labelMap: {
"com.simplemobiletools.filemanager.pro": qsTr("Files"),
"com.simplemobiletools.smsmessenger": qsTr("Messages"),
"org.fossify.filemanager": qsTr("Files"),
"org.fossify.smsmessenger": qsTr("Messages"),
"mobi.inthepocket.bcmc.bancontact": qsTr("Bancontact"),
"com.facebook.lite": qsTr("Facebook"),
"org.mozilla.fennec_fdroid": qsTr("Browser"),
"com.google.android.gm" : qsTr("Mail"),
"com.fsck.k9": qsTr("Mail"),
"at.bitfire.davdroid": qsTr("Sync"),
"hideme.android.vpn.noPlayStore": qsTr("VPN"),
"com.simplemobiletools.filemanager.pro": qsTr("Files"),
"com.aurora.store": qsTr("Store"),
"com.aurora.adroid": qsTr("A-Droid"),
"net.osmand.plus": qsTr("Maps"),
"com.volla.launcher": qsTr("Settings"),
"com.simplemobiletools.smsmessenger": qsTr("Messages"),
"com.android.fmradio" : qsTr("Radio"),
"de.baumann.weather": qsTr("Weather")
}
Expand Down
1 change: 1 addition & 0 deletions Collections.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,7 @@ LauncherPage {
currentCollectionModel.executeSelection(model, mainView.actionType.ShowGroup)
} else {
// todo: should be replaced by model id
if (statusBadge.visible) statusBadge.visible = false
currentCollectionModel.executeSelection(model, mainView.actionType.ShowDetails)
}
}
Expand Down
2 changes: 1 addition & 1 deletion android/AndroidManifest.xml
View file
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.1" android:versionCode="298" android:installLocation="auto">
<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">
<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
Binary file modified android/res/drawable-hdpi/icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/res/drawable-ldpi/icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/res/drawable-mdpi/icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions android/src/com/volla/launcher/worker/AppWorker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ public void run() {
"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.elishaazaria.sayboard");
"com.elishaazaria.sayboard", "com.jzhk.chlidmode", "com.jzhk.gamemode", "com.jzhk.tool",
"com.google.android.apps.adm", "com.android.soundrecorder", "com.jzhk.easylauncher");

final List<String> mostUsed = Arrays.asList("com.android.dialer", "com.mediatek.camera",
"com.simplemobiletools.dialer", "com.simplemobiletools.gallery.pro", "com.android.messaging",
Expand Down Expand Up @@ -114,8 +115,6 @@ public void run() {
timeInForeground = timeInForeground + 10; // fall back for missing stats
}

Log.d(TAG, "Statistic: " + timeInForeground);

appInfo.put("statistic", (int)timeInForeground);
appList.add(appInfo);
}
Expand Down
35 changes: 20 additions & 15 deletions android/src/com/volla/launcher/worker/ShortcutsWorker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,29 @@ public void run() {
query.setQueryFlags(ShortcutQuery.FLAG_MATCH_PINNED);
int uid = activity.getApplicationInfo().uid;

List<ShortcutInfo> shortcutInfos = launcher.getShortcuts(query, UserHandle.getUserHandleForUid(uid));
List pinnedShortcuts = new LinkedList();

Log.d(TAG, shortcutInfos.size() + " pinned shortucts retrieved");

for (int i = 0; i < shortcutInfos.size(); i++) {
ShortcutInfo shortcutInfo = shortcutInfos.get(i);
if (shortcutInfo.isEnabled()) {
Drawable shortcutIcon = launcher.getShortcutIconDrawable(shortcutInfo,0);
Map pinnedShortcut = new HashMap();
pinnedShortcut.put("shortcutId", shortcutInfo.getId() );
pinnedShortcut.put("package", shortcutInfo.getPackage() );
pinnedShortcut.put("label", shortcutInfo.getShortLabel().toString() );
pinnedShortcut.put("icon", drawableToBase64(shortcutIcon) );
pinnedShortcuts.add(pinnedShortcut);
} else {
Log.d(TAG, "Disabled shortcut: " + shortcutInfo.getId());
try {
List<ShortcutInfo> shortcutInfos = launcher.getShortcuts(query, UserHandle.getUserHandleForUid(uid));

Log.d(TAG, shortcutInfos.size() + " pinned shortucts retrieved");

for (int i = 0; i < shortcutInfos.size(); i++) {
ShortcutInfo shortcutInfo = shortcutInfos.get(i);
if (shortcutInfo.isEnabled()) {
Drawable shortcutIcon = launcher.getShortcutIconDrawable(shortcutInfo,0);
Map pinnedShortcut = new HashMap();
pinnedShortcut.put("shortcutId", shortcutInfo.getId() );
pinnedShortcut.put("package", shortcutInfo.getPackage() );
pinnedShortcut.put("label", shortcutInfo.getShortLabel().toString() );
pinnedShortcut.put("icon", drawableToBase64(shortcutIcon) );
pinnedShortcuts.add(pinnedShortcut);
} else {
Log.d(TAG, "Disabled shortcut: " + shortcutInfo.getId());
}
}
} catch (SecurityException se) {
Log.e(TAG, "An error occured: " + se.getMessage());
}

Map responseMessage = new HashMap();
Expand Down
Binary file added icons/Volla_108.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/Volla_128.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/Volla_172.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed icons/volla.png
View file
Binary file not shown.
Binary file removed icons/volla@2.png
View file
Binary file not shown.
Binary file removed icons/volla@3.png
View file
Binary file not shown.
Binary file added images/Summer_Mode_2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion main.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,7 @@ ApplicationWindow {
mainView.wallpaper = "data:image/png;base64," + message["wallpaper"]
mainView.wallpaperId = message["wallpaperId"]
} else if (message["wallpaperId"] === undefined) {
mainView.wallpaper = "/android/res/drawable/wallpaper_image.png"
mainView.wallpaper = "/images/Summer_Mode_2x.png"
mainView.wallpaperId = "default"
}
} else if (type === 'volla.launcher.receiveTextResponse') {
Expand Down
1 change: 1 addition & 0 deletions qml.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,5 +100,6 @@
<file>images/open-in-signal_light@2x.png</file>
<file>images/open-in-signal_light_2x.png</file>
<file>SttSetup.qml</file>
<file>images/Summer_Mode_2x.png</file>
</qresource>
</RCC>

0 comments on commit eefbc53

Please # to comment.