From 974cf18cdbb5356332fe2d9f940f0a2abc6895f2 Mon Sep 17 00:00:00 2001 From: Berkay Tumal Date: Wed, 21 Aug 2024 13:14:23 +0300 Subject: [PATCH] Read 0.2.1 changelog --- android/app/build.gradle.kts | 4 ++-- .../main/java/web/bmdominatezz/gravy/WebInterface.java | 10 ++++++---- src/scripts/grooveMock.js | 6 +++--- src/scripts/iconPack.js | 2 +- src/scripts/pages/tileList.js | 4 +++- src/styles/pages/tileList.scss | 4 ++-- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 410483d..3de8416 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -10,8 +10,8 @@ android { applicationId = "web.bmdominatezz.gravy" minSdk = 26 targetSdk = 34 - versionCode = 20 //011 - versionName = "0.2.0-beta.2" + versionCode = 21 //011 + versionName = "0.2.1-beta.2" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/android/app/src/main/java/web/bmdominatezz/gravy/WebInterface.java b/android/app/src/main/java/web/bmdominatezz/gravy/WebInterface.java index 941658b..8aeb93d 100644 --- a/android/app/src/main/java/web/bmdominatezz/gravy/WebInterface.java +++ b/android/app/src/main/java/web/bmdominatezz/gravy/WebInterface.java @@ -59,10 +59,12 @@ public String retrieveApps() throws JSONException { Log.d("groovelauncher", "retrieveApps: " + mainActivity.webView.retrievedApps.toString()); JSONArray retrievedApps = new JSONArray(); for (ResolveInfo resolveInfo : mainActivity.webView.retrievedApps) { - JSONObject appInfo = new JSONObject(); - appInfo.put("packageName", resolveInfo.activityInfo.packageName); - appInfo.put("label", resolveInfo.loadLabel(mainActivity.packageManager).toString()); - retrievedApps.put(appInfo); + if (!resolveInfo.activityInfo.packageName.equals("web.bmdominatezz.gravy")) { + JSONObject appInfo = new JSONObject(); + appInfo.put("packageName", resolveInfo.activityInfo.packageName); + appInfo.put("label", resolveInfo.loadLabel(mainActivity.packageManager).toString()); + retrievedApps.put(appInfo); + } } JSONObject grooveSettings = new JSONObject(); grooveSettings.put("packageName", "groove.internal.settings"); diff --git a/src/scripts/grooveMock.js b/src/scripts/grooveMock.js index 56439e3..0f08722 100644 --- a/src/scripts/grooveMock.js +++ b/src/scripts/grooveMock.js @@ -11,7 +11,7 @@ class GrooveMock { var retrievedApps = this.#retrievedApps $.getJSON(mockURL, function (data) { data.apps.forEach(app => { - retrievedApps.push({ packageName: app.packageName, label: app.label }) + if (app.packageName != "web.bmdominatezz.gravy") retrievedApps.push({ packageName: app.packageName, label: app.label }) }); retrievedApps.push({ packageName: "groove.internal.settings", label: "Groove Settings" }) }); @@ -54,10 +54,10 @@ class GrooveMock { openURL(url) { window.open(url, "_blank") } - getAppVersion(){ + getAppVersion() { return "web-test" } - getWebViewVersion(){ + getWebViewVersion() { return "chrome" } } diff --git a/src/scripts/iconPack.js b/src/scripts/iconPack.js index 5bf903a..eaa55ab 100644 --- a/src/scripts/iconPack.js +++ b/src/scripts/iconPack.js @@ -42,7 +42,7 @@ const iconPackConverter = [ //Sim Menu { apps: ["com.android.stk"], icon: "", pack: 1 }, //Mail - { apps: ["com.google.android.gm", "com.samsung.android.email.provider"], icon: "󰏆", pack: 1 }, + { apps: ["com.google.android.gm", "com.samsung.android.email.provider"], icon: "", pack: 1 }, //FM Radio { apps: ["com.android.app.fm", "com.sec.android.app.fm"], icon: "󰐹", pack: 1 }, //Health diff --git a/src/scripts/pages/tileList.js b/src/scripts/pages/tileList.js index a916bed..ac3daf6 100644 --- a/src/scripts/pages/tileList.js +++ b/src/scripts/pages/tileList.js @@ -291,10 +291,12 @@ var wallpaperLastScroll = 0 var wallpaperScroll = 0 $(window).on("finishedLoading", () => { window.scrollers.tile_page_scroller.scroller.translater.hooks.on('translate', (e) => { + if(!document.querySelector("div.slide-page-home.wallpaper-behind")) return; const deltaY = wallpaperLastScroll - e.y wallpaperScroll += deltaY / 300 wallpaperScroll = wallpaperScroll < 0 ? 0 : wallpaperScroll > 1 ? 1 : wallpaperScroll - document.querySelector("div.slide-page-home.wallpaper-behind").style.setProperty("background-position", `0px ${(wallpaperScroll) * -100}px`) + + document.querySelector("div.slide-page-home.wallpaper-behind").style.setProperty("background-position", `50% ${(wallpaperScroll) * -100}px`) wallpaperLastScroll = e.y diff --git a/src/styles/pages/tileList.scss b/src/styles/pages/tileList.scss index 5d0c3f3..6176994 100644 --- a/src/styles/pages/tileList.scss +++ b/src/styles/pages/tileList.scss @@ -182,8 +182,8 @@ div.tile-list-page { } div.slide-page-home.wallpaper-behind{ background-repeat: no-repeat; - background-position: 0px 0px; - background-size: cover; + background-position: 50% 0px; + background-size: auto calc(100% + 100px); } div.tile-list-container, div.tile-list-inner-container {