From 13e279aa9a2b1fe47376b72baad4ddac086f1796 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Thu, 5 Jun 2025 15:23:51 +1200
Subject: [PATCH] Improved how fallback options are selected

---
 .../src/lib/components/Settings/Player.svelte | 72 +++++++++----------
 .../lib/components/Settings/Settings.svelte   |  2 -
 materialious/src/lib/i18n/locales/en.json     |  4 +-
 3 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/materialious/src/lib/components/Settings/Player.svelte b/materialious/src/lib/components/Settings/Player.svelte
index babd7cea..d8e381ce 100644
--- a/materialious/src/lib/components/Settings/Player.svelte
+++ b/materialious/src/lib/components/Settings/Player.svelte
@@ -20,6 +20,13 @@
 
 	let defaultLanguage = $state(get(playerDefaultLanguage));
 
+	let localVideoFallback: 'enabled' | 'disabled' | 'always' = $state('enabled');
+	if (!$playerYouTubeJsFallback) {
+		localVideoFallback = 'disabled';
+	} else if ($playerYouTubeJsAlways) {
+		localVideoFallback = 'always';
+	}
+
 	const languageNames = ISO6391.getAllCodes().map((code) =>
 		ISO6391.getName(code).toLocaleLowerCase()
 	);
@@ -28,6 +35,21 @@
 		const value = (event.target as HTMLSelectElement).value;
 		playerDefaultQualityStore.set(value);
 	}
+
+	function onLocalVideoFallbackChange() {
+		switch (localVideoFallback) {
+			case 'enabled':
+				playerYouTubeJsFallback.set(true);
+				break;
+			case 'disabled':
+				playerYouTubeJsFallback.set(false);
+				break;
+			case 'always':
+				playerYouTubeJsAlways.set(true);
+				playerYouTubeJsFallback.set(true);
+				break;
+		}
+	}
 </script>
 
 <div class="margin"></div>
@@ -55,8 +77,8 @@
 		onchange={onQualityChange}
 	>
 		<option value="auto">Auto (Recommended)</option>
-		<option value="144">144p (Low)</option>
-		<option value="240">240p</option>
+		<option value="144">144p (Ultra low)</option>
+		<option value="240">240p (Low)</option>
 		<option value="360">360p (SD)</option>
 		<option value="480">480p (SD+)</option>
 		<option value="720">720p (HD)</option>
@@ -68,6 +90,18 @@
 	<i>arrow_drop_down</i>
 </div>
 
+{#if Capacitor.isNativePlatform()}
+	<div class="field suffix border label">
+		<select name="ytfallback" bind:value={localVideoFallback} onchange={onLocalVideoFallbackChange}>
+			<option value="enabled">{$_('enabled')}</option>
+			<option value="always">{$_('layout.player.youtubeJsAlways')}</option>
+			<option value="disabled">{$_('disabled')}</option>
+		</select>
+		<label for="ytfallback">{$_('layout.player.localVideoFallback')}</label>
+		<i>arrow_drop_down</i>
+	</div>
+{/if}
+
 <div class="field no-margin">
 	<nav class="no-padding">
 		<div class="max">
@@ -183,37 +217,3 @@
 		</label>
 	</nav>
 </div>
-
-{#if Capacitor.isNativePlatform()}
-	<div class="field no-margin">
-		<nav class="no-padding">
-			<div class="max">
-				<div>{$_('layout.player.youtubeJsAlways')}</div>
-			</div>
-			<label class="switch">
-				<input
-					type="checkbox"
-					bind:checked={$playerYouTubeJsAlways}
-					onclick={() => playerYouTubeJsAlways.set(!$playerYouTubeJsAlways)}
-				/>
-				<span></span>
-			</label>
-		</nav>
-	</div>
-
-	<div class="field no-margin">
-		<nav class="no-padding">
-			<div class="max">
-				<div>{$_('layout.player.youtubeJsFallback')}</div>
-			</div>
-			<label class="switch">
-				<input
-					type="checkbox"
-					bind:checked={$playerYouTubeJsFallback}
-					onclick={() => playerYouTubeJsFallback.set(!$playerYouTubeJsFallback)}
-				/>
-				<span></span>
-			</label>
-		</nav>
-	</div>
-{/if}
diff --git a/materialious/src/lib/components/Settings/Settings.svelte b/materialious/src/lib/components/Settings/Settings.svelte
index 740a8b86..6110ec92 100644
--- a/materialious/src/lib/components/Settings/Settings.svelte
+++ b/materialious/src/lib/components/Settings/Settings.svelte
@@ -1,8 +1,6 @@
 <script lang="ts">
-	import ISO6391 from 'iso-639-1';
 	import { onMount } from 'svelte';
 	import { _ } from '$lib/i18n';
-	import { get } from 'svelte/store';
 	import ApiExtended from './ApiExtended.svelte';
 	import DataPreferences from './DataPreferences.svelte';
 	import DeArrow from './DeArrow.svelte';
diff --git a/materialious/src/lib/i18n/locales/en.json b/materialious/src/lib/i18n/locales/en.json
index 056c8f30..b54b17d0 100644
--- a/materialious/src/lib/i18n/locales/en.json
+++ b/materialious/src/lib/i18n/locales/en.json
@@ -1,5 +1,6 @@
 {
 	"enabled": "Enabled",
+	"disabled": "Disabled",
 	"copyUrl": "Copy URL",
 	"loadMore": "Load more",
 	"views": "views",
@@ -144,8 +145,9 @@
 			"backgroundPlay": "Play audio in background",
 			"dash": "Dash",
 			"silenceSkipper": "Silence skipper (Experimental)",
+			"localVideoFallback": "Local video fallback",
 			"youtubeJsFallback": "Local video processing fallback",
-			"youtubeJsAlways": "Always use local video processing",
+			"youtubeJsAlways": "Always use",
 			"lockOrientation": "Orientation locked to aspect ratio"
 		},
 		"bookmarklet": "Bookmarklet",