Skip to content

Commit e4a0d8d

Browse files
refactor: improve conditional checks for showing the development menu
1 parent 9a8114c commit e4a0d8d

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@ open class MendixReactActivity : ReactActivity(), DevAppMenuHandler, LaunchScree
5858
override fun createReactActivityDelegate(): ReactActivityDelegate {
5959
return object : ReactActivityDelegate(this, mainComponentName) {
6060
override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
61-
if (mendixApp?.showExtendedDevMenu == true && keyCode == KeyEvent.KEYCODE_MENU) {
62-
showDevAppMenu()
61+
if (keyCode == KeyEvent.KEYCODE_MENU) {
62+
if (mendixApp?.showExtendedDevMenu == true) {
63+
showDevAppMenu()
64+
}
6365
return true
6466
}
6567
return super.onKeyUp(keyCode, event)

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,14 @@ open class MendixReactFragment : ReactFragment(), MendixReactFragmentView {
8585
}
8686

8787
override fun onKeyUp(keyCode: Int, event: KeyEvent?): Boolean {
88-
if (mendixApp?.showExtendedDevMenu != true) {
89-
return false
90-
}
9188
if (keyCode == KeyEvent.KEYCODE_MENU || doubleTapReloadRecognizer.didDoubleTapBacktick(
9289
keyCode,
9390
view
9491
)
9592
) {
96-
showDevAppMenu()
93+
if (mendixApp?.showExtendedDevMenu == true) {
94+
showDevAppMenu()
95+
}
9796
return true
9897
}
9998
return super.onKeyUp(keyCode, event)

0 commit comments

Comments
 (0)