Add Enhanced Navigation Methods to WoltModalSheet

coffee_maker/android/build.gradle

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

coffee_maker/devtools_options.yaml

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

coffee_maker/ios/Flutter/Debug.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

coffee_maker/ios/Flutter/Release.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

coffee_maker/ios/Podfile

@@ -0,0 +1,44 @@
+# Uncomment this line to define a global platform for your project
+# platform :ios, '12.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+  target 'RunnerTests' do
+    inherit! :search_paths
+  end
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_ios_build_settings(target)
+  end
+end

coffee_maker/lib/home/online/large_screen/large_screen_coffee_order_list_section.dart

@@ -80,7 +80,10 @@ class _LargeScreenCoffeeOrderListHeader extends StatelessWidget {
       ),
       child: Text(
         '${_coffeeMakerStep.stepName} ($_count)',
-        style: Theme.of(context).textTheme.titleMedium!,
+        style: Theme.of(context)
+            .textTheme
+            .titleMedium!
+            .copyWith(color: Colors.black),
         textAlign: TextAlign.center,
       ),
     );

coffee_maker/lib/home/online/modal_pages/add_water/add_water_description_modal_page.dart

@@ -1,15 +1,13 @@
+import 'package:coffee_maker/home/online/view_model/store_online_view_model.dart';
 import 'package:demo_ui_components/demo_ui_components.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:wolt_modal_sheet/wolt_modal_sheet.dart';
 
 class AddWaterDescriptionModalPage {
   AddWaterDescriptionModalPage._();
 
-  static WoltModalSheetPage build({
-    required VoidCallback onCancelPressed,
-    required VoidCallback onNextPage,
-    required VoidCallback onClosed,
-  }) {
+  static WoltModalSheetPage build(String coffeeOrderId) {
     return WoltModalSheetPage(
       heroImage: const Image(
         image: AssetImage('lib/assets/images/add_water_description.png'),
@@ -19,24 +17,35 @@ class AddWaterDescriptionModalPage {
         padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
         child: Column(
           children: [
-            WoltElevatedButton(
-              onPressed: onCancelPressed,
-              theme: WoltElevatedButtonTheme.secondary,
-              child: const Text('Cancel order'),
-            ),
+            Builder(builder: (context) {
+              final model = context.read<StoreOnlineViewModel>();
+
+              return WoltElevatedButton(
+                onPressed: () {
+                  model.onCoffeeOrderStatusChange(coffeeOrderId);
+                  Navigator.pop(context);
+                },
+                theme: WoltElevatedButtonTheme.secondary,
+                child: const Text('Cancel order'),
+              );
+            }),
             const SizedBox(height: 8),
-            WoltElevatedButton(
-              onPressed: onNextPage,
-              child: const Text('Continue to temperature'),
-            ),
+            Builder(builder: (context) {
+              return WoltElevatedButton(
+                onPressed: WoltModalSheet.of(context).showNext,
+                child: const Text('Continue to temperature'),
+              );
+            }),
           ],
         ),
       ),
       pageTitle: const ModalSheetTitle(
         'Adding water for coffee',
         textAlign: TextAlign.center,
       ),
-      trailingNavBarWidget: WoltModalSheetCloseButton(onClosed: onClosed),
+      trailingNavBarWidget: Builder(builder: (context) {
+        return WoltModalSheetCloseButton(onClosed: Navigator.of(context).pop);
+      }),
       child: const Padding(
         padding: EdgeInsets.only(bottom: (2 * WoltElevatedButton.height) + 8),
         child: Padding(

coffee_maker/lib/home/online/modal_pages/add_water/water_settings_modal_page.dart

@@ -1,17 +1,16 @@
+import 'package:coffee_maker/entities/coffee_maker_step.dart';
 import 'package:coffee_maker/home/online/modal_pages/add_water/widgets/water_quantity_temperature_input.dart';
 import 'package:coffee_maker/home/online/modal_pages/add_water/widgets/water_source_list.dart';
+import 'package:coffee_maker/home/online/view_model/store_online_view_model.dart';
 import 'package:demo_ui_components/demo_ui_components.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:wolt_modal_sheet/wolt_modal_sheet.dart';
 
 class WaterSettingsModalPage {
   WaterSettingsModalPage._();
 
-  static WoltModalSheetPage build({
-    required VoidCallback onBackButtonPressed,
-    required VoidCallback onClosed,
-    required VoidCallback onWaterAdded,
-  }) {
+  static WoltModalSheetPage build(String coffeeOrderId) {
     final buttonEnabledListener = ValueNotifier(false);
     const pageTitle = 'Water settings';
 
@@ -21,18 +20,24 @@ class WaterSettingsModalPage {
         builder: (_, isEnabled, __) {
           return Padding(
             padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
-            child: WoltElevatedButton(
-              onPressed: onWaterAdded,
-              enabled: isEnabled,
-              child: const Text('Finish adding water'),
-            ),
+            child: Builder(builder: (context) {
+              final model = context.read<StoreOnlineViewModel>();
+              return WoltElevatedButton(
+                onPressed: () {
+                  model.onCoffeeOrderStatusChange(
+                      coffeeOrderId, CoffeeMakerStep.ready);
+                  Navigator.pop(context);
+                },
+                enabled: isEnabled,
+                child: const Text('Finish adding water'),
+              );
+            }),
           );
         },
       ),
       pageTitle: const ModalSheetTitle(pageTitle),
-      trailingNavBarWidget: WoltModalSheetCloseButton(onClosed: onClosed),
-      leadingNavBarWidget:
-          WoltModalSheetBackButton(onBackPressed: onBackButtonPressed),
+      trailingNavBarWidget: const WoltModalSheetCloseButton(),
+      leadingNavBarWidget: const WoltModalSheetBackButton(),
       child: Padding(
         padding: const EdgeInsets.fromLTRB(16, 16, 16, 120),
         child: Column(

coffee_maker/lib/home/online/modal_pages/grind/grind_or_reject_modal_page.dart

@@ -1,40 +1,47 @@
+import 'package:coffee_maker/entities/coffee_maker_step.dart';
+import 'package:coffee_maker/home/online/view_model/store_online_view_model.dart';
 import 'package:demo_ui_components/demo_ui_components.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:wolt_modal_sheet/wolt_modal_sheet.dart';
 
 class GrindOrRejectModalPage {
   GrindOrRejectModalPage._();
 
-  static WoltModalSheetPage build({
-    required String coffeeOrderId,
-    required VoidCallback onRejectPressed,
-    required VoidCallback onStartGrinding,
-    required VoidCallback onClosed,
-  }) {
+  static WoltModalSheetPage build({required String coffeeOrderId}) {
     return WoltModalSheetPage(
       stickyActionBar: Padding(
         padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
         child: Column(
           children: [
-            WoltElevatedButton(
-              onPressed: onRejectPressed,
-              theme: WoltElevatedButtonTheme.secondary,
-              colorName: WoltColorName.red,
-              child: const Text('Reject order'),
-            ),
+            Builder(builder: (context) {
+              return WoltElevatedButton(
+                onPressed: WoltModalSheet.of(context).showNext,
+                theme: WoltElevatedButtonTheme.secondary,
+                colorName: WoltColorName.red,
+                child: const Text('Reject order'),
+              );
+            }),
             const SizedBox(height: 8),
-            WoltElevatedButton(
-              onPressed: onStartGrinding,
-              child: const Text('Start grinding'),
-            ),
+            Builder(builder: (context) {
+              final model = context.read<StoreOnlineViewModel>();
+              return WoltElevatedButton(
+                onPressed: () {
+                  model.onCoffeeOrderStatusChange(
+                      coffeeOrderId, CoffeeMakerStep.addWater);
+                  Navigator.pop(context);
+                },
+                child: const Text('Start grinding'),
+              );
+            }),
           ],
         ),
       ),
       pageTitle: ModalSheetTitle(
         'Are you ready to prepare order $coffeeOrderId?',
         textAlign: TextAlign.center,
       ),
-      trailingNavBarWidget: WoltModalSheetCloseButton(onClosed: onClosed),
+      trailingNavBarWidget: const WoltModalSheetCloseButton(),
       child: const Padding(
         padding: EdgeInsets.only(bottom: (2 * WoltElevatedButton.height) + 48),
         child: Padding(

coffee_maker/lib/home/online/modal_pages/grind/reject_order_modal_page.dart

@@ -1,16 +1,14 @@
 import 'package:coffee_maker/home/online/modal_pages/grind/reject_order_reason.dart';
+import 'package:coffee_maker/home/online/view_model/store_online_view_model.dart';
 import 'package:demo_ui_components/demo_ui_components.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
 import 'package:wolt_modal_sheet/wolt_modal_sheet.dart';
 
 class RejectOrderModalPage {
   RejectOrderModalPage._();
 
-  static WoltModalSheetPage build({
-    required VoidCallback onCoffeeOrderRejected,
-    required VoidCallback onBackButtonPressed,
-    required VoidCallback onClosed,
-  }) {
+  static WoltModalSheetPage build({required String coffeeOrderId}) {
     final buttonEnabledListener = ValueNotifier(false);
 
     return WoltModalSheetPage(
@@ -19,20 +17,25 @@ class RejectOrderModalPage {
         builder: (_, isEnabled, __) {
           return Padding(
             padding: const EdgeInsets.fromLTRB(16, 0, 16, 16),
-            child: WoltElevatedButton(
-              onPressed: onCoffeeOrderRejected,
-              theme: WoltElevatedButtonTheme.secondary,
-              colorName: WoltColorName.red,
-              enabled: isEnabled,
-              child: const Text('Reject'),
-            ),
+            child: Builder(builder: (context) {
+              final model = context.read<StoreOnlineViewModel>();
+              return WoltElevatedButton(
+                onPressed: () {
+                  model.onCoffeeOrderStatusChange(coffeeOrderId);
+                  Navigator.pop(context);
+                },
+                theme: WoltElevatedButtonTheme.secondary,
+                colorName: WoltColorName.red,
+                enabled: isEnabled,
+                child: const Text('Reject'),
+              );
+            }),
           );
         },
       ),
       pageTitle: const ModalSheetTitle('Reject order'),
-      trailingNavBarWidget: WoltModalSheetCloseButton(onClosed: onClosed),
-      leadingNavBarWidget:
-          WoltModalSheetBackButton(onBackPressed: onBackButtonPressed),
+      trailingNavBarWidget: const WoltModalSheetCloseButton(),
+      leadingNavBarWidget: const WoltModalSheetBackButton(),
       child: Padding(
         padding: const EdgeInsets.only(bottom: 120),
         child: Padding(