|
@@ -23,13 +23,15 @@ import ServicesSectionScreen from "../screens/Services/ServicesSectionScreen";
|
23
|
23
|
import AmicaleContactScreen from "../screens/Amicale/AmicaleContactScreen";
|
24
|
24
|
import {createScreenCollapsibleStack, getWebsiteStack} from "../utils/CollapsibleUtils";
|
25
|
25
|
|
|
26
|
+const modalTransition = Platform.OS === 'ios' ? TransitionPresets.ModalPresentationIOS : TransitionPresets.ModalSlideFromBottomIOS;
|
|
27
|
+
|
|
28
|
+
|
26
|
29
|
const defaultScreenOptions = {
|
27
|
30
|
gestureEnabled: true,
|
28
|
31
|
cardOverlayEnabled: true,
|
29
|
|
- ...TransitionPresets.ScaleFromCenterAndroid,
|
|
32
|
+ ...modalTransition,
|
30
|
33
|
};
|
31
|
34
|
|
32
|
|
-const modalTransition = Platform.OS === 'ios' ? TransitionPresets.ModalPresentationIOS : TransitionPresets.ModalSlideFromBottomIOS;
|
33
|
35
|
|
34
|
36
|
const ServicesStack = createStackNavigator();
|
35
|
37
|
|
|
@@ -42,7 +44,7 @@ function ServicesStackComponent() {
|
42
|
44
|
>
|
43
|
45
|
{createScreenCollapsibleStack("index", ServicesStack, WebsitesHomeScreen, i18n.t('screens.services'))}
|
44
|
46
|
{createScreenCollapsibleStack("services-section", ServicesStack, ServicesSectionScreen, "SECTION")}
|
45
|
|
- {createScreenCollapsibleStack("amicale-contact", ServicesStack, AmicaleContactScreen, i18n.t('screens.amicaleAbout'), true, {...modalTransition})}
|
|
47
|
+ {createScreenCollapsibleStack("amicale-contact", ServicesStack, AmicaleContactScreen, i18n.t('screens.amicaleAbout'))}
|
46
|
48
|
</ServicesStack.Navigator>
|
47
|
49
|
);
|
48
|
50
|
}
|
|
@@ -60,10 +62,7 @@ function ProxiwashStackComponent() {
|
60
|
62
|
<ProxiwashStack.Screen
|
61
|
63
|
name="proxiwash-about"
|
62
|
64
|
component={ProxiwashAboutScreen}
|
63
|
|
- options={{
|
64
|
|
- title: i18n.t('screens.proxiwash'),
|
65
|
|
- ...modalTransition,
|
66
|
|
- }}
|
|
65
|
+ options={{title: i18n.t('screens.proxiwash'),}}
|
67
|
66
|
/>
|
68
|
67
|
</ProxiwashStack.Navigator>
|
69
|
68
|
);
|
|
@@ -79,19 +78,14 @@ function PlanningStackComponent() {
|
79
|
78
|
screenOptions={defaultScreenOptions}
|
80
|
79
|
>
|
81
|
80
|
<PlanningStack.Screen
|
82
|
|
- name="planning"
|
|
81
|
+ name="index"
|
83
|
82
|
component={PlanningScreen}
|
84
|
|
- options={{
|
85
|
|
- title: i18n.t('screens.planning'),
|
86
|
|
- }}
|
|
83
|
+ options={{title: i18n.t('screens.planning'),}}
|
87
|
84
|
/>
|
88
|
85
|
<PlanningStack.Screen
|
89
|
86
|
name="planning-information"
|
90
|
87
|
component={PlanningDisplayScreen}
|
91
|
|
- options={{
|
92
|
|
- title: i18n.t('screens.planningDisplayScreen'),
|
93
|
|
- ...modalTransition,
|
94
|
|
- }}
|
|
88
|
+ options={{title: i18n.t('screens.planningDisplayScreen'),}}
|
95
|
89
|
/>
|
96
|
90
|
</PlanningStack.Navigator>
|
97
|
91
|
);
|
|
@@ -130,34 +124,22 @@ function HomeStackComponent(initialRoute: string | null, defaultData: { [key: st
|
130
|
124
|
<HomeStack.Screen
|
131
|
125
|
name="scanner"
|
132
|
126
|
component={ScannerScreen}
|
133
|
|
- options={{
|
134
|
|
- title: i18n.t('screens.scanner'),
|
135
|
|
- ...modalTransition,
|
136
|
|
- }}
|
|
127
|
+ options={{title: i18n.t('screens.scanner'),}}
|
137
|
128
|
/>
|
138
|
129
|
<HomeStack.Screen
|
139
|
130
|
name="club-information"
|
140
|
131
|
component={ClubDisplayScreen}
|
141
|
|
- options={{
|
142
|
|
- title: i18n.t('screens.clubDisplayScreen'),
|
143
|
|
- ...modalTransition,
|
144
|
|
- }}
|
|
132
|
+ options={{title: i18n.t('screens.clubDisplayScreen'),}}
|
145
|
133
|
/>
|
146
|
134
|
<HomeStack.Screen
|
147
|
135
|
name="feed-information"
|
148
|
136
|
component={FeedItemScreen}
|
149
|
|
- options={{
|
150
|
|
- title: i18n.t('screens.feedDisplayScreen'),
|
151
|
|
- ...modalTransition,
|
152
|
|
- }}
|
|
137
|
+ options={{title: i18n.t('screens.feedDisplayScreen'),}}
|
153
|
138
|
/>
|
154
|
139
|
<HomeStack.Screen
|
155
|
140
|
name="planning-information"
|
156
|
141
|
component={PlanningDisplayScreen}
|
157
|
|
- options={{
|
158
|
|
- title: i18n.t('screens.planningDisplayScreen'),
|
159
|
|
- ...modalTransition,
|
160
|
|
- }}
|
|
142
|
+ options={{title: i18n.t('screens.planningDisplayScreen'),}}
|
161
|
143
|
/>
|
162
|
144
|
</HomeStack.Navigator>
|
163
|
145
|
);
|
|
@@ -173,13 +155,7 @@ function PlanexStackComponent() {
|
173
|
155
|
screenOptions={defaultScreenOptions}
|
174
|
156
|
>
|
175
|
157
|
{getWebsiteStack("index", PlanexStack, PlanexScreen, "Planex")}
|
176
|
|
- {createScreenCollapsibleStack(
|
177
|
|
- "group-select",
|
178
|
|
- PlanexStack,
|
179
|
|
- GroupSelectionScreen,
|
180
|
|
- "GROUP SELECT",
|
181
|
|
- true,
|
182
|
|
- {...modalTransition})}
|
|
158
|
+ {createScreenCollapsibleStack("group-select", PlanexStack, GroupSelectionScreen, "GROUP SELECT")}
|
183
|
159
|
</PlanexStack.Navigator>
|
184
|
160
|
);
|
185
|
161
|
}
|