From 8a6c4bd08c48f100a9ed41f0d5ee196f877514eb Mon Sep 17 00:00:00 2001 From: WardPearce Date: Wed, 9 Oct 2024 11:53:44 +1300 Subject: [PATCH] Minor fixes --- materialious/android/app/build.gradle | 4 +- materialious/electron/package.json | 2 +- materialious/package.json | 2 +- materialious/src/app.d.ts | 3 +- materialious/src/lib/Player.svelte | 1 - materialious/src/lib/Thumbnail.svelte | 7 +-- .../routes/(app)/watch/[slug]/+page.svelte | 48 ++++++++++--------- materialious/tsconfig.json | 3 +- update_versions.py | 2 +- 9 files changed, 35 insertions(+), 37 deletions(-) diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index 01a45972..d0cca656 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 56 - versionName "1.6.5" + versionCode 57 + versionName "1.6.6" 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 1a4c89b2..a699198c 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.6.5", + "version": "1.6.6", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index b398620c..287f91f4 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.6.5", + "version": "1.6.6", "private": true, "scripts": { "dev": "vite dev", diff --git a/materialious/src/app.d.ts b/materialious/src/app.d.ts index 743f07b2..bffe90f7 100644 --- a/materialious/src/app.d.ts +++ b/materialious/src/app.d.ts @@ -10,4 +10,5 @@ declare global { } } -export {}; +export { }; + diff --git a/materialious/src/lib/Player.svelte b/materialious/src/lib/Player.svelte index b22a88fc..b098f1d8 100644 --- a/materialious/src/lib/Player.svelte +++ b/materialious/src/lib/Player.svelte @@ -519,7 +519,6 @@ title={data.video.title} streamType={playerIsLive ? 'live' : 'on-demand'} viewType={audioMode ? 'audio' : 'video'} - fullscreen={false} keep-alive {src} > diff --git a/materialious/src/lib/Thumbnail.svelte b/materialious/src/lib/Thumbnail.svelte index e81c4a57..75075432 100644 --- a/materialious/src/lib/Thumbnail.svelte +++ b/materialious/src/lib/Thumbnail.svelte @@ -231,12 +231,7 @@ showVideoPreview = true; try { videoPreview = await getVideo(video.videoId); - if (videoPreview.formatStreams.length === 0) { - showVideoPreview = false; - videoPreview = null; - } - - if (videoPreview.hlsUrl) { + if (videoPreview.hlsUrl || videoPreview.formatStreams.length === 0) { showVideoPreview = false; videoPreview = null; } else { diff --git a/materialious/src/routes/(app)/watch/[slug]/+page.svelte b/materialious/src/routes/(app)/watch/[slug]/+page.svelte index 8b48d1e7..3afc1847 100644 --- a/materialious/src/routes/(app)/watch/[slug]/+page.svelte +++ b/materialious/src/routes/(app)/watch/[slug]/+page.svelte @@ -423,22 +423,22 @@ downloadStage = $_('player.downloadSteps.ffmpeg'); } - function onClassWorkerProgress(progress) { + function onClassWorkerProgress(progress: number) { downloadStage = $_('player.downloadSteps.classWorker'); downloadProgress = progress; } - function onCoreProgress(progress) { + function onCoreProgress(progress: number) { downloadStage = $_('player.downloadSteps.core'); downloadProgress = progress; } - function onWasmProgress(progress) { + function onWasmProgress(progress: number) { downloadStage = $_('player.downloadSteps.wasm'); downloadProgress = progress; } - function onWorkerProgress(progress) { + function onWorkerProgress(progress: number) { downloadStage = $_('player.downloadSteps.worker'); downloadProgress = progress; } @@ -707,17 +707,7 @@ {#if player && showTranscript} {/if} - {#if !playlist} - {#if data.video.recommendedVideos} - {#each data.video.recommendedVideos as recommendedVideo} -
- {#key recommendedVideo.videoId} - - {/key} -
- {/each} - {/if} - {:else} + {#if playlist}
{playlist.author}

{/each} + {:else if data.video.recommendedVideos} + {#each data.video.recommendedVideos as recommendedVideo} +
+ {#key recommendedVideo.videoId} + + {/key} +
+ {/each} {/if} {/if} diff --git a/materialious/tsconfig.json b/materialious/tsconfig.json index be94989f..d9a18b12 100644 --- a/materialious/tsconfig.json +++ b/materialious/tsconfig.json @@ -15,8 +15,9 @@ ] }, "include": [ + "src/**/*.d.ts", "src/**/*.ts", - "src/**/*.d.ts" + "src/**/*.svelte" ], "exclude": [ "node_modules", diff --git a/update_versions.py b/update_versions.py index f9e69fbe..242f72f8 100644 --- a/update_versions.py +++ b/update_versions.py @@ -5,7 +5,7 @@ import json import os import re -LATEST_VERSION = "1.6.5" +LATEST_VERSION = "1.6.6" WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious") ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")