bquintan/application-amicale
1
0
Fork 0
forked from vergnet/application-amicale
Code Issues Pull requests Releases Wiki Activity

Added Yohan to dev list

Browse source
This commit is contained in:
keplyx 2019-11-16 12:55:47 +01:00
parent 52729bee53
commit 4780b838ab
4 changed files with 61 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
screens/About/AboutScreen.js
View file

@ -28,13 +28,18 @@ const links = {
bugsGit: 'https://git.srv-falcon.etud.insa-toulouse.fr/vergnet/application-amicale/issues', 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', 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', 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=" + "subject=" +
"Application Amicale INSA Toulouse" + "Application Amicale INSA Toulouse" +
"&body=" + "&body=" +
"Coucou !\n\n", "Coucou !\n\n",
linkedin: 'https://www.linkedin.com/in/arnaud-vergnet-434ba5179/', authorLinkedin: 'https://www.linkedin.com/in/arnaud-vergnet-434ba5179/',
facebook: 'https://www.facebook.com/arnaud.vergnet', 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/', react: 'https://facebook.github.io/react-native/',
}; };
@ -125,21 +130,39 @@ export default class AboutScreen extends React.Component<Props, State> {
showChevron: false showChevron: false
}, },
{ {
onPressCallback: () => openWebLink(links.mail), onPressCallback: () => openWebLink(links.authorMail),
icon: 'email', icon: 'email',
text: i18n.t('aboutScreen.mail'), text: i18n.t('aboutScreen.authorMail'),
showChevron: true showChevron: true
}, },
{ {
onPressCallback: () => openWebLink(links.linkedin), onPressCallback: () => openWebLink(links.authorLinkedin),
icon: 'linkedin', icon: 'linkedin',
text: 'Linkedin', text: 'Linkedin',
showChevron: true showChevron: true
}, },
];
/**
* Data to be displayed in the additional developer card
*/
additionalDevData: Array<Object> = [
{ {
onPressCallback: () => openWebLink(links.facebook), onPressCallback: () => console.log('Meme this'),
icon: 'facebook', icon: 'account',
text: 'Facebook', 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 showChevron: true
}, },
]; ];
@ -291,6 +314,18 @@ export default class AboutScreen extends React.Component<Props, State> {
</Card> </Card>
<Card> <Card>
<CardItem>
<Left>
<CustomMaterialIcon
icon={'account-multiple'}
fontSize={40}
width={40}
color={ThemeManager.getCurrentThemeVariables().brandPrimary}/>
<Body>
<H1>{i18n.t('aboutScreen.team')}</H1>
</Body>
</Left>
</CardItem>
<CardItem header> <CardItem header>
<Text>{i18n.t('aboutScreen.author')}</Text> <Text>{i18n.t('aboutScreen.author')}</Text>
</CardItem> </CardItem>
@ -302,6 +337,17 @@ export default class AboutScreen extends React.Component<Props, State> {
this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug) this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug)
} }
/> />
<CardItem header>
<Text>{i18n.t('aboutScreen.additionalDev')}</Text>
</CardItem>
<FlatList
data={this.additionalDevData}
extraData={this.state}
keyExtractor={(item) => item.icon}
renderItem={({item}) =>
this.getCardItem(item.onPressCallback, item.icon, item.text, item.showChevron, item.showOnlyDebug)
}
/>
</Card> </Card>
<Card> <Card>

1
screens/SettingsScreen.js
View file

@ -140,7 +140,6 @@ export default class SettingsScreen extends React.Component<Props, State> {
actions: [NavigationActions.navigate({routeName: 'Main'})], actions: [NavigationActions.navigate({routeName: 'Main'})],
}); });
this.props.navigation.dispatch(resetAction); this.props.navigation.dispatch(resetAction);
// this.props.navigation.navigate('SettingsScreen');
} }
/** /**

4
translations/en.json
View file

@ -110,8 +110,10 @@
"changelog": "Changelog", "changelog": "Changelog",
"license": "License", "license": "License",
"debug": "Debug", "debug": "Debug",
"team": "Team",
"author": "Author", "author": "Author",
"mail": "Send an email", "authorMail": "Send an email",
"additionalDev": "Additional developer",
"technologies": "Technologies", "technologies": "Technologies",
"reactNative": "Made with React Native", "reactNative": "Made with React Native",
"libs": "Libraries used" "libs": "Libraries used"

4
translations/fr.json
View file

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