Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions android/app/src/dev/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@
<string name="camera_permission_button">Continue</string>
<string name="packager_connection_timeout">Please verify that your Mendix App is running.</string>
<string name="qr_code_invalid">This is not a valid QR code.</string>
<string name="enable_dev_mode">Enable dev mode</string>
<string name="clear_data">Clear data</string>
</resources>
2 changes: 1 addition & 1 deletion ios/Dev/MendixApp/MendixAppViewController.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import UIKit
import MendixNative

class MendixAppViewController: UIViewController, ReactNativeDelegate {
class MendixAppViewController: UIViewController, ReactNativeDelegateInternal {
override func viewDidLoad() {
super.viewDidLoad()

Expand Down
13 changes: 0 additions & 13 deletions ios/Dev/MendixApp/MendixReactWindowExtensions.swift

This file was deleted.

14 changes: 2 additions & 12 deletions ios/Extensions/AppDelegate+Extension.swift
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import Foundation
import MendixNative
import React_RCTAppDelegate
#if canImport(ReactAppDependencyProvider)
import ReactAppDependencyProvider
#endif

extension AppDelegate {

Expand All @@ -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()
}
Expand Down
5 changes: 3 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ PODS:
- React-renderercss
- React-rendererdebug
- React-utils
- ReactAppDependencyProvider
- ReactCodegen
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions ios/nativeTemplate.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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 */; };
Expand Down Expand Up @@ -57,7 +56,6 @@
1A0B3ADB2397F1FF00388BF7 /* URLValidator.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = URLValidator.swift; sourceTree = "<group>"; };
1A0B3ADD2397F36300388BF7 /* QRView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRView.swift; sourceTree = "<group>"; };
1A0B3ADF2397F38300388BF7 /* QRMaskView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRMaskView.swift; sourceTree = "<group>"; };
1A0B3AE12397FBF600388BF7 /* MendixReactWindowExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MendixReactWindowExtensions.swift; sourceTree = "<group>"; };
1A0B3AE92398185600388BF7 /* config.debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = config.debug.xcconfig; sourceTree = "<group>"; };
1A0B3AEE2399058B00388BF7 /* config.release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = config.release.xcconfig; sourceTree = "<group>"; };
1A0B3AF02399095C00388BF7 /* config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = config.xcconfig; sourceTree = "<group>"; };
Expand Down Expand Up @@ -171,7 +169,6 @@
children = (
1A0B3AD22397E15800388BF7 /* MendixApp.storyboard */,
1A0B3AD42397E16900388BF7 /* MendixAppViewController.swift */,
1A0B3AE12397FBF600388BF7 /* MendixReactWindowExtensions.swift */,
);
path = MendixApp;
sourceTree = "<group>";
Expand Down Expand Up @@ -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 */,
Expand Down
Binary file modified package-0.4.1.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion stale_files
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ ios/SplashScreenPresenter.m
ios/StoryBoardSplash.m
ios/SwiftInterop.swift
ios/Dev/AppDelegate.h
ios/Dev/AppDelegate.m
ios/Dev/AppDelegate.m
ios/Dev/MendixApp/MendixReactWindowExtensions.swift