diff --git a/materialious/android/.idea/.gitignore b/materialious/android/.idea/.gitignore deleted file mode 100644 index 26d33521..00000000 --- a/materialious/android/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/materialious/android/.idea/deploymentTargetSelector.xml b/materialious/android/.idea/deploymentTargetSelector.xml index ef13f838..b268ef36 100644 --- a/materialious/android/.idea/deploymentTargetSelector.xml +++ b/materialious/android/.idea/deploymentTargetSelector.xml @@ -4,14 +4,6 @@ diff --git a/materialious/android/.idea/misc.xml b/materialious/android/.idea/misc.xml index b2c751a3..f7608eda 100644 --- a/materialious/android/.idea/misc.xml +++ b/materialious/android/.idea/misc.xml @@ -1,9 +1,4 @@ - - - - - + \ No newline at end of file diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index bc6aa5b7..fee39381 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 193 - versionName "1.13.9" + versionCode 194 + versionName "1.13.10" 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/capacitor.build.gradle b/materialious/android/app/capacitor.build.gradle index fb4c4f4f..0c8df5c3 100644 --- a/materialious/android/app/capacitor.build.gradle +++ b/materialious/android/app/capacitor.build.gradle @@ -9,7 +9,6 @@ android { apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle" dependencies { - implementation project(':capacitor-community-safe-area') implementation project(':capacitor-app') implementation project(':capacitor-browser') implementation project(':capacitor-clipboard') diff --git a/materialious/android/app/src/main/AndroidManifest.xml b/materialious/android/app/src/main/AndroidManifest.xml index a2ed4bb3..077c998f 100644 --- a/materialious/android/app/src/main/AndroidManifest.xml +++ b/materialious/android/app/src/main/AndroidManifest.xml @@ -15,8 +15,7 @@ android:label="@string/title_activity_main" android:theme="@style/AppTheme.NoActionBarLaunch" android:launchMode="singleTask" - android:exported="true" - android:windowOptOutEdgeToEdgeEnforcement="true"> + android:exported="true"> @@ -70,25 +69,6 @@ android:pathPrefix="/shorts" /> - - - - - - - - - - - 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 49358529..9157f71e 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 @@ -4,6 +4,7 @@ import android.os.Bundle; import android.webkit.WebView; import android.webkit.WebSettings; + import com.getcapacitor.BridgeActivity; public class MainActivity extends BridgeActivity { @@ -20,6 +21,7 @@ public class MainActivity extends BridgeActivity { WebView webview = getBridge().getWebView(); webview.setOverScrollMode(WebView.OVER_SCROLL_NEVER); webview.setVerticalScrollBarEnabled(false); + webview.setHorizontalScrollBarEnabled(false); WebSettings settings = webview.getSettings(); settings.setMediaPlaybackRequiresUserGesture(false); diff --git a/materialious/android/capacitor.settings.gradle b/materialious/android/capacitor.settings.gradle index 0dc65e52..dde8a6a0 100644 --- a/materialious/android/capacitor.settings.gradle +++ b/materialious/android/capacitor.settings.gradle @@ -2,9 +2,6 @@ include ':capacitor-android' project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor') -include ':capacitor-community-safe-area' -project(':capacitor-community-safe-area').projectDir = new File('../node_modules/@capacitor-community/safe-area/android') - include ':capacitor-app' project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android') diff --git a/materialious/android/gradle.properties b/materialious/android/gradle.properties index 2e87c52f..2cc41580 100644 --- a/materialious/android/gradle.properties +++ b/materialious/android/gradle.properties @@ -9,7 +9,7 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx1536m +org.gradle.jvmargs=-Xms1G -Xmx1G # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/materialious/capacitor.config.ts b/materialious/capacitor.config.ts index 80444d38..f7cebf74 100644 --- a/materialious/capacitor.config.ts +++ b/materialious/capacitor.config.ts @@ -6,10 +6,7 @@ const config: CapacitorConfig = { webDir: 'build', plugins: { CapacitorNodeJS: { - nodeDir: 'nodejs-android' - }, - SystemBars: { - insetsHandling: 'disable' + nodeDir: 'nodejsAndroid' } }, server: { diff --git a/materialious/electron/materialious.metainfo.xml b/materialious/electron/materialious.metainfo.xml index af54b8dc..f182770e 100644 --- a/materialious/electron/materialious.metainfo.xml +++ b/materialious/electron/materialious.metainfo.xml @@ -92,7 +92,11 @@ - + + + https://github.com/Materialious/Materialious/releases/tag/1.13.10 + + https://github.com/Materialious/Materialious/releases/tag/1.13.9 diff --git a/materialious/electron/package.json b/materialious/electron/package.json index a0644583..f9ebc9f5 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.13.9", + "version": "1.13.10", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", @@ -45,4 +45,4 @@ "capacitor", "electron" ] -} +} \ No newline at end of file diff --git a/materialious/package-lock.json b/materialious/package-lock.json index e335b2ec..86915a57 100644 --- a/materialious/package-lock.json +++ b/materialious/package-lock.json @@ -1,16 +1,15 @@ { "name": "materialious", - "version": "1.13.6", + "version": "1.13.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "materialious", - "version": "1.13.6", + "version": "1.13.9", "hasInstallScript": true, "dependencies": { "@capacitor-community/electron": "^5.0.1", - "@capacitor-community/safe-area": "^8.0.1", "@capacitor/android": "^8.0.0", "@capacitor/app": "^8.0.0", "@capacitor/browser": "^8.0.0", @@ -1712,15 +1711,6 @@ "ora": "^5.4.1" } }, - "node_modules/@capacitor-community/safe-area": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@capacitor-community/safe-area/-/safe-area-8.0.1.tgz", - "integrity": "sha512-zVVQ7k94DbOff1mHP8qrZGTJZWyhGZnKHD2eXdcobIoOBFW9CeVphLNZYDCop/DBsHXfv6r8k0/Ac8xMIlwT+A==", - "license": "MIT", - "peerDependencies": { - "@capacitor/core": ">=8.0.0" - } - }, "node_modules/@capacitor/android": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/@capacitor/android/-/android-8.0.0.tgz", diff --git a/materialious/package.json b/materialious/package.json index 716b8d52..c1beeef6 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.13.9", + "version": "1.13.10", "private": true, "scripts": { "dev": "npm run patch:github && vite dev", @@ -37,13 +37,12 @@ "svelte-check": "^4.3.3", "tslib": "^2.7.0", "typescript": "^5.9.3", - "vite": "^7.3.1", - "typescript-eslint": "^8.53.1" + "typescript-eslint": "^8.53.1", + "vite": "^7.3.1" }, "type": "module", "dependencies": { "@capacitor-community/electron": "^5.0.1", - "@capacitor-community/safe-area": "^8.0.1", "@capacitor/android": "^8.0.0", "@capacitor/app": "^8.0.0", "@capacitor/browser": "^8.0.0", diff --git a/materialious/src/app.html b/materialious/src/app.html index c2f83100..dae55a35 100644 --- a/materialious/src/app.html +++ b/materialious/src/app.html @@ -1,19 +1,20 @@ + + + + + + + + Materialious + %sveltekit.head% + - - - - - - - - Materialious - %sveltekit.head% - - - -
%sveltekit.body%
- - - \ No newline at end of file + +
%sveltekit.body%
+ + diff --git a/materialious/src/lib/api/youtubejs.ts b/materialious/src/lib/api/youtubejs.ts index 57cccaad..22906b0f 100644 --- a/materialious/src/lib/api/youtubejs.ts +++ b/materialious/src/lib/api/youtubejs.ts @@ -91,7 +91,7 @@ export async function getVideoTYjs(videoId: string): Promise { // https://github.com/LuanRT/googlevideo/issues/42 if (video.streaming_data) video.streaming_data.adaptive_formats = video.streaming_data.adaptive_formats.filter( - (format) => !format.xtags + (format) => format.xtags !== 'CgcKAnZiEgEx' ); const adaptiveFormats: AdaptiveFormats[] = []; diff --git a/materialious/src/lib/components/Player.svelte b/materialious/src/lib/components/Player.svelte index 5feb597a..25bfd500 100644 --- a/materialious/src/lib/components/Player.svelte +++ b/materialious/src/lib/components/Player.svelte @@ -3,7 +3,7 @@ import { getBestThumbnail } from '$lib/images'; import { padTime, videoLength } from '$lib/numbers'; import { type PhasedDescription, type Timestamp } from '$lib/timestamps'; - import { SafeArea, SystemBarsStyle, SystemBarsType } from '@capacitor-community/safe-area'; + import { SystemBars, SystemBarsStyle, SystemBarType } from '@capacitor/core'; import { Capacitor } from '@capacitor/core'; import { ScreenOrientation, type ScreenOrientationResult } from '@capacitor/screen-orientation'; import { error, type Page } from '@sveltejs/kit'; @@ -264,14 +264,12 @@ if (isFullScreen) { // Ensure bar color is black while in fullscreen - await SafeArea.setSystemBarsStyle({ - style: SystemBarsStyle.Dark + await SystemBars.setStyle({ style: SystemBarsStyle.Light }); + await SystemBars.hide({ + bar: SystemBarType.NavigationBar }); - await SafeArea.hideSystemBars({ - type: SystemBarsType.NavigationBar - }); - await SafeArea.hideSystemBars({ - type: SystemBarsType.StatusBar + await SystemBars.hide({ + bar: SystemBarType.StatusBar }); } else { await setStatusBarColor(); diff --git a/materialious/src/lib/css/global.css b/materialious/src/lib/css/global.css index af5920e5..e044119a 100644 --- a/materialious/src/lib/css/global.css +++ b/materialious/src/lib/css/global.css @@ -45,7 +45,16 @@ button, } nav.top { - padding: 1em 0; + padding-bottom: 1em; + padding-top: calc(var(--safe-area-inset-top) + 1rem) !important; +} + +nav.bottom { + padding-bottom: var(--safe-area-inset-bottom) !important; +} + +dialog { + padding-top: calc(var(--safe-area-inset-top) + 1rem) !important; } main.root { diff --git a/materialious/src/lib/theme.ts b/materialious/src/lib/theme.ts index b180f9ac..331515e1 100644 --- a/materialious/src/lib/theme.ts +++ b/materialious/src/lib/theme.ts @@ -1,8 +1,7 @@ -import { Capacitor } from '@capacitor/core'; +import { Capacitor, SystemBarType } from '@capacitor/core'; import ui from 'beercss'; -import { tick } from 'svelte'; import { get } from 'svelte/store'; -import { SafeArea, SystemBarsStyle, SystemBarsType } from '@capacitor-community/safe-area'; +import { SystemBars, SystemBarsStyle } from '@capacitor/core'; import { darkModeStore, interfaceAmoledTheme } from './store'; export async function getDynamicTheme(mode?: string): Promise> { @@ -20,18 +19,14 @@ export async function getDynamicTheme(mode?: string): Promise