From a2864c540f219d8f8f67d08ae69b682d7c47d7d9 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Thu, 24 Oct 2024 11:50:15 +1300 Subject: [PATCH 01/21] Bump versions --- materialious/android/app/build.gradle | 4 ++-- materialious/electron/package.json | 2 +- materialious/package.json | 2 +- update_versions.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index a5620235..510caa83 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 66 - versionName "1.6.15" + versionCode 67 + versionName "1.6.16" 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/package.json b/materialious/electron/package.json index 931096f5..38d83345 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.6.15", + "version": "1.6.16", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 271419df..a5e617b4 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.6.15", + "version": "1.6.16", "private": true, "scripts": { "dev": "vite dev", diff --git a/update_versions.py b/update_versions.py index 55ae8953..751fc3b7 100644 --- a/update_versions.py +++ b/update_versions.py @@ -5,7 +5,7 @@ import json import os import re -LATEST_VERSION = "1.6.15" +LATEST_VERSION = "1.6.16" WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious") ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json") From d1e8b19cfa43b06105443b07fbf88000388eeb88 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Thu, 24 Oct 2024 11:52:34 +1300 Subject: [PATCH 02/21] Only use mini player if no fallback --- .../src/routes/(app)/watch/[slug]/+page.svelte | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/materialious/src/routes/(app)/watch/[slug]/+page.svelte b/materialious/src/routes/(app)/watch/[slug]/+page.svelte index 60de01bc..b001128f 100644 --- a/materialious/src/routes/(app)/watch/[slug]/+page.svelte +++ b/materialious/src/routes/(app)/watch/[slug]/+page.svelte @@ -45,7 +45,7 @@ import ui from 'beercss'; import type { DataConnection } from 'peerjs'; import { type Segment } from 'sponsorblock-api'; - import { onDestroy, onMount } from 'svelte'; + import { onDestroy, onMount, tick } from 'svelte'; import { _ } from 'svelte-i18n'; import { get } from 'svelte/store'; import type { MediaTimeUpdateEvent } from 'vidstack'; @@ -252,7 +252,7 @@ } if (player) { - player.addEventListener('end', () => { + player.addEventListener('end', async () => { if (playlistVideos.length === 0) { if ($playerAutoplayNextByDefaultStore) { goto(`/watch/${data.video.recommendedVideos[0].videoId}`); @@ -260,7 +260,7 @@ return; } - goToCurrentPlaylistItem(); + await goToCurrentPlaylistItem(); const playlistVideoIds = playlistVideos.map((value) => { return value.videoId; @@ -321,7 +321,8 @@ !$syncPartyPeerStore && !data.video.hlsUrl && data.video.formatStreams && - data.video.formatStreams.length > 0 + data.video.formatStreams.length > 0 && + data.video.fallbackPatch === undefined ) { miniPlayerSrcStore.set({ video: data.video, @@ -352,7 +353,8 @@ } } - function goToCurrentPlaylistItem() { + async function goToCurrentPlaylistItem() { + await tick(); const playlistCurrentVideo = document.getElementById(data.video.videoId); const playlistScrollable = document.getElementById('playlist'); From 0c9147a072a5928cf25bd95c7518b7f4d2839aa4 Mon Sep 17 00:00:00 2001 From: WardPearce Date: Thu, 24 Oct 2024 11:58:13 +1300 Subject: [PATCH 03/21] Fix playlists columns --- materialious/src/routes/(app)/playlists/+page.svelte | 9 +++++---- materialious/src/routes/(app)/watch/[slug]/+page.svelte | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/materialious/src/routes/(app)/playlists/+page.svelte b/materialious/src/routes/(app)/playlists/+page.svelte index d3e9b811..40a89e24 100644 --- a/materialious/src/routes/(app)/playlists/+page.svelte +++ b/materialious/src/routes/(app)/playlists/+page.svelte @@ -1,5 +1,6 @@ diff --git a/materialious/src/lib/Thumbnail.svelte b/materialious/src/lib/Thumbnail.svelte index 4c408144..cbca3b55 100644 --- a/materialious/src/lib/Thumbnail.svelte +++ b/materialious/src/lib/Thumbnail.svelte @@ -2,8 +2,8 @@ import { createEventDispatcher, onDestroy, onMount } from 'svelte'; import { _ } from 'svelte-i18n'; import { get } from 'svelte/store'; - import { getChannel, getDeArrow, getThumbnail, getVideo, getVideoProgress } from './Api'; - import type { Notification, PlaylistPageVideo, Video, VideoBase, VideoPlay } from './Api/model'; + import { getChannel, getDeArrow, getThumbnail, getVideo, getVideoProgress } from './api'; + import type { Notification, PlaylistPageVideo, Video, VideoBase, VideoPlay } from './api/model'; import { cleanNumber, getBestThumbnail, diff --git a/materialious/src/lib/Transcript.svelte b/materialious/src/lib/Transcript.svelte index 254777eb..ae65a088 100644 --- a/materialious/src/lib/Transcript.svelte +++ b/materialious/src/lib/Transcript.svelte @@ -5,7 +5,7 @@ import { get } from 'svelte/store'; import type { MediaTimeUpdateEvent } from 'vidstack'; import type { MediaPlayerElement } from 'vidstack/elements'; - import type { VideoPlay } from './Api/model'; + import type { VideoPlay } from './api/model'; import { decodeHtmlCharCodes, videoLength } from './misc'; import { instanceStore } from './store'; diff --git a/materialious/src/lib/VideoList.svelte b/materialious/src/lib/VideoList.svelte index 5a980293..75921f7e 100644 --- a/materialious/src/lib/VideoList.svelte +++ b/materialious/src/lib/VideoList.svelte @@ -1,11 +1,11 @@