From 3fe6be4238349c58de04eefc827501752acca1a8 Mon Sep 17 00:00:00 2001
From: Arnaud Vergnet <vergnet@etud.insa-toulouse.fr>
Date: Thu, 9 Apr 2020 00:43:43 +0200
Subject: [PATCH] Allow going back to last screen after login

---
 App.js                                 |  2 +-
 src/components/Custom/ErrorView.js     |  7 ++++-
 src/components/Lists/WebSectionList.js |  6 ++---
 src/navigation/MainTabNavigator.js     |  4 +--
 src/screens/Amicale/LoginScreen.js     | 37 +++++++++++++++++++++-----
 src/screens/HomeScreen.js              | 22 +++++++--------
 src/utils/URLHandler.js                |  4 +--
 7 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/App.js b/App.js
index 62a3058..c56b066 100644
--- a/App.js
+++ b/App.js
@@ -73,7 +73,7 @@ export default class App extends React.Component<Props, State> {
         // Navigate to nested navigator and pass data to the index screen
         this.navigatorRef.current.navigate('home', {
             screen: 'index',
-            params: {nextScreen: route, data: data, shouldOpen: true}
+            params: {nextScreen: route, data: data}
         });
     };
 
diff --git a/src/components/Custom/ErrorView.js b/src/components/Custom/ErrorView.js
index 4d302c2..8b1c117 100644
--- a/src/components/Custom/ErrorView.js
+++ b/src/components/Custom/ErrorView.js
@@ -9,6 +9,7 @@ import {ERROR_TYPE} from "../../managers/ConnectionManager";
 
 type Props = {
     navigation: Object,
+    route: Object,
     errorCode: number,
     onRefresh: Function,
 }
@@ -85,7 +86,11 @@ class ErrorView extends React.PureComponent<Props, State> {
         </Button>;
     }
 
