Merge pull request #790 from Materialious/update/1.7.4

Update/1.7.4

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.

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,12 @@ 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);
+        webview.setVerticalScrollBarEnabled(false);
+    }
 }

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

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

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

materialious/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "materialious",
-	"version": "1.7.3",
+	"version": "1.7.4",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",

materialious/src/routes/(app)/+layout.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { afterNavigate, beforeNavigate, goto } from '$app/navigation';
 
-	import { navigating, page } from '$app/stores';
+	import { navigating } from '$app/stores';
 	import '$lib/android/http/androidRequests';
 	import colorTheme, { convertToHexColorCode } from '$lib/android/plugins/colorTheme';
 	import { getFeed } from '$lib/api/index';
@@ -21,7 +21,6 @@
 		darkModeStore,
 		instanceStore,
 		interfaceAmoledTheme,
-		interfaceDefaultPage,
 		showWarningStore,
 		syncPartyPeerStore,
 		themeColorStore
@@ -149,19 +148,6 @@
 	onMount(async () => {
 		ui();
 
-		if (
-			$interfaceDefaultPage &&
-			$interfaceDefaultPage !== '/' &&
-			$interfaceDefaultPage.startsWith('/') &&
-			$page.url.pathname === '/'
-		) {
-			getPages().forEach((page) => {
-				if (page.href === $interfaceDefaultPage && (!page.requiresAuth || $authStore)) {
-					goto($interfaceDefaultPage);
-				}
-			});
-		}
-
 		scrollableRoot = document.querySelector('.root');
 
 		loadSettingsFromEnv();

materialious/src/routes/+layout.ts

@@ -2,7 +2,10 @@ import { browser } from '$app/environment';
 import { goto } from '$app/navigation';
 import { getResolveUrl } from '$lib/api';
 import '$lib/i18n'; // Import to initialize. Important :)
+import { getPages } from '$lib/navPages.js';
+import { authStore, interfaceDefaultPage } from '$lib/store.js';
 import { locale, waitLocale } from 'svelte-i18n';
+import { get } from 'svelte/store';
 
 export let ssr = false;
 
@@ -18,6 +21,21 @@ export async function load({ url }) {
 		} catch { }
 	}
 
+	const defaultPage = get(interfaceDefaultPage);
+
+	if (
+		defaultPage &&
+		defaultPage !== '/' &&
+		defaultPage.startsWith('/') &&
+		url.pathname === '/'
+	) {
+		getPages().forEach((page) => {
+			if (page.href === defaultPage && (!page.requiresAuth || get(authStore))) {
+				goto(defaultPage);
+			}
+		});
+	}
+
 	if (browser) {
 		locale.set(window.navigator.language);
 	}

materialious/static/nodejs-android/index.js

@@ -20,6 +20,7 @@ function fetchWithRedirects(targetUrl, options, redirectCount = 0) {
         const req = httpClient.request(targetUrl, options, (res) => {
             if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
                 if (redirectCount >= MAX_REDIRECTS) {
+                    req.end();
                     return reject(new Error('Too many redirects'));
                 }
 
@@ -28,6 +29,7 @@ function fetchWithRedirects(targetUrl, options, redirectCount = 0) {
                     const redirectUrl = new URL(res.headers.location, targetUrl);
                     return resolve(fetchWithRedirects(redirectUrl, options, redirectCount + 1));
                 } catch (error) {
+                    req.end();
                     return reject(new Error(`Invalid URL in redirect: ${error.message}`));
                 }
             }

materialious/static/style.css

@@ -63,6 +63,7 @@ main.root {
 @media screen and (max-width: 650px) {
 	dialog.right {
 		width: 100% !important;
+		border-radius: 0 !important;
 	}
 }
 
@@ -77,8 +78,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;
+	}
+}

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