From 9b147d0a9a4044253c4f12cf8149041121a4f53a Mon Sep 17 00:00:00 2001 From: Ward Date: Sun, 8 Jun 2025 19:43:53 +1200 Subject: [PATCH] Lazy loading & shows active timestamp (#964) --- materialious/android/app/build.gradle | 4 +- .../electron/materialious.metainfo.xml | 6 ++- materialious/electron/package-lock.json | 4 +- materialious/electron/package.json | 4 +- materialious/package.json | 4 +- .../lib/components/ChannelThumbnail.svelte | 1 + .../src/lib/components/Comment.svelte | 2 +- .../lib/components/PlaylistThumbnail.svelte | 1 + materialious/src/lib/components/Search.svelte | 6 ++- .../src/lib/components/ShareVideo.svelte | 20 +++++---- .../src/lib/components/Thumbnail.svelte | 2 +- .../src/lib/components/Transcript.svelte | 1 + .../src/lib/components/VideoList.svelte | 1 + materialious/src/lib/misc.ts | 1 + materialious/src/lib/timestamps.ts | 17 ++++++-- materialious/src/routes/(app)/+layout.svelte | 7 +++- .../routes/(app)/channel/[slug]/+page.svelte | 32 ++++++++------ .../routes/(app)/playlist/[slug]/+page.svelte | 42 ++++++++++--------- .../routes/(app)/search/[slug]/+page.svelte | 1 + .../(app)/subscriptions/manage/+page.svelte | 2 +- .../routes/(app)/watch/[slug]/+page.svelte | 16 +++++-- update_versions.py | 2 +- 22 files changed, 112 insertions(+), 64 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index 2984e702..d2b6382c 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 120 - versionName "1.9.3" + versionCode 121 + versionName "1.9.4" 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 5c6bfbc6..f5605588 100644 --- a/materialious/electron/materialious.metainfo.xml +++ b/materialious/electron/materialious.metainfo.xml @@ -55,7 +55,11 @@ intense - + + + https://github.com/Materialious/Materialious/releases/tag/1.9.4 + + https://github.com/Materialious/Materialious/releases/tag/1.9.3 diff --git a/materialious/electron/package-lock.json b/materialious/electron/package-lock.json index 61d4130e..df959c28 100644 --- a/materialious/electron/package-lock.json +++ b/materialious/electron/package-lock.json @@ -1,12 +1,12 @@ { "name": "Materialious", - "version": "1.9.2", + "version": "1.9.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "Materialious", - "version": "1.9.2", + "version": "1.9.3", "license": "MIT", "dependencies": { "@capacitor-community/electron": "^5.0.0", diff --git a/materialious/electron/package.json b/materialious/electron/package.json index c990a154..f395a13c 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.9.3", + "version": "1.9.4", "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 a8aee0d0..1fcc8c6e 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.9.3", + "version": "1.9.4", "private": true, "scripts": { "dev": "vite dev", @@ -70,4 +70,4 @@ "svelte-persisted-store": "^0.12.0", "youtubei.js": "^13.4.0" } -} +} \ No newline at end of file diff --git a/materialious/src/lib/components/ChannelThumbnail.svelte b/materialious/src/lib/components/ChannelThumbnail.svelte index a973413b..1749f00b 100644 --- a/materialious/src/lib/components/ChannelThumbnail.svelte +++ b/materialious/src/lib/components/ChannelThumbnail.svelte @@ -36,6 +36,7 @@ {:else} {#if userPfp} - comment profile + comment profile {:else} {/if} diff --git a/materialious/src/lib/components/PlaylistThumbnail.svelte b/materialious/src/lib/components/PlaylistThumbnail.svelte index 575c64b9..bb2c8778 100644 --- a/materialious/src/lib/components/PlaylistThumbnail.svelte +++ b/materialious/src/lib/components/PlaylistThumbnail.svelte @@ -58,6 +58,7 @@ {:else if img && img.src !== ''}
- dispatch('searchCancelled')}>arrow_back + dispatch('searchCancelled')} + >arrow_back - close + close
{#if searchSuggestions} {#each suggestionsForSearch as suggestion, index} diff --git a/materialious/src/lib/components/ShareVideo.svelte b/materialious/src/lib/components/ShareVideo.svelte index 94a66e78..c14c9716 100644 --- a/materialious/src/lib/components/ShareVideo.svelte +++ b/materialious/src/lib/components/ShareVideo.svelte @@ -13,8 +13,9 @@ let { video }: Props = $props(); - - +
{$_('player.share.youtubeLink')}
+ diff --git a/materialious/src/lib/components/Thumbnail.svelte b/materialious/src/lib/components/Thumbnail.svelte index 99b5f6be..32d88768 100644 --- a/materialious/src/lib/components/Thumbnail.svelte +++ b/materialious/src/lib/components/Thumbnail.svelte @@ -163,7 +163,7 @@ {#if !thumbnail}
{:else} - Thumbnail for video + Thumbnail for video {/if} {/if} {#if progress} diff --git a/materialious/src/lib/components/Transcript.svelte b/materialious/src/lib/components/Transcript.svelte index bcffad51..44d5501b 100644 --- a/materialious/src/lib/components/Transcript.svelte +++ b/materialious/src/lib/components/Transcript.svelte @@ -135,6 +135,7 @@ {#each personalPlaylists as personalPlaylist} - + {/each} @@ -610,18 +612,24 @@
    {#each data.content.timestamps as timestamp}
  • { if (playerElement) playerElement.currentTime = timestamp.time; }} > Thumbnail for current video
    -

    {timestamp.title}

    - {timestamp.timePretty} +

    {timestamp.title}

    + = timestamp.time && + (playerCurrentTime <= timestamp.endTime || timestamp.endTime === -1)} + class="chip no-margin">{timestamp.timePretty}
    • {/each} diff --git a/update_versions.py b/update_versions.py index 2d8175b8..8f69fc3c 100644 --- a/update_versions.py +++ b/update_versions.py @@ -3,7 +3,7 @@ import os import re from datetime import datetime -LATEST_VERSION = "1.9.3" +LATEST_VERSION = "1.9.4" RELEASE_DATE = datetime.now().strftime("%Y-%-m-%d") # Format: YYYY-M-D WORKING_DIR = os.path.join(