From a4f8988bbf91c4ba69a00b447e6938f0638fdf4f Mon Sep 17 00:00:00 2001 From: ward Date: Mon, 23 Jun 2025 17:23:54 +1200 Subject: [PATCH] Move isAndroidTv store setting to +layout.ts --- materialious/src/routes/(app)/+layout.svelte | 5 +---- materialious/src/routes/+layout.ts | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/materialious/src/routes/(app)/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte index fc293ddf..a907d4eb 100644 --- a/materialious/src/routes/(app)/+layout.svelte +++ b/materialious/src/routes/(app)/+layout.svelte @@ -32,10 +32,9 @@ import ui from 'beercss'; import 'material-dynamic-colors'; import { onMount } from 'svelte'; - import { _, initI18n } from '$lib/i18n'; + import { _ } from '$lib/i18n'; import { get } from 'svelte/store'; import { pwaInfo } from 'virtual:pwa-info'; - import androidTv from '$lib/android/plugins/androidTv'; import Mousetrap from 'mousetrap'; let { children } = $props(); @@ -186,8 +185,6 @@ } } - $isAndroidTvStore = (await androidTv.isAndroidTv()).value; - if ($isAndroidTvStore) { const topContent = document.getElementById('top-content') as HTMLElement; Mousetrap.bind('down', () => { diff --git a/materialious/src/routes/+layout.ts b/materialious/src/routes/+layout.ts index 1f6b127a..9cc9c450 100644 --- a/materialious/src/routes/+layout.ts +++ b/materialious/src/routes/+layout.ts @@ -1,10 +1,11 @@ import { browser } from '$app/environment'; import { goto } from '$app/navigation'; +import androidTv from '$lib/android/plugins/androidTv'; import { getResolveUrl } from '$lib/api'; import '$lib/i18n'; // Import to initialize. Important :) import { initI18n } from '$lib/i18n'; import { getPages } from '$lib/navPages.js'; -import { authStore, interfaceDefaultPage } from '$lib/store.js'; +import { authStore, interfaceDefaultPage, isAndroidTvStore } from '$lib/store.js'; import { get } from 'svelte/store'; export const ssr = false; @@ -14,6 +15,8 @@ export async function load({ url }) { await initI18n(); } + isAndroidTvStore.set((await androidTv.isAndroidTv()).value); + if (url.pathname.startsWith('/@')) { const username = url.pathname.split('/')[1];