Merge pull request #301 from woltapp/remove-provider-dependency-from-…

…coffee-maker-nav2-example Remove Provider state management dependency from coffee maker nav2 example
woltapp · Aug 17, 2024 · fed3802 · fed3802
2 parents 2c6c245 + 65a11a2
commit fed3802
Show file tree

Hide file tree

Showing 70 changed files with 758 additions and 740 deletions.
diff --git a/coffee_maker_navigator_2/lib/app.dart b/coffee_maker_navigator_2/lib/app.dart
diff --git a/coffee_maker_navigator_2/lib/app/app.dart b/coffee_maker_navigator_2/lib/app/app.dart
@@ -0,0 +1,26 @@
+import 'package:wolt_di/wolt_di.dart';
+import 'package:coffee_maker_navigator_2/app/di/coffee_maker_app_level_dependency_container.dart';
+import 'package:demo_ui_components/demo_ui_components.dart';
+import 'package:flutter/material.dart';
+
+class CoffeeMakerApp extends StatelessWidget {
+  const CoffeeMakerApp({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return DependencyInjector(
+      child: Builder(builder: (context) {
+        final appLevelDependencyContainer = DependencyInjector.container<
+            CoffeeMakerAppLevelDependencyContainer>(context);
+
+        return MaterialApp.router(
+          debugShowCheckedModeBanner: false,
+          theme: AppThemeData.themeData(context),
+          routerDelegate: appLevelDependencyContainer.appRouterDelegate,
+          backButtonDispatcher:
+              appLevelDependencyContainer.backButtonDispatcher,
+        );
+      }),
+    );
+  }
+}
diff --git a/...ta/auth/local/auth_local_data_source.dart → ...th/data/local/auth_local_data_source.dart b/...ta/auth/local/auth_local_data_source.dart → ...th/data/local/auth_local_data_source.dart
diff --git a/...data/auth/repository/auth_repository.dart → ...auth/data/repository/auth_repository.dart b/...data/auth/repository/auth_repository.dart → ...auth/data/repository/auth_repository.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:coffee_maker_navigator_2/data/auth/local/auth_local_data_source.dart';
+import 'package:coffee_maker_navigator_2/app/auth/data/local/auth_local_data_source.dart';
 
 class AuthRepository {
   final AuthLocalDataSource localAuthDataSource;

diff --git a/...gator_2/lib/domain/auth/auth_service.dart → ...r_2/lib/app/auth/domain/auth_service.dart b/...gator_2/lib/domain/auth/auth_service.dart → ...r_2/lib/app/auth/domain/auth_service.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:coffee_maker_navigator_2/data/auth/repository/auth_repository.dart';
+import 'package:coffee_maker_navigator_2/app/auth/data/repository/auth_repository.dart';
 import 'package:flutter/foundation.dart';
 
 abstract interface class AuthService {
@@ -11,6 +11,8 @@ abstract interface class AuthService {
   Future<void> logOut();
 
   Future<void> logIn(String email, String password);
+
+  void dispose();
 }
 
 class AuthServiceImpl implements AuthService {
@@ -50,4 +52,9 @@ class AuthServiceImpl implements AuthService {
       _authStateNotifier.value = false;
     }
   }
+
+  @override
+  void dispose() {
+    _authStateNotifier.dispose();
+  }
 }
diff --git a/...maker_app_level_dependency_container.dart → ...maker_app_level_dependency_container.dart b/...maker_app_level_dependency_container.dart → ...maker_app_level_dependency_container.dart
@@ -1,11 +1,11 @@
-import 'package:coffee_maker_navigator_2/data/auth/local/auth_local_data_source.dart';
-import 'package:coffee_maker_navigator_2/data/auth/repository/auth_repository.dart';
-import 'package:coffee_maker_navigator_2/data/onboarding/local/onboarding_local_data_source.dart';
-import 'package:coffee_maker_navigator_2/data/onboarding/repository/onboarding_repository.dart';
-import 'package:coffee_maker_navigator_2/domain/auth/auth_service.dart';
-import 'package:coffee_maker_navigator_2/domain/onboarding/onboarding_service.dart';
-import 'package:coffee_maker_navigator_2/ui/router/view/app_router_delegate.dart';
-import 'package:coffee_maker_navigator_2/ui/router/view_model/router_view_model.dart';
+import 'package:coffee_maker_navigator_2/app/auth/data/local/auth_local_data_source.dart';
+import 'package:coffee_maker_navigator_2/app/auth/data/repository/auth_repository.dart';
+import 'package:coffee_maker_navigator_2/app/auth/domain/auth_service.dart';
+import 'package:coffee_maker_navigator_2/features/onboarding/data/local/onboarding_local_data_source.dart';
+import 'package:coffee_maker_navigator_2/features/onboarding/data/repository/onboarding_repository.dart';
+import 'package:coffee_maker_navigator_2/features/onboarding/domain/onboarding_service.dart';
+import 'package:coffee_maker_navigator_2/app/router/view/app_router_delegate.dart';
+import 'package:coffee_maker_navigator_2/app/router/view_model/router_view_model.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -78,6 +78,6 @@ class CoffeeMakerAppLevelDependencyContainer
       onboardingService: _onboardingService,
       isUserLoggedIn: _authService.authStateListenable.value ?? false,
       isTutorialShown: _onboardingService.isTutorialShown(),
-    )..onInit();
+    );
   }
 }
