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

Improved amicale home button and post login behavior

Browse source
This commit is contained in:
Arnaud Vergnet 2020-06-26 12:28:18 +02:00
parent fe9089881a
commit f2acb59ea7
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/components/Home/ActionsDashboardItem.js
View file

@ -44,10 +44,8 @@ class ActionsDashBoardItem extends React.Component<Props> {
? "chevron-right" ? "chevron-right"
: "login"}/>} : "login"}/>}
onPress={isLoggedIn onPress={isLoggedIn
? () => this.props.navigation.navigate("services", { ? () => this.props.navigation.navigate("profile")
screen: 'index' : () => this.props.navigation.navigate("login", {nextScreen: "profile"})}
})
: () => this.props.navigation.navigate("login")}
style={styles.list} style={styles.list}
/> />
</Card> </Card>

23
src/screens/Amicale/LoginScreen.js
View file

@ -50,11 +50,27 @@ class LoginScreen extends React.Component<Props, State> {
onPasswordChange: Function; onPasswordChange: Function;
passwordInputRef: Object; passwordInputRef: Object;
nextScreen: string | null;
constructor(props) { constructor(props) {
super(props); super(props);
this.onEmailChange = this.onInputChange.bind(this, true); this.onEmailChange = this.onInputChange.bind(this, true);
this.onPasswordChange = this.onInputChange.bind(this, false); this.onPasswordChange = this.onInputChange.bind(this, false);
this.props.navigation.addListener('focus', this.onScreenFocus);
}
onScreenFocus = () => {
this.handleNavigationParams();
};
handleNavigationParams () {
if (this.props.route.params != null) {
if (this.props.route.params.nextScreen != null)
this.nextScreen = this.props.route.params.nextScreen;
else
this.nextScreen = null;
}
console.log(this.nextScreen);
} }
showErrorDialog = (error: number) => showErrorDialog = (error: number) =>
@ -65,7 +81,12 @@ class LoginScreen extends React.Component<Props, State> {
hideErrorDialog = () => this.setState({dialogVisible: false}); hideErrorDialog = () => this.setState({dialogVisible: false});
handleSuccess = () => this.props.navigation.goBack(); handleSuccess = () => {
if (this.nextScreen == null)
this.props.navigation.goBack();
else
this.props.navigation.replace(this.nextScreen);
};
onResetPasswordClick = () => Linking.openURL(RESET_PASSWORD_PATH); onResetPasswordClick = () => Linking.openURL(RESET_PASSWORD_PATH);