Enable navigation animations on Android, decrease animation speed (#4207)
* bump and rm patch * use the better settings * fix types * remove animation duration * try it with full screen * thanks mozz - use `ios` only on android * maybe a little duration * slightly faster duration * Revert "fix types" This reverts commitd15d4b7a9b. * Revert "bump and rm patch" This reverts commit571f85f9e5. --------- Co-authored-by: Dan Abramov <dan.abramov@gmail.com>
This commit is contained in:
+14
-13
@@ -353,11 +353,11 @@ function HomeTabNavigator() {
|
|||||||
return (
|
return (
|
||||||
<HomeTab.Navigator
|
<HomeTab.Navigator
|
||||||
screenOptions={{
|
screenOptions={{
|
||||||
animation: isAndroid ? 'none' : undefined,
|
animation: isAndroid ? 'ios' : undefined,
|
||||||
|
animationDuration: 285,
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
fullScreenGestureEnabled: true,
|
fullScreenGestureEnabled: true,
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
animationDuration: 250,
|
|
||||||
contentStyle: pal.view,
|
contentStyle: pal.view,
|
||||||
}}>
|
}}>
|
||||||
<HomeTab.Screen name="Home" getComponent={() => HomeScreen} />
|
<HomeTab.Screen name="Home" getComponent={() => HomeScreen} />
|
||||||
@@ -371,11 +371,11 @@ function SearchTabNavigator() {
|
|||||||
return (
|
return (
|
||||||
<SearchTab.Navigator
|
<SearchTab.Navigator
|
||||||
screenOptions={{
|
screenOptions={{
|
||||||
animation: isAndroid ? 'none' : undefined,
|
animation: isAndroid ? 'ios' : undefined,
|
||||||
|
animationDuration: 285,
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
fullScreenGestureEnabled: true,
|
fullScreenGestureEnabled: true,
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
animationDuration: 250,
|
|
||||||
contentStyle: pal.view,
|
contentStyle: pal.view,
|
||||||
}}>
|
}}>
|
||||||
<SearchTab.Screen name="Search" getComponent={() => SearchScreen} />
|
<SearchTab.Screen name="Search" getComponent={() => SearchScreen} />
|
||||||
@@ -389,11 +389,11 @@ function FeedsTabNavigator() {
|
|||||||
return (
|
return (
|
||||||
<FeedsTab.Navigator
|
<FeedsTab.Navigator
|
||||||
screenOptions={{
|
screenOptions={{
|
||||||
animation: isAndroid ? 'none' : undefined,
|
animation: isAndroid ? 'ios' : undefined,
|
||||||
|
animationDuration: 285,
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
fullScreenGestureEnabled: true,
|
fullScreenGestureEnabled: true,
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
animationDuration: 250,
|
|
||||||
contentStyle: pal.view,
|
contentStyle: pal.view,
|
||||||
}}>
|
}}>
|
||||||
<FeedsTab.Screen name="Feeds" getComponent={() => FeedsScreen} />
|
<FeedsTab.Screen name="Feeds" getComponent={() => FeedsScreen} />
|
||||||
@@ -407,11 +407,11 @@ function NotificationsTabNavigator() {
|
|||||||
return (
|
return (
|
||||||
<NotificationsTab.Navigator
|
<NotificationsTab.Navigator
|
||||||
screenOptions={{
|
screenOptions={{
|
||||||
animation: isAndroid ? 'none' : undefined,
|
animation: isAndroid ? 'ios' : undefined,
|
||||||
|
animationDuration: 285,
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
fullScreenGestureEnabled: true,
|
fullScreenGestureEnabled: true,
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
animationDuration: 250,
|
|
||||||
contentStyle: pal.view,
|
contentStyle: pal.view,
|
||||||
}}>
|
}}>
|
||||||
<NotificationsTab.Screen
|
<NotificationsTab.Screen
|
||||||
@@ -429,11 +429,11 @@ function MyProfileTabNavigator() {
|
|||||||
return (
|
return (
|
||||||
<MyProfileTab.Navigator
|
<MyProfileTab.Navigator
|
||||||
screenOptions={{
|
screenOptions={{
|
||||||
animation: isAndroid ? 'none' : undefined,
|
animation: isAndroid ? 'ios' : undefined,
|
||||||
|
animationDuration: 285,
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
fullScreenGestureEnabled: true,
|
fullScreenGestureEnabled: true,
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
animationDuration: 250,
|
|
||||||
contentStyle: pal.view,
|
contentStyle: pal.view,
|
||||||
}}>
|
}}>
|
||||||
<MyProfileTab.Screen
|
<MyProfileTab.Screen
|
||||||
@@ -454,11 +454,11 @@ function MessagesTabNavigator() {
|
|||||||
return (
|
return (
|
||||||
<MessagesTab.Navigator
|
<MessagesTab.Navigator
|
||||||
screenOptions={{
|
screenOptions={{
|
||||||
animation: isAndroid ? 'none' : undefined,
|
animation: isAndroid ? 'ios' : undefined,
|
||||||
|
animationDuration: 285,
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
fullScreenGestureEnabled: true,
|
fullScreenGestureEnabled: true,
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
animationDuration: 250,
|
|
||||||
contentStyle: pal.view,
|
contentStyle: pal.view,
|
||||||
}}>
|
}}>
|
||||||
<MessagesTab.Screen
|
<MessagesTab.Screen
|
||||||
@@ -488,10 +488,11 @@ const FlatNavigator = () => {
|
|||||||
<Flat.Navigator
|
<Flat.Navigator
|
||||||
screenListeners={screenListeners}
|
screenListeners={screenListeners}
|
||||||
screenOptions={{
|
screenOptions={{
|
||||||
|
animation: isAndroid ? 'ios' : undefined,
|
||||||
|
animationDuration: 285,
|
||||||
gestureEnabled: true,
|
gestureEnabled: true,
|
||||||
fullScreenGestureEnabled: true,
|
fullScreenGestureEnabled: true,
|
||||||
headerShown: false,
|
headerShown: false,
|
||||||
animationDuration: 250,
|
|
||||||
contentStyle: pal.view,
|
contentStyle: pal.view,
|
||||||
}}>
|
}}>
|
||||||
<Flat.Screen
|
<Flat.Screen
|
||||||
|
|||||||
Reference in New Issue
Block a user