diff --git a/locales/en.json b/locales/en.json index 65d4aa7..e6923cc 100644 --- a/locales/en.json +++ b/locales/en.json @@ -41,6 +41,7 @@ "washer": "Washer", "washers": "Washers", "updated": "Updated ", + "switch": "Switch laundromat", "min": "min", "informationTab": "Information", "paymentTab": "Payment", diff --git a/locales/fr.json b/locales/fr.json index e88f098..03444a3 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -41,6 +41,7 @@ "washer": "Lave-Linge", "washers": "Lave-Linges", "updated": "Mise à jour ", + "switch": "Changer de laverie", "min": "min", "informationTab": "Informations", "paymentTab": "Paiement", diff --git a/src/components/Lists/Proximo/ProximoListHeader.tsx b/src/components/Lists/Proximo/ProximoListHeader.tsx index b4636aa..f5144af 100644 --- a/src/components/Lists/Proximo/ProximoListHeader.tsx +++ b/src/components/Lists/Proximo/ProximoListHeader.tsx @@ -1,8 +1,11 @@ import React from 'react'; import { StyleSheet } from 'react-native'; -import { Card, Text } from 'react-native-paper'; +import { Avatar, Button, Card, Text } from 'react-native-paper'; import TimeAgo from 'react-native-timeago'; import i18n from 'i18n-js'; +import { useNavigation } from '@react-navigation/core'; +import { MainRoutes } from '../../../navigation/MainNavigator'; +import ProxiwashConstants from '../../../constants/ProxiwashConstants'; let moment = require('moment'); //load moment module to set local language require('moment/locale/fr'); // import moment local language file during the application build @@ -14,14 +17,22 @@ type Props = { }; const styles = StyleSheet.create({ - card: { marginHorizontal: 5 }, + card: { + marginHorizontal: 5, + }, + actions: { + justifyContent: 'center', + }, }); function ProximoListHeader(props: Props) { + const navigation = useNavigation(); const { date, selectedWash } = props; let title = i18n.t('screens.proxiwash.washinsa.title'); + let icon = ProxiwashConstants.washinsa.icon; if (selectedWash === 'tripodeB') { title = i18n.t('screens.proxiwash.tripodeB.title'); + icon = ProxiwashConstants.tripodeB.icon; } return ( @@ -35,7 +46,17 @@ function ProximoListHeader(props: Props) { ) : null } + left={(iconProps) => } /> + + + ); } diff --git a/src/screens/Proxiwash/ProxiwashScreen.tsx b/src/screens/Proxiwash/ProxiwashScreen.tsx index 8b3ab2d..abe8794 100644 --- a/src/screens/Proxiwash/ProxiwashScreen.tsx +++ b/src/screens/Proxiwash/ProxiwashScreen.tsx @@ -130,11 +130,6 @@ function ProxiwashScreen() { navigation.setOptions({ headerRight: () => ( - navigation.navigate('settings')} - />