Browse Source

Added Yohan to dev list

keplyx 2 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,13 +28,18 @@ const links = {
28 28
     bugsGit: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/issues',
29 29
     changelog: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/src/branch/master/Changelog.md',
30 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 32
         "subject=" +
33 33
         "Application Amicale INSA Toulouse" +
34 34
         "&body=" +
35 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 43
     react: 'https://facebook.github.io/react-native/',
39 44
 };
40 45
 
@@ -125,21 +130,39 @@ export default class AboutScreen extends React.Component<Props, State> {
125 130
             showChevron: false
126 131
         },
127 132
         {
128
-            onPressCallback: () => openWebLink(links.mail),
133
+            onPressCallback: () => openWebLink(links.authorMail),
129 134
             icon: 'email',
130
-            text: i18n.t('aboutScreen.mail'),
135
+            text: i18n.t('aboutScreen.authorMail'),
131 136
             showChevron: true
132 137
         },
133 138
         {
134
-            onPressCallback: () => openWebLink(links.linkedin),
139
+            onPressCallback: () => openWebLink(links.authorLinkedin),
135 140
             icon: 'linkedin',
136 141
             text: 'Linkedin',
137 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 166
             showChevron: true
144 167
         },
145 168
     ];
@@ -291,6 +314,18 @@ export default class AboutScreen extends React.Component<Props, State> {
291 314
                     </Card>
292 315
 
293 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 329
                         <CardItem header>
295 330
                             <Text>{i18n.t('aboutScreen.author')}</Text>
296 331
                         </CardItem>
@@ -302,6 +337,17 @@ export default class AboutScreen extends React.Component<Props, State> {
302 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 351
                     </Card>
306 352
 
307 353
                     <Card>

+ 0
- 1
screens/SettingsScreen.js View File

@@ -140,7 +140,6 @@ export default class SettingsScreen extends React.Component<Props, State> {
140 140
             actions: [NavigationActions.navigate({routeName: 'Main'})],
141 141
         });
142 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,8 +110,10 @@
110 110
     "changelog": "Changelog",
111 111
     "license": "License",
112 112
     "debug": "Debug",
113
+    "team": "Team",
113 114
     "author": "Author",
114
-    "mail": "Send an email",
115
+    "authorMail": "Send an email",
116
+    "additionalDev": "Additional developer",
115 117
     "technologies": "Technologies",
116 118
     "reactNative": "Made with React Native",
117 119
     "libs": "Libraries used"

+ 3
- 1
translations/fr.json View File

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

Loading…
Cancel
Save