diff --git a/...ib/ui/router/entities/app_route_page.dart → ...b/app/router/entities/app_route_page.dart b/...ib/ui/router/entities/app_route_page.dart → ...b/app/router/entities/app_route_page.dart
@@ -1,16 +1,15 @@
-import 'package:coffee_maker_navigator_2/domain/orders/entities/coffee_maker_step.dart';
-import 'package:coffee_maker_navigator_2/ui/add_water/view/add_water_screen.dart';
-import 'package:coffee_maker_navigator_2/ui/auth/view/auth_screen.dart';
-import 'package:coffee_maker_navigator_2/ui/onboarding/view/onboarding_modal_sheet_page.dart';
-import 'package:coffee_maker_navigator_2/ui/orders/view/modal_pages/grind/grind_or_reject_modal_page.dart';
-import 'package:coffee_maker_navigator_2/ui/orders/view/modal_pages/grind/reject_order_modal_page.dart';
-import 'package:coffee_maker_navigator_2/ui/orders/view/orders_screen.dart';
-import 'package:coffee_maker_navigator_2/ui/router/entities/app_route_settings_name.dart';
-import 'package:coffee_maker_navigator_2/ui/router/view_model/router_view_model.dart';
-import 'package:coffee_maker_navigator_2/ui/tutorials/view/single_tutorial_screen.dart';
-import 'package:coffee_maker_navigator_2/ui/tutorials/view/tutorials_screen.dart';
+import 'package:coffee_maker_navigator_2/features/add_water/ui/view/add_water_screen.dart';
+import 'package:coffee_maker_navigator_2/features/orders/domain/entities/coffee_maker_step.dart';
+import 'package:coffee_maker_navigator_2/features/tutorial/view/single_tutorial_screen.dart';
+import 'package:coffee_maker_navigator_2/features/tutorial/view/tutorials_screen.dart';
+import 'package:coffee_maker_navigator_2/features/login/ui/view/login_screen.dart';
+import 'package:coffee_maker_navigator_2/features/onboarding/ui/view/onboarding_modal_sheet_page.dart';
+import 'package:coffee_maker_navigator_2/features/orders/ui/view/modal_pages/grind/grind_or_reject_modal_page.dart';
+import 'package:coffee_maker_navigator_2/features/orders/ui/view/modal_pages/grind/reject_order_modal_page.dart';
+import 'package:coffee_maker_navigator_2/features/orders/ui/view/orders_screen.dart';
+import 'package:coffee_maker_navigator_2/app/router/entities/app_route_settings_name.dart';
+import 'package:coffee_maker_navigator_2/utils/extensions/context_extensions.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 import 'package:wolt_modal_sheet/wolt_modal_sheet.dart';
 
 sealed class AppRoutePage<T> extends Page<T> {
@@ -26,7 +25,7 @@ class AuthRoutePage extends AppRoutePage<void> {
   @override
   Route<void> createRoute(BuildContext context) {
     return MaterialPageRoute<void>(
-      builder: (context) => const AuthScreen(),
+      builder: (context) => const LoginScreen(),
       settings: this,
     );
   }
@@ -115,9 +114,9 @@ class OnboardingModalRoutePage extends AppRoutePage<void> {
         (context) => [OnboardingModalSheetPage()],
       ),
       onModalDismissedWithDrag:
-          context.read<RouterViewModel>().onCloseOnboardingModalSheet,
+          context.routerViewModel.onCloseOnboardingModalSheet,
       onModalDismissedWithBarrierTap:
-          context.read<RouterViewModel>().onCloseOnboardingModalSheet,
+          context.routerViewModel.onCloseOnboardingModalSheet,
     );
   }
 }
