Minor fixes

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.

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",

materialious/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "materialious",
-	"version": "1.6.5",
+	"version": "1.6.6",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",

materialious/src/app.d.ts

@@ -10,4 +10,5 @@ declare global {
 	}
 }
 
-export {};
+export { };
+

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}
 >

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 {

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}
 				<Transcript bind:player video={data.video} />
 			{/if}
-			{#if !playlist}
-				{#if data.video.recommendedVideos}
-					{#each data.video.recommendedVideos as recommendedVideo}
-						<article class="no-padding">
-							{#key recommendedVideo.videoId}
-								<Thumbnail video={recommendedVideo} sideways={true} />
-							{/key}
-						</article>
-					{/each}
-				{/if}
-			{:else}
+			{#if playlist}
 				<article
 					style="height: 85vh; position: relative;"
 					id="playlist"
@@ -733,12 +723,14 @@
 						<p><a href={`/channel/${playlist.authorId}`}>{playlist.author}</a></p>
 						<nav>
 							<button
-								on:click={() => (
-									(loopPlaylist = !loopPlaylist),
+								on:click={() => {
+									if (!playlist) return;
+
+									loopPlaylist = !loopPlaylist;
 									playlistSettingsStore.set({
 										[playlist.playlistId]: { loop: loopPlaylist, shuffle: shufflePlaylist }
-									})
-								)}
+									});
+								}}
 								class="circle"
 								class:fill={!loopPlaylist}
 							>
@@ -748,12 +740,14 @@
 								</div>
 							</button>
 							<button
-								on:click={() => (
-									(shufflePlaylist = !shufflePlaylist),
+								on:click={() => {
+									if (!playlist) return;
+
+									shufflePlaylist = !shufflePlaylist;
 									playlistSettingsStore.set({
 										[playlist.playlistId]: { loop: loopPlaylist, shuffle: shufflePlaylist }
-									})
-								)}
+									});
+								}}
 								class="circle"
 								class:fill={!shufflePlaylist}
 							>
@@ -787,6 +781,14 @@
 						</article>
 					{/each}
 				</article>
+			{:else if data.video.recommendedVideos}
+				{#each data.video.recommendedVideos as recommendedVideo}
+					<article class="no-padding">
+						{#key recommendedVideo.videoId}
+							<Thumbnail video={recommendedVideo} sideways={true} />
+						{/key}
+					</article>
+				{/each}
 			{/if}
 		</div>
 	{/if}

materialious/tsconfig.json

@@ -15,8 +15,9 @@
 		]
 	},
 	"include": [
+		"src/**/*.d.ts",
 		"src/**/*.ts",
-		"src/**/*.d.ts"
+		"src/**/*.svelte"
 	],
 	"exclude": [
 		"node_modules",

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")