Merge pull request #120 from PennyPilot/fix/initial-screen

Fix/initial screen

Author: mohamedshemees

lib/money_app.dart

@@ -18,12 +18,21 @@ class AuthRedirectNotifier extends ChangeNotifier {
   final AuthenticationRepository _authRepository;
   late final StreamSubscription<AuthState> _subscription;
   bool _isPasswordRecovery = false;
+  bool _isAuthenticated = false;
+
+  bool get isAuthenticated => _isAuthenticated;
 
   AuthRedirectNotifier(this._authRepository) {
     _subscription = _authRepository.onAuthStateChange.listen((data) {
       if (data.event == AuthChangeEvent.passwordRecovery) {
         _isPasswordRecovery = true;
         notifyListeners();
+      } else if (data.session != null) {
+        _isAuthenticated = true;
+        notifyListeners();
+      } else {
+        _isAuthenticated = false;
+        notifyListeners();
       }
     });
   }
@@ -39,13 +48,18 @@ final _authRedirectNotifier =
     AuthRedirectNotifier(getIt<AuthenticationRepository>());
 final _router = GoRouter(
   routes: $appRoutes,
-  initialLocation: '/login',
+  initialLocation: _authRedirectNotifier.isAuthenticated ? RoutePaths.main : RoutePaths.login,
   refreshListenable: _authRedirectNotifier,
   redirect: (context, state) {
     if (_authRedirectNotifier._isPasswordRecovery) {
       _authRedirectNotifier._isPasswordRecovery = false;
-      return '/update_password';
+      return RoutePaths.forgetPassword;
     }
+
+    final loggingIn = state.matchedLocation == RoutePaths.login;
+    if (!_authRedirectNotifier.isAuthenticated && !loggingIn) return RoutePaths.login;
+    if (_authRedirectNotifier.isAuthenticated && loggingIn) return RoutePaths.main;
+
     return null;
   },
 );

lib/presentation/navigation/routes.dart

@@ -17,7 +17,20 @@ import '../trasnaction_details/transaction_details_screen.dart';
 
 part 'routes.g.dart';
 
-@TypedGoRoute<OnBoardingRoute>(path: '/')
+abstract class RoutePaths {
+  static const String onBoarding = '/';
+  static const String login = '/login';
+  static const String main = '/main';
+  static const String createAccount = '/createAccount';
+  static const String statistics = '/statistics';
+  static const String transactionDetails = '/transaction_details';
+  static const String forgetPassword = '/forget_password';
+  static const String updatePassword = '/update_password';
+  static const String addIncome = '/add-income';
+  static const String addExpense = '/add-expense';
+}
+
+@TypedGoRoute<OnBoardingRoute>(path: RoutePaths.onBoarding)
 @immutable
 class OnBoardingRoute extends GoRouteData with $OnBoardingRoute {
   const OnBoardingRoute();
@@ -38,7 +51,7 @@ class OnBoardingRoute extends GoRouteData with $OnBoardingRoute {
   }
 }
 
-@TypedGoRoute<LoginRoute>(path: '/login')
+@TypedGoRoute<LoginRoute>(path: RoutePaths.login)
 @immutable
 class LoginRoute extends GoRouteData with $LoginRoute {
   const LoginRoute();
@@ -52,7 +65,7 @@ class LoginRoute extends GoRouteData with $LoginRoute {
   }
 }
 
-@TypedGoRoute<MainRoute>(path: '/main')
+@TypedGoRoute<MainRoute>(path: RoutePaths.main)
 @immutable
 class MainRoute extends GoRouteData with $MainRoute {
   const MainRoute();
@@ -63,7 +76,7 @@ class MainRoute extends GoRouteData with $MainRoute {
   }
 }
 
-@TypedGoRoute<CreateAccountRoute>(path: '/createAccount')
+@TypedGoRoute<CreateAccountRoute>(path: RoutePaths.createAccount)
 @immutable
 class CreateAccountRoute extends GoRouteData
     with $CreateAccountRoute {
@@ -75,7 +88,7 @@ class CreateAccountRoute extends GoRouteData
   }
 }
 
-@TypedGoRoute<StatisticsRoute>(path: '/statistics')
+@TypedGoRoute<StatisticsRoute>(path: RoutePaths.statistics)
 @immutable
 class StatisticsRoute extends GoRouteData
     with $StatisticsRoute {
@@ -90,7 +103,7 @@ class StatisticsRoute extends GoRouteData
   }
 }
 
-@TypedGoRoute<TransactionDetailsRoute>(path: '/transaction_details')
+@TypedGoRoute<TransactionDetailsRoute>(path: RoutePaths.transactionDetails)
 @immutable
 class TransactionDetailsRoute extends GoRouteData with $TransactionDetailsRoute {
   final String transactionId;
@@ -102,7 +115,7 @@ class TransactionDetailsRoute extends GoRouteData with $TransactionDetailsRoute
   }
 }
 
-@TypedGoRoute<ForgetPasswordRoute>(path: '/forget_password')
+@TypedGoRoute<ForgetPasswordRoute>(path: RoutePaths.forgetPassword)
 @immutable
 class ForgetPasswordRoute extends GoRouteData with $ForgetPasswordRoute {
   const ForgetPasswordRoute();
@@ -113,7 +126,7 @@ class ForgetPasswordRoute extends GoRouteData with $ForgetPasswordRoute {
   }
 }
 
-@TypedGoRoute<UpdatePasswordRoute>(path: '/update_password')
+@TypedGoRoute<UpdatePasswordRoute>(path: RoutePaths.updatePassword)
 @immutable
 class UpdatePasswordRoute extends GoRouteData with $UpdatePasswordRoute {
   @override
@@ -122,7 +135,7 @@ class UpdatePasswordRoute extends GoRouteData with $UpdatePasswordRoute {
   }
 }
 
-@TypedGoRoute<AddIncomeRoute>(path: '/add-income')
+@TypedGoRoute<AddIncomeRoute>(path: RoutePaths.addIncome)
 @immutable
 class AddIncomeRoute extends GoRouteData with $AddIncomeRoute {
   const AddIncomeRoute();
@@ -133,7 +146,7 @@ class AddIncomeRoute extends GoRouteData with $AddIncomeRoute {
   }
 }
 
-@TypedGoRoute<AddExpenseRoute>(path: '/add-expense')
+@TypedGoRoute<AddExpenseRoute>(path: RoutePaths.addExpense)
 @immutable
 class AddExpenseRoute extends GoRouteData with $AddExpenseRoute {
   const AddExpenseRoute();