diff --git a/android/app/src/dev/res/values/strings.xml b/android/app/src/dev/res/values/strings.xml index 51bffb312..43ca31b56 100644 --- a/android/app/src/dev/res/values/strings.xml +++ b/android/app/src/dev/res/values/strings.xml @@ -8,4 +8,6 @@ Continue Please verify that your Mendix App is running. This is not a valid QR code. + Enable dev mode + Clear data diff --git a/ios/Dev/MendixApp/MendixAppViewController.swift b/ios/Dev/MendixApp/MendixAppViewController.swift index 4d27f47b7..882c8be39 100644 --- a/ios/Dev/MendixApp/MendixAppViewController.swift +++ b/ios/Dev/MendixApp/MendixAppViewController.swift @@ -1,7 +1,7 @@ import UIKit import MendixNative -class MendixAppViewController: UIViewController, ReactNativeDelegate { +class MendixAppViewController: UIViewController, ReactNativeDelegateInternal { override func viewDidLoad() { super.viewDidLoad() diff --git a/ios/Dev/MendixApp/MendixReactWindowExtensions.swift b/ios/Dev/MendixApp/MendixReactWindowExtensions.swift deleted file mode 100644 index 1bcfa74c5..000000000 --- a/ios/Dev/MendixApp/MendixReactWindowExtensions.swift +++ /dev/null @@ -1,13 +0,0 @@ -import MendixNative - -extension MendixReactWindow { - open override var canBecomeFirstResponder: Bool { - return true - } - - open override func motionEnded(_ motion: UIEvent.EventSubtype, with event: UIEvent?) { - if (motion == .motionShake && ReactAppProvider.isReactAppActive()) { - DevHelper.showAppMenu(); - } - } -} diff --git a/ios/Extensions/AppDelegate+Extension.swift b/ios/Extensions/AppDelegate+Extension.swift index 4f8cd6ecf..f6e90065d 100644 --- a/ios/Extensions/AppDelegate+Extension.swift +++ b/ios/Extensions/AppDelegate+Extension.swift @@ -1,9 +1,5 @@ import Foundation import MendixNative -import React_RCTAppDelegate -#if canImport(ReactAppDependencyProvider) -import ReactAppDependencyProvider -#endif extension AppDelegate { @@ -22,20 +18,14 @@ extension AppDelegate { func showUnrecoverableDialog(title: String, message: String) { let controller = UIAlertController(title: title, message: message, preferredStyle: .alert) controller.addAction(.init(title: "Close", style: .default, handler: {_ in - fatalError(message) + print(message) + exit(0) })) window?.rootViewController?.present(controller, animated: true, completion: nil) } func setupApp(application: UIApplication, launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) { - #if canImport(ReactAppDependencyProvider) - let appDependencyProvider: any RCTDependencyProvider = RCTAppDependencyProvider() - setUpProvider(dependencyProvider: appDependencyProvider) - #else setUpProvider() - #endif - - super.application(application, didFinishLaunchingWithOptions: launchOptions) clearKeychain() setupUI() } diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 078d994fe..7718a4454 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -49,6 +49,7 @@ PODS: - React-renderercss - React-rendererdebug - React-utils + - ReactAppDependencyProvider - ReactCodegen - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core @@ -3728,12 +3729,12 @@ SPEC CHECKSUMS: FBLazyVector: baf9d0492aa305444465c798e972f87e6a60dc69 fmt: 530618a01105dae0fa3a2f27c81ae11fa8f67eac glog: e56ede4028c4b7418e6b1195a36b1656bb35e225 - hermes-engine: 054cdf1294d0852c33cd980e7fcd94b4274ed8b3 + hermes-engine: 4148e3274555c07bacaf4f0e3707bbdfcac3a160 IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485 libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7 libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8 - MendixNative: 91822aad01e73d9afe13953415824bd451b809d9 + MendixNative: d2d164b7e500184fe8e8eedf101264f77cd43a0e op-sqlite: 64000c0da2357c4d73faf4d23ff34dd1ddb332d4 OpenSSL-Universal: 9110d21982bb7e8b22a962b6db56a8aa805afde7 RCT-Folly: 36c4f904fb6cd0219dcb76b94e9502d2a72fab0b diff --git a/ios/nativeTemplate.xcodeproj/project.pbxproj b/ios/nativeTemplate.xcodeproj/project.pbxproj index a6912c013..8dc1b7028 100644 --- a/ios/nativeTemplate.xcodeproj/project.pbxproj +++ b/ios/nativeTemplate.xcodeproj/project.pbxproj @@ -18,7 +18,6 @@ 1A0B3ADC2397F1FF00388BF7 /* URLValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A0B3ADB2397F1FF00388BF7 /* URLValidator.swift */; }; 1A0B3ADE2397F36300388BF7 /* QRView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A0B3ADD2397F36300388BF7 /* QRView.swift */; }; 1A0B3AE02397F38300388BF7 /* QRMaskView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A0B3ADF2397F38300388BF7 /* QRMaskView.swift */; }; - 1A0B3AE22397FBF600388BF7 /* MendixReactWindowExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A0B3AE12397FBF600388BF7 /* MendixReactWindowExtensions.swift */; }; 1A0B3AEA2398185600388BF7 /* config.debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 1A0B3AE92398185600388BF7 /* config.debug.xcconfig */; }; 1A0B3AEF2399058B00388BF7 /* config.release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 1A0B3AEE2399058B00388BF7 /* config.release.xcconfig */; }; 1A0B3AF12399095C00388BF7 /* config.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 1A0B3AF02399095C00388BF7 /* config.xcconfig */; }; @@ -57,7 +56,6 @@ 1A0B3ADB2397F1FF00388BF7 /* URLValidator.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = URLValidator.swift; sourceTree = ""; }; 1A0B3ADD2397F36300388BF7 /* QRView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRView.swift; sourceTree = ""; }; 1A0B3ADF2397F38300388BF7 /* QRMaskView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRMaskView.swift; sourceTree = ""; }; - 1A0B3AE12397FBF600388BF7 /* MendixReactWindowExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MendixReactWindowExtensions.swift; sourceTree = ""; }; 1A0B3AE92398185600388BF7 /* config.debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = config.debug.xcconfig; sourceTree = ""; }; 1A0B3AEE2399058B00388BF7 /* config.release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = config.release.xcconfig; sourceTree = ""; }; 1A0B3AF02399095C00388BF7 /* config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = config.xcconfig; sourceTree = ""; }; @@ -171,7 +169,6 @@ children = ( 1A0B3AD22397E15800388BF7 /* MendixApp.storyboard */, 1A0B3AD42397E16900388BF7 /* MendixAppViewController.swift */, - 1A0B3AE12397FBF600388BF7 /* MendixReactWindowExtensions.swift */, ); path = MendixApp; sourceTree = ""; @@ -521,7 +518,6 @@ buildActionMask = 2147483647; files = ( 9E9B12FA2EAB8C2800714B41 /* AppDelegate.swift in Sources */, - 1A0B3AE22397FBF600388BF7 /* MendixReactWindowExtensions.swift in Sources */, 9E9B13012EAB8D2600714B41 /* MendixAppDelegate.swift in Sources */, 1A0B3AD52397E16900388BF7 /* MendixAppViewController.swift in Sources */, 9E9B13032EAB8EB700714B41 /* SplashScreenPresenter.swift in Sources */, diff --git a/package-0.4.1.tgz b/package-0.4.1.tgz index 5e9a83245..0ef02e27e 100644 Binary files a/package-0.4.1.tgz and b/package-0.4.1.tgz differ diff --git a/package-lock.json b/package-lock.json index 67653582b..3a7ed9f0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6283,7 +6283,7 @@ "node_modules/mendix-native": { "version": "0.4.1", "resolved": "file:package-0.4.1.tgz", - "integrity": "sha512-wUjkQQp5wd5BMYNfMby0+ENecJbdTwEfwNl0cWdBeFqxnZnY+B/MdsDLZsmq5b/uloAk5HHJIrEmnGAEY0acHg==", + "integrity": "sha512-vZpT8dcnWrHscmbahhLt2STx9j5DdJAnlJm9RVyijQM6/XXyvFWLfZOjcnAoKQJ2uGsh++WVeHPZiWw3yLN8TA==", "license": "MIT", "workspaces": [ "example" diff --git a/stale_files b/stale_files index 782b7c315..fe473f845 100644 --- a/stale_files +++ b/stale_files @@ -13,4 +13,5 @@ ios/SplashScreenPresenter.m ios/StoryBoardSplash.m ios/SwiftInterop.swift ios/Dev/AppDelegate.h -ios/Dev/AppDelegate.m \ No newline at end of file +ios/Dev/AppDelegate.m +ios/Dev/MendixApp/MendixReactWindowExtensions.swift \ No newline at end of file