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")