vergnet/application-amicale
5
5
Fork 5
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: vergnet:faac5688f8089c958e95187db50bf25e7d1051e4
Branches Tags
vergnet:master
vergnet:functional-migration
vergnet:v5.0.0-3
vergnet:v5.0.0-2
vergnet:4.1.0
vergnet:4.0.1
vergnet:3.0.7
...
compare: vergnet:09ed0058aef3e6ab3700bbb6a8c484f5d073f431
Branches Tags
vergnet:master
vergnet:functional-migration
vergnet:v5.0.0-3
vergnet:v5.0.0-2
vergnet:4.1.0
vergnet:4.0.1
vergnet:3.0.7

3 commits
faac5688f8 ... 09ed0058ae

Author SHA1 Message Date
Arnaud Vergnet
09ed0058ae Remove useless console.log 2020-09-23 19:08:29 +02:00
Arnaud Vergnet
1639544810 Open current webview url instead of start url 2020-09-23 19:08:09 +02:00
Arnaud Vergnet
4492debad9 Fix french translation for go back/next 2020-09-23 19:03:25 +02:00
3 changed files with 8 additions and 6 deletions
Show stats Expand all files Collapse all files

4
locales/fr.json
View file

@ -475,8 +475,8 @@
"loading": "Chargement...", "loading": "Chargement...",
"retry": "Réessayer", "retry": "Réessayer",
"networkError": "Impossible de contacter les serveurs. Assure-toi d'être connecté à Internet.", "networkError": "Impossible de contacter les serveurs. Assure-toi d'être connecté à Internet.",
"goBack": "Suivant", "goBack": "Précédent",
"goForward": "Précédent", "goForward": "Suivant",
"openInBrowser": "Ouvrir dans le navigateur", "openInBrowser": "Ouvrir dans le navigateur",
"notAvailable": "Non disponible", "notAvailable": "Non disponible",
"listUpdateFail": "Erreur lors de la mise à jour de la liste" "listUpdateFail": "Erreur lors de la mise à jour de la liste"

9
src/components/Screens/WebViewScreen.tsx
View file

@ -66,6 +66,8 @@ class WebViewScreen extends React.PureComponent<PropsType> {
customPaddingFunction: null, customPaddingFunction: null,
}; };
currentUrl: string;
webviewRef: {current: null | WebView}; webviewRef: {current: null | WebView};
canGoBack: boolean; canGoBack: boolean;
@ -74,6 +76,7 @@ class WebViewScreen extends React.PureComponent<PropsType> {
super(props); super(props);
this.webviewRef = React.createRef(); this.webviewRef = React.createRef();
this.canGoBack = false; this.canGoBack = false;
this.currentUrl = props.url;
} }
/** /**
@ -222,8 +225,7 @@ class WebViewScreen extends React.PureComponent<PropsType> {
}; };
onOpenClicked = () => { onOpenClicked = () => {
const {url} = this.props; Linking.openURL(this.currentUrl);
Linking.openURL(url);
}; };
onScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => { onScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
@ -261,7 +263,8 @@ class WebViewScreen extends React.PureComponent<PropsType> {
onRefresh={this.onRefreshClicked} onRefresh={this.onRefreshClicked}
/> />
)} )}
onNavigationStateChange={(navState: {canGoBack: boolean}) => { onNavigationStateChange={(navState) => {
this.currentUrl = navState.url;
this.canGoBack = navState.canGoBack; this.canGoBack = navState.canGoBack;
}} }}
onMessage={props.onMessage} onMessage={props.onMessage}

1
src/screens/Amicale/Equipment/EquipmentConfirmScreen.tsx
View file

@ -61,7 +61,6 @@ function EquipmentConfirmScreen(props: Props) {
date: getRelativeDateString(start), date: getRelativeDateString(start),
}); });
} }
console.log(buttonText);
return ( return (
<CollapsibleScrollView> <CollapsibleScrollView>
<Card style={{margin: 5}}> <Card style={{margin: 5}}>