fix: Custom theme is reset to default theme after refresh

tonygeli · Oct 24, 2019 · f8d976b · f8d976b
1 parent 79eb368
commit f8d976b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/client/localStorage.ts b/client/localStorage.ts
@@ -44,7 +44,7 @@ export default function getData() {
         primaryColor: '',
         primaryTextColor: '',
         backgroundImage: '',
-        zero: false,
+        aero: false,
     };
     if (theme && config.theme[theme]) {
         themeConfig = config.theme[theme];
@@ -62,7 +62,7 @@ export default function getData() {
                 LocalStorageKey.BackgroundImage,
                 config.theme.default.backgroundImage,
             ),
-            zero: getSwitchValue(
+            aero: getSwitchValue(
                 LocalStorageKey.Aero,
                 false,
             ),

diff --git a/client/modules/Chat/Chat.less b/client/modules/Chat/Chat.less
@@ -11,7 +11,7 @@
     position: relative;
 
     &[data-aero=true] {
-        background-color: rgba(241, 241, 241, 0.1);
+        background-color: rgba(241, 241, 241, 0.15);
     }
 
     @media @mobile {

diff --git a/client/modules/Sidebar/Setting.tsx b/client/modules/Sidebar/Setting.tsx
@@ -18,6 +18,7 @@ import playSound from '../../../utils/playSound';
 import Style from './Setting.less';
 import Common from './Common.less';
 import { Tabs, TabPane, ScrollableInkTabBar, TabContent } from '../../components/Tabs';
+import { LocalStorageKey } from '../../localStorage';
 
 interface SettingProps {
     visible: boolean;
@@ -52,11 +53,16 @@ function Setting(props: SettingProps) {
             action.setStatus('backgroundImage', themeConfig.backgroundImage);
             action.setStatus('aero', themeConfig.aero);
             setCssVariable(themeConfig.primaryColor, themeConfig.primaryTextColor);
-            window.localStorage.removeItem('primaryColor');
-            window.localStorage.removeItem('primaryTextColor');
-            window.localStorage.removeItem('backgroundImage');
-            window.localStorage.removeItem('zero');
+            window.localStorage.removeItem(LocalStorageKey.PrimaryColor);
+            window.localStorage.removeItem(LocalStorageKey.PrimaryTextColor);
+            window.localStorage.removeItem(LocalStorageKey.BackgroundImage);
+            window.localStorage.removeItem(LocalStorageKey.Aero);
             Message.success('已修改主题');
+        } else {
+            window.localStorage.setItem(LocalStorageKey.PrimaryColor, primaryColor);
+            window.localStorage.setItem(LocalStorageKey.PrimaryTextColor, primaryTextColor);
+            window.localStorage.setItem(LocalStorageKey.BackgroundImage, backgroundImage);
+            window.localStorage.setItem(LocalStorageKey.Aero, aero.toString());
         }
     }
 

diff --git a/client/state/reducer.ts b/client/state/reducer.ts
@@ -242,7 +242,7 @@ const initialState: State = {
         primaryColor: localStorage.primaryColor,
         primaryTextColor: localStorage.primaryTextColor,
         backgroundImage: localStorage.backgroundImage,
-        aero: false,
+        aero: localStorage.aero,
         soundSwitch: localStorage.soundSwitch,
         sound: localStorage.sound,
         notificationSwitch: localStorage.notificationSwitch,