diff --git a/screens/About/AboutScreen.js b/screens/About/AboutScreen.js index 1b5c08d..5163271 100644 --- a/screens/About/AboutScreen.js +++ b/screens/About/AboutScreen.js @@ -28,13 +28,18 @@ const links = { bugsGit: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/issues', changelog: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/src/branch/master/Changelog.md', license: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/src/branch/master/LICENSE', - mail: "mailto:vergnet@etud.insa-toulouse.fr?" + + authorMail: "mailto:vergnet@etud.insa-toulouse.fr?" + "subject=" + "Application Amicale INSA Toulouse" + "&body=" + "Coucou !\n\n", - linkedin: 'https://www.linkedin.com/in/arnaud-vergnet-434ba5179/', - facebook: 'https://www.facebook.com/arnaud.vergnet', + authorLinkedin: 'https://www.linkedin.com/in/arnaud-vergnet-434ba5179/', + yohanMail: "mailto:TODO@etud.insa-toulouse.fr?" + // TODO set real email + "subject=" + + "Application Amicale INSA Toulouse" + + "&body=" + + "Coucou !\n\n", + yohanLinkedin: 'https://www.linkedin.com/in/', // TODO set real link react: 'https://facebook.github.io/react-native/', }; @@ -125,21 +130,39 @@ export default class AboutScreen extends React.Component { showChevron: false }, { - onPressCallback: () => openWebLink(links.mail), + onPressCallback: () => openWebLink(links.authorMail), icon: 'email', - text: i18n.t('aboutScreen.mail'), + text: i18n.t('aboutScreen.authorMail'), showChevron: true }, { - onPressCallback: () => openWebLink(links.linkedin), + onPressCallback: () => openWebLink(links.authorLinkedin), icon: 'linkedin', text: 'Linkedin', showChevron: true }, + ]; + + /** + * Data to be displayed in the additional developer card + */ + additionalDevData: Array = [ { - onPressCallback: () => openWebLink(links.facebook), - icon: 'facebook', - text: 'Facebook', + onPressCallback: () => console.log('Meme this'), + icon: 'account', + text: 'Yohan SIMARD', + showChevron: false + }, + { + onPressCallback: () => openWebLink(links.yohanMail), + icon: 'email', + text: i18n.t('aboutScreen.authorMail'), + showChevron: true + }, + { + onPressCallback: () => openWebLink(links.yohanLinkedin), + icon: 'linkedin', + text: 'Linkedin', showChevron: true }, ]; @@ -291,6 +314,18 @@ export default class AboutScreen extends React.Component { + + + + +

{i18n.t('aboutScreen.team')}

+ + + {i18n.t('aboutScreen.author')} @@ -302,6 +337,17 @@ export default class AboutScreen extends React.Component { this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug) } /> + + {i18n.t('aboutScreen.additionalDev')} + + item.icon} + renderItem={({item}) => + this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug) + } + /> diff --git a/screens/SettingsScreen.js b/screens/SettingsScreen.js index 87b4949..89e9a12 100644 --- a/screens/SettingsScreen.js +++ b/screens/SettingsScreen.js @@ -140,7 +140,6 @@ export default class SettingsScreen extends React.Component { actions: [NavigationActions.navigate({routeName: 'Main'})], }); this.props.navigation.dispatch(resetAction); - // this.props.navigation.navigate('SettingsScreen'); } /** diff --git a/translations/en.json b/translations/en.json index cff5cba..406b29a 100644 --- a/translations/en.json +++ b/translations/en.json @@ -110,8 +110,10 @@ "changelog": "Changelog", "license": "License", "debug": "Debug", + "team": "Team", "author": "Author", - "mail": "Send an email", + "authorMail": "Send an email", + "additionalDev": "Additional developer", "technologies": "Technologies", "reactNative": "Made with React Native", "libs": "Libraries used" diff --git a/translations/fr.json b/translations/fr.json index 78c47a9..44a5868 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -110,8 +110,10 @@ "changelog": "Historique des modifications", "license": "Licence", "debug": "Debug", + "team": "Équipe", "author": "Auteur", - "mail": "Envoyer un mail", + "authorMail": "Envoyer un mail", + "additionalDev": "Développeur additionnel", "technologies": "Technologies", "reactNative": "Créé avec React Native", "libs": "Librairies utilisées"