diff --git a/apps/mobile/src/navigation/navigationstack.js b/apps/mobile/src/navigation/navigationstack.js index 7c071a200..b4e8155f7 100644 --- a/apps/mobile/src/navigation/navigationstack.js +++ b/apps/mobile/src/navigation/navigationstack.js @@ -1,5 +1,6 @@ import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'; import { NavigationContainer } from '@react-navigation/native'; +import { createNativeStackNavigator } from '@react-navigation/native-stack'; import * as React from 'react'; import Container from '../components/container'; import Favorites from '../screens/favorites'; @@ -18,12 +19,14 @@ import { eSendEvent } from '../services/event-manager'; import SettingsService from '../services/settings'; import useNavigationStore from '../stores/use-navigation-store'; import { useSelectionStore } from '../stores/use-selection-store'; +import { useThemeStore } from '../stores/use-theme-store'; import { history } from '../utils'; import { rootNavigatorRef } from '../utils/global-refs'; import { hideAllTooltips } from '../utils/hooks/use-tooltip'; -const Tab = createBottomTabNavigator(); +const NativeStack = createNativeStackNavigator(); const Tabs = React.memo( () => { + const colors = useThemeStore(state => state.colors); const homepage = SettingsService.get().homepage; React.useEffect(() => { setTimeout(() => { @@ -32,28 +35,32 @@ const Tabs = React.memo( }, []); return ( - null} initialRouteName={homepage} backBehavior="history" screenOptions={{ headerShown: false, - lazy: false + lazy: false, + animation: 'none', + contentStyle: { + backgroundColor: colors.bg + } }} > - - - - - - - - - - - - - + + + + + + + + + + + + + ); }, () => true