Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Native Template

![License](https://img.shields.io/badge/license-MIT-blue.svg)
![React Native](https://img.shields.io/badge/react_native-0.75.4-blue.svg)
![React Native](https://img.shields.io/badge/react_native-0.84.1-blue.svg)
![Node](https://img.shields.io/badge/node-v20-green.svg)

![Custom Dev App CI - Android](https://github.com/mendix/native-template/actions/workflows/android-build-custom-dev-app.yml/badge.svg?branch=master)
Expand Down
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>
1 change: 1 addition & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ android.nonTransitiveRClass=true
android.suppressUnsupportedCompileSdk=33
newArchEnabled=true
hermesEnabled=true
hermesV1Enabled=false
mendixnative.cookieEncryption=false
VisionCamera_enableCodeScanner=true

Expand Down
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
3 changes: 3 additions & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ ENV['RCT_NEW_ARCH_ENABLED'] = '1'
ENV['RCT_USE_PREBUILT_RNCORE'] = '0'
ENV['RCT_USE_RN_DEP'] = '0'

# The JS bundle is compiled compiled using a different version than the prebuilt Hermes engine embedded in the native binary, causing a runtime crash.
ENV['RCT_HERMES_V1_ENABLED'] = '0'

# Use it to require both react-native's and this package's scripts:
node_require('react-native/scripts/react_native_pods.rb')
node_require('react-native-permissions/scripts/setup.rb')
Expand Down
Loading
Loading