diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index 47efd00d..afd8b634 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 142 - versionName "1.10.1" + versionCode 143 + versionName "1.10.2" 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/AndroidManifest.xml b/materialious/android/app/src/main/AndroidManifest.xml index fd984f8b..44c38187 100644 --- a/materialious/android/app/src/main/AndroidManifest.xml +++ b/materialious/android/app/src/main/AndroidManifest.xml @@ -15,7 +15,8 @@ android:label="@string/title_activity_main" android:theme="@style/AppTheme.NoActionBarLaunch" android:launchMode="singleTask" - android:exported="true"> + android:exported="true" + android:windowOptOutEdgeToEdgeEnforcement="true"> diff --git a/materialious/android/app/src/main/res/layout/activity_main.xml b/materialious/android/app/src/main/res/layout/activity_main.xml index b5ad1387..f74092fa 100644 --- a/materialious/android/app/src/main/res/layout/activity_main.xml +++ b/materialious/android/app/src/main/res/layout/activity_main.xml @@ -7,6 +7,8 @@ tools:context=".MainActivity"> + android:layout_height="match_parent" + android:fitsSystemWindows="true" /> diff --git a/materialious/electron/materialious.metainfo.xml b/materialious/electron/materialious.metainfo.xml index 3ed2a94c..ea35db48 100644 --- a/materialious/electron/materialious.metainfo.xml +++ b/materialious/electron/materialious.metainfo.xml @@ -59,7 +59,11 @@ - + + + https://github.com/Materialious/Materialious/releases/tag/1.10.2 + + https://github.com/Materialious/Materialious/releases/tag/1.10.1 diff --git a/materialious/electron/package-lock.json b/materialious/electron/package-lock.json index bbab730b..1eaa4fad 100644 --- a/materialious/electron/package-lock.json +++ b/materialious/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "Materialious", - "version": "1.10.1", + "version": "1.10.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "Materialious", - "version": "1.10.1", + "version": "1.10.2", "license": "MIT", "dependencies": { "@capacitor-community/electron": "^5.0.0", diff --git a/materialious/electron/package.json b/materialious/electron/package.json index c4658db8..fbbf0cce 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.10.1", + "version": "1.10.2", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", @@ -44,4 +44,4 @@ "capacitor", "electron" ] -} +} \ No newline at end of file diff --git a/materialious/package.json b/materialious/package.json index 1bd2f6de..e548fdc0 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.10.1", + "version": "1.10.2", "private": true, "scripts": { "dev": "vite dev", @@ -70,4 +70,4 @@ "svelte-persisted-store": "^0.12.0", "youtubei.js": "^15.0.0" } -} +} \ No newline at end of file diff --git a/materialious/src/lib/components/Player.svelte b/materialious/src/lib/components/Player.svelte index 7ab39c19..709e90e0 100644 --- a/materialious/src/lib/components/Player.svelte +++ b/materialious/src/lib/components/Player.svelte @@ -240,18 +240,11 @@ if (widthHeight.length !== 2) return; if (Number(widthHeight[0]) > Number(widthHeight[1])) { - await StatusBar.setOverlaysWebView({ overlay: true }); - await StatusBar.hide(); - await NavigationBar.hide(); await ScreenOrientation.lock({ orientation: 'landscape' }); } else { await ScreenOrientation.lock({ orientation: 'portrait' }); } } else { - await StatusBar.setOverlaysWebView({ overlay: false }); - await StatusBar.show(); - await NavigationBar.show(); - await ScreenOrientation.lock({ orientation: (originalOrigination as ScreenOrientationResult).type }); @@ -740,7 +733,6 @@ onDestroy(async () => { if (Capacitor.getPlatform() === 'android' && !$isAndroidTvStore) { if (originalOrigination) { - await StatusBar.setOverlaysWebView({ overlay: false }); await StatusBar.show(); await ScreenOrientation.lock({ orientation: originalOrigination.type diff --git a/materialious/src/lib/css/global.css b/materialious/src/lib/css/global.css index cedc4e56..7b155a77 100644 --- a/materialious/src/lib/css/global.css +++ b/materialious/src/lib/css/global.css @@ -39,30 +39,6 @@ button.row:hover { width: 100%; } -@media screen and (max-width: 650px) { - dialog.right { - width: 100% !important; - border-radius: 0 !important; - } -} - -@media screen and (max-width: 650px) { - main.root { - padding-left: 0.1em !important; - padding-right: 0.1em !important; - } -} - -@media screen and (max-width: 650px) { - main.root { - scrollbar-width: none !important; - } - - main.root::-webkit-scrollbar { - display: none !important; - } -} - @media screen and (max-width: 1000px) { menu.mobile { z-index: 9999 !important; @@ -70,4 +46,27 @@ button.row:hover { top: 20% !important; width: 100% !important; } + + main.root { + scrollbar-width: none !important; + } + + main.root::-webkit-scrollbar { + display: none !important; + } + + main.root { + padding-left: 0.1em !important; + padding-right: 0.1em !important; + } + + dialog.right { + width: 100% !important; + border-radius: 0 !important; + padding-top: 2em; + } + + nav.top { + height: 110px; + } } diff --git a/materialious/src/lib/theme.ts b/materialious/src/lib/theme.ts index f4c7b26e..a346932a 100644 --- a/materialious/src/lib/theme.ts +++ b/materialious/src/lib/theme.ts @@ -7,7 +7,7 @@ import { get } from 'svelte/store'; import { darkModeStore, interfaceAmoledTheme } from './store'; export async function getDynamicTheme(mode?: string): Promise> { - const givenSettings = (await ui('theme')); + const givenSettings = await ui('theme'); // @ts-ignore const themes: string = givenSettings[mode ? mode : (ui('mode') as string)]; @@ -23,12 +23,13 @@ export async function setStatusBarColor() { if (Capacitor.getPlatform() === 'android') { await tick(); - const surfaceColor = get(interfaceAmoledTheme) ? '#000000' : (await getDynamicTheme())['--surface-container']; + const surfaceColor = get(interfaceAmoledTheme) + ? '#000000' + : (await getDynamicTheme())['--surface-container']; await StatusBar.setBackgroundColor({ color: surfaceColor }); - await StatusBar.setOverlaysWebView({overlay: false}) await NavigationBar.setColor({ color: surfaceColor, @@ -42,10 +43,11 @@ export async function setStatusBarColor() { } else { await StatusBar.setStyle({ style: Style.Light }); } + + await StatusBar.setOverlaysWebView({ overlay: false }); } } - export function setAmoledTheme() { const isAmoled = get(interfaceAmoledTheme); const isDark = get(darkModeStore); @@ -85,4 +87,4 @@ export function setTheme() { ui('mode', 'light'); } } -} \ No newline at end of file +} diff --git a/materialious/src/routes/(app)/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte index a907d4eb..dfe4cd14 100644 --- a/materialious/src/routes/(app)/+layout.svelte +++ b/materialious/src/routes/(app)/+layout.svelte @@ -345,9 +345,7 @@ class:active={$page.url.href.endsWith(navPage.href)} data-sveltekit-preload-data="off" >{navPage.icon} - {#if $page.url.href.endsWith(navPage.href)} - {navPage.name} - {/if} + {navPage.name} {/if} {/each} diff --git a/update_versions.py b/update_versions.py index 12162b7d..b8fd483e 100644 --- a/update_versions.py +++ b/update_versions.py @@ -3,7 +3,7 @@ import os import re from datetime import datetime -LATEST_VERSION = "1.10.1" +LATEST_VERSION = "1.10.2" RELEASE_DATE = datetime.now().strftime("%Y-%-m-%d") # Format: YYYY-M-D WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")