From de6fd0a925139932d7fd5379ee7851b9b2c7115d Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Fri, 24 Jan 2025 13:26:58 +1300
Subject: [PATCH] Fixes to StatusBar and NavigationBar logic

---
 materialious/android/app/build.gradle        | 4 ++--
 materialious/electron/package.json           | 2 +-
 materialious/package.json                    | 2 +-
 materialious/src/lib/Player.svelte           | 7 ++++++-
 materialious/src/lib/theme.ts                | 3 +++
 materialious/src/routes/(app)/+layout.svelte | 7 +++++--
 update_versions.py                           | 2 +-
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle
index c128c36c..55e505f3 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 80
-        versionName "1.6.29"
+        versionCode 81
+        versionName "1.6.30"
         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/package.json b/materialious/electron/package.json
index 99541ed0..8fee234d 100644
--- a/materialious/electron/package.json
+++ b/materialious/electron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "Materialious",
-	"version": "1.6.29",
+	"version": "1.6.30",
 	"description": "Modern material design for Invidious.",
 	"author": {
 		"name": "Ward Pearce",
diff --git a/materialious/package.json b/materialious/package.json
index c99fd238..303f0dbe 100644
--- a/materialious/package.json
+++ b/materialious/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "materialious",
-	"version": "1.6.29",
+	"version": "1.6.30",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",
diff --git a/materialious/src/lib/Player.svelte b/materialious/src/lib/Player.svelte
index 47409705..c94e16bb 100644
--- a/materialious/src/lib/Player.svelte
+++ b/materialious/src/lib/Player.svelte
@@ -4,7 +4,8 @@
 	import { page } from '$app/stores';
 	import { Capacitor } from '@capacitor/core';
 	import { ScreenOrientation, type ScreenOrientationResult } from '@capacitor/screen-orientation';
-	import { StatusBar } from '@capacitor/status-bar';
+	import { StatusBar, Style } from '@capacitor/status-bar';
+	import { NavigationBar } from '@hugotomazi/capacitor-navigation-bar';
 	import { AudioPlayer } from '@mediagrid/capacitor-native-audio';
 	import type { Page } from '@sveltejs/kit';
 	import { SponsorBlock, type Category, type Segment } from 'sponsorblock-api';
@@ -434,6 +435,10 @@
 						if (event.detail) {
 							// Ensure bar color is black while in fullscreen
 							await StatusBar.setBackgroundColor({ color: '#000000' });
+							await NavigationBar.setColor({
+								color: '#000000'
+							});
+							await StatusBar.setStyle({ style: Style.Dark });
 						} else {
 							await setStatusBarColor();
 						}
diff --git a/materialious/src/lib/theme.ts b/materialious/src/lib/theme.ts
index 4cf28eae..e9f4401f 100644
--- a/materialious/src/lib/theme.ts
+++ b/materialious/src/lib/theme.ts
@@ -2,6 +2,7 @@ import { Capacitor } from '@capacitor/core';
 import { StatusBar, Style } from '@capacitor/status-bar';
 import { NavigationBar } from '@hugotomazi/capacitor-navigation-bar';
 import ui from 'beercss';
+import { tick } from 'svelte';
 import { get } from 'svelte/store';
 import { darkModeStore, interfaceAmoledTheme } from './store';
 
@@ -20,6 +21,8 @@ export async function getDynamicTheme(mode?: string): Promise<Record<string, str
 
 export async function setStatusBarColor() {
 	if (Capacitor.getPlatform() === 'android') {
+		await tick();
+
 		const surfaceColor = get(interfaceAmoledTheme) ? '#000000' : (await getDynamicTheme())['--surface-container'];
 
 		await StatusBar.setBackgroundColor({
diff --git a/materialious/src/routes/(app)/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte
index d7dd7688..feb9ebfb 100644
--- a/materialious/src/routes/(app)/+layout.svelte
+++ b/materialious/src/routes/(app)/+layout.svelte
@@ -50,8 +50,10 @@
 
 	let notifications: Notification[] = [];
 
-	interfaceAmoledTheme.subscribe(() => {
+	interfaceAmoledTheme.subscribe(async () => {
 		setAmoledTheme();
+
+		await setStatusBarColor();
 	});
 
 	darkModeStore.subscribe(async () => {
@@ -176,11 +178,12 @@
 					const colorPalette = await colorTheme.getColorPalette();
 					themeHex = convertToHexColorCode(colorPalette.primary);
 					await ui('theme', themeHex);
-					await setStatusBarColor();
 				} catch {}
 			}
 		}
 
+		await setStatusBarColor();
+
 		setTheme();
 		setAmoledTheme();
 
diff --git a/update_versions.py b/update_versions.py
index 7da0ec99..83e6e2a9 100644
--- a/update_versions.py
+++ b/update_versions.py
@@ -5,7 +5,7 @@ import json
 import os
 import re
 
-LATEST_VERSION = "1.6.29"
+LATEST_VERSION = "1.6.30"
 WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")
 
 ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")