diff options
Diffstat (limited to 'src/Navigation.tsx')
-rw-r--r-- | src/Navigation.tsx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/Navigation.tsx b/src/Navigation.tsx index 323f668b7..81d08c7da 100644 --- a/src/Navigation.tsx +++ b/src/Navigation.tsx @@ -17,7 +17,6 @@ import { import {timeout} from '#/lib/async/timeout' import {useColorSchemeStyle} from '#/lib/hooks/useColorSchemeStyle' -import {usePalette} from '#/lib/hooks/usePalette' import {useWebScrollRestoration} from '#/lib/hooks/useWebScrollRestoration' import {buildStateObject} from '#/lib/routes/helpers' import { @@ -93,6 +92,7 @@ import { StarterPackScreenShort, } from '#/screens/StarterPack/StarterPackScreen' import {Wizard} from '#/screens/StarterPack/Wizard' +import {useTheme} from '#/alf' import {router} from '#/routes' import {Referrer} from '../modules/expo-bluesky-swiss-army' @@ -412,7 +412,7 @@ function TabsNavigator() { } function HomeTabNavigator() { - const pal = usePalette('default') + const t = useTheme() return ( <HomeTab.Navigator @@ -422,7 +422,7 @@ function HomeTabNavigator() { gestureEnabled: true, fullScreenGestureEnabled: true, headerShown: false, - contentStyle: pal.view, + contentStyle: t.atoms.bg, }}> <HomeTab.Screen name="Home" getComponent={() => HomeScreen} /> <HomeTab.Screen name="Start" getComponent={() => HomeScreen} /> @@ -432,7 +432,7 @@ function HomeTabNavigator() { } function SearchTabNavigator() { - const pal = usePalette('default') + const t = useTheme() return ( <SearchTab.Navigator screenOptions={{ @@ -441,7 +441,7 @@ function SearchTabNavigator() { gestureEnabled: true, fullScreenGestureEnabled: true, headerShown: false, - contentStyle: pal.view, + contentStyle: t.atoms.bg, }}> <SearchTab.Screen name="Search" getComponent={() => SearchScreen} /> {commonScreens(SearchTab as typeof HomeTab)} @@ -450,7 +450,7 @@ function SearchTabNavigator() { } function NotificationsTabNavigator() { - const pal = usePalette('default') + const t = useTheme() return ( <NotificationsTab.Navigator screenOptions={{ @@ -459,7 +459,7 @@ function NotificationsTabNavigator() { gestureEnabled: true, fullScreenGestureEnabled: true, headerShown: false, - contentStyle: pal.view, + contentStyle: t.atoms.bg, }}> <NotificationsTab.Screen name="Notifications" @@ -472,7 +472,7 @@ function NotificationsTabNavigator() { } function MyProfileTabNavigator() { - const pal = usePalette('default') + const t = useTheme() return ( <MyProfileTab.Navigator screenOptions={{ @@ -481,7 +481,7 @@ function MyProfileTabNavigator() { gestureEnabled: true, fullScreenGestureEnabled: true, headerShown: false, - contentStyle: pal.view, + contentStyle: t.atoms.bg, }}> <MyProfileTab.Screen // @ts-ignore // TODO: fix this broken type in ProfileScreen @@ -498,7 +498,7 @@ function MyProfileTabNavigator() { } function MessagesTabNavigator() { - const pal = usePalette('default') + const t = useTheme() return ( <MessagesTab.Navigator screenOptions={{ @@ -507,7 +507,7 @@ function MessagesTabNavigator() { gestureEnabled: true, fullScreenGestureEnabled: true, headerShown: false, - contentStyle: pal.view, + contentStyle: t.atoms.bg, }}> <MessagesTab.Screen name="Messages" @@ -527,7 +527,7 @@ function MessagesTabNavigator() { * in a single ("flat") stack. */ const FlatNavigator = () => { - const pal = usePalette('default') + const t = useTheme() const numUnread = useUnreadNotifications() const screenListeners = useWebScrollRestoration() const title = (page: MessageDescriptor) => bskyTitle(i18n._(page), numUnread) @@ -541,7 +541,7 @@ const FlatNavigator = () => { gestureEnabled: true, fullScreenGestureEnabled: true, headerShown: false, - contentStyle: pal.view, + contentStyle: t.atoms.bg, }}> <Flat.Screen name="Home" |