chore: refactor

Author: YogendraShelke

example/app.json

@@ -1,4 +1,4 @@
 {
-  "name": "MendixNativeExample",
-  "displayName": "MendixNativeExample"
+  "name": "App",
+  "displayName": "App"
 }

example/ios/MendixNativeExample/AppDelegate.swift

@@ -3,12 +3,18 @@ import React
 import MendixNative
 
 @main
-class AppDelegate: ReactNative {
+class AppDelegate: ReactAppProvider {
+    
     override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
+        super.setUpProvider()
         super.application(application, didFinishLaunchingWithOptions: launchOptions)
         changeRoot(to: Home())
         return true
     }
+    
+    open override func bundleURL() -> URL? {
+        return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
+    }
 }
 
 class Home: UIViewController {
@@ -32,12 +38,6 @@ class Home: UIViewController {
     }
 
     @objc func openApp() {
-        guard let appDelegate = UIApplication.shared.delegate as? AppDelegate else {
-            return
-        }
-        let reactRootView = appDelegate.rootViewFactory.view(withModuleName: "MendixNativeExample")
-        let controller = UIViewController()
-        controller.view = reactRootView
-        appDelegate.changeRoot(to: controller)
+        ReactAppProvider.shared()?.setReactViewController(UIViewController())
     }
 }

ios/Modules/Helper/BundleHelper.swift

@@ -0,0 +1,14 @@
+import Foundation
+
+public class BundleHelper {
+    public static func getJSBundleFile() -> URL? {
+        if hasNativeOtaBundle(), let bundleUrl = OtaJSBundleFileProvider.getBundleUrl() {
+            return bundleUrl
+        }
+        return Bundle.main.url(forResource: "index.ios", withExtension: "bundle", subdirectory: "Bundle")
+    }
+    
+    public static func hasNativeOtaBundle() -> Bool {
+        return FileManager.default.contents(atPath: OtaHelpers.getOtaManifestFilepath()) != nil
+    }
+}

ios/Modules/Helper/DevHelper.swift

@@ -0,0 +1,25 @@
+import React
+
+public class DevHelper {
+    
+    public static func showAppMenu() {
+        devMenu?.show()
+    }
+    
+    public static func toggleElementInspector() {
+        devSettings?.toggleElementInspector()
+    }
+    
+    public static var devSettings: RCTDevSettings? {
+        return ReactHostManager.module(type: RCTDevSettings.self)
+    }
+    
+    public static var devMenu: RCTDevMenu? {
+        return ReactHostManager.module(type: RCTDevMenu.self)
+    }
+    
+    public static func setDebugMode(enabled: Bool) {
+        AppPreferences.remoteDebuggingEnabled = enabled
+        devSettings?.isDebuggingRemotely = enabled
+    }
+}

ios/Modules/Helper/KeychainHelper.swift

@@ -2,6 +2,10 @@ import Foundation
 
 public class KeychainHelper {
 
+    public static func clear() {
+        clear(scopeKey: MxConfiguration.appName)
+    }
+    
     public static func clear(scopeKey: String?) {
         let keys = [
             Self.toAppScopeKey("token", scope: scopeKey),

ios/Modules/Helper/ReactAppProvider.swift

@@ -0,0 +1,68 @@
+import UIKit
+import React
+import React_RCTAppDelegate
+import ReactAppDependencyProvider
+
+open class ReactAppProvider: RCTAppDelegate {
+    
+    var reactRootViewName: String = "App"
+    
+    public func setUpProvider(moduleName: String = "App", reactRootViewName: String = "App") {
+        self.moduleName = moduleName
+        self.reactRootViewName = reactRootViewName
+        automaticallyLoadReactNativeWindow = false
+        dependencyProvider = RCTAppDependencyProvider()
+        initialProps = [:]
+        window = UIApplication
+            .shared
+            .connectedScenes
+            .compactMap { $0 as? UIWindowScene }
+            .first?
+            .windows
+            .first { $0.isKeyWindow } ?? UIWindow(frame: UIScreen.main.bounds)
+    }
+    
+    public override func sourceURL(for bridge: RCTBridge) -> URL? {
+        return self.bundleURL()
+    }
+    
+    open override func bundleURL() -> URL? {
+        return ReactNative.shared.bundleURL()
+    }
+    
+    public func setReactViewController(_ controller: UIViewController) {
+        controller.view = reactAppView()
+        changeRoot(to: controller)
+    }
+    
+    public func reactAppView() -> UIView? {
+        let view = rootViewFactory.view(withModuleName: reactRootViewName)
+        view.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+        view.frame = window.rootViewController?.view.frame ?? .zero
+        return view
+    }
+    
+    public func startReactApp() {
+        
+    }
+    
+    public func stopReactApp() {
+    }
+    
+    public static func shared() -> ReactAppProvider? {
+        return UIApplication.shared.delegate as? ReactAppProvider
+    }
+    
+    public func isReactAppActive() -> Bool {
+        return bridge != nil
+    }
+    
+    public func changeRoot(to controller: UIViewController) {
+        window.rootViewController = controller
+        window.makeKeyAndVisible()
+    }
+    
+    public var rootView: UIView? {
+        return window.rootViewController?.view
+    }
+}

ios/Modules/Helper/ReactHostManager.swift

@@ -0,0 +1,21 @@
+import React
+
+public class ReactHostManager {
+    
+    public static var bridge: RCTBridge? {
+        return ReactAppProvider.shared()?.bridge
+    }
+    
+    public static func module<T: NSObject>(type: T.Type) -> T? {
+        return bridge?.moduleRegistry.module(for: type.self) as? T
+    }
+    
+    public static func module(name: String) -> Any? {
+        return bridge?.moduleRegistry.module(forName: name)
+    }
+    
+    public static var isActive: Bool {
+        return ReactAppProvider.shared()?.isReactAppActive() ?? false
+    }
+}
+

ios/Modules/Helper/StorageHelper.swift

@@ -1,9 +1,9 @@
 import Foundation
 import RNCAsyncStorage
 
-class StorageHelper {
+public class StorageHelper {
 
-    static func clearAll() {
+    public static func clearAll() {
         if let documentPath = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first {
             clearDataAt(url: documentPath, component: MxConfiguration.filesDirectoryName)
         }
@@ -17,7 +17,7 @@ class StorageHelper {
         }
     }
 
-    static func clearDataAt(url: URL, component: String) {
+    public static func clearDataAt(url: URL, component: String) {
         let path = url.appendingPathComponent(component).path
         _ = NativeFsModule.remove(path, error: nil)
     }

ios/Modules/Helper/TapGestureRecognizerHelper.swift

@@ -17,7 +17,7 @@ class TapGestureRecognizerHelper {
     private var tapGestureRecognizer: UITapGestureRecognizer?
 
     @objc private func handleTapAction(_ gestureRecognizer: UITapGestureRecognizer) {
-        if gestureRecognizer.state == .ended && ReactNative.instance.isActive() , let onTapAction {
+        if gestureRecognizer.state == .ended && ReactAppProvider.shared()?.isReactAppActive() == true , let onTapAction {
             onTapAction(gestureRecognizer)
         }
     }

ios/Modules/Helper/UnsafeMxFunction.swift

@@ -20,7 +20,7 @@ enum UnsafeMxFunction {
     }
 
     var target: NSObject? {
-        return ReactNative.instance.rootViewFactory.bridge?.moduleRegistry.module(forName: className) as? NSObject
+        return ReactHostManager.module(name: className) as? NSObject
     }
 
     func perform() {