Merge branch 'main' into casper/feedback

Author: A-Kashif108

devtools_options.yaml

@@ -0,0 +1 @@
+extensions:

lib/data/core/router/registry/paths.dart

@@ -17,4 +17,7 @@ class AppPathsRegistry {
   static const String leavesAndRebate = 'leavesAndRebate';
   static const String feedback = 'feedback';
   static const String resetPassword = 'resetPassword';
+
+  static const String noInternetWrapper = '/noInternetWrapper';
+  static const String noInternetConnection = 'noInternetConnection';
 }

lib/data/core/router/registry/routes.dart

@@ -61,5 +61,15 @@ class AppRoutesRegistry {
         ),
       ],
     ),
+    CustomRoute(
+        path: AppPathsRegistry.noInternetWrapper,
+        page: NoInternetWrapper.page,
+        children: [
+          CustomRoute(
+            initial: true,
+            path: AppPathsRegistry.noInternetConnection,
+            page: NoInternetRoute.page,
+          ),
+        ]),
   ];
 }

lib/presentation/app/app.dart

@@ -46,6 +46,8 @@ class _AppetizerAppState extends State<AppetizerApp> {
           return [const LoginWrapper()];
         case NavigateTo.showHomeScreen:
           return [const HomeWrapper()];
+        case NavigateTo.showNoInternetScreen:
+          return [const NoInternetWrapper()];
         default:
           return [];
       }

lib/presentation/app/bloc/app_bloc.dart

@@ -25,6 +25,7 @@ class AppBloc extends Bloc<AppEvent, AppState> {
     on<GetUser>(_onGetUser);
     on<NavigateToHomeScreen>(_onNavigateToHome);
     on<NavigateToLoginScreen>(_onNavigateToLogin);
+    on<NavigateToNoInternetScreen>(_onNavigateToNoInternetScreen);
     on<ToggleCheckOutStatusEvent>(_onToggleCheckOutStatus);
   }
 
@@ -64,8 +65,12 @@ class AppBloc extends Bloc<AppEvent, AppState> {
       emit(state.copyWith(user: user));
       add(const NavigateToHomeScreen());
     } catch (err) {
-      LocalStorageService.setValue(key: AppConstants.LOGGED_IN, value: false);
-      add(const NavigateToLoginScreen());
+      if (LocalStorageService.getValue<bool>(AppConstants.LOGGED_IN) ?? false) {
+        add(const NavigateToNoInternetScreen());
+      } else {
+        LocalStorageService.setValue(key: AppConstants.LOGGED_IN, value: false);
+        add(const NavigateToLoginScreen());
+      }
     }
   }
 
@@ -81,5 +86,10 @@ class AppBloc extends Bloc<AppEvent, AppState> {
     emit(state.copyWith(navigateTo: NavigateTo.showLoginScreen));
   }
 
+  FutureOr<void> _onNavigateToNoInternetScreen(
+      NavigateToNoInternetScreen event, Emitter<AppState> emit) {
+    emit(state.copyWith(navigateTo: NavigateTo.showNoInternetScreen));
+  }
+
   String get userName => _user?.name ?? 'A';
 }

lib/presentation/app/bloc/app_event.dart

@@ -23,6 +23,10 @@ class NavigateToLoginScreen extends AppEvent {
   const NavigateToLoginScreen();
 }
 
+class NavigateToNoInternetScreen extends AppEvent {
+  const NavigateToNoInternetScreen();
+}
+
 class ToggleCheckOutStatusEvent extends AppEvent {
   const ToggleCheckOutStatusEvent();
 }

lib/presentation/app/bloc/app_state.dart

@@ -4,6 +4,7 @@ enum NavigateTo {
   inital,
   showLoginScreen,
   showHomeScreen,
+  showNoInternetScreen,
 }
 
 class AppState {

lib/presentation/no_internet/bloc/no_internet_bloc.dart

@@ -0,0 +1,24 @@
+import 'package:appetizer/domain/repositories/user/user_repository.dart';
+import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
+
+part 'no_internet_event.dart';
+part 'no_internet_state.dart';
+
+class NoInternetBloc extends Bloc<NoInternetEvent, NoInternetState> {
+  final UserRepository repo;
+  NoInternetBloc({required this.repo}) : super(const NoInternetInitial()) {
+    on<ReloadPressed>(_onReloadPressed);
+  }
+
+  void _onReloadPressed(
+      ReloadPressed event, Emitter<NoInternetState> emit) async {
+    emit(const Loading());
+    try {
+      await repo.getCurrentUser();
+      emit(const ReloadSuccess());
+    } catch (e) {
+      emit(const NoInternetInitial());
+    }
+  }
+}

lib/presentation/no_internet/bloc/no_internet_event.dart

@@ -0,0 +1,12 @@
+part of 'no_internet_bloc.dart';
+
+class NoInternetEvent extends Equatable {
+  const NoInternetEvent();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class ReloadPressed extends NoInternetEvent {
+  const ReloadPressed();
+}

lib/presentation/no_internet/bloc/no_internet_state.dart

@@ -0,0 +1,20 @@
+part of 'no_internet_bloc.dart';
+
+class NoInternetState extends Equatable {
+  const NoInternetState();
+
+  @override
+  List<Object> get props => [];
+}
+
+class NoInternetInitial extends NoInternetState {
+  const NoInternetInitial();
+}
+
+class Loading extends NoInternetState {
+  const Loading();
+}
+
+class ReloadSuccess extends NoInternetState {
+  const ReloadSuccess();
+}