Update example README to reflect RN 0.75 changes

Also cleanup AppDelegate.

Author: DanielKuhn

apps/example/README.md

@@ -13,41 +13,42 @@ The Project name in this example is `Example`, which you should replace with you
 
 Create a new `AppDelegate.swift` file, once prompted, click *Create bridging headers for Swift*.
 
-Paste the following code to the `AppDelegate.swift`, it includes Flipper code.
+Paste the following code to the `AppDelegate.swift`.
 
 ```swift
 // ios/AppDelegate.swift
 import UIKit
 import CarPlay
 import React
-#if DEBUG
-#if FB_SONARKIT_ENABLED
-import FlipperKit
-#endif
-#endif
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate, RCTBridgeDelegate {
 
-  var window: UIWindow?
-  var bridge: RCTBridge?;
-  var rootView: RCTRootView?;
+  var rootView: UIView?
+
+  override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
+    moduleName = "RNCarPlayScene"
+    initialProps = [:]
 
-  static var shared: AppDelegate { return UIApplication.shared.delegate as! AppDelegate }
+    let app = super.application(application, didFinishLaunchingWithOptions: launchOptions)
+    self.rootView = self.createRootView(
+      with: self.bridge!,
+      moduleName: self.moduleName!,
+      initProps: self.initialProps!
+    )
+    return app
+  }
 
-  func sourceURL(for bridge: RCTBridge!) -> URL! {
+  override func bundleURL() -> URL? {
     #if DEBUG
-    return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index");
+    return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
     #else
     return Bundle.main.url(forResource:"main", withExtension:"jsbundle")
     #endif
   }
 
-  func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-    initializeFlipper(with: application)
-    self.bridge = RCTBridge.init(delegate: self, launchOptions: launchOptions)
-    self.rootView = RCTRootView.init(bridge: self.bridge!, moduleName: "Example", initialProperties: nil)
-    return true
+  override func sourceURL(for bridge: RCTBridge) -> URL? {
+    return bundleURL()
   }
 
   func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
@@ -64,47 +65,22 @@ class AppDelegate: UIResponder, UIApplicationDelegate, RCTBridgeDelegate {
 
   func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
   }
-
-  private func initializeFlipper(with application: UIApplication) {
-    #if DEBUG
-    #if FB_SONARKIT_ENABLED
-    let client = FlipperClient.shared()
-    let layoutDescriptorMapper = SKDescriptorMapper(defaults: ())
-    client?.add(FlipperKitLayoutPlugin(rootNode: application, with: layoutDescriptorMapper!))
-    client?.add(FKUserDefaultsPlugin(suiteName: nil))
-    client?.add(FlipperKitReactPlugin())
-    client?.add(FlipperKitNetworkPlugin(networkAdapter: SKIOSNetworkAdapter()))
-    client?.start()
-    #endif
-    #endif
-  }
 }
 ```
 
 Paste the following to your bridging header file `Example-Bridging-Header.h`:
 
 ```objc
 // ios/Example-Bridging-Header.h
+#import <RCTAppDelegate.h>
 #import "RNCarPlay.h"
-
-#ifdef DEBUG
-#ifdef FB_SONARKIT_ENABLED
-#import <FlipperKit/FlipperClient.h>
-#import <FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.h>
-#import <FlipperKitUserDefaultsPlugin/FKUserDefaultsPlugin.h>
-#import <FlipperKitNetworkPlugin/FlipperKitNetworkPlugin.h>
-#import <SKIOSNetworkPlugin/SKIOSNetworkAdapter.h>
-#import <FlipperKitReactPlugin/FlipperKitReactPlugin.h>
-#endif
-#endif
 ```
 
-### 3. Add flags for Swift compiler in debug mode
+### 3. Add flag for Swift compiler in debug mode
 
-Go to XCode project, hit `Build Settings`, search for `Swift Compiler - Custom Flags` and then under `Active Compilation Conditions`, add the following flags to `Debug` only:
+Go to XCode project, hit `Build Settings`, search for `Swift Compiler - Custom Flags` and then under `Active Compilation Conditions`, add the following flag to `Debug` only:
 
   - DEBUG
-  - FB_SONARKIT_ENABLED
 
 ### 4. Create Phone Scene
 
