Fixes after PR

Author: gosha212

lib/android/app/src/main/java/com/reactnativenavigation/views/touch/OverlayTouchDelegate.kt

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.views.touch
 
 import android.view.MotionEvent
+import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.VisibleForTesting
 import com.facebook.react.views.debuggingoverlay.DebuggingOverlay
@@ -49,17 +50,14 @@ open class OverlayTouchDelegate(
         for (i in 0 until reactViewSurface.childCount) {
             val childItem = reactViewSurface.getChildAt(i)
 
-            if (childItem is ViewGroup) {
-                if (childItem.getChildAt(0) is DebuggingOverlay) {
-                    continue
-                }
-            }
-
-            if (childItem.isVisible && event.coordinatesInsideView(childItem)) {
+            if (!debuggingOverlay(childItem) && childItem.isVisible && event.coordinatesInsideView(childItem)) {
                 return true
             }
         }
         return false
     }
 
+    private fun debuggingOverlay(childItem: View?): Boolean =
+        childItem is ViewGroup && childItem.getChildAt(0) is DebuggingOverlay
+
 }

lib/android/app/src/test/java/com/reactnativenavigation/views/OverlayTouchDelegateTest.java

@@ -13,7 +13,6 @@
 import com.reactnativenavigation.views.touch.OverlayTouchDelegate;
 
 import org.junit.Test;
-import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
@@ -36,12 +35,12 @@ public class OverlayTouchDelegateTest extends BaseTest {
 
     @Override
     public void beforeEach() {
-        mockHierarchy();
+        reactView = mock(ReactView.class);
+        component = mock(ComponentLayout.class);
         uut = spy(new OverlayTouchDelegate(component, reactView));
     }
 
-    private void mockHierarchy() {
-        reactView = mock(ReactView.class);
+    private void mockHierarchyWithDebuggingOverlay() {
         // Mock the hierarchy: ReactView -> ReactSurfaceView -> ReactViewGroup(s)
         ViewGroup reactSurfaceView = mock(ViewGroup.class);
         ViewGroup debuggingOverlayContainer = mock(ViewGroup.class);
@@ -81,12 +80,11 @@ private void mockHierarchy() {
             rect.set(new Rect(0, 0, 100, 100));
             return null;
         }).when(debuggingOverlayContainer).getHitRect(any(Rect.class));
-
-        component = mock(ComponentLayout.class);
     }
 
     @Test
     public void downEventIsHandled() {
+        mockHierarchyWithDebuggingOverlay();
         uut.setInterceptTouchOutside(new Bool(true));
         uut.onInterceptTouchEvent(downEvent);
         verify(uut, times(1)).handleDown(downEvent);