-    goToLogin = () => this.props.navigation.navigate("login");
+    goToLogin = () => this.props.navigation.navigate("login",
+        {
+           screen: 'index',
+           params: {nextScreen: this.props.route.name}
+        });
 
     getLoginButton() {
         return <Button
diff --git a/src/components/Lists/WebSectionList.js b/src/components/Lists/WebSectionList.js
index 06f4dee..b46f44b 100644
--- a/src/components/Lists/WebSectionList.js
+++ b/src/components/Lists/WebSectionList.js
@@ -19,7 +19,7 @@ type Props = {
     stickyHeader: boolean,
     createDataset: Function,
     updateData: number,
-    itemHeight: number,
+    itemHeight: number | null,
 }
 
 type State = {
@@ -43,7 +43,7 @@ export default class WebSectionList extends React.PureComponent<Props, State> {
         renderSectionHeader: null,
         stickyHeader: false,
         updateData: 0,
-        itemHeight: undefined,
+        itemHeight: null,
     };
 
     refreshInterval: IntervalID;
@@ -198,7 +198,7 @@ export default class WebSectionList extends React.PureComponent<Props, State> {
                             errorCode={ERROR_TYPE.CONNECTION_ERROR}
                             onRefresh={this.onRefresh}/>
                     }
-                    getItemLayout={this.props.itemHeight !== undefined ? this.itemLayout : undefined}
+                    getItemLayout={this.props.itemHeight !== null ? this.itemLayout : undefined}
                 />
                 <Snackbar
                     visible={this.state.snackbarVisible}
diff --git a/src/navigation/MainTabNavigator.js b/src/navigation/MainTabNavigator.js
index c96d725..a7c1166 100644
--- a/src/navigation/MainTabNavigator.js
+++ b/src/navigation/MainTabNavigator.js
@@ -169,7 +169,7 @@ function HomeStackComponent(initialRoute: string | null, defaultData: Object) {
                 initialParams={data}
             />
             <HomeStack.Screen
-                name="planning-information"
+                name="home-planning-information"
                 component={PlanningDisplayScreen}
                 options={{
                     title: i18n.t('screens.planningDisplayScreen'),
@@ -177,7 +177,7 @@ function HomeStackComponent(initialRoute: string | null, defaultData: Object) {
                 }}
             />
             <HomeStack.Screen
-                name="club-information"
+                name="home-club-information"
                 component={ClubDisplayScreen}
                 options={({navigation}) => {
                     return {
diff --git a/src/screens/Amicale/LoginScreen.js b/src/screens/Amicale/LoginScreen.js
index efdb833..2a90857 100644
--- a/src/screens/Amicale/LoginScreen.js
+++ b/src/screens/Amicale/LoginScreen.js
@@ -7,9 +7,11 @@ import ConnectionManager from "../../managers/ConnectionManager";
 import {openBrowser} from "../../utils/WebBrowser";
 import i18n from 'i18n-js';
 import ErrorDialog from "../../components/Dialog/ErrorDialog";
+import {CommonActions} from "@react-navigation/native";
 
 type Props = {
     navigation: Object,
+    route: Object,
 }
 
 type State = {
@@ -44,17 +46,28 @@ class LoginScreen extends React.Component<Props, State> {
 
     onEmailChange: Function;
     onPasswordChange: Function;
-
     passwordInputRef: Object;
 
+    nextScreen: string;
+
     constructor(props) {
         super(props);
         this.onEmailChange = this.onInputChange.bind(this, true);
         this.onPasswordChange = this.onInputChange.bind(this, false);
 
         this.colors = props.theme.colors;
+
+        this.props.navigation.addListener('focus', this.onScreenFocus);
     }
 
+    onScreenFocus = () => {
+        if (this.props.route.params !== undefined && this.props.route.params.nextScreen !== undefined) {
+            this.nextScreen = this.props.route.params.nextScreen;
+            this.props.navigation.dispatch(CommonActions.setParams({nextScreen: 'profile'}));
+        } else
+            this.nextScreen = 'profile';
+    };
+
     showErrorDialog = (error: number) =>
         this.setState({
             dialogVisible: true,
@@ -63,23 +76,33 @@ class LoginScreen extends React.Component<Props, State> {
 
     hideErrorDialog = () => this.setState({dialogVisible: false});
 
-    handleSuccess = () => this.props.navigation.navigate('profile');
+    handleSuccess = () => this.props.navigation.navigate(this.nextScreen);
 
     onResetPasswordClick = () => openBrowser(RESET_PASSWORD_LINK, this.colors.primary);
 
     validateEmail = () => this.setState({isEmailValidated: true});
 
-    isEmailValid() {return emailRegex.test(this.state.email);}
+    isEmailValid() {
+        return emailRegex.test(this.state.email);
+    }
 
-    shouldShowEmailError() {return this.state.isEmailValidated && !this.isEmailValid();}
+    shouldShowEmailError() {
+        return this.state.isEmailValidated && !this.isEmailValid();
+    }
 
     validatePassword = () => this.setState({isPasswordValidated: true});
 
-    isPasswordValid() {return this.state.password !== '';}
+    isPasswordValid() {
+        return this.state.password !== '';
+    }
 
-    shouldShowPasswordError() {return this.state.isPasswordValidated && !this.isPasswordValid();}
+    shouldShowPasswordError() {
+        return this.state.isPasswordValidated && !this.isPasswordValid();
+    }
 
-    shouldEnableLogin() {return this.isEmailValid() && this.isPasswordValid() && !this.state.loading;}
+    shouldEnableLogin() {
+        return this.isEmailValid() && this.isPasswordValid() && !this.state.loading;
+    }
 
     onInputChange(isEmail: boolean, value: string) {
         if (isEmail) {
diff --git a/src/screens/HomeScreen.js b/src/screens/HomeScreen.js
index f753ab9..152a660 100644
--- a/src/screens/HomeScreen.js
+++ b/src/screens/HomeScreen.js
@@ -39,17 +39,12 @@ type Props = {
  */
 class HomeScreen extends React.Component<Props> {
 
-    getRenderItem: Function;
-    createDataset: Function;
-
     colors: Object;
 
     isLoggedIn: boolean | null;
 
     constructor(props) {
         super(props);
-        this.getRenderItem = this.getRenderItem.bind(this);
-        this.createDataset = this.createDataset.bind(this);
         this.colors = props.theme.colors;
 
         this.isLoggedIn = null;
@@ -85,10 +80,10 @@ class HomeScreen extends React.Component<Props> {
 
     handleNavigationParams = () => {
         if (this.props.route.params !== undefined) {
-            if (this.props.route.params.shouldOpen !== undefined && this.props.route.params.shouldOpen) {
+            if (this.props.route.params.nextScreen !== undefined && this.props.route.params.nextScreen !== null) {
                 this.props.navigation.navigate(this.props.route.params.nextScreen, this.props.route.params.data);
                 // reset params to prevent infinite loop
-                this.props.navigation.dispatch(CommonActions.setParams({ shouldOpen: false }));
+                this.props.navigation.dispatch(CommonActions.setParams({ nextScreen: null }));
             }
         }
     };
@@ -122,7 +117,7 @@ class HomeScreen extends React.Component<Props> {
      * @param fetchedData
      * @return {*}
      */
-    createDataset(fetchedData: Object) {
+    createDataset = (fetchedData: Object) => {
         // fetchedData = DATA;
         let newsData = [];
         let dashboardData = [];
@@ -201,7 +196,7 @@ class HomeScreen extends React.Component<Props> {
             return this.getDashboardEventItem(content);
         else if (item['id'] === 'top')
             return this.getDashboardTopItem(content);
-        else if (item['id'] === 'actions')
+        else
             return this.getActionsDashboardItem();
     }
 
@@ -462,10 +457,11 @@ class HomeScreen extends React.Component<Props> {
      * @param section The current section
      * @return {*}
      */
-    getRenderItem({item, section}: Object) {
-        return (section['id'] === SECTIONS_ID[0] ?
-            this.getDashboardItem(item) : this.getFeedItem(item));
-    }
+    getRenderItem = ({item, section}: Object) => {
+        return (section['id'] === SECTIONS_ID[0]
+            ? this.getDashboardItem(item)
+            : this.getFeedItem(item));
+    };
 
     openScanner = () => this.props.navigation.navigate("scanner");
 
diff --git a/src/utils/URLHandler.js b/src/utils/URLHandler.js
index d7c6c5c..94c683c 100644
--- a/src/utils/URLHandler.js
+++ b/src/utils/URLHandler.js
@@ -7,8 +7,8 @@ export default class URLHandler {
     static CLUB_INFO_URL_PATH = "club";
     static EVENT_INFO_URL_PATH = "event";
 
-    static CLUB_INFO_ROUTE = "club-information";
-    static EVENT_INFO_ROUTE = "planning-information";
+    static CLUB_INFO_ROUTE = "home-club-information";
+    static EVENT_INFO_ROUTE = "home-planning-information";
 
     onInitialURLParsed: Function;
     onDetectURL: Function;