Browse Source

Changed screen transition animations

keplyx 4 years ago
parent
commit
de787bf5a6
3 changed files with 35 additions and 17 deletions
  1. 29
    11
      navigation/DrawerNavigator.js
  2. 5
    5
      navigation/MainTabNavigator.js
  3. 1
    1
      screens/PlanningDisplayScreen.js

+ 29
- 11
navigation/DrawerNavigator.js View File

@@ -33,22 +33,40 @@ const AboutStack = createStackNavigator({
33 33
         },
34 34
     });
35 35
 
36
+
37
+// Create a stack to use animations
38
+function createDrawerStackWithInitialRoute(initialRoute: string) {
39
+    return createStackNavigator({
40
+            Main: createMaterialBottomTabNavigatorWithInitialRoute(initialRoute),
41
+            SettingsScreen: {screen: SettingsScreen},
42
+            AboutScreen: AboutStack,
43
+            SelfMenuScreen: {screen: SelfMenuScreen},
44
+            TutorInsaScreen: {screen: TutorInsaScreen},
45
+            AmicaleScreen: {screen: AmicaleScreen},
46
+            WiketudScreen: {screen: WiketudScreen},
47
+            ElusEtudScreen: {screen: ElusEtudScreen},
48
+            BlueMindScreen: {screen: BlueMindScreen},
49
+            EntScreen: {screen: EntScreen},
50
+            AvailableRoomScreen: {screen: AvailableRoomScreen},
51
+        },
52
+        {
53
+            initialRouteName: "Main",
54
+            mode: 'card',
55
+            headerMode: "none",
56
+            defaultNavigationOptions: {
57
+                gestureEnabled: true,
58
+                cardOverlayEnabled: true,
59
+                ...TransitionPresets.SlideFromRightIOS,
60
+            },
61
+        });
62
+}
63
+
36 64
 /**
37 65
  * Creates the drawer navigation stack
38 66
  */
39 67
 function createDrawerNavigatorWithInitialRoute(initialRoute: string) {
40 68
     return createDrawerNavigator({
41
-        Main: createMaterialBottomTabNavigatorWithInitialRoute(initialRoute),
42
-        SettingsScreen: {screen: SettingsScreen},
43
-        AboutScreen: AboutStack,
44
-        SelfMenuScreen: {screen: SelfMenuScreen},
45
-        TutorInsaScreen: {screen: TutorInsaScreen},
46
-        AmicaleScreen: {screen: AmicaleScreen},
47
-        WiketudScreen: {screen: WiketudScreen},
48
-        ElusEtudScreen: {screen: ElusEtudScreen},
49
-        BlueMindScreen: {screen: BlueMindScreen},
50
-        EntScreen: {screen: EntScreen},
51
-        AvailableRoomScreen: {screen: AvailableRoomScreen},
69
+        Main: createDrawerStackWithInitialRoute(initialRoute),
52 70
     }, {
53 71
         contentComponent: Sidebar,
54 72
         initialRouteName: 'Main',

+ 5
- 5
navigation/MainTabNavigator.js View File

@@ -27,8 +27,8 @@ const ProximoStack = createStackNavigator({
27 27
         ProximoListScreen: {screen: ProximoListScreen},
28 28
         ProximoAboutScreen: {
29 29
             screen: ProximoAboutScreen,
30
-            navigationOptions: ({ navigation }) => ({
31
-                ...TransitionPresets.ModalPresentationIOS,
30
+            navigationOptions: () => ({
31
+                ...TransitionPresets.ModalSlideFromBottomIOS,
32 32
             }),
33 33
         },
34 34
     },
@@ -54,7 +54,7 @@ const ProxiwashStack = createStackNavigator({
54 54
         defaultNavigationOptions: {
55 55
             gestureEnabled: true,
56 56
             cardOverlayEnabled: true,
57
-            ...TransitionPresets.ModalPresentationIOS,
57
+            ...TransitionPresets.ModalSlideFromBottomIOS,
58 58
         },
59 59
     });
60 60
 
@@ -69,7 +69,7 @@ const PlanningStack = createStackNavigator({
69 69
         defaultNavigationOptions: {
70 70
             gestureEnabled: true,
71 71
             cardOverlayEnabled: true,
72
-            ...TransitionPresets.ModalPresentationIOS,
72
+            ...TransitionPresets.ModalSlideFromBottomIOS,
73 73
         },
74 74
     });
75 75
 
@@ -84,7 +84,7 @@ const HomeStack = createStackNavigator({
84 84
         defaultNavigationOptions: {
85 85
             gestureEnabled: true,
86 86
             cardOverlayEnabled: true,
87
-            ...TransitionPresets.ModalPresentationIOS,
87
+            ...TransitionPresets.ModalSlideFromBottomIOS,
88 88
         },
89 89
     });
90 90
 

+ 1
- 1
screens/PlanningDisplayScreen.js View File

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

Loading…
Cancel
Save