simplify screen options, use default animation duration
This commit is contained in:
+16
-45
@@ -103,7 +103,7 @@ import {
|
|||||||
import {Wizard} from '#/screens/StarterPack/Wizard'
|
import {Wizard} from '#/screens/StarterPack/Wizard'
|
||||||
import TopicScreen from '#/screens/Topic'
|
import TopicScreen from '#/screens/Topic'
|
||||||
import {VideoFeed} from '#/screens/VideoFeed'
|
import {VideoFeed} from '#/screens/VideoFeed'
|
||||||
import {useTheme} from '#/alf'
|
import {type Theme, useTheme} from '#/alf'
|
||||||
import {
|
import {
|
||||||
EmailDialogScreenID,
|
EmailDialogScreenID,
|
||||||
useEmailDialogControl,
|
useEmailDialogControl,
|
||||||
@@ -515,19 +515,20 @@ function TabsNavigator() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function screenOptions(t: Theme) {
|
||||||
|
return {
|
||||||
|
fullScreenGestureEnabled: true,
|
||||||
|
fullScreenGestureShadowEnabled: true,
|
||||||
|
headerShown: false,
|
||||||
|
contentStyle: t.atoms.bg,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function HomeTabNavigator() {
|
function HomeTabNavigator() {
|
||||||
const t = useTheme()
|
const t = useTheme()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<HomeTab.Navigator
|
<HomeTab.Navigator screenOptions={screenOptions(t)} initialRouteName="Home">
|
||||||
screenOptions={{
|
|
||||||
animationDuration: 285,
|
|
||||||
fullScreenGestureEnabled: true,
|
|
||||||
fullScreenGestureShadowEnabled: true,
|
|
||||||
headerShown: false,
|
|
||||||
contentStyle: t.atoms.bg,
|
|
||||||
}}
|
|
||||||
initialRouteName="Home">
|
|
||||||
<HomeTab.Screen name="Home" getComponent={() => HomeScreen} />
|
<HomeTab.Screen name="Home" getComponent={() => HomeScreen} />
|
||||||
<HomeTab.Screen name="Start" getComponent={() => HomeScreen} />
|
<HomeTab.Screen name="Start" getComponent={() => HomeScreen} />
|
||||||
{commonScreens(HomeTab as typeof Flat)}
|
{commonScreens(HomeTab as typeof Flat)}
|
||||||
@@ -539,13 +540,7 @@ function SearchTabNavigator() {
|
|||||||
const t = useTheme()
|
const t = useTheme()
|
||||||
return (
|
return (
|
||||||
<SearchTab.Navigator
|
<SearchTab.Navigator
|
||||||
screenOptions={{
|
screenOptions={screenOptions(t)}
|
||||||
animationDuration: 285,
|
|
||||||
fullScreenGestureEnabled: true,
|
|
||||||
fullScreenGestureShadowEnabled: true,
|
|
||||||
headerShown: false,
|
|
||||||
contentStyle: t.atoms.bg,
|
|
||||||
}}
|
|
||||||
initialRouteName="Search">
|
initialRouteName="Search">
|
||||||
<SearchTab.Screen name="Search" getComponent={() => SearchScreen} />
|
<SearchTab.Screen name="Search" getComponent={() => SearchScreen} />
|
||||||
{commonScreens(SearchTab as typeof Flat)}
|
{commonScreens(SearchTab as typeof Flat)}
|
||||||
@@ -557,13 +552,7 @@ function NotificationsTabNavigator() {
|
|||||||
const t = useTheme()
|
const t = useTheme()
|
||||||
return (
|
return (
|
||||||
<NotificationsTab.Navigator
|
<NotificationsTab.Navigator
|
||||||
screenOptions={{
|
screenOptions={screenOptions(t)}
|
||||||
animationDuration: 285,
|
|
||||||
fullScreenGestureEnabled: true,
|
|
||||||
fullScreenGestureShadowEnabled: true,
|
|
||||||
headerShown: false,
|
|
||||||
contentStyle: t.atoms.bg,
|
|
||||||
}}
|
|
||||||
initialRouteName="Notifications">
|
initialRouteName="Notifications">
|
||||||
<NotificationsTab.Screen
|
<NotificationsTab.Screen
|
||||||
name="Notifications"
|
name="Notifications"
|
||||||
@@ -579,13 +568,7 @@ function MyProfileTabNavigator() {
|
|||||||
const t = useTheme()
|
const t = useTheme()
|
||||||
return (
|
return (
|
||||||
<MyProfileTab.Navigator
|
<MyProfileTab.Navigator
|
||||||
screenOptions={{
|
screenOptions={screenOptions(t)}
|
||||||
animationDuration: 285,
|
|
||||||
fullScreenGestureEnabled: true,
|
|
||||||
fullScreenGestureShadowEnabled: true,
|
|
||||||
headerShown: false,
|
|
||||||
contentStyle: t.atoms.bg,
|
|
||||||
}}
|
|
||||||
initialRouteName="MyProfile">
|
initialRouteName="MyProfile">
|
||||||
<MyProfileTab.Screen
|
<MyProfileTab.Screen
|
||||||
// MyProfile is not in AllNavigationParams - asserting as Profile at least
|
// MyProfile is not in AllNavigationParams - asserting as Profile at least
|
||||||
@@ -603,13 +586,7 @@ function MessagesTabNavigator() {
|
|||||||
const t = useTheme()
|
const t = useTheme()
|
||||||
return (
|
return (
|
||||||
<MessagesTab.Navigator
|
<MessagesTab.Navigator
|
||||||
screenOptions={{
|
screenOptions={screenOptions(t)}
|
||||||
animationDuration: 285,
|
|
||||||
fullScreenGestureEnabled: true,
|
|
||||||
fullScreenGestureShadowEnabled: true,
|
|
||||||
headerShown: false,
|
|
||||||
contentStyle: t.atoms.bg,
|
|
||||||
}}
|
|
||||||
initialRouteName="Messages">
|
initialRouteName="Messages">
|
||||||
<MessagesTab.Screen
|
<MessagesTab.Screen
|
||||||
name="Messages"
|
name="Messages"
|
||||||
@@ -637,13 +614,7 @@ const FlatNavigator = () => {
|
|||||||
return (
|
return (
|
||||||
<Flat.Navigator
|
<Flat.Navigator
|
||||||
screenListeners={screenListeners}
|
screenListeners={screenListeners}
|
||||||
screenOptions={{
|
screenOptions={screenOptions(t)}>
|
||||||
animationDuration: 285,
|
|
||||||
fullScreenGestureEnabled: true,
|
|
||||||
fullScreenGestureShadowEnabled: true,
|
|
||||||
headerShown: false,
|
|
||||||
contentStyle: t.atoms.bg,
|
|
||||||
}}>
|
|
||||||
<Flat.Screen
|
<Flat.Screen
|
||||||
name="Home"
|
name="Home"
|
||||||
getComponent={() => HomeScreen}
|
getComponent={() => HomeScreen}
|
||||||
|
|||||||
Reference in New Issue
Block a user