From 42657c26a3e925715765cc4ed0dd2bdb32e359fc Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 4 Apr 2025 15:43:06 +1300 Subject: [PATCH 1/5] Fix video options being cut off --- materialious/android/app/build.gradle | 4 ++-- materialious/electron/materialious.metainfo.xml | 6 +++++- materialious/electron/package.json | 2 +- materialious/package.json | 2 +- materialious/src/lib/components/Player.svelte | 2 +- materialious/src/lib/css/shaka-player-theme.css | 12 +++++++++--- update_versions.py | 2 +- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index ee7ad688..c80bf262 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 100 - versionName "1.7.18" + versionCode 101 + versionName "1.7.19" 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 401b7ee5..84790dc8 100644 --- a/materialious/electron/materialious.metainfo.xml +++ b/materialious/electron/materialious.metainfo.xml @@ -61,7 +61,11 @@ - + + + https://github.com/Materialious/Materialious/releases/tag/1.7.19 + + https://github.com/Materialious/Materialious/releases/tag/1.7.18 diff --git a/materialious/electron/package.json b/materialious/electron/package.json index 2de4195a..d7030157 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.7.18", + "version": "1.7.19", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 40018caa..2b759fb4 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.7.18", + "version": "1.7.19", "private": true, "scripts": { "dev": "vite dev", diff --git a/materialious/src/lib/components/Player.svelte b/materialious/src/lib/components/Player.svelte index 59a65271..55dc4422 100644 --- a/materialious/src/lib/components/Player.svelte +++ b/materialious/src/lib/components/Player.svelte @@ -156,7 +156,7 @@ 'playback_rate', 'loop', 'language', - 'save_video_frame', + Capacitor.getPlatform() === 'android' ? '' : 'save_video_frame', 'statistics' ], enableTooltips: true diff --git a/materialious/src/lib/css/shaka-player-theme.css b/materialious/src/lib/css/shaka-player-theme.css index a2194644..bee376c4 100644 --- a/materialious/src/lib/css/shaka-player-theme.css +++ b/materialious/src/lib/css/shaka-player-theme.css @@ -140,10 +140,8 @@ .youtube-theme .shaka-overflow-menu, .youtube-theme .shaka-settings-menu { - border-radius: 2px; + border-radius: 0.25em; background: var(--surface-dim); - text-shadow: 0 0 2px rgb(0 0 0%); - -webkit-transition: opacity 0.1s cubic-bezier(0, 0, 0.2, 1); transition: opacity 0.1s cubic-bezier(0, 0, 0.2, 1); right: 10px; bottom: 50px; @@ -298,4 +296,12 @@ font-size: 25px; -webkit-transition: font-size 0.1s cubic-bezier(0, 0, 0.2, 1); transition: font-size 0.1s cubic-bezier(0, 0, 0.2, 1); +} + +@media screen and (max-width: 650px) { + .youtube-theme .shaka-overflow-menu, + .youtube-theme .shaka-settings-menu { + top: 10px; + position: absolute; + } } \ No newline at end of file diff --git a/update_versions.py b/update_versions.py index 474c39a9..57f5fcbe 100644 --- a/update_versions.py +++ b/update_versions.py @@ -3,7 +3,7 @@ import os import re from datetime import datetime -LATEST_VERSION = "1.7.18" +LATEST_VERSION = "1.7.19" 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") From 2e605084c6371afd2f9b2b12650fa7a90e056bbf Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 4 Apr 2025 15:47:46 +1300 Subject: [PATCH 2/5] Improve shaka player css --- materialious/electron/package-lock.json | 4 ++-- .../src/lib/css/shaka-player-theme.css | 20 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/materialious/electron/package-lock.json b/materialious/electron/package-lock.json index a13de3d1..371835f2 100644 --- a/materialious/electron/package-lock.json +++ b/materialious/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "Materialious", - "version": "1.7.18", + "version": "1.7.19", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "Materialious", - "version": "1.7.18", + "version": "1.7.19", "license": "MIT", "dependencies": { "@capacitor-community/electron": "^5.0.0", diff --git a/materialious/src/lib/css/shaka-player-theme.css b/materialious/src/lib/css/shaka-player-theme.css index bee376c4..e54e5113 100644 --- a/materialious/src/lib/css/shaka-player-theme.css +++ b/materialious/src/lib/css/shaka-player-theme.css @@ -154,12 +154,14 @@ } .youtube-theme .shaka-settings-menu button { - font-size: 12px; + font-size: 1em; + border: none; + margin: 0; } .youtube-theme .shaka-settings-menu button span { margin-left: 33px; - font-size: 13px; + font-size: 1em; } .youtube-theme .shaka-settings-menu button[aria-selected="true"] { @@ -179,7 +181,7 @@ -webkit-box-ordinal-group: 2; -ms-flex-order: 1; order: 1; - font-size: 18px; + font-size: 1em; padding-left: 5px; } @@ -217,7 +219,7 @@ -ms-flex-negative: initial; flex-shrink: initial; padding-left: 15px; - font-size: 13px; + font-size: 1em; font-weight: 500; display: -webkit-box; display: -ms-flexbox; @@ -230,7 +232,7 @@ .youtube-theme .shaka-overflow-menu span+span { color: var(--primary-text); font-weight: 400 !important; - font-size: 12px !important; + font-size: 1em !important; padding-right: 8px; padding-left: 0 !important; } @@ -247,13 +249,13 @@ .youtube-theme .shaka-back-to-overflow-button { padding: 8px 0; border-bottom: 1px solid rgba(255, 255, 255, 0.2); - font-size: 12px; + font-size: 1em; color: var(--primary-text); height: 40px; } .youtube-theme .shaka-back-to-overflow-button .material-icons-round { - font-size: 15px; + font-size: 1em; padding-right: 10px; } @@ -288,12 +290,12 @@ } .youtube-theme .shaka-overflow-menu-button { - font-size: 18px; + font-size: 1em; margin-right: 5px; } .youtube-theme .shaka-fullscreen-button:hover { - font-size: 25px; + font-size: 1em; -webkit-transition: font-size 0.1s cubic-bezier(0, 0, 0.2, 1); transition: font-size 0.1s cubic-bezier(0, 0, 0.2, 1); } From 638b321fabf5c048e09300d2ae10150410ed15c8 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Fri, 4 Apr 2025 16:05:31 +1300 Subject: [PATCH 3/5] Fixed comments and desc not letting u collapse them --- .../routes/(app)/watch/[slug]/+page.svelte | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/materialious/src/routes/(app)/watch/[slug]/+page.svelte b/materialious/src/routes/(app)/watch/[slug]/+page.svelte index cfcb6941..15de46ca 100644 --- a/materialious/src/routes/(app)/watch/[slug]/+page.svelte +++ b/materialious/src/routes/(app)/watch/[slug]/+page.svelte @@ -74,6 +74,15 @@ let playerCurrentTime: number = $state(0); + $effect(() => { + if ($interfaceAutoExpandComments && comments) { + const commentSectionElement = document.getElementById('comment-section'); + if (commentSectionElement) { + commentSectionElement.click(); + } + } + }); + playlistSettingsStore.subscribe((playlistSetting) => { if (!data.playlistId) return; if (data.playlistId in playlistSetting) { @@ -214,6 +223,13 @@ }); onMount(async () => { + if ($interfaceAutoExpandDesc) { + const descriptionElement = document.getElementById('description'); + if (descriptionElement) { + descriptionElement.click(); + } + } + if ($syncPartyConnectionsStore) { $syncPartyConnectionsStore.forEach((conn) => { playerSyncEvents(conn); @@ -562,8 +578,8 @@
-
- +
+