Browse Source

Added Yohan to dev list

keplyx 4 years ago
parent
commit
4780b838ab
4 changed files with 61 additions and 12 deletions
  1. 55
    9
      screens/About/AboutScreen.js
  2. 0
    1
      screens/SettingsScreen.js
  3. 3
    1
      translations/en.json
  4. 3
    1
      translations/fr.json

+ 55
- 9
screens/About/AboutScreen.js View File

28
     bugsGit: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/issues',
28
     bugsGit: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/issues',
29
     changelog: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/src/branch/master/Changelog.md',
29
     changelog: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/src/branch/master/Changelog.md',
30
     license: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/src/branch/master/LICENSE',
30
     license: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/src/branch/master/LICENSE',
31
-    mail: "mailto:vergnet@etud.insa-toulouse.fr?" +
31
+    authorMail: "mailto:vergnet@etud.insa-toulouse.fr?" +
32
         "subject=" +
32
         "subject=" +
33
         "Application Amicale INSA Toulouse" +
33
         "Application Amicale INSA Toulouse" +
34
         "&body=" +
34
         "&body=" +
35
         "Coucou !\n\n",
35
         "Coucou !\n\n",
36
-    linkedin: 'https://www.linkedin.com/in/arnaud-vergnet-434ba5179/',
37
-    facebook: 'https://www.facebook.com/arnaud.vergnet',
36
+    authorLinkedin: 'https://www.linkedin.com/in/arnaud-vergnet-434ba5179/',
37
+    yohanMail: "mailto:TODO@etud.insa-toulouse.fr?" + // TODO set real email
38
+        "subject=" +
39
+        "Application Amicale INSA Toulouse" +
40
+        "&body=" +
41
+        "Coucou !\n\n",
42
+    yohanLinkedin: 'https://www.linkedin.com/in/', // TODO set real link
38
     react: 'https://facebook.github.io/react-native/',
43
     react: 'https://facebook.github.io/react-native/',
39
 };
44
 };
40
 
45
 
125
             showChevron: false
130
             showChevron: false
126
         },
131
         },
127
         {
132
         {
128
-            onPressCallback: () => openWebLink(links.mail),
133
+            onPressCallback: () => openWebLink(links.authorMail),
129
             icon: 'email',
134
             icon: 'email',
130
-            text: i18n.t('aboutScreen.mail'),
135
+            text: i18n.t('aboutScreen.authorMail'),
131
             showChevron: true
136
             showChevron: true
132
         },
137
         },
133
         {
138
         {
134
-            onPressCallback: () => openWebLink(links.linkedin),
139
+            onPressCallback: () => openWebLink(links.authorLinkedin),
135
             icon: 'linkedin',
140
             icon: 'linkedin',
136
             text: 'Linkedin',
141
             text: 'Linkedin',
137
             showChevron: true
142
             showChevron: true
138
         },
143
         },
144
+    ];
145
+
146
+    /**
147
+     * Data to be displayed in the additional developer card
148
+     */
149
+    additionalDevData: Array<Object> = [
150
+        {
151
+            onPressCallback: () => console.log('Meme this'),
152
+            icon: 'account',
153
+            text: 'Yohan SIMARD',
154
+            showChevron: false
155
+        },
156
+        {
157
+            onPressCallback: () => openWebLink(links.yohanMail),
158
+            icon: 'email',
159
+            text: i18n.t('aboutScreen.authorMail'),
160
+            showChevron: true
161
+        },
139
         {
162
         {
140
-            onPressCallback: () => openWebLink(links.facebook),
141
-            icon: 'facebook',
142
-            text: 'Facebook',
163
+            onPressCallback: () => openWebLink(links.yohanLinkedin),
164
+            icon: 'linkedin',
165
+            text: 'Linkedin',
143
             showChevron: true
166
             showChevron: true
144
         },
167
         },
145
     ];
168
     ];
291
                     </Card>
314
                     </Card>
292
 
315
 
293
                     <Card>
316
                     <Card>
317
+                        <CardItem>
318
+                            <Left>
319
+                                <CustomMaterialIcon
320
+                                    icon={'account-multiple'}
321
+                                    fontSize={40}
322
+                                    width={40}
323
+                                    color={ThemeManager.getCurrentThemeVariables().brandPrimary}/>
324
+                                <Body>
325
+                                    <H1>{i18n.t('aboutScreen.team')}</H1>
326
+                                </Body>
327
+                            </Left>
328
+                        </CardItem>
294
                         <CardItem header>
329
                         <CardItem header>
295
                             <Text>{i18n.t('aboutScreen.author')}</Text>
330
                             <Text>{i18n.t('aboutScreen.author')}</Text>
296
                         </CardItem>
331
                         </CardItem>
302
                                 this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug)
337
                                 this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug)
303
                             }
338
                             }
304
                         />
339
                         />
340
+                        <CardItem header>
341
+                            <Text>{i18n.t('aboutScreen.additionalDev')}</Text>
342
+                        </CardItem>
343
+                        <FlatList
344
+                            data={this.additionalDevData}
345
+                            extraData={this.state}
346
+                            keyExtractor={(item) => item.icon}
347
+                            renderItem={({item}) =>
348
+                                this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug)
349
+                            }
350
+                        />
305
                     </Card>
351
                     </Card>
306
 
352
 
307
                     <Card>
353
                     <Card>

+ 0
- 1
screens/SettingsScreen.js View File

140
             actions: [NavigationActions.navigate({routeName: 'Main'})],
140
             actions: [NavigationActions.navigate({routeName: 'Main'})],
141
         });
141
         });
142
         this.props.navigation.dispatch(resetAction);
142
         this.props.navigation.dispatch(resetAction);
143
-        // this.props.navigation.navigate('SettingsScreen');
144
     }
143
     }
145
 
144
 
146
     /**
145
     /**

+ 3
- 1
translations/en.json View File

110
     "changelog": "Changelog",
110
     "changelog": "Changelog",
111
     "license": "License",
111
     "license": "License",
112
     "debug": "Debug",
112
     "debug": "Debug",
113
+    "team": "Team",
113
     "author": "Author",
114
     "author": "Author",
114
-    "mail": "Send an email",
115
+    "authorMail": "Send an email",
116
+    "additionalDev": "Additional developer",
115
     "technologies": "Technologies",
117
     "technologies": "Technologies",
116
     "reactNative": "Made with React Native",
118
     "reactNative": "Made with React Native",
117
     "libs": "Libraries used"
119
     "libs": "Libraries used"

+ 3
- 1
translations/fr.json View File

110
     "changelog": "Historique des modifications",
110
     "changelog": "Historique des modifications",
111
     "license": "Licence",
111
     "license": "Licence",
112
     "debug": "Debug",
112
     "debug": "Debug",
113
+    "team": "Équipe",
113
     "author": "Auteur",
114
     "author": "Auteur",
114
-    "mail": "Envoyer un mail",
115
+    "authorMail": "Envoyer un mail",
116
+    "additionalDev": "Développeur additionnel",
115
     "technologies": "Technologies",
117
     "technologies": "Technologies",
116
     "reactNative": "Créé avec React Native",
118
     "reactNative": "Créé avec React Native",
117
     "libs": "Librairies utilisées"
119
     "libs": "Librairies utilisées"

Loading…
Cancel
Save