refactor: remove unused imports and clean up touch event handling in Mendix components

Author: YogendraShelke

android/src/main/java/com/mendix/mendixnative/MendixInitializer.kt

@@ -1,15 +1,10 @@
 package com.mendix.mendixnative
 
 import android.app.Activity
-import android.view.MotionEvent
 import com.facebook.react.ReactHost
-import com.facebook.react.common.ShakeDetector
 import com.facebook.react.devsupport.DevSupportManagerBase
-import com.facebook.react.devsupport.attachMendixSupportManagerShakeDetector
-import com.facebook.react.devsupport.makeShakeDetector
 import com.facebook.react.modules.network.OkHttpClientProvider
 import com.mendix.mendixnative.config.AppPreferences
-import com.mendix.mendixnative.handler.DevMenuTouchEventHandler
 import com.mendix.mendixnative.react.*
 import com.mendix.mendixnative.request.MendixNetworkInterceptor
 import com.mendix.mendixnative.util.CookieEncryption
@@ -23,8 +18,6 @@ class MendixInitializer(
   private val reactHost: ReactHost,
   private val hasRNDeveloperSupport: Boolean = false,
 ) {
-  private var shakeDetector: ShakeDetector? = null
-  private var devMenuTouchEventHandler: DevMenuTouchEventHandler? = null
 
   fun onCreate(mendixApp: MendixApp, clearData: Boolean) {
     // Assign mendix xas id interceptor to okhttp
@@ -41,17 +34,15 @@ class MendixInitializer(
     MxConfiguration.runtimeUrl = runtimeUrl
     MxConfiguration.warningsFilter = mendixApp.warningsFilter
 
-    // Destroy any existing ReactInstance so we start fresh, but do NOT invalidate —
-    // invalidate() is terminal in bridgeless mode and prevents the host from ever being reused.
-    reactHost.destroy("Clean start for new Mendix app", null)
+    // Reload only if there's already a running instance.
+    if (reactHost.currentReactContext != null) {
+      reactHost.reload("Clean start for new Mendix app")
+    }
     if (clearData) clearData(context.application)
     if (hasRNDeveloperSupport) setupDeveloperApp(runtimeUrl, mendixApp)
   }
 
   fun onDestroy() {
-    // Stop shaking as early as possible to avoid orphaned dialogs
-    stopShakeDetector()
-
     if (hasRNDeveloperSupport) {
       AppPreferences(context.applicationContext).setElementInspector(false)
     }
@@ -64,26 +55,6 @@ class MendixInitializer(
     closeSqlDatabaseConnection(reactHost.currentReactContext)
   }
 
-  fun stopShakeDetector() {
-    shakeDetector?.stop()
-  }
-
-  fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
-    return devMenuTouchEventHandler?.handle(ev) ?: false
-  }
-
-  private fun attachShakeDetector(devAppMenuHandler: DevAppMenuHandler) {
-    if (shakeDetector == null) {
-      shakeDetector = makeShakeDetector(context.applicationContext) {
-        devAppMenuHandler.showDevAppMenu()
-      }
-    }
-
-    (reactHost.devSupportManager as? DevSupportManagerBase)?.run {
-        attachMendixSupportManagerShakeDetector(shakeDetector!!, this)
-    }
-  }
-
   private fun setupDeveloperApp(
     runtimeUrl: String,
     mendixApp: MendixApp

android/src/main/java/com/mendix/mendixnative/activity/MendixReactActivity.kt

@@ -2,7 +2,6 @@ package com.mendix.mendixnative.activity
 
 import android.os.Bundle
 import android.view.KeyEvent
-import android.view.MotionEvent
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
 import com.facebook.react.bridge.ReactContext
@@ -42,12 +41,6 @@ open class MendixReactActivity : ReactActivity(), DevAppMenuHandler, LaunchScree
     super.onDestroy()
   }
 
-  override fun dispatchTouchEvent(ev: MotionEvent): Boolean {
-    return if (mendixInitializer.dispatchTouchEvent(ev)) {
-      true
-    } else super.dispatchTouchEvent(ev)
-  }
-
   override fun getMainComponentName(): String? {
     return MAIN_COMPONENT_NAME
   }
@@ -65,7 +58,7 @@ open class MendixReactActivity : ReactActivity(), DevAppMenuHandler, LaunchScree
   override fun createReactActivityDelegate(): ReactActivityDelegate {
     return object : ReactActivityDelegate(this, mainComponentName) {
       override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
-        if (keyCode == KeyEvent.KEYCODE_MENU) {
+        if (mendixApp?.showExtendedDevMenu == true && keyCode == KeyEvent.KEYCODE_MENU) {
           showDevAppMenu()
           return true
         }

android/src/main/java/com/mendix/mendixnative/fragment/MendixReactFragment.kt

@@ -3,7 +3,6 @@ package com.mendix.mendixnative.fragment
 import android.content.Intent
 import android.os.Bundle
 import android.view.KeyEvent
-import android.view.MotionEvent
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.mendix.mendixnative.DevAppMenuHandler
 import com.mendix.mendixnative.MendixInitializer
@@ -86,6 +85,9 @@ open class MendixReactFragment : ReactFragment(), MendixReactFragmentView {
   }
 
   override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
+    if (mendixApp?.showExtendedDevMenu != true) {
+      return false
+    }
     if (keyCode == KeyEvent.KEYCODE_MENU || doubleTapReloadRecognizer.didDoubleTapBacktick(
         keyCode,
         view
@@ -104,23 +106,13 @@ open class MendixReactFragment : ReactFragment(), MendixReactFragmentView {
   }
 
   open fun onCloseProjectSelected() {
-    // Closing shake detection to avoid dialog from triggering while closing
-    mendixInitializer.stopShakeDetector();
-  }
-
-  override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
-    return mendixInitializer.dispatchTouchEvent(ev)
   }
 }
 
-interface MendixReactFragmentView : DevAppMenuHandler, TouchEventDispatcher, BackButtonHandler {
+interface MendixReactFragmentView : DevAppMenuHandler, BackButtonHandler {
   fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean
 }
 
-interface TouchEventDispatcher {
-  fun dispatchTouchEvent(ev: MotionEvent?): Boolean
-}
-
 interface BackButtonHandler {
   fun onBackPressed(): Boolean
 }