@@ -119,11 +95,16 @@ import SwiftUI
 class PhoneSceneDelegate: UIResponder, UIWindowSceneDelegate {
   var window: UIWindow?
   func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
+
+    if session.role != .windowApplication {
+      return
+    }
+
     guard let appDelegate = (UIApplication.shared.delegate as? AppDelegate) else { return }
     guard let windowScene = (scene as? UIWindowScene) else { return }
 
     let rootViewController = UIViewController()
-    rootViewController.view = appDelegate.rootView;
+    rootViewController.view = appDelegate.rootView
 
     let window = UIWindow(windowScene: windowScene)
     window.rootViewController = rootViewController
@@ -146,14 +127,15 @@ import CarPlay
 class CarSceneDelegate: UIResponder, CPTemplateApplicationSceneDelegate {
   func templateApplicationScene(_ templateApplicationScene: CPTemplateApplicationScene,
                                   didConnect interfaceController: CPInterfaceController) {
-    RNCarPlay.connect(with: interfaceController, window: templateApplicationScene.carWindow);
+    RNCarPlay.connect(with: interfaceController, window: templateApplicationScene.carWindow)
   }
 
   func templateApplicationScene(_ templateApplicationScene: CPTemplateApplicationScene, didDisconnectInterfaceController interfaceController: CPInterfaceController) {
     RNCarPlay.disconnect()
   }
 }
 
+
 ```
 
 ### 6. Update the manifest in Info.plist

apps/example/ios/AppDelegate.swift

@@ -5,18 +5,21 @@ import React
 @main
 class AppDelegate: RCTAppDelegate {
 
-  var rootView: UIView?;
-  var concurrentRootEnabled = true;
-
-  static var shared: AppDelegate { return UIApplication.shared.delegate as! AppDelegate }
+  var rootView: UIView?
 
   override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
     moduleName = "RNCarPlayScene"
     initialProps = [:]
 
-    return super.application(application, didFinishLaunchingWithOptions: launchOptions);
+    let app = super.application(application, didFinishLaunchingWithOptions: launchOptions)
+    self.rootView = self.createRootView(
+      with: self.bridge!,
+      moduleName: self.moduleName!,
+      initProps: self.initialProps!
+    )
+    return app
   }
-
+  
   override func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
     if (connectingSceneSession.role == UISceneSession.Role.carTemplateApplication) {
       let scene =  UISceneConfiguration(name: "CarPlay", sessionRole: connectingSceneSession.role)
@@ -31,9 +34,9 @@ class AppDelegate: RCTAppDelegate {
 
   override func bundleURL() -> URL? {
     #if DEBUG
-      return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index");
+    return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
     #else
-      return Bundle.main.url(forResource:"main", withExtension:"jsbundle")
+    return Bundle.main.url(forResource:"main", withExtension:"jsbundle")
     #endif
   }
 

apps/example/ios/CarScene.swift

@@ -4,7 +4,7 @@ import CarPlay
 class CarSceneDelegate: UIResponder, CPTemplateApplicationSceneDelegate {
   func templateApplicationScene(_ templateApplicationScene: CPTemplateApplicationScene,
                                   didConnect interfaceController: CPInterfaceController) {
-    RNCarPlay.connect(with: interfaceController, window: templateApplicationScene.carWindow);
+    RNCarPlay.connect(with: interfaceController, window: templateApplicationScene.carWindow)
   }
 
   func templateApplicationScene(_ templateApplicationScene: CPTemplateApplicationScene, didDisconnectInterfaceController interfaceController: CPInterfaceController) {

apps/example/ios/PhoneScene.swift

@@ -14,7 +14,7 @@ class PhoneSceneDelegate: UIResponder, UIWindowSceneDelegate {
     guard let windowScene = (scene as? UIWindowScene) else { return }
 
     let rootViewController = UIViewController()
-    rootViewController.view = appDelegate.rootView;
+    rootViewController.view = appDelegate.rootView
 
     let window = UIWindow(windowScene: windowScene)
     window.rootViewController = rootViewController

apps/example/ios/RNCarPlayScene-Bridging-Header.h

@@ -1,2 +1,2 @@
-#import "RNCarPlay.h"
 #import <RCTAppDelegate.h>
+#import "RNCarPlay.h"

apps/example/ios/RNCarPlayScene.xcodeproj/project.pbxproj

@@ -495,7 +495,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = RNCarPlayScene;
-				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG FB_SONARKIT_ENABLED";
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OBJC_BRIDGING_HEADER = "RNCarPlayScene-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;