Fix snackbar color for button
This commit is contained in:
parent
adc2d05b2c
commit
b776d88327
33
App.tsx
33
App.tsx
|
@ -37,10 +37,10 @@ export const CombinedDarkTheme = {
|
||||||
}
|
}
|
||||||
|
|
||||||
const App = () => {
|
const App = () => {
|
||||||
const isDark = useColorScheme() === 'dark'
|
const phoneTheme = useColorScheme()
|
||||||
const [initialized, setInitialized] = useState(false)
|
const [initialized, setInitialized] = useState(false)
|
||||||
const [snackbar, setSnackbar] = useState('')
|
const [snackbar, setSnackbar] = useState('')
|
||||||
const [theme, setTheme] = useState('system')
|
const [appTheme, setAppTheme] = useState('system')
|
||||||
|
|
||||||
const [lightColor, setLightColor] = useState<string>(
|
const [lightColor, setLightColor] = useState<string>(
|
||||||
CombinedDefaultTheme.colors.primary,
|
CombinedDefaultTheme.colors.primary,
|
||||||
|
@ -54,7 +54,7 @@ const App = () => {
|
||||||
;(async () => {
|
;(async () => {
|
||||||
if (!AppDataSource.isInitialized) await AppDataSource.initialize()
|
if (!AppDataSource.isInitialized) await AppDataSource.initialize()
|
||||||
const settings = await settingsRepo.findOne({ where: {} })
|
const settings = await settingsRepo.findOne({ where: {} })
|
||||||
setTheme(settings.theme)
|
setAppTheme(settings.theme)
|
||||||
if (settings.lightColor) setLightColor(settings.lightColor)
|
if (settings.lightColor) setLightColor(settings.lightColor)
|
||||||
if (settings.darkColor) setDarkColor(settings.darkColor)
|
if (settings.darkColor) setDarkColor(settings.darkColor)
|
||||||
setInitialized(true)
|
setInitialized(true)
|
||||||
|
@ -81,20 +81,11 @@ const App = () => {
|
||||||
colors: { ...CombinedDefaultTheme.colors, primary: lightColor },
|
colors: { ...CombinedDefaultTheme.colors, primary: lightColor },
|
||||||
}
|
}
|
||||||
: CombinedDefaultTheme
|
: CombinedDefaultTheme
|
||||||
let value = isDark ? darkTheme : lightTheme
|
let value = phoneTheme === 'dark' ? darkTheme : lightTheme
|
||||||
if (theme === 'dark') value = darkTheme
|
if (appTheme === 'dark') value = darkTheme
|
||||||
else if (theme === 'light') value = lightTheme
|
else if (appTheme === 'light') value = lightTheme
|
||||||
return value
|
return value
|
||||||
}, [isDark, theme, lightColor, darkColor])
|
}, [phoneTheme, appTheme, lightColor, darkColor])
|
||||||
|
|
||||||
const action = useMemo(
|
|
||||||
() => ({
|
|
||||||
label: 'Close',
|
|
||||||
onPress: () => setSnackbar(''),
|
|
||||||
color: paperTheme.colors.background,
|
|
||||||
}),
|
|
||||||
[paperTheme.colors.background],
|
|
||||||
)
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<PaperProvider
|
<PaperProvider
|
||||||
|
@ -105,8 +96,8 @@ const App = () => {
|
||||||
{initialized && (
|
{initialized && (
|
||||||
<ThemeContext.Provider
|
<ThemeContext.Provider
|
||||||
value={{
|
value={{
|
||||||
theme,
|
theme: appTheme,
|
||||||
setTheme,
|
setTheme: setAppTheme,
|
||||||
lightColor,
|
lightColor,
|
||||||
setLightColor,
|
setLightColor,
|
||||||
darkColor,
|
darkColor,
|
||||||
|
@ -122,7 +113,11 @@ const App = () => {
|
||||||
duration={3000}
|
duration={3000}
|
||||||
onDismiss={() => setSnackbar('')}
|
onDismiss={() => setSnackbar('')}
|
||||||
visible={!!snackbar}
|
visible={!!snackbar}
|
||||||
action={action}
|
action={{
|
||||||
|
label: 'Close',
|
||||||
|
onPress: () => setSnackbar(''),
|
||||||
|
textColor: paperTheme.colors.background,
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{snackbar}
|
{snackbar}
|
||||||
</Snackbar>
|
</Snackbar>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user