Changed screen transition animations

navigation/DrawerNavigator.js

@@ -33,22 +33,40 @@ const AboutStack = createStackNavigator({
         },
     });
 
+
+// Create a stack to use animations
+function createDrawerStackWithInitialRoute(initialRoute: string) {
+    return createStackNavigator({
+            Main: createMaterialBottomTabNavigatorWithInitialRoute(initialRoute),
+            SettingsScreen: {screen: SettingsScreen},
+            AboutScreen: AboutStack,
+            SelfMenuScreen: {screen: SelfMenuScreen},
+            TutorInsaScreen: {screen: TutorInsaScreen},
+            AmicaleScreen: {screen: AmicaleScreen},
+            WiketudScreen: {screen: WiketudScreen},
+            ElusEtudScreen: {screen: ElusEtudScreen},
+            BlueMindScreen: {screen: BlueMindScreen},
+            EntScreen: {screen: EntScreen},
+            AvailableRoomScreen: {screen: AvailableRoomScreen},
+        },
+        {
+            initialRouteName: "Main",
+            mode: 'card',
+            headerMode: "none",
+            defaultNavigationOptions: {
+                gestureEnabled: true,
+                cardOverlayEnabled: true,
+                ...TransitionPresets.SlideFromRightIOS,
+            },
+        });
+}
+
 /**
  * Creates the drawer navigation stack
  */
 function createDrawerNavigatorWithInitialRoute(initialRoute: string) {
     return createDrawerNavigator({
-        Main: createMaterialBottomTabNavigatorWithInitialRoute(initialRoute),
+        Main: createDrawerStackWithInitialRoute(initialRoute),
-        SettingsScreen: {screen: SettingsScreen},
-        AboutScreen: AboutStack,
-        SelfMenuScreen: {screen: SelfMenuScreen},
-        TutorInsaScreen: {screen: TutorInsaScreen},
-        AmicaleScreen: {screen: AmicaleScreen},
-        WiketudScreen: {screen: WiketudScreen},
-        ElusEtudScreen: {screen: ElusEtudScreen},
-        BlueMindScreen: {screen: BlueMindScreen},
-        EntScreen: {screen: EntScreen},
-        AvailableRoomScreen: {screen: AvailableRoomScreen},
     }, {
         contentComponent: Sidebar,
         initialRouteName: 'Main',

navigation/MainTabNavigator.js

@@ -27,8 +27,8 @@ const ProximoStack = createStackNavigator({
         ProximoListScreen: {screen: ProximoListScreen},
         ProximoAboutScreen: {
             screen: ProximoAboutScreen,
-            navigationOptions: ({ navigation }) => ({
+            navigationOptions: () => ({
-                ...TransitionPresets.ModalPresentationIOS,
+                ...TransitionPresets.ModalSlideFromBottomIOS,
             }),
         },
     },
@@ -54,7 +54,7 @@ const ProxiwashStack = createStackNavigator({
         defaultNavigationOptions: {
             gestureEnabled: true,
             cardOverlayEnabled: true,
-            ...TransitionPresets.ModalPresentationIOS,
+            ...TransitionPresets.ModalSlideFromBottomIOS,
         },
     });
 
@@ -69,7 +69,7 @@ const PlanningStack = createStackNavigator({
         defaultNavigationOptions: {
             gestureEnabled: true,
             cardOverlayEnabled: true,
-            ...TransitionPresets.ModalPresentationIOS,
+            ...TransitionPresets.ModalSlideFromBottomIOS,
         },
     });
 
@@ -84,7 +84,7 @@ const HomeStack = createStackNavigator({
         defaultNavigationOptions: {
             gestureEnabled: true,
             cardOverlayEnabled: true,
-            ...TransitionPresets.ModalPresentationIOS,
+            ...TransitionPresets.ModalSlideFromBottomIOS,
         },
     });
 

screens/PlanningDisplayScreen.js

@@ -30,7 +30,7 @@ export default class PlanningDisplayScreen extends React.Component<Props> {
             <Container>
                 <CustomHeader
                     navigation={nav}
-                    title={i18n.t('screens.planningDisplayScreen')}
+                    title={displayData.title}
                     subtitle={PlanningEventManager.getFormattedTime(displayData)}
                     hasBackButton={true}/>
                 <Content padder>