From f026afffe0aea711bc421b24022877d51436fce7 Mon Sep 17 00:00:00 2001
From: farfromrefug <dev@akylas.fr>
Date: Wed, 13 Nov 2024 16:04:39 +0100
Subject: [PATCH] chore: improved eink theme

---
 App_Resources/Android/src/main/res/values/themes.xml |  5 +++--
 app/helpers/theme.ts                                 | 12 ++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/App_Resources/Android/src/main/res/values/themes.xml b/App_Resources/Android/src/main/res/values/themes.xml
index a803f35d..0dbe33c8 100644
--- a/App_Resources/Android/src/main/res/values/themes.xml
+++ b/App_Resources/Android/src/main/res/values/themes.xml
@@ -57,13 +57,14 @@
         <!-- <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialogEInk</item> -->
     </style>
     <style name="AppTheme.EInk" parent="AppTheme">
+        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.EinkBottomSheetDialog</item>
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:windowActionBarOverlay">false</item>
         <item name="android:windowTranslucentNavigation">false</item>
-        <item name="android:navigationBarColor">@android:color/white</item>
+        <item name="android:navigationBarColor">@color/md_theme_eink_background</item>
         <item name="android:windowLightNavigationBar">true</item>
         <item name="android:windowLightStatusBar">true</item>
-        <item name="android:statusBarColor">@android:color/white</item>
+        <item name="android:statusBarColor">@color/md_theme_eink_background</item>
         <item name="bottomSheetDialogTheme">@style/ThemeOverlay.App.BottomSheetDialogEInk</item>
 
         <item name="colorPrimary">@color/md_theme_eink_primary</item>
diff --git a/app/helpers/theme.ts b/app/helpers/theme.ts
index 7fd15e34..b343f816 100644
--- a/app/helpers/theme.ts
+++ b/app/helpers/theme.ts
@@ -278,15 +278,19 @@ export function start() {
         if (__ANDROID__) {
             if (colorTheme !== DEFAULT_COLOR_THEME) {
                 const context = Utils.android.getApplicationContext();
-                let nativeTheme = 'AppTheme';
+                let nativeTheme;
                 switch (colorTheme) {
                     case 'eink':
                         nativeTheme = 'AppTheme.EInk';
                         break;
                 }
-                const themeId = context.getResources().getIdentifier(nativeTheme, 'style', context.getPackageName());
-                DEV_LOG && console.log(SETTINGS_COLOR_THEME, nativeTheme, themeId);
-                ApplicationSettings.setNumber('SET_THEME_ON_LAUNCH', themeId);
+                if (nativeTheme) {
+                    const themeId = context.getResources().getIdentifier(nativeTheme, 'style', context.getPackageName());
+                    DEV_LOG && console.log(SETTINGS_COLOR_THEME, nativeTheme, themeId);
+                    ApplicationSettings.setNumber('SET_THEME_ON_LAUNCH', themeId);
+                } else {
+                    ApplicationSettings.remove('SET_THEME_ON_LAUNCH');
+                }
             } else {
                 ApplicationSettings.remove('SET_THEME_ON_LAUNCH');
             }