Add dark mode toggle
parent
53267d755b
commit
a90fd5d26f
|
@ -5,12 +5,13 @@ import {RootSiblingParent} from 'react-native-root-siblings'
|
||||||
import {GestureHandlerRootView} from 'react-native-gesture-handler'
|
import {GestureHandlerRootView} from 'react-native-gesture-handler'
|
||||||
import SplashScreen from 'react-native-splash-screen'
|
import SplashScreen from 'react-native-splash-screen'
|
||||||
import {SafeAreaProvider} from 'react-native-safe-area-context'
|
import {SafeAreaProvider} from 'react-native-safe-area-context'
|
||||||
|
import {observer} from 'mobx-react-lite'
|
||||||
import {ThemeProvider} from './view/lib/ThemeContext'
|
import {ThemeProvider} from './view/lib/ThemeContext'
|
||||||
import * as view from './view/index'
|
import * as view from './view/index'
|
||||||
import {RootStoreModel, setupState, RootStoreProvider} from './state'
|
import {RootStoreModel, setupState, RootStoreProvider} from './state'
|
||||||
import {MobileShell} from './view/shell/mobile'
|
import {MobileShell} from './view/shell/mobile'
|
||||||
|
|
||||||
function App() {
|
const App = observer(() => {
|
||||||
const [rootStore, setRootStore] = useState<RootStoreModel | undefined>(
|
const [rootStore, setRootStore] = useState<RootStoreModel | undefined>(
|
||||||
undefined,
|
undefined,
|
||||||
)
|
)
|
||||||
|
@ -41,7 +42,7 @@ function App() {
|
||||||
<GestureHandlerRootView style={{flex: 1}}>
|
<GestureHandlerRootView style={{flex: 1}}>
|
||||||
<RootSiblingParent>
|
<RootSiblingParent>
|
||||||
<RootStoreProvider value={rootStore}>
|
<RootStoreProvider value={rootStore}>
|
||||||
<ThemeProvider>
|
<ThemeProvider theme={rootStore.shell.darkMode ? 'dark' : 'light'}>
|
||||||
<SafeAreaProvider>
|
<SafeAreaProvider>
|
||||||
<MobileShell />
|
<MobileShell />
|
||||||
</SafeAreaProvider>
|
</SafeAreaProvider>
|
||||||
|
@ -50,6 +51,6 @@ function App() {
|
||||||
</RootSiblingParent>
|
</RootSiblingParent>
|
||||||
</GestureHandlerRootView>
|
</GestureHandlerRootView>
|
||||||
)
|
)
|
||||||
}
|
})
|
||||||
|
|
||||||
export default App
|
export default App
|
||||||
|
|
|
@ -67,6 +67,7 @@ export class RootStoreModel {
|
||||||
me: this.me.serialize(),
|
me: this.me.serialize(),
|
||||||
nav: this.nav.serialize(),
|
nav: this.nav.serialize(),
|
||||||
onboard: this.onboard.serialize(),
|
onboard: this.onboard.serialize(),
|
||||||
|
shell: this.shell.serialize(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -84,6 +85,9 @@ export class RootStoreModel {
|
||||||
if (hasProp(v, 'onboard')) {
|
if (hasProp(v, 'onboard')) {
|
||||||
this.onboard.hydrate(v.onboard)
|
this.onboard.hydrate(v.onboard)
|
||||||
}
|
}
|
||||||
|
if (hasProp(v, 'shell')) {
|
||||||
|
this.shell.hydrate(v.shell)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import {makeAutoObservable} from 'mobx'
|
import {makeAutoObservable} from 'mobx'
|
||||||
import {ProfileViewModel} from './profile-view'
|
import {ProfileViewModel} from './profile-view'
|
||||||
|
import {isObj, hasProp} from '../lib/type-guards'
|
||||||
|
|
||||||
export class ConfirmModal {
|
export class ConfirmModal {
|
||||||
name = 'confirm'
|
name = 'confirm'
|
||||||
|
@ -135,6 +136,7 @@ export interface ComposerOpts {
|
||||||
}
|
}
|
||||||
|
|
||||||
export class ShellUiModel {
|
export class ShellUiModel {
|
||||||
|
darkMode = false
|
||||||
minimalShellMode = false
|
minimalShellMode = false
|
||||||
isMainMenuOpen = false
|
isMainMenuOpen = false
|
||||||
isModalActive = false
|
isModalActive = false
|
||||||
|
@ -156,7 +158,25 @@ export class ShellUiModel {
|
||||||
composerOpts: ComposerOpts | undefined
|
composerOpts: ComposerOpts | undefined
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
makeAutoObservable(this)
|
makeAutoObservable(this, {serialize: false, hydrate: false})
|
||||||
|
}
|
||||||
|
|
||||||
|
serialize(): unknown {
|
||||||
|
return {
|
||||||
|
darkMode: this.darkMode,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
hydrate(v: unknown) {
|
||||||
|
if (isObj(v)) {
|
||||||
|
if (hasProp(v, 'darkMode') && typeof v.darkMode === 'boolean') {
|
||||||
|
this.darkMode = v.darkMode
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
setDarkMode(v: boolean) {
|
||||||
|
this.darkMode = v
|
||||||
}
|
}
|
||||||
|
|
||||||
setMinimalShellMode(v: boolean) {
|
setMinimalShellMode(v: boolean) {
|
||||||
|
|
|
@ -6,6 +6,7 @@ import {
|
||||||
View,
|
View,
|
||||||
ViewStyle,
|
ViewStyle,
|
||||||
} from 'react-native'
|
} from 'react-native'
|
||||||
|
import {observer} from 'mobx-react-lite'
|
||||||
import VersionNumber from 'react-native-version-number'
|
import VersionNumber from 'react-native-version-number'
|
||||||
import {s, colors} from '../../lib/styles'
|
import {s, colors} from '../../lib/styles'
|
||||||
import {useStores} from '../../../state'
|
import {useStores} from '../../../state'
|
||||||
|
@ -18,16 +19,12 @@ import {
|
||||||
} from '../../lib/icons'
|
} from '../../lib/icons'
|
||||||
import {UserAvatar} from '../../com/util/UserAvatar'
|
import {UserAvatar} from '../../com/util/UserAvatar'
|
||||||
import {Text} from '../../com/util/text/Text'
|
import {Text} from '../../com/util/text/Text'
|
||||||
|
import {ToggleButton} from '../../com/util/forms/ToggleButton'
|
||||||
import {CreateSceneModal} from '../../../state/models/shell-ui'
|
import {CreateSceneModal} from '../../../state/models/shell-ui'
|
||||||
import {usePalette} from '../../lib/hooks/usePalette'
|
import {usePalette} from '../../lib/hooks/usePalette'
|
||||||
|
|
||||||
export const Menu = ({
|
export const Menu = observer(
|
||||||
visible,
|
({visible, onClose}: {visible: boolean; onClose: () => void}) => {
|
||||||
onClose,
|
|
||||||
}: {
|
|
||||||
visible: boolean
|
|
||||||
onClose: () => void
|
|
||||||
}) => {
|
|
||||||
const pal = usePalette('default')
|
const pal = usePalette('default')
|
||||||
const store = useStores()
|
const store = useStores()
|
||||||
|
|
||||||
|
@ -137,12 +134,16 @@ export const Menu = ({
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
<View style={[styles.section, pal.border]}>
|
<View style={[styles.section, pal.border]}>
|
||||||
<MenuItem
|
<MenuItem
|
||||||
icon={<HomeIcon style={pal.text as StyleProp<ViewStyle>} size="26" />}
|
icon={
|
||||||
|
<HomeIcon style={pal.text as StyleProp<ViewStyle>} size="26" />
|
||||||
|
}
|
||||||
label="Home"
|
label="Home"
|
||||||
url="/"
|
url="/"
|
||||||
/>
|
/>
|
||||||
<MenuItem
|
<MenuItem
|
||||||
icon={<BellIcon style={pal.text as StyleProp<ViewStyle>} size="28" />}
|
icon={
|
||||||
|
<BellIcon style={pal.text as StyleProp<ViewStyle>} size="28" />
|
||||||
|
}
|
||||||
label="Notifications"
|
label="Notifications"
|
||||||
url="/notifications"
|
url="/notifications"
|
||||||
count={store.me.notificationCount}
|
count={store.me.notificationCount}
|
||||||
|
@ -173,7 +174,10 @@ export const Menu = ({
|
||||||
<View style={[styles.section, pal.border]}>
|
<View style={[styles.section, pal.border]}>
|
||||||
<MenuItem
|
<MenuItem
|
||||||
icon={
|
icon={
|
||||||
<UserGroupIcon style={pal.text as StyleProp<ViewStyle>} size="30" />
|
<UserGroupIcon
|
||||||
|
style={pal.text as StyleProp<ViewStyle>}
|
||||||
|
size="30"
|
||||||
|
/>
|
||||||
}
|
}
|
||||||
label="Create a scene"
|
label="Create a scene"
|
||||||
onPress={onPressCreateScene}
|
onPress={onPressCreateScene}
|
||||||
|
@ -190,15 +194,23 @@ export const Menu = ({
|
||||||
url="/settings"
|
url="/settings"
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
|
<View style={[styles.section, pal.border]}>
|
||||||
|
<ToggleButton
|
||||||
|
label="Dark mode"
|
||||||
|
isSelected={store.shell.darkMode}
|
||||||
|
onPress={() => store.shell.setDarkMode(!store.shell.darkMode)}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
<View style={styles.footer}>
|
<View style={styles.footer}>
|
||||||
<Text style={[pal.textLight]}>
|
<Text style={[pal.textLight]}>
|
||||||
Build version {VersionNumber.appVersion} ({VersionNumber.buildVersion}
|
Build version {VersionNumber.appVersion} (
|
||||||
)
|
{VersionNumber.buildVersion})
|
||||||
</Text>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
},
|
||||||
|
)
|
||||||
|
|
||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
view: {
|
view: {
|
||||||
|
|
Loading…
Reference in New Issue