This commit upgrades `react-native` to `v0.75.3` Following changes were also made : - `NDK` upgraded to `26.1.10909125` - `@react-native/gradle-plugin` is set up using `includeBuild` gradle mechanism which is a better way. - `reactjs` is upgraded to `18.3.1` - `react-native-config` is upgraded to `1.5.3` - `react-native-navigation` is upgraded to `7.40.1` - `react-native-reanimated` is upgraded to `3.16.6` - `react-native-gesture-handler` is upgraded to `2.22.0` - `react-native-keychain` is upgraded to `9.2.2` - patches for react-native-navigation are updated. PR in RNN repo -> https://github.com/wix/react-native-navigation/pull/7913 - patched autolinking behaviour in `react-native` to prevent generating `autolinking.json` in a gradle step. We run gradle in a sandbox with `--offline` so this is not feasible for us. We do the same thing via a nix phase called `autolinkPhase`. - `AGP` is bumped to `8.5.0` and `aapt2` is bumped to `8.5.0-11315950` - we no longer need to patch out `-X` from `script_phases-patched.sh` - `gradle` deps were updated. - `pods` were updated. - `gems` were updated.
45 lines
2.1 KiB
Diff
45 lines
2.1 KiB
Diff
--- /tmp/tmp-status-mobile-65370082b/tmp.ZT96tMu4Rb/ModalContentLayout.kt 2024-09-16 22:51:02.779796000 +0530
|
|
+++ ./node_modules/react-native-navigation/lib/android/app/src/reactNative71/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt 2024-09-16 22:52:23.327090657 +0530
|
|
@@ -49,17 +49,17 @@
|
|
updateFirstChildView()
|
|
}
|
|
}
|
|
- override fun onChildStartedNativeGesture(child: View, androidEvent: MotionEvent?) {
|
|
+ override fun onChildStartedNativeGesture(child: View, androidEvent: MotionEvent) {
|
|
mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
|
|
}
|
|
- override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
|
|
+ override fun onChildStartedNativeGesture(androidEvent: MotionEvent) {
|
|
mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
|
|
}
|
|
- override fun onChildEndedNativeGesture(child: View, androidEvent: MotionEvent?) {
|
|
+ override fun onChildEndedNativeGesture(child: View, androidEvent: MotionEvent) {
|
|
mJSTouchDispatcher.onChildEndedNativeGesture(androidEvent, this.getEventDispatcher())
|
|
}
|
|
override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
|
|
- private fun getEventDispatcher(): EventDispatcher? {
|
|
+ private fun getEventDispatcher(): EventDispatcher {
|
|
val reactContext: ReactContext = this.getReactContext()
|
|
return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
|
|
}
|
|
@@ -73,15 +73,15 @@
|
|
return this.context as ReactContext
|
|
}
|
|
|
|
- override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
|
|
+ override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
|
|
mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
|
|
return super.onInterceptTouchEvent(event)
|
|
}
|
|
|
|
- override fun onTouchEvent(event: MotionEvent?): Boolean {
|
|
+ override fun onTouchEvent(event: MotionEvent): Boolean {
|
|
mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
|
|
super.onTouchEvent(event)
|
|
return true
|
|
}
|
|
|
|
-}
|
|
\ No newline at end of file
|
|
+}
|