From d1b2bc0c1767bbf610ac6a3af3fec8a5ba38538e Mon Sep 17 00:00:00 2001 From: ward Date: Thu, 19 Jun 2025 18:49:40 +1200 Subject: [PATCH 1/2] Fixe setting focus issues --- materialious/android/.idea/deploymentTargetSelector.xml | 8 ++++++++ materialious/android/app/build.gradle | 4 ++-- materialious/electron/materialious.metainfo.xml | 6 +++++- materialious/electron/package.json | 2 +- materialious/package.json | 2 +- materialious/src/routes/(app)/+layout.svelte | 8 ++++---- update_versions.py | 2 +- 7 files changed, 22 insertions(+), 10 deletions(-) diff --git a/materialious/android/.idea/deploymentTargetSelector.xml b/materialious/android/.idea/deploymentTargetSelector.xml index b268ef36..0cd9f26b 100644 --- a/materialious/android/.idea/deploymentTargetSelector.xml +++ b/materialious/android/.idea/deploymentTargetSelector.xml @@ -4,6 +4,14 @@ diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle index fb4fd521..951f2e9f 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 128 - versionName "1.9.11" + versionCode 129 + versionName "1.9.12" 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/materialious.metainfo.xml b/materialious/electron/materialious.metainfo.xml index b1ffabf5..d200a360 100644 --- a/materialious/electron/materialious.metainfo.xml +++ b/materialious/electron/materialious.metainfo.xml @@ -63,7 +63,11 @@ - + + + https://github.com/Materialious/Materialious/releases/tag/1.9.12 + + https://github.com/Materialious/Materialious/releases/tag/1.9.11 diff --git a/materialious/electron/package.json b/materialious/electron/package.json index 93c2b8ac..a7af7ed9 100644 --- a/materialious/electron/package.json +++ b/materialious/electron/package.json @@ -1,6 +1,6 @@ { "name": "Materialious", - "version": "1.9.11", + "version": "1.9.12", "description": "Modern material design for Invidious.", "author": { "name": "Ward Pearce", diff --git a/materialious/package.json b/materialious/package.json index 7ec0e97c..0a39b647 100644 --- a/materialious/package.json +++ b/materialious/package.json @@ -1,6 +1,6 @@ { "name": "materialious", - "version": "1.9.11", + "version": "1.9.12", "private": true, "scripts": { "dev": "vite dev", diff --git a/materialious/src/routes/(app)/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte index 062f7e4e..306553f4 100644 --- a/materialious/src/routes/(app)/+layout.svelte +++ b/materialious/src/routes/(app)/+layout.svelte @@ -174,10 +174,10 @@ isAndroidTv = (await androidTv.isAndroidTv()).value; if (isAndroidTv) { - const mainContent = document.getElementById('main-content') as HTMLElement; + const topContent = document.getElementById('top-content') as HTMLElement; Mousetrap.bind('down', () => { - if (!mainContent.contains(document.activeElement)) { - mainContent.focus(); + if (topContent.contains(document.activeElement)) { + document.getElementById('main-content')?.focus(); return false; } }); @@ -250,7 +250,7 @@ {/if} -