Browse Source

Fixed auto dark mode

keplyx 4 years ago
parent
commit
f06d5c36e4
1 changed files with 6 additions and 4 deletions
  1. 6
    4
      utils/ThemeManager.js

+ 6
- 4
utils/ThemeManager.js View File

@@ -3,7 +3,7 @@
3 3
 import AsyncStorageManager from "./AsyncStorageManager";
4 4
 import {DarkTheme, DefaultTheme} from 'react-native-paper';
5 5
 import AprilFoolsManager from "./AprilFoolsManager";
6
-import { Appearance } from 'react-native-appearance';
6
+import {Appearance} from 'react-native-appearance';
7 7
 
8 8
 const colorScheme = Appearance.getColorScheme();
9 9
 
@@ -112,8 +112,10 @@ export default class ThemeManager {
112 112
      * @returns {boolean} Night mode state
113 113
      */
114 114
     static getNightMode(): boolean {
115
-        return AsyncStorageManager.getInstance().preferences.nightMode.current === '1' ||
116
-            AsyncStorageManager.getInstance().preferences.nightModeFollowSystem.current === '1' && colorScheme === 'dark';
115
+        return (AsyncStorageManager.getInstance().preferences.nightMode.current === '1' &&
116
+            (AsyncStorageManager.getInstance().preferences.nightModeFollowSystem.current !== '1' ||
117
+                colorScheme === 'no-preference')) ||
118
+            (AsyncStorageManager.getInstance().preferences.nightModeFollowSystem.current === '1' && colorScheme === 'dark');
117 119
     }
118 120
 
119 121
     /**
@@ -123,7 +125,7 @@ export default class ThemeManager {
123 125
     static getCurrentTheme(): Object {
124 126
         if (AprilFoolsManager.getInstance().isAprilFoolsEnabled())
125 127
             return AprilFoolsManager.getAprilFoolsTheme(ThemeManager.getWhiteTheme());
126
-         else
128
+        else
127 129
             return ThemeManager.getBaseTheme()
128 130
     }
129 131
 

Loading…
Cancel
Save