@@ -127,8 +126,7 @@ class GrindCoffeeModalRoutePage extends AppRoutePage<void> {
   String get name => RouteSettingsName.onboarding.routeName;
 
   final String coffeeOrderId;
-  final void Function(String orderId, [CoffeeMakerStep? newStep])
-      onCoffeeOrderStatusChange;
+  final OnCoffeeOrderStatusChange onCoffeeOrderStatusChange;
 
   GrindCoffeeModalRoutePage(
     this.coffeeOrderId,

diff --git a/...ter/entities/app_route_settings_name.dart → ...ter/entities/app_route_settings_name.dart b/...ter/entities/app_route_settings_name.dart → ...ter/entities/app_route_settings_name.dart
diff --git a/...b/ui/router/view/app_router_delegate.dart → .../app/router/view/app_router_delegate.dart b/...b/ui/router/view/app_router_delegate.dart → .../app/router/view/app_router_delegate.dart
@@ -1,36 +1,36 @@
 import 'dart:async';
 
-import 'package:coffee_maker_navigator_2/ui/orders/view/widgets/coffee_order_list_view_for_step.dart';
-import 'package:coffee_maker_navigator_2/ui/router/entities/app_route_page.dart';
-import 'package:coffee_maker_navigator_2/ui/router/view_model/router_view_model.dart';
+import 'package:coffee_maker_navigator_2/features/orders/ui/view/widgets/coffee_order_list_view_for_step.dart';
+import 'package:coffee_maker_navigator_2/app/router/entities/app_route_page.dart';
+import 'package:coffee_maker_navigator_2/utils/extensions/context_extensions.dart';
 import 'package:demo_ui_components/demo_ui_components.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
 
 class AppRouterDelegate extends RouterDelegate<Object> with ChangeNotifier {
   GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
 
   @override
   Widget build(BuildContext context) {
-    final routerViewModel = context.watch<RouterViewModel>();
-    final pages = routerViewModel.state.pages;
-
-    return Navigator(
-      key: navigatorKey,
-      pages: pages,
-      onPopPage: (route, result) {
-        final context = navigatorKey.currentContext;
-        final name = route.settings.name;
-
-        if (context != null && name != null) {
-          context
-              .read<RouterViewModel>()
-              .onPagePoppedImperatively(poppingPageName: name);
-        }
-
-        return route.didPop(result);
+    return ValueListenableBuilder<List<AppRoutePage>>(
+      valueListenable: context.routerViewModel.pages,
+      builder: (context, pages, __) {
+        return Navigator(
+          key: navigatorKey,
+          pages: pages,
+          onPopPage: (route, result) {
+            final context = navigatorKey.currentContext;
+            final name = route.settings.name;
+
+            if (context != null && name != null) {
+              context.routerViewModel
+                  .onPagePoppedImperatively(poppingPageName: name);
+            }
+
+            return route.didPop(result);
+          },
+          observers: [_AppRouteObserver(Theme.of(context).colorScheme)],
+        );
       },
-      observers: [_AppRouteObserver(Theme.of(context).colorScheme)],
     );
   }
 
@@ -43,8 +43,7 @@ class AppRouterDelegate extends RouterDelegate<Object> with ChangeNotifier {
       if (_isImperativePopFromOrderScreenModals(currentContext)) {
         return Future.value(true);
       }
-      return currentContext
-          .read<RouterViewModel>()
+      return currentContext.routerViewModel
           .onPagePoppedWithOperatingSystemIntent();
     }