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
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ class MainActivity : AppCompatActivity(), DefaultHardwareBackBtnHandler, LaunchS
}

override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
return if ((currentFragment as? MendixReactFragment)?.onKeyUp(
return if (event != null && (currentFragment as? MendixReactFragment)?.onKeyUp(
keyCode,
event
) == true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import com.mendix.mendixnative.api.ResponseStatus
import com.mendix.mendixnative.api.RuntimeInfoResponse
import com.mendix.mendixnative.api.getRuntimeInfo
import com.mendix.mendixnative.react.MxConfiguration
import com.mendix.mendixnative.util.MendixBackwardsCompatUtility
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
Expand Down Expand Up @@ -141,7 +140,6 @@ class ProjectLoaderViewModel : ViewModel() {
ResponseStatus.FAILED -> setStatus(STATUS_ERROR_CONNECTION)
else -> {
val nativeBinaryVersion = runtimeInfoResponse.data!!.nativeBinaryVersion
MendixBackwardsCompatUtility.update(runtimeInfoResponse.data!!.version)
val supportedBinaryVersion = MxConfiguration.NATIVE_BINARY_VERSION
when {
nativeBinaryVersion == supportedBinaryVersion -> {
Expand Down
5 changes: 4 additions & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,7 @@ hermesEnabled=true
mendixnative.cookieEncryption=true
VisionCamera_enableCodeScanner=true

edgeToEdgeEnabled=true
edgeToEdgeEnabled=true

# enabled by default in RN 0.84, disabling it since appdev/clent still use hermes v0.16.0
hermesV1Enabled=false
3 changes: 3 additions & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ ENV['RCT_NEW_ARCH_ENABLED'] = '1'
ENV['RCT_USE_PREBUILT_RNCORE'] = '1'
ENV['RCT_USE_RN_DEP'] = '1'

# Enabled by default in RN 0.84, disabling it since appdev/clent still use hermes v0.16.0
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
22 changes: 11 additions & 11 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ PODS:
- GoogleUtilities/UserDefaults (7.13.3):
- GoogleUtilities/Logger
- GoogleUtilities/Privacy
- hermes-engine (250829098.0.9):
- hermes-engine/Pre-built (= 250829098.0.9)
- hermes-engine/Pre-built (250829098.0.9)
- hermes-engine (0.15.1):
- hermes-engine/Pre-built (= 0.15.1)
- hermes-engine/Pre-built (0.15.1)
- IQKeyboardManager (6.5.19)
- libwebp (1.5.0):
- libwebp/demux (= 1.5.0)
Expand All @@ -167,7 +167,7 @@ PODS:
- libwebp/sharpyuv (1.5.0)
- libwebp/webp (1.5.0):
- libwebp/sharpyuv
- MendixNative (0.5.0):
- MendixNative (0.6.0):
- hermes-engine
- RCTRequired
- RCTTypeSafety
Expand Down Expand Up @@ -3119,7 +3119,7 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/Libraries/FBLazyVector"
hermes-engine:
:podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
:tag: hermes-v250829098.0.9
:tag: hermes-v0.15.1
MendixNative:
:path: "../node_modules/mendix-native"
op-sqlite:
Expand Down Expand Up @@ -3371,10 +3371,10 @@ SPEC CHECKSUMS:
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
GoogleMaps: 8939898920281c649150e0af74aa291c60f2e77d
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
hermes-engine: 9f413d250a72916dd55c7f91986df1af38bfd3d1
hermes-engine: 2ece5229b4460076597f50050f4fb14074f8f714
IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
MendixNative: 7cba944a4e608e6ab40ec281e9b2b0f9f3cdefe0
MendixNative: 7e5ed081dfc0cbe76d8d81b76efafba9f3dd6a4e
MultiplatformBleAdapter: b1fddd0d499b96b607e00f0faa8e60648343dc1d
nanopb: 438bc412db1928dac798aa6fd75726007be04262
op-sqlite: e9ef65bcf95a97863874cee87841425bb71c8396
Expand All @@ -3390,7 +3390,7 @@ SPEC CHECKSUMS:
React: 1ba7d364ade7d883a1ec055bfc3606f35fdee17b
React-callinvoker: bc2a26f8d84fb01f003fc6de6c9337b64715f95b
React-Core: 7840d3a80b43a95c5e80ef75146bd70925ebab0f
React-Core-prebuilt: d701b5b0eb57bfcf6c51f70272957e310f18265b
React-Core-prebuilt: a54db89db007bc34115efc5abe10e05c699797da
React-CoreModules: 2eb010400b63b89e53a324ffb3c112e4c7c3ce42
React-cxxreact: a558e92199d26f145afa9e62c4233cf8e7950efe
React-debug: 755200a6e7f5e6e0a40ff8d215493d43cce285fc
Expand Down Expand Up @@ -3470,7 +3470,7 @@ SPEC CHECKSUMS:
ReactCodegen: 797de5178718324c6eba3327b07f9a423fbd5787
ReactCommon: 07572bf9e687c8a52fbe4a3641e9e3a1a477c78e
ReactNativeBiometrics: 9ead8d633833fd13e5a79564af8ba7064c2a58c6
ReactNativeDependencies: 3594fe509c7410bab314d8d79aba0852e442de2d
ReactNativeDependencies: e709c771664b1e4e11acf00936c61a975577bf9c
RNBootSplash: 13b7612788960d0c5446e68489ac2509e506cfcd
RNCalendarEvents: f90f73666b6bcbb3cc8a491ffbb5e48c0db3de37
RNCAsyncStorage: 3a4f5e2777dae1688b781a487923a08569e27fe4
Expand All @@ -3493,14 +3493,14 @@ SPEC CHECKSUMS:
RNSound: 25cfdc38a1353362053c01ca827d7ddf80860de1
RNSVG: c69f7709226108f5eb89b5aa8833c17a36345468
RNSwanBrowser: 2f5794aca112ebea7c875e6e2918d32011d0b6b3
RNWorklets: 06ce05d69455cc14f5676c177050a39aa557d4d2
RNWorklets: 7d24538032e023ed207e3b4d9b234695ddadd201
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
SSZipArchive: 8a6ee5677c8e304bebc109e39cf0da91ccef22ea
SwiftAudioEx: f6aa653770f3a0d3851edaf8d834a30aee4a7646
VisionCamera: 7187b3dac1ff3071234ead959ce311875748e14f
Yoga: c0b3f2c7e8d3e327e450223a2414ca3fa296b9a2

PODFILE CHECKSUM: 3ac57498e7a5b50e63c45224f2a40431ea916f8c
PODFILE CHECKSUM: 81c4ca245150e58edd434018a63f151b472d150d

COCOAPODS: 1.16.2
8 changes: 4 additions & 4 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"dependencies": {
"@gorhom/bottom-sheet": "5.2.14",
"mendix-native": "https://github.com/mendix/mendix-native/releases/download/v0.5.0/mendix-native-v0.5.0.tgz",
"mendix-native": "https://github.com/mendix/mendix-native/releases/download/v0.6.0/mendix-native-v0.6.0.tgz",
"@octokit/rest": "^21.1.1",
"@op-engineering/op-sqlite": "15.2.5",
"@shopify/flash-list": "2.3.1",
Expand Down