MS-497 pg icons not icons utilization in the response of checkout api i os native

Sample/ios/Runner/AppDelegate.swift

@@ -2,12 +2,15 @@ import Flutter
 import UIKit
 
 @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)
+  }
 }

Sample/ios/Runner/Info.plist

@@ -4,6 +4,8 @@
 <dict>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
 	<true/>
+	<key>CFBundleAllowMixedLocalizations</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -28,6 +30,27 @@
 	<false/>
 	<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>
@@ -40,8 +63,6 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>CFBundleAllowMixedLocalizations</key>
-	<true/>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

Sample/lib/api/model/pg_codes.dart

@@ -11,7 +11,9 @@ enum PGCode {
 
   apple_pay(code: "apple-pay", name: "Apple Pay"),
   tap_pg(code: "tap_pg", name: "Tag PG"),
-  ottu_sdk(code: "ottu_sdk", name: "Ottu Sdk");
+  ottu_sdk(code: "ottu_sdk", name: "Ottu Sdk"),
+  cod(code: "cod", name: "cod"),
+  jamiawallet(code: "jamiawallet", name: "jamiawallet");
 
   const PGCode({required this.code, required this.name, this.inverselyRelated});
 

Sample/lib/feature/home/home_screen.dart

@@ -287,18 +287,6 @@ class _HomeScreenState extends State<HomeScreen> {
                           Text('Fail payment validation', style: TextStyle(color: Colors.red)),
                         ],
                       ),
-                      Row(
-                        children: [
-                          Checkbox(
-                            checkColor: Colors.red,
-                            value: state.failPaymentValidation ?? false,
-                            onChanged: (bool? value) {
-                              context.read<HomeScreenCubit>().onFailPaymentValidation(value);
-                            },
-                          ),
-                          Text('Fail payment validation', style: TextStyle(color: Colors.red)),
-                        ],
-                      ),
                       const SizedBox(height: 24),
                       Divider(height: 2, thickness: 3),
                       const Text('Payment methods:'),

Sample/lib/feature/home/home_screen_cubit.dart

@@ -76,6 +76,8 @@ class HomeScreenCubit extends Cubit<HomeScreenState> {
                  //PGCode.urpay: true,
                  PGCode.tamara: true,
                  PGCode.tabby: true,
+                 PGCode.cod: true,
+                 PGCode.jamiawallet: true,
                }),
              ),
        ) {

ios/ottu_flutter_checkout/Sources/ottu_flutter_checkout/CheckoutPlatformView.swift

@@ -221,19 +221,25 @@ public class CheckoutPlatformView: NSObject, FlutterPlatformView {
     }
 
     func tryAttachController() {
+        Logger.sdk.info("tryAttachController")
         guard let pvc = self.paymentViewController else { return }
 
-        if let parentVC = UIApplication.shared.delegate?.window??
-            .rootViewController as? FlutterViewController
-        {
-            parentVC.addChild(pvc)
-            _view.addCheckoutView(pvc.view)
-            pvc.didMove(toParent: parentVC)
-            Logger.sdk.info("Added to parent!")
-        } else {
-            Logger.sdk.info("Waiting for parent...")
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
-                self.tryAttachController()
+        if let scene = UIApplication.shared.connectedScenes.first as? UIWindowScene {
+            if let window = scene.windows.first(where: { $0.isKeyWindow }) {
+                let rootViewController = window.rootViewController
+                Logger.sdk.info("tryAttachController, pvc: \(rootViewController)")
+                if let parentVC = rootViewController as? FlutterViewController {
+                    Logger.sdk.debug("tryAttachController, addChild PVC")
+                    parentVC.addChild(pvc)
+                    _view.addCheckoutView(pvc.view)
+                    pvc.didMove(toParent: parentVC)
+                    Logger.sdk.info("Added to parent!")
+                } else {
+                    Logger.sdk.info("tryAttachController, PVC hasn found, waiting for parent...")
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+                        self.tryAttachController()
+                    }
+                }
             }
         }
     }

lib/src/checkout_widget.dart

@@ -49,6 +49,9 @@ class _OttuCheckoutWidgetState extends State<OttuCheckoutWidget> {
   @override
   void initState() {
     super.initState();
+    if (kDebugMode) {
+      print("OttuCheckoutWidget.initState()");
+    }
     _methodChannel.setMethodCallHandler(_handleChannelMethod);
   }