diff --git a/.github/workflows/prod-android.yml b/.github/workflows/prod-android.yml index 5f0c1818..6e2d71f5 100644 --- a/.github/workflows/prod-android.yml +++ b/.github/workflows/prod-android.yml @@ -31,7 +31,7 @@ jobs: run: cd ../ && npm install - name: Build android nodejs packages - run: cd ../static/nodejs-android && npm install + run: cd ../static/nodejsAndroid && npm install - name: Build package run: cd ../ && npm run build diff --git a/.github/workflows/pull-android.yml b/.github/workflows/pull-android.yml index e7e7526c..63dbd5ba 100644 --- a/.github/workflows/pull-android.yml +++ b/.github/workflows/pull-android.yml @@ -1,46 +1,46 @@ name: Check Android on: - pull_request: - branches: ["main"] + pull_request: + branches: ["main"] permissions: - contents: write + contents: write jobs: - android-check: - runs-on: ubuntu-latest - defaults: - run: - working-directory: ./materialious/android + android-check: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./materialious/android - steps: - - uses: actions/checkout@v3 + steps: + - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: latest + - uses: actions/setup-node@v3 + with: + node-version: latest - - name: Install modules - run: cd ../ && npm install + - name: Install modules + run: cd ../ && npm install - - name: Build android nodejs packages - run: cd ../static/nodejs-android && npm install + - name: Build android nodejs packages + run: cd ../static/nodejsAndroid && npm install - - name: Build package - run: cd ../ && npm run build + - name: Build package + run: cd ../ && npm run build - - name: Sync package - run: cd ../ && npx cap sync + - name: Sync package + run: cd ../ && npx cap sync - - name: Setup JDK - uses: actions/setup-java@v3 - with: - distribution: "zulu" - java-version: "21" - cache: "gradle" + - name: Setup JDK + uses: actions/setup-java@v3 + with: + distribution: "zulu" + java-version: "21" + cache: "gradle" - - name: Build App - run: | - bash gradlew assembleRelease - bash gradlew bundleRelease + - name: Build App + run: | + bash gradlew assembleRelease + bash gradlew bundleRelease diff --git a/docs/BUILDING.md b/docs/BUILDING.md index a2d15657..129a0370 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -26,6 +26,6 @@ Materialious desktop builds are handled through GitHub using [prod-desktop.yml]( ### Android Release Android builds are handled using the workflow [prod-android.yml](../.github/workflows/prod-android.yml). -- After running the standard `npm install` and `npm run build` commands, we install the modules located in [nodejs-android/](../materialious/static/nodejs-android/) for [Capacitor-NodeJS](https://github.com/hampoelz/Capacitor-NodeJS). +- After running the standard `npm install` and `npm run build` commands, we install the modules located in [nodejsAndroid/](../materialious/static/nodejsAndroid/) for [Capacitor-NodeJS](https://github.com/hampoelz/Capacitor-NodeJS). - The `npx cap sync` command is used to synchronize with [Capacitor](https://capacitorjs.com). - The Android build is processed using [setup-java](https://github.com/actions/setup-java/tree/v3/), followed by signing the APK with [sign-android-release](https://github.com/ilharp/sign-android-release/tree/v1.0.4). 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/capacitor.config.ts b/materialious/electron/capacitor.config.ts index 80444d38..f7cebf74 100644 --- a/materialious/electron/capacitor.config.ts +++ b/materialious/electron/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-lock.json b/materialious/electron/package-lock.json index 54004d12..31ba6af3 100644 --- a/materialious/electron/package-lock.json +++ b/materialious/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "Materialious", - "version": "1.13.9", + "version": "1.13.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "Materialious", - "version": "1.13.9", + "version": "1.13.10", "license": "MIT", "dependencies": { "@capacitor-community/electron": "^5.0.0", @@ -4414,9 +4414,9 @@ "license": "MIT" }, "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "version": "4.17.23", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", + "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", "dev": true, "license": "MIT" }, 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/eslint.config.js b/materialious/eslint.config.js index 72ad1f90..cd915cee 100644 --- a/materialious/eslint.config.js +++ b/materialious/eslint.config.js @@ -67,7 +67,7 @@ export default ts.config( 'package-lock.json', 'yarn.lock', // Ignore our nodejs android code - '**/nodejs-android/*', + '**/nodejsAndroid/*', // Ignore electron code from capacitorjs '**/electron/*', // Ignore build files diff --git a/materialious/package-lock.json b/materialious/package-lock.json index e335b2ec..28ef0227 100644 --- a/materialious/package-lock.json +++ b/materialious/package-lock.json @@ -1,16 +1,15 @@ { "name": "materialious", - "version": "1.13.6", + "version": "1.13.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "materialious", - "version": "1.13.6", + "version": "1.13.10", "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", @@ -2046,9 +2036,9 @@ } }, "node_modules/@capacitor/cli": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-8.0.0.tgz", - "integrity": "sha512-v9hEBi69xGxuuZhg55N031bMEenKaPSv71Il8C22VOOH6surDyv/MPeImN0oVfFc7eiklaW3rDFYVz6cmXfJWQ==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@capacitor/cli/-/cli-8.0.1.tgz", + "integrity": "sha512-okCNTsL8FNYrtPNeHWFjWb1S+PwBMhx5wFLhDC0MZOIrOLm+2ynMBtKu3BnR0Nv1hozoHcOCi6SuTF1TrRpb3w==", "license": "MIT", "dependencies": { "@ionic/cli-framework-output": "^2.2.8", @@ -2059,7 +2049,7 @@ "env-paths": "^2.2.0", "fs-extra": "^11.2.0", "kleur": "^4.1.5", - "native-run": "^2.0.1", + "native-run": "^2.0.3", "open": "^8.4.0", "plist": "^3.1.0", "prompts": "^2.4.2", @@ -5048,9 +5038,9 @@ } }, "node_modules/beercss": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/beercss/-/beercss-3.13.1.tgz", - "integrity": "sha512-729VrZYmaySNf8OXJ7iovXdToiqwiSuMNBABWOTMQxOBnwS78VnV7tRs1Ke0yK5mjij5WYwr6MLx4eSK0S7ThQ==", + "version": "3.13.3", + "resolved": "https://registry.npmjs.org/beercss/-/beercss-3.13.3.tgz", + "integrity": "sha512-tMs2kYBiq+wYqqnE+H2wy0BBIMpzRwy3EKnR40XnE41JUFdkM1CdsCnV+RGMB0fokAQVW2WPaNIik0VPUfitLw==", "license": "MIT", "dependencies": { "material-dynamic-colors": "^1.1.2" @@ -9163,9 +9153,9 @@ } }, "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "version": "4.17.23", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", + "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", "dev": true, "license": "MIT" }, @@ -9754,9 +9744,9 @@ "license": "MIT" }, "node_modules/native-run": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/native-run/-/native-run-2.0.1.tgz", - "integrity": "sha512-XfG1FBZLM50J10xH9361whJRC9SHZ0Bub4iNRhhI61C8Jv0e1ud19muex6sNKB51ibQNUJNuYn25MuYET/rE6w==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/native-run/-/native-run-2.0.3.tgz", + "integrity": "sha512-U1PllBuzW5d1gfan+88L+Hky2eZx+9gv3Pf6rNBxKbORxi7boHzqiA6QFGSnqMem4j0A9tZ08NMIs5+0m/VS1Q==", "license": "MIT", "dependencies": { "@ionic/utils-fs": "^3.1.7", @@ -11753,9 +11743,9 @@ } }, "node_modules/shaka-player": { - "version": "4.16.14", - "resolved": "https://registry.npmjs.org/shaka-player/-/shaka-player-4.16.14.tgz", - "integrity": "sha512-RDxHFlsibqtcjbMflx7upcioJEr66deRyDOb2GQCMEic2NFv6qKdbeyguV+ZDSO6Bcg5/cFZsoDdim5jDnNpSw==", + "version": "4.16.15", + "resolved": "https://registry.npmjs.org/shaka-player/-/shaka-player-4.16.15.tgz", + "integrity": "sha512-jsA1AkQO5zWdrXI8RW/BK0vbdI2ZrHG0w73qPVLoGRoCggmkpJ1rT26/KjmakoO1X+Z2nkIVofTuE5gvirkV8w==", "license": "Apache-2.0", "engines": { "node": ">=18" @@ -12448,9 +12438,9 @@ } }, "node_modules/svelte": { - "version": "5.47.1", - "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.47.1.tgz", - "integrity": "sha512-MhSWfWEpG5T57z0Oyfk9D1GhAz/KTZKZZlWtGEsy9zNk2fafpuU7sJQlXNSA8HtvwKxVC9XlDyl5YovXUXjjHA==", + "version": "5.48.3", + "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.48.3.tgz", + "integrity": "sha512-w7QZ398cdNherTdiQ/v3SYLLGOO4948Jgjh04PYqtTYVohmBvbmFwLmo7pp8gp4/1tceRWfSTjHgjtfpCVNJmQ==", "license": "MIT", "dependencies": { "@jridgewell/remapping": "^2.3.4", 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..8699d00d 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(); @@ -606,6 +604,11 @@ onMount(async () => { shaka.polyfill.installAll(); if (!shaka.Player.isBrowserSupported()) { + addToast({ + data: { + text: 'Browser not supported for playback.' + } + }); return; } @@ -704,12 +707,12 @@ isPlaying: true, hasClose: true, dismissable: true, - playIcon: 'media_play', - pauseIcon: 'media_pause', - prevIcon: 'media_prev', - nextIcon: 'media_next', - closeIcon: 'media_close', - notificationIcon: 'notification', + playIcon: '', + pauseIcon: '', + prevIcon: '', + nextIcon: '', + closeIcon: '', + notificationIcon: '', ticker: `Now playing "${data.video.title}"` }); 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/i18n/locales/de.json b/materialious/src/lib/i18n/locales/de.json index 0318a803..bb5e02c2 100644 --- a/materialious/src/lib/i18n/locales/de.json +++ b/materialious/src/lib/i18n/locales/de.json @@ -181,7 +181,8 @@ "tangentJokes": "Füllende Abweichler/Witze", "automatic": "Automatisch überspringen", "manual": "Manuell überspringen", - "timeline": "Nur Zeitleiste" + "timeline": "Nur Zeitleiste", + "musicOffTopic": "Nicht-musikalisches Segment" }, "deArrow": { "title": "DeArrow", @@ -194,7 +195,9 @@ "expandChapters": "Kapitel standardmäßig ausklappen", "displayThumbnailAvatars": "Vorschaubild-Avatare (Langsam)", "about": "Über", - "androidNativeShare": "Natives Teilen nutzen" + "androidNativeShare": "Natives Teilen nutzen", + "joinSyncParty": "Synchronisationsgruppen-URL eingeben", + "shareURL": "URL teilen" }, "subscribe": "Abonnieren", "recommendedVideos": "Vorgeschlagene Videos", diff --git a/materialious/src/lib/i18n/locales/gsw.json b/materialious/src/lib/i18n/locales/gsw.json index 84d8af64..4986fc14 100644 --- a/materialious/src/lib/i18n/locales/gsw.json +++ b/materialious/src/lib/i18n/locales/gsw.json @@ -49,7 +49,8 @@ "tangentJokes": "Füllendi Abwiichler/Witz", "automatic": "Automatisch überspringe", "manual": "Manuell überspringe", - "timeline": "Nur Ziitleischte" + "timeline": "Nur Ziitleischte", + "musicOffTopic": "Nöd-musikalischs Segment" }, "interface": "Bedienoberflächi", "star": "Sternli uf GitHub vergeh!", @@ -92,7 +93,9 @@ "expandDescription": "Beschriibig standardmässig erwiitere", "disableAutoUpdate": "Automatischi Updates deaktiviere", "about": "Über", - "androidNativeShare": "Nativs Teile bruche" + "androidNativeShare": "Nativs Teile bruche", + "shareURL": "URL teile", + "joinSyncParty": "Synchronistationsgruppe-URL iigeh" }, "videos": "Videos", "cancel": "Abbreche", diff --git a/materialious/src/lib/i18n/locales/hu.json b/materialious/src/lib/i18n/locales/hu.json index 6b39fcc2..eeeb5d16 100644 --- a/materialious/src/lib/i18n/locales/hu.json +++ b/materialious/src/lib/i18n/locales/hu.json @@ -47,7 +47,8 @@ "tangentJokes": "Kitöltő mellékvágányok/poénok", "automatic": "Automatikus átugrás", "manual": "Kézi ugrás", - "timeline": "Csak idővonal" + "timeline": "Csak idővonal", + "musicOffTopic": "Nem zenei szegmens" }, "syncPartyWarning": "Vegye figyelembe, hogy IP-címe látható lesz az Ön által meghívott felhasználók számára.", "expandDescription": "Leírás kibontása alapértelmezetten", 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