* add ThemeProvider to App.web.tsx * make FlatNavigator use themed color * fix extra padding on top in web * add observer to App.web.tsx to make it react to theme changes * fix TS for useColorSchemeStyle * add dark mode toggle button to web LeftNav * fix index.web.tsx border colors for web * Move the darkmode desktop web toggle to the right nav column --------- Co-authored-by: Paul Frazee <pfrazee@gmail.com>
This commit is contained in:
parent
05e4e4ff93
commit
f50f07f562
7 changed files with 75 additions and 21 deletions
|
@ -6,8 +6,10 @@ import * as analytics from 'lib/analytics'
|
|||
import {RootStoreModel, setupState, RootStoreProvider} from './state'
|
||||
import {Shell} from './view/shell/index'
|
||||
import {ToastContainer} from './view/com/util/Toast.web'
|
||||
import {ThemeProvider} from 'lib/ThemeContext'
|
||||
import {observer} from 'mobx-react-lite'
|
||||
|
||||
function App() {
|
||||
const App = observer(() => {
|
||||
const [rootStore, setRootStore] = useState<RootStoreModel | undefined>(
|
||||
undefined,
|
||||
)
|
||||
|
@ -27,17 +29,19 @@ function App() {
|
|||
}
|
||||
|
||||
return (
|
||||
<RootSiblingParent>
|
||||
<analytics.Provider>
|
||||
<RootStoreProvider value={rootStore}>
|
||||
<SafeAreaProvider>
|
||||
<Shell />
|
||||
</SafeAreaProvider>
|
||||
<ToastContainer />
|
||||
</RootStoreProvider>
|
||||
</analytics.Provider>
|
||||
</RootSiblingParent>
|
||||
<ThemeProvider theme={rootStore.shell.darkMode ? 'dark' : 'light'}>
|
||||
<RootSiblingParent>
|
||||
<analytics.Provider>
|
||||
<RootStoreProvider value={rootStore}>
|
||||
<SafeAreaProvider>
|
||||
<Shell />
|
||||
</SafeAreaProvider>
|
||||
<ToastContainer />
|
||||
</RootStoreProvider>
|
||||
</analytics.Provider>
|
||||
</RootSiblingParent>
|
||||
</ThemeProvider>
|
||||
)
|
||||
}
|
||||
})
|
||||
|
||||
export default App
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue