Support rn68 on android (old architecture) (#7472)

See #7466

lib/android/app/build.gradle

@@ -106,6 +106,10 @@ android {
             dimension "RNN.reactNativeVersion"
             buildConfigField("int", "REACT_NATVE_VERSION_MINOR", "63")
         }
+        reactNative68 {
+            dimension "RNN.reactNativeVersion"
+            buildConfigField("int", "REACT_NATVE_VERSION_MINOR", "68")
+        }
     }
 
     def flavor = resolveFlavor()
@@ -122,7 +126,9 @@ String resolveFlavor() {
     Integer reactNativeMinorComponent = reactNativeVersionComponents[1].toInteger()
     Integer reactNativePatchComponent = reactNativeVersionComponents[2].toInteger()
 
-    if (reactNativeMinorComponent >= 63) {
+    if (reactNativeMinorComponent >= 68) {
+        return "reactNative68"
+    } else if (reactNativeMinorComponent >= 63) {
         return "reactNative63"
     } else if (reactNativeMinorComponent >= 62) {
         return "reactNative62"

lib/android/app/src/reactNative55/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -0,0 +1,81 @@
+package com.reactnativenavigation.react.modal
+
+import android.content.Context
+import android.view.MotionEvent
+import android.view.View
+import com.facebook.react.bridge.*
+import com.facebook.react.uimanager.*
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.views.view.ReactViewGroup
+
+
+class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
+    private var hasAdjustedSize = false
+    private var viewWidth = 0
+    private var viewHeight = 0
+    private val mJSTouchDispatcher = JSTouchDispatcher(this)
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        viewWidth = w
+        viewHeight = h
+        this.updateFirstChildView()
+    }
+    private fun updateFirstChildView() {
+        if (this.childCount > 0) {
+            hasAdjustedSize = false
+            val viewTag = getChildAt(0).id
+            val reactContext: ReactContext = this.getReactContext()
+            reactContext.runOnNativeModulesQueueThread(object : GuardedRunnable(reactContext) {
+                override fun runGuarded() {
+                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule(
+                            UIManagerModule::class.java
+                    ) as UIManagerModule
+                    uiManager.updateNodeSize(
+                            viewTag,
+                            this@ModalContentLayout.viewWidth,
+                            this@ModalContentLayout.viewHeight
+                    )
+                }
+            })
+        } else {
+            hasAdjustedSize = true
+        }
+    }
+
+    override fun addView(child: View?, index: Int, params: LayoutParams?) {
+        super.addView(child, index, params)
+        if (hasAdjustedSize) {
+            updateFirstChildView()
+        }
+    }
+    override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
+    private fun getEventDispatcher(): EventDispatcher? {
+        val reactContext: ReactContext = this.getReactContext()
+        return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+    }
+
+
+    override fun handleException(t: Throwable?) {
+        getReactContext().handleException(RuntimeException(t))
+    }
+
+    private fun getReactContext(): ReactContext {
+        return this.context as ReactContext
+    }
+
+    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        return super.onInterceptTouchEvent(event)
+    }
+
+    override fun onTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        super.onTouchEvent(event)
+        return true
+    }
+
+}

lib/android/app/src/reactNative56/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -0,0 +1,81 @@
+package com.reactnativenavigation.react.modal
+
+import android.content.Context
+import android.view.MotionEvent
+import android.view.View
+import com.facebook.react.bridge.*
+import com.facebook.react.uimanager.*
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.views.view.ReactViewGroup
+
+
+class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
+    private var hasAdjustedSize = false
+    private var viewWidth = 0
+    private var viewHeight = 0
+    private val mJSTouchDispatcher = JSTouchDispatcher(this)
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        viewWidth = w
+        viewHeight = h
+        this.updateFirstChildView()
+    }
+    private fun updateFirstChildView() {
+        if (this.childCount > 0) {
+            hasAdjustedSize = false
+            val viewTag = getChildAt(0).id
+            val reactContext: ReactContext = this.getReactContext()
+            reactContext.runOnNativeModulesQueueThread(object : GuardedRunnable(reactContext) {
+                override fun runGuarded() {
+                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule(
+                            UIManagerModule::class.java
+                    ) as UIManagerModule
+                    uiManager.updateNodeSize(
+                            viewTag,
+                            this@ModalContentLayout.viewWidth,
+                            this@ModalContentLayout.viewHeight
+                    )
+                }
+            })
+        } else {
+            hasAdjustedSize = true
+        }
+    }
+
+    override fun addView(child: View?, index: Int, params: LayoutParams?) {
+        super.addView(child, index, params)
+        if (hasAdjustedSize) {
+            updateFirstChildView()
+        }
+    }
+    override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
+    private fun getEventDispatcher(): EventDispatcher? {
+        val reactContext: ReactContext = this.getReactContext()
+        return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+    }
+
+
+    override fun handleException(t: Throwable?) {
+        getReactContext().handleException(RuntimeException(t))
+    }
+
+    private fun getReactContext(): ReactContext {
+        return this.context as ReactContext
+    }
+
+    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        return super.onInterceptTouchEvent(event)
+    }
+
+    override fun onTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        super.onTouchEvent(event)
+        return true
+    }
+
+}

lib/android/app/src/reactNative57/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -0,0 +1,81 @@
+package com.reactnativenavigation.react.modal
+
+import android.content.Context
+import android.view.MotionEvent
+import android.view.View
+import com.facebook.react.bridge.*
+import com.facebook.react.uimanager.*
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.views.view.ReactViewGroup
+
+
+class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
+    private var hasAdjustedSize = false
+    private var viewWidth = 0
+    private var viewHeight = 0
+    private val mJSTouchDispatcher = JSTouchDispatcher(this)
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        viewWidth = w
+        viewHeight = h
+        this.updateFirstChildView()
+    }
+    private fun updateFirstChildView() {
+        if (this.childCount > 0) {
+            hasAdjustedSize = false
+            val viewTag = getChildAt(0).id
+            val reactContext: ReactContext = this.getReactContext()
+            reactContext.runOnNativeModulesQueueThread(object : GuardedRunnable(reactContext) {
+                override fun runGuarded() {
+                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule(
+                            UIManagerModule::class.java
+                    ) as UIManagerModule
+                    uiManager.updateNodeSize(
+                            viewTag,
+                            this@ModalContentLayout.viewWidth,
+                            this@ModalContentLayout.viewHeight
+                    )
+                }
+            })
+        } else {
+            hasAdjustedSize = true
+        }
+    }
+
+    override fun addView(child: View?, index: Int, params: LayoutParams?) {
+        super.addView(child, index, params)
+        if (hasAdjustedSize) {
+            updateFirstChildView()
+        }
+    }
+    override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
+    private fun getEventDispatcher(): EventDispatcher? {
+        val reactContext: ReactContext = this.getReactContext()
+        return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+    }
+
+
+    override fun handleException(t: Throwable?) {
+        getReactContext().handleException(RuntimeException(t))
+    }
+
+    private fun getReactContext(): ReactContext {
+        return this.context as ReactContext
+    }
+
+    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        return super.onInterceptTouchEvent(event)
+    }
+
+    override fun onTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        super.onTouchEvent(event)
+        return true
+    }
+
+}

lib/android/app/src/reactNative57_5/java/com/reactnativenavigation/react/modal/ModalContentLayout.kt

@@ -0,0 +1,81 @@
+package com.reactnativenavigation.react.modal
+
+import android.content.Context
+import android.view.MotionEvent
+import android.view.View
+import com.facebook.react.bridge.*
+import com.facebook.react.uimanager.*
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.views.view.ReactViewGroup
+
+
+class ModalContentLayout(context: Context?) : ReactViewGroup(context), RootView{
+    private var hasAdjustedSize = false
+    private var viewWidth = 0
+    private var viewHeight = 0
+    private val mJSTouchDispatcher = JSTouchDispatcher(this)
+
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        viewWidth = w
+        viewHeight = h
+        this.updateFirstChildView()
+    }
+    private fun updateFirstChildView() {
+        if (this.childCount > 0) {
+            hasAdjustedSize = false
+            val viewTag = getChildAt(0).id
+            val reactContext: ReactContext = this.getReactContext()
+            reactContext.runOnNativeModulesQueueThread(object : GuardedRunnable(reactContext) {
+                override fun runGuarded() {
+                    val uiManager = this@ModalContentLayout.getReactContext().getNativeModule(
+                            UIManagerModule::class.java
+                    ) as UIManagerModule
+                    uiManager.updateNodeSize(
+                            viewTag,
+                            this@ModalContentLayout.viewWidth,
+                            this@ModalContentLayout.viewHeight
+                    )
+                }
+            })
+        } else {
+            hasAdjustedSize = true
+        }
+    }
+
+    override fun addView(child: View?, index: Int, params: LayoutParams?) {
+        super.addView(child, index, params)
+        if (hasAdjustedSize) {
+            updateFirstChildView()
+        }
+    }
+    override fun onChildStartedNativeGesture(androidEvent: MotionEvent?) {
+        mJSTouchDispatcher.onChildStartedNativeGesture(androidEvent, this.getEventDispatcher())
+    }
+    override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
+    private fun getEventDispatcher(): EventDispatcher? {
+        val reactContext: ReactContext = this.getReactContext()
+        return reactContext.getNativeModule(UIManagerModule::class.java)!!.eventDispatcher
+    }
+
+
+    override fun handleException(t: Throwable?) {
+        getReactContext().handleException(RuntimeException(t))
+    }
+
+    private fun getReactContext(): ReactContext {
+        return this.context as ReactContext
+    }
+
+    override fun onInterceptTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        return super.onInterceptTouchEvent(event)
+    }
+
+    override fun onTouchEvent(event: MotionEvent?): Boolean {
+        mJSTouchDispatcher.handleTouchEvent(event, getEventDispatcher())
+        super.onTouchEvent(event)
+        return true
+    }
+
+}