diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index a0e89835..ced51595 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 108 - versionName "1.8.4" + versionCode 109 + versionName "1.8.5" 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/electron/materialious.metainfo.xml b/materialious/electron/materialious.metainfo.xml index 75ed49ae..d98e74a6 100644 --- a/materialious/electron/materialious.metainfo.xml +++ b/materialious/electron/materialious.metainfo.xml @@ -54,20 +54,10 @@ - - - - - - - - - - - - - - + + https://github.com/Materialious/Materialious/releases/tag/1.8.5 + + https://github.com/Materialious/Materialious/releases/tag/1.8.4 diff --git a/materialious/electron/package-lock.json b/materialious/electron/package-lock.json index 8693089f..aa3b9685 100644 --- a/materialious/electron/package-lock.json +++ b/materialious/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "Materialious", - "version": "1.8.2", + "version": "1.8.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "Materialious", - "version": "1.8.2", + "version": "1.8.5", "license": "MIT", "dependencies": { "@capacitor-community/electron": "^5.0.0", @@ -2492,9 +2492,9 @@ } }, "node_modules/electron": { - "version": "35.2.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-35.2.1.tgz", - "integrity": "sha512-LO4xXLpzkPPUVLvAbdHMlW7N9Z+Qqz+7QsmSWXluTIQMeJk+v7o36nUTZghyA2I1s//tlMvuaCtle6Qo2W0Ktg==", + "version": "35.5.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-35.5.0.tgz", + "integrity": "sha512-16ScwDuKgnuL7tSrEgBvQe1Hm4CSK0vbOusPFrDs4oIs3QOdEFtrP9i8+4yKQGXpszj4f4F0MQjKv1tu9E4Gvg==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/materialious/electron/package.json b/materialious/electron/package.json index eb41388f..ab585488 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.8.4", + "version": "1.8.5", "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 32640e0d..b72d5e08 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.8.4", + "version": "1.8.5", "private": true, "scripts": { "dev": "vite dev", @@ -71,4 +71,4 @@ "terser": "^5.34.1", "youtubei.js": "^13.4.0" } -} +} \ No newline at end of file diff --git a/materialious/src/lib/components/ContentColumn.svelte b/materialious/src/lib/components/ContentColumn.svelte index c229023e..9b5de488 100644 --- a/materialious/src/lib/components/ContentColumn.svelte +++ b/materialious/src/lib/components/ContentColumn.svelte @@ -1,10 +1,7 @@
-
+
search { showSearchBox = true; await tick(); @@ -112,14 +113,13 @@ }} /> {#if showSearchBox} - +
dispatch('searchCancelled')}>arrow_back diff --git a/materialious/src/lib/components/VideoList.svelte b/materialious/src/lib/components/VideoList.svelte index 31d373fb..3fee66be 100644 --- a/materialious/src/lib/components/VideoList.svelte +++ b/materialious/src/lib/components/VideoList.svelte @@ -17,7 +17,7 @@ let auth = get(authStore); - async function removePlaylistItem(indexId: string, videoId: string) { + async function removePlaylistItem(indexId: string) { if (!playlistId) return; await removePlaylistVideo(playlistId, indexId); } @@ -27,25 +27,22 @@
{#each videos as video} - -
- - {#if auth && decodeURIComponent(auth.username) === playlistAuthor && 'indexId' in video} -
- -
- {/if} -
- + +
+ + {#if auth && decodeURIComponent(auth.username) === playlistAuthor && 'indexId' in video} +
+ +
+ {/if} +
+ {/each}
diff --git a/materialious/src/lib/css/global.css b/materialious/src/lib/css/global.css index ba4ae4ec..402e29be 100644 --- a/materialious/src/lib/css/global.css +++ b/materialious/src/lib/css/global.css @@ -17,10 +17,6 @@ main.root { overflow-y: auto; } -article, dialog { - border-radius: .25rem !important; -} - .row { padding: 1em !important; } @@ -79,6 +75,5 @@ button.row:hover { position: fixed !important; top: 20% !important; width: 100% !important; - background-color: var(--surface-variant) !important; } -} \ No newline at end of file +} diff --git a/materialious/src/lib/css/shaka-player-theme.css b/materialious/src/lib/css/shaka-player-theme.css index e9195df6..18b7bb4e 100644 --- a/materialious/src/lib/css/shaka-player-theme.css +++ b/materialious/src/lib/css/shaka-player-theme.css @@ -123,7 +123,8 @@ transition: none !important; opacity: 1 !important; visibility: visible !important; - z-index: 9999 !important; + z-index: 99999999 !important; + pointer-events: auto !important; pointer-events: auto !important; } @@ -157,10 +158,18 @@ padding-left: 0.3125rem; /* 5px */ } +.shaka-overflow-menu * { + z-index: 99999999 !important; + pointer-events: auto !important; +} + .youtube-theme .shaka-overflow-menu button, .youtube-theme .shaka-settings-menu button { padding: 0; margin-bottom: 0.5em; + visibility: visible !important; + z-index: 99999999 !important; + pointer-events: auto !important; } .youtube-theme .shaka-overflow-menu button i { @@ -174,6 +183,10 @@ outline: none; height: 2.5rem; /* 40px */ flex: 0 0 100%; + visibility: visible !important; + z-index: 99999999 !important; + pointer-events: auto !important; + pointer-events: auto !important; } .shaka-settings-menu { @@ -264,11 +277,65 @@ @media screen and (max-width: 650px) { .youtube-theme .shaka-overflow-menu, .youtube-theme .shaka-settings-menu { - min-width: 100%; - position: fixed; - top: 75%; - left: 50%; - height: 50vh; - transform: translate(-50%, -50%); + width: 100% !important; + min-width: 100% !important; + position: fixed !important; + top: 100% !important; + left: 50% !important; + height: 50vh !important; + transform: translate(-50%, -50%) !important; + pointer-events: all !important; + z-index: 99999999 !important; + pointer-events: auto !important; + opacity: 1 !important; + visibility: visible !important; + padding: 1rem !important; + box-shadow: var(--elevate2); + background-color: var(--surface-container); + z-index: 11; + inset: auto auto 0 0; + inline-size: 100%; + max-block-size: 50vh; + max-inline-size: none !important; + overflow-x: hidden; + overflow-y: auto; + font-size: 0.875rem; + font-weight: 400; + text-transform: none; + color: var(--on-surface); + line-height: normal; + text-align: start; + border-radius: 0.25rem; + transition: + all var(--speed2), + 0s background-color; + } + + .youtube-theme .shaka-overflow-menu::before, + .youtube-theme .shaka-settings-menu::before { + content: '' !important; + position: fixed !important; + top: 0 !important; + left: 0 !important; + width: 100vw !important; + height: 100vh !important; + background: transparent !important; + z-index: 99999998 !important; + pointer-events: auto !important; + } + + .youtube-theme .shaka-overflow-menu:hover, + .youtube-theme .shaka-settings-menu:hover { + z-index: 99999998 !important; + pointer-events: auto !important; + opacity: 1 !important; + visibility: visible !important; + } + + #shaka-container { + z-index: 99999998 !important; + pointer-events: auto !important; + opacity: 1 !important; + visibility: visible !important; } } diff --git a/materialious/src/lib/patches/youtubejs.ts b/materialious/src/lib/patches/youtubejs.ts index fe8d52b4..ecc6e638 100644 --- a/materialious/src/lib/patches/youtubejs.ts +++ b/materialious/src/lib/patches/youtubejs.ts @@ -117,6 +117,10 @@ export async function patchYoutubeJs(videoId: string): Promise { const recommendedVideos: VideoBase[] = []; video.watch_next_feed?.forEach((recommended: Record) => { + if (!recommended.title) { + return; + } + recommendedVideos.push({ videoThumbnails: (recommended?.thumbnails as Thumbnail[]) || [], videoId: recommended?.id || '', diff --git a/materialious/src/lib/sabr/shakaHttpPlugin.ts b/materialious/src/lib/sabr/shakaHttpPlugin.ts index 598a5b1e..6ee23e8c 100644 --- a/materialious/src/lib/sabr/shakaHttpPlugin.ts +++ b/materialious/src/lib/sabr/shakaHttpPlugin.ts @@ -100,13 +100,13 @@ export class HttpFetchPlugin { }); const timeoutMs = request.retryParameters.timeout; - if (timeoutMs) { - // const timer = new shaka.util.Timer(() => { - // abortStatus.timedOut = true; - // controller.abort(); - // }); - // timer.tickAfter(timeoutMs / 1000); - // op.finally(() => timer.stop()); + if (timeoutMs && Capacitor.getPlatform() !== 'android') { + const timer = new shaka.util.Timer(() => { + abortStatus.timedOut = true; + controller.abort(); + }); + timer.tickAfter(timeoutMs / 1000); + op.finally(() => timer.stop()); } return op; diff --git a/materialious/src/routes/(app)/watch/[slug]/+page.svelte b/materialious/src/routes/(app)/watch/[slug]/+page.svelte index ce4953f7..dd7ff7df 100644 --- a/materialious/src/routes/(app)/watch/[slug]/+page.svelte +++ b/materialious/src/routes/(app)/watch/[slug]/+page.svelte @@ -41,7 +41,7 @@ let { data = $bindable() } = $props(); - let playerElement: HTMLMediaElement; + let playerElement: HTMLMediaElement | undefined = $state(); let comments: Comments | null = $state(null); data.streamed.comments?.then((streamedComments) => { @@ -238,10 +238,11 @@ if (playerElement) { playerElement.addEventListener('timeupdate', () => { + if (!playerElement) return; playerCurrentTime = playerElement.currentTime; }); - playerElement.addEventListener('end', async () => { + playerElement.addEventListener('ended', async () => { if (playlistVideos.length === 0) { if ($playerAutoplayNextByDefaultStore) { goto(`/watch/${data.video.recommendedVideos[0].videoId}`); @@ -504,7 +505,7 @@ width_wide
{$_('player.theatreMode')}
- {#if data.video.lengthSeconds > 60 && !data.video.hlsUrl} + {#if data.video.lengthSeconds > 360 && !data.video.hlsUrl}
{#if !theatreMode}
- {#if showTranscript} + {#if showTranscript && playerElement} {/if} {#if playlist} diff --git a/update_versions.py b/update_versions.py index 5649a3e9..b30b9e54 100644 --- a/update_versions.py +++ b/update_versions.py @@ -3,7 +3,7 @@ import os import re from datetime import datetime -LATEST_VERSION = "1.8.3" +LATEST_VERSION = "1.8.5" RELEASE_DATE = datetime.now().strftime("%Y-%-m-%d") # Format: YYYY-M-D WORKING_DIR = os.path.join(