Refactor some code in App.tsx
This commit is contained in:
parent
4b5e7011d6
commit
be3af4db22
26
App.tsx
26
App.tsx
|
@ -37,7 +37,7 @@ export const CombinedDarkTheme = {
|
||||||
};
|
};
|
||||||
|
|
||||||
const App = () => {
|
const App = () => {
|
||||||
const phoneTheme = useColorScheme();
|
const systemTheme = useColorScheme();
|
||||||
|
|
||||||
const [appSettings, setAppSettings] = useState({
|
const [appSettings, setAppSettings] = useState({
|
||||||
startup: undefined,
|
startup: undefined,
|
||||||
|
@ -61,29 +61,27 @@ const App = () => {
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const paperTheme = useMemo(() => {
|
const paperTheme = useMemo(() => {
|
||||||
const darkTheme = appSettings.darkColor
|
const darkTheme = {
|
||||||
? {
|
|
||||||
...CombinedDarkTheme,
|
...CombinedDarkTheme,
|
||||||
colors: {
|
colors: {
|
||||||
...CombinedDarkTheme.colors,
|
...CombinedDarkTheme.colors,
|
||||||
primary: appSettings.darkColor,
|
primary: appSettings.darkColor,
|
||||||
},
|
},
|
||||||
}
|
dark: true,
|
||||||
: CombinedDarkTheme;
|
};
|
||||||
const lightTheme = appSettings.lightColor
|
const lightTheme = {
|
||||||
? {
|
|
||||||
...CombinedDefaultTheme,
|
...CombinedDefaultTheme,
|
||||||
colors: {
|
colors: {
|
||||||
...CombinedDefaultTheme.colors,
|
...CombinedDefaultTheme.colors,
|
||||||
primary: appSettings.lightColor,
|
primary: appSettings.lightColor,
|
||||||
},
|
},
|
||||||
}
|
dark: false,
|
||||||
: CombinedDefaultTheme;
|
};
|
||||||
let value = phoneTheme === "dark" ? darkTheme : lightTheme;
|
let theme = systemTheme === "dark" ? darkTheme : lightTheme;
|
||||||
if (appSettings.theme === "dark") value = darkTheme;
|
if (appSettings.theme === "dark") theme = darkTheme;
|
||||||
else if (appSettings.theme === "light") value = lightTheme;
|
else if (appSettings.theme === "light") theme = lightTheme;
|
||||||
return value;
|
return theme;
|
||||||
}, [phoneTheme, appSettings]);
|
}, [systemTheme, appSettings]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<PaperProvider
|
<PaperProvider
|
||||||
|
|
Loading…
Reference in New Issue
Block a user