From dad9e24fca520e0b70ecafd0f244aac73008d0fe Mon Sep 17 00:00:00 2001 From: WardPearce Date: Mon, 27 Jan 2025 19:34:20 +1300 Subject: [PATCH 1/7] Disable overscroll --- materialious/android/app/build.gradle | 4 ++-- .../app/src/main/java/us/materialio/app/MainActivity.java | 8 ++++++++ materialious/electron/package-lock.json | 4 ++-- materialious/electron/package.json | 2 +- materialious/package-lock.json | 4 ++-- materialious/package.json | 2 +- update_versions.py | 2 +- 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index 2a245ad0..08130295 100644 --- a/materialious/android/app/build.gradle +++ b/materialious/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "us.materialio.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 85 - versionName "1.7.3" + versionCode 86 + versionName "1.7.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/materialious/android/app/src/main/java/us/materialio/app/MainActivity.java b/materialious/android/app/src/main/java/us/materialio/app/MainActivity.java index feee75e4..875f3e71 100644 --- a/materialious/android/app/src/main/java/us/materialio/app/MainActivity.java +++ b/materialious/android/app/src/main/java/us/materialio/app/MainActivity.java @@ -1,6 +1,7 @@ package us.materialio.app; import android.os.Bundle; +import android.webkit.WebView; import com.getcapacitor.BridgeActivity; @@ -10,4 +11,11 @@ public class MainActivity extends BridgeActivity { registerPlugin(ColorTheme.class); super.onCreate(savedInstanceState); } + + @Override + public void onStart() { + super.onStart(); + WebView webview = getBridge().getWebView(); + webview.setOverScrollMode(WebView.OVER_SCROLL_NEVER); + } } diff --git a/materialious/electron/package-lock.json b/materialious/electron/package-lock.json index fbcac07e..a641a229 100644 --- a/materialious/electron/package-lock.json +++ b/materialious/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "Materialious", - "version": "1.6.27", + "version": "1.7.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "Materialious", - "version": "1.6.27", + "version": "1.7.4", "license": "MIT", "dependencies": { "@capacitor-community/electron": "^5.0.0", diff --git a/materialious/electron/package.json b/materialious/electron/package.json index f65c2a02..0538459f 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.7.3", + "version": "1.7.4", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package-lock.json b/materialious/package-lock.json index a025e44a..efe9595e 100644 --- a/materialious/package-lock.json +++ b/materialious/package-lock.json @@ -1,12 +1,12 @@ { "name": "materialious", - "version": "1.6.30", + "version": "1.7.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "materialious", - "version": "1.6.30", + "version": "1.7.4", "dependencies": { "@capacitor-community/electron": "^5.0.1", "@capacitor/android": "^6.1.2", diff --git a/materialious/package.json b/materialious/package.json index 9779cf2a..d969f1ad 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.7.3", + "version": "1.7.4", "private": true, "scripts": { "dev": "vite dev", diff --git a/update_versions.py b/update_versions.py index d5935414..6508efb3 100644 --- a/update_versions.py +++ b/update_versions.py @@ -5,7 +5,7 @@ import json import os import re -LATEST_VERSION = "1.7.3" +LATEST_VERSION = "1.7.4" WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious") ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json") From f5fcc552c8e490d41d9f7f289e93ef6eb794d127 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Mon, 27 Jan 2025 19:40:30 +1300 Subject: [PATCH 2/7] Completely hide scrollbar --- .../main/java/us/materialio/app/MainActivity.java | 1 + materialious/static/style.css | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/materialious/android/app/src/main/java/us/materialio/app/MainActivity.java b/materialious/android/app/src/main/java/us/materialio/app/MainActivity.java index 875f3e71..133f8b82 100644 --- a/materialious/android/app/src/main/java/us/materialio/app/MainActivity.java +++ b/materialious/android/app/src/main/java/us/materialio/app/MainActivity.java @@ -17,5 +17,6 @@ public class MainActivity extends BridgeActivity { super.onStart(); WebView webview = getBridge().getWebView(); webview.setOverScrollMode(WebView.OVER_SCROLL_NEVER); + webview.setVerticalScrollBarEnabled(false); } } diff --git a/materialious/static/style.css b/materialious/static/style.css index f6cdbba7..928a9334 100644 --- a/materialious/static/style.css +++ b/materialious/static/style.css @@ -77,8 +77,18 @@ main.root { main.root { scrollbar-width: none !important; } - + main.root::-webkit-scrollbar { display: none !important; } } + +@media screen and (max-width: 650px) { + ::-webkit-scrollbar { + display: none !important; + } + + html { + scrollbar-width: none !important; + } +} \ No newline at end of file From 6b8e699d510eb3fde8fc5a87c3a898c2303904a9 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Mon, 27 Jan 2025 19:43:16 +1300 Subject: [PATCH 3/7] Speed up default page loading --- materialious/src/routes/(app)/+layout.svelte | 16 +--------------- materialious/src/routes/+layout.ts | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/materialious/src/routes/(app)/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte index 39ee8dc7..a66a5765 100644 --- a/materialious/src/routes/(app)/+layout.svelte +++ b/materialious/src/routes/(app)/+layout.svelte @@ -1,7 +1,7 @@