From 5eb0f1b216ab22a773123f93682b1d698ef04cf6 Mon Sep 17 00:00:00 2001
From: abdul-alaa <abashir@talabat.com>
Date: Thu, 23 Apr 2026 18:01:53 +0400
Subject: [PATCH 1/2] Migrate testing_app to UIScene lifecycle

Part of flutter/flutter#176957
---
 testing_app/ios/Runner/AppDelegate.swift | 11 +++++----
 testing_app/ios/Runner/Info.plist        | 29 ++++++++++++++++++++----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/testing_app/ios/Runner/AppDelegate.swift b/testing_app/ios/Runner/AppDelegate.swift
index 70693e4a8c1..c30b367ec0a 100644
--- a/testing_app/ios/Runner/AppDelegate.swift
+++ b/testing_app/ios/Runner/AppDelegate.swift
@@ -1,13 +1,16 @@
-import UIKit
 import Flutter
+import UIKit
 
-@UIApplicationMain
-@objc class AppDelegate: FlutterAppDelegate {
+@main
+@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)
+  }
 }
diff --git a/testing_app/ios/Runner/Info.plist b/testing_app/ios/Runner/Info.plist
index 0f22db4b24e..434734531a4 100644
--- a/testing_app/ios/Runner/Info.plist
+++ b/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>

From 909861c0da2211a4a264a532e397ae45d7a0c08c Mon Sep 17 00:00:00 2001
From: Eric Windmill <eric@ericwindmill.com>
Date: Fri, 19 Jun 2026 14:34:54 -0700
Subject: [PATCH 2/2] resolve CI break

---
 compass_app/app/lib/routing/router.dart         | 3 ++-
 pedometer/lib/pedometer_bindings_generated.dart | 4 +---
 pubspec.yaml                                    | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/compass_app/app/lib/routing/router.dart b/compass_app/app/lib/routing/router.dart
index 05cad62b082..28470685013 100644
--- a/compass_app/app/lib/routing/router.dart
+++ b/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';
diff --git a/pedometer/lib/pedometer_bindings_generated.dart b/pedometer/lib/pedometer_bindings_generated.dart
index eb567657bcc..91c38f28a23 100644
--- a/pedometer/lib/pedometer_bindings_generated.dart
+++ b/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(
             (
diff --git a/pubspec.yaml b/pubspec.yaml
index a4a3adbf49a..813d5cac611 100644
--- a/pubspec.yaml
+++ b/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
+