Merge branch 'main' into fix-compass-sharedpreferences-migration

compass_app/app/lib/routing/router.dart

@@ -14,7 +14,8 @@ import '../ui/auth/login/widgets/login_screen.dart';
 import '../ui/auth/logout/view_models/logout_viewmodel.dart';
 import '../ui/booking/view_models/booking_viewmodel.dart';
 import '../ui/booking/widgets/booking_screen.dart';
-import '../ui/home/widgets/home_screen_container.dart';
+import '../ui/home/view_models/home_viewmodel.dart';
+import '../ui/home/widgets/home_screen.dart';
 import '../ui/results/view_models/results_viewmodel.dart';
 import '../ui/results/widgets/results_screen.dart';
 import '../ui/search_form/view_models/search_form_viewmodel.dart';

compass_app/app/lib/ui/home/view_models/home_viewmodel.dart

@@ -65,31 +65,27 @@ class HomeViewModel extends ChangeNotifier {
   }
 
   Future<Result<void>> _deleteBooking(int id) async {
-    try {
+    final resultDelete = await _bookingRepository.delete(id);
-      final resultDelete = await _bookingRepository.delete(id);
+    switch (resultDelete) {
-      switch (resultDelete) {
+      case Ok<void>():
-        case Ok<void>():
+        _log.fine('Deleted booking $id');
-          _log.fine('Deleted booking $id');
+      case Error<void>():
-        case Error<void>():
+        _log.warning('Failed to delete booking $id', resultDelete.error);
-          _log.warning('Failed to delete booking $id', resultDelete.error);
+        return resultDelete;
-          return resultDelete;
+    }
-      }
-
-      // After deleting the booking, we need to reload the bookings list.
-      // BookingRepository is the source of truth for bookings.
-      final resultLoadBookings = await _bookingRepository.getBookingsList();
-      switch (resultLoadBookings) {
-        case Ok<List<BookingSummary>>():
-          _bookings = resultLoadBookings.value;
-          _log.fine('Loaded bookings');
-        case Error<List<BookingSummary>>():
-          _log.warning('Failed to load bookings', resultLoadBookings.error);
-          return resultLoadBookings;
-      }
 
-      return resultLoadBookings;
+    // After deleting the booking, reload the bookings list.
-    } finally {
+    final resultLoadBookings = await _bookingRepository.getBookingsList();
-      notifyListeners();
+    switch (resultLoadBookings) {
+      case Ok<List<BookingSummary>>():
+        _bookings = resultLoadBookings.value;
+        _log.fine('Loaded bookings');
+        notifyListeners(); // notify only when data changes
+      case Error<List<BookingSummary>>():
+        _log.warning('Failed to load bookings', resultLoadBookings.error);
+        return resultLoadBookings;
     }
+
+    return resultLoadBookings;
   }
 }

pedometer/lib/pedometer_bindings_generated.dart

@@ -45993,9 +45993,7 @@ class ObjCBlock_ffiVoid_ObjCObject_ffiUnsignedLong_bool extends _ObjCBlockBase {
                       ffi.UnsignedLong,
                       ffi.Pointer<ffi.Bool>,
                     )
-                  >(
+                  >(_ObjCBlock_ffiVoid_ObjCObject_ffiUnsignedLong_bool_closureTrampoline)
-                    _ObjCBlock_ffiVoid_ObjCObject_ffiUnsignedLong_bool_closureTrampoline,
-                  )
                   .cast(),
           _ObjCBlock_ffiVoid_ObjCObject_ffiUnsignedLong_bool_registerClosure(
             (

pubspec.yaml

@@ -50,8 +50,8 @@ skip_ci:
   - add_to_app/multiple_flutters/multiple_flutters_module
   - add_to_app/plugin/flutter_module_using_plugin
   - add_to_app/prebuilt_module/flutter_module
-  # remove after 3.44 release
   - cupertino_gallery
 
 skip_ci_beta:
-  - material_3_demo
+  # - sample_name_to_skip
+

testing_app/ios/Runner/AppDelegate.swift

@@ -1,13 +1,16 @@
-import UIKit
 import Flutter
+import UIKit
 
-@UIApplicationMain
+@main
-@objc class AppDelegate: FlutterAppDelegate {
+@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
   override func application(
     _ application: UIApplication,
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
-    GeneratedPluginRegistrant.register(with: self)
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
+
+  func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
+    GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
+  }
 }

testing_app/ios/Runner/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -24,6 +26,29 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+		<key>UISceneConfigurations</key>
+		<dict>
+			<key>UIWindowSceneSessionRoleApplication</key>
+			<array>
+				<dict>
+					<key>UISceneClassName</key>
+					<string>UIWindowScene</string>
+					<key>UISceneConfigurationName</key>
+					<string>flutter</string>
+					<key>UISceneDelegateClassName</key>
+					<string>FlutterSceneDelegate</string>
+					<key>UISceneStoryboardFile</key>
+					<string>Main</string>
+				</dict>
+			</array>
+		</dict>
+	</dict>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -43,9 +68,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
 </dict>
 </plist>