diff --git a/materialious/android/.idea/deploymentTargetSelector.xml b/materialious/android/.idea/deploymentTargetSelector.xml index b268ef36..e0ffe5ff 100644 --- a/materialious/android/.idea/deploymentTargetSelector.xml +++ b/materialious/android/.idea/deploymentTargetSelector.xml @@ -4,6 +4,14 @@ diff --git a/materialious/src/lib/components/settings/Interface.svelte b/materialious/src/lib/components/settings/Interface.svelte index 10939f72..78a67e04 100644 --- a/materialious/src/lib/components/settings/Interface.svelte +++ b/materialious/src/lib/components/settings/Interface.svelte @@ -233,6 +233,7 @@ onInput={setColor} position="responsive" isAlpha={false} + hex={get(themeColorStore)} sliderDirection="horizontal" /> diff --git a/materialious/src/routes/(app)/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte index 4b1c909f..37c585df 100644 --- a/materialious/src/routes/(app)/+layout.svelte +++ b/materialious/src/routes/(app)/+layout.svelte @@ -192,7 +192,7 @@
{$_('layout.settings')}
{#if showLogin} - {#if (!$invidiousAuthStore && !isOwnBackend()?.internalAuth) || !$rawMasterKeyStore} + {#if (!$invidiousAuthStore && !isOwnBackend()?.internalAuth) || (!$rawMasterKeyStore && isOwnBackend()?.internalAuth)} login
{$_('layout.login')}
diff --git a/materialious/src/routes/(app)/+page.ts b/materialious/src/routes/(app)/+page.ts index 8ae46ee6..e890fc48 100644 --- a/materialious/src/routes/(app)/+page.ts +++ b/materialious/src/routes/(app)/+page.ts @@ -1,15 +1,13 @@ -import { goto } from '$app/navigation'; import { resolve } from '$app/paths'; import { getPopular, HTTPError } from '$lib/api/index'; import { isYTBackend } from '$lib/misc'; -import { feedCacheStore, invidiousInstanceStore } from '$lib/store'; -import { error } from '@sveltejs/kit'; +import { feedCacheStore, invidiousInstanceStore, isAndroidTvStore } from '$lib/store'; +import { error, redirect } from '@sveltejs/kit'; import { get } from 'svelte/store'; export async function load() { if (isYTBackend()) { - goto(resolve('/subscriptions', {}), { replaceState: true }); - return; + throw redirect(307, resolve('/subscriptions', {})); } if (!get(invidiousInstanceStore)) { @@ -44,6 +42,10 @@ export async function load() { ); } + if (popularDisabled && get(isAndroidTvStore)) { + throw redirect(307, resolve('/search', {})); + } + return { popularDisabled: popularDisabled };