Stop setting id for root views

lib/android/app/src/main/java/com/reactnativenavigation/utils/ViewUtils.java

@@ -58,4 +58,20 @@ public class ViewUtils {
     public interface Matcher<T> {
         boolean match(T child);
     }
+
+    public static boolean isChildOf(ViewGroup parent, View child) {
+        if (parent == child) return true;
+
+        for (int i = 0; i < parent.getChildCount(); i++) {
+            View view = parent.getChildAt(i);
+            if (view == child) {
+                return true;
+            }
+
+            if (view instanceof ViewGroup) {
+                if (isChildOf((ViewGroup) view, child)) return true;
+            }
+        }
+        return false;
+    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ViewController.java

@@ -12,7 +12,6 @@ import android.view.ViewTreeObserver;
 
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.FabOptionsPresenter;
-import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.utils.StringUtils;
 import com.reactnativenavigation.utils.Task;
 import com.reactnativenavigation.utils.UiUtils;
@@ -112,9 +111,6 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
                 throw new RuntimeException("Tried to create view after it has already been destroyed");
             }
             view = createView();
-            if (view.getId() < 0) {
-                view.setId(CompatUtils.generateViewId());
-            }
             view.getViewTreeObserver().addOnGlobalLayoutListener(this);
         }
         return view;

lib/android/app/src/test/java/com/reactnativenavigation/BaseTest.java

@@ -5,6 +5,7 @@ import android.support.v7.app.*;
 import android.view.*;
 
 import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
 import org.junit.*;
@@ -31,18 +32,16 @@ public abstract class BaseTest {
         return Robolectric.setupActivity(AppCompatActivity.class);
     }
 
-    public void assertIsChildById(ViewGroup parent, View child) {
+    public void assertIsChild(ViewGroup parent, View child) {
         assertThat(parent).isNotNull();
         assertThat(child).isNotNull();
-        assertThat(child.getId()).isNotZero().isPositive();
-        assertThat(parent.findViewById(child.getId())).isNotNull().isEqualTo(child);
+        assertThat(ViewUtils.isChildOf(parent, child)).isTrue();
     }
 
     public void assertNotChildOf(ViewGroup parent, View child) {
         assertThat(parent).isNotNull();
         assertThat(child).isNotNull();
-        assertThat(child.getId()).isNotZero().isPositive();
-        assertThat(parent.findViewById(child.getId())).isNull();
+        assertThat(ViewUtils.isChildOf(parent, child)).isFalse();
     }
 
     protected void disablePushAnimation(ViewController... controllers) {

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java

@@ -65,14 +65,14 @@ public class NavigatorTest extends BaseTest {
     public void setRoot_AddsChildControllerView() {
         assertThat(uut.getView().getChildCount()).isZero();
         uut.setRoot(child1, new MockPromise());
-        assertIsChildById(uut.getView(), child1.getView());
+        assertIsChild(uut.getView(), child1.getView());
     }
 
     @Test
     public void setRoot_ReplacesExistingChildControllerViews() {
         uut.setRoot(child1, new MockPromise());
         uut.setRoot(child2, new MockPromise());
-        assertIsChildById(uut.getView(), child2.getView());
+        assertIsChild(uut.getView(), child2.getView());
     }
 
     @Test
@@ -87,20 +87,20 @@ public class NavigatorTest extends BaseTest {
         stackController.push(child1, new CommandListenerAdapter());
         uut.setRoot(stackController, new MockPromise());
 
-        assertIsChildById(uut.getView(), stackController.getView());
-        assertIsChildById(stackController.getView(), child1.getView());
+        assertIsChild(uut.getView(), stackController.getView());
+        assertIsChild(stackController.getView(), child1.getView());
 
         uut.push(child1.getId(), child2, new CommandListenerAdapter());
 
-        assertIsChildById(uut.getView(), stackController.getView());
-        assertIsChildById(stackController.getView(), child2.getView());
+        assertIsChild(uut.getView(), stackController.getView());
+        assertIsChild(stackController.getView(), child2.getView());
     }
 
     @Test
     public void push_InvalidPushWithoutAStack_DoesNothing() {
         uut.setRoot(child1, new MockPromise());
         uut.push(child1.getId(), child2, new CommandListenerAdapter());
-        assertIsChildById(uut.getView(), child1.getView());
+        assertIsChild(uut.getView(), child1.getView());
     }
 
     @Test
@@ -273,19 +273,19 @@ public class NavigatorTest extends BaseTest {
     }
 
     @Test
-    public void push_Promise() {
+    public void push_promise() {
         final StackController stackController = newStack();
         stackController.push(child1, new CommandListenerAdapter());
         uut.setRoot(stackController, new MockPromise());
 
-        assertIsChildById(uut.getView(), stackController.getView());
-        assertIsChildById(stackController.getView(), child1.getView());
+        assertIsChild(uut.getView(), stackController.getView());
+        assertIsChild(stackController.getView(), child1.getView());
 
         uut.push(child1.getId(), child2, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
-                assertIsChildById(uut.getView(), stackController.getView());
-                assertIsChildById(stackController.getView(), child2.getView());
+                assertIsChild(uut.getView(), stackController.getView());
+                assertIsChild(stackController.getView(), child2.getView());
             }
         });
     }
@@ -296,7 +296,7 @@ public class NavigatorTest extends BaseTest {
         uut.push(child1.getId(), child2, new CommandListenerAdapter() {
             @Override
             public void onError(String message) {
-                assertIsChildById(uut.getView(), child1.getView());
+                assertIsChild(uut.getView(), child1.getView());
             }
         });
 
@@ -341,7 +341,7 @@ public class NavigatorTest extends BaseTest {
         stackController.push(child1, new CommandListenerAdapter());
         uut.showModal(stackController, new MockPromise());
         uut.push(stackController.getId(), child2, new CommandListenerAdapter());
-        assertIsChildById(stackController.getView(), child2.getView());
+        assertIsChild(stackController.getView(), child2.getView());
     }
 
     @Test

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/StackControllerTest.java

@@ -219,16 +219,16 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void push_addsToViewTree() {
-        assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
+        assertNotChildOf(uut.getView(), child1.getView());
         uut.push(child1, new CommandListenerAdapter());
-        assertThat(uut.getView().findViewById(child1.getView().getId())).isNotNull();
+        assertIsChild(uut.getView(), child1.getView());
     }
 
     @Test
     public void push_removesPreviousFromTree() {
-        assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
+        assertNotChildOf(uut.getView(), child1.getView());
         uut.push(child1, new CommandListenerAdapter());
-        assertThat(uut.getView().findViewById(child1.getView().getId())).isNotNull();
+        assertIsChild(uut.getView(), child1.getView());
         uut.push(child2, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
@@ -299,11 +299,11 @@ public class StackControllerTest extends BaseTest {
         uut.push(child2, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
-                assertIsChildById(uut.getView(), child2View);
+                assertIsChild(uut.getView(), child2View);
                 assertNotChildOf(uut.getView(), child1View);
                 uut.pop(new CommandListenerAdapter());
                 assertNotChildOf(uut.getView(), child2View);
-                assertIsChildById(uut.getView(), child1View);
+                assertIsChild(uut.getView(), child1View);
             }
         });
     }
@@ -318,7 +318,7 @@ public class StackControllerTest extends BaseTest {
                     @Override
                     public void onSuccess(String childId) {
                         assertContainsOnlyId(child1.getId());
-                        assertIsChildById(uut.getView(), child1.getView());
+                        assertIsChild(uut.getView(), child1.getView());
                     }
                 });
             }
@@ -329,10 +329,10 @@ public class StackControllerTest extends BaseTest {
     public void popSpecific_deepInStack() {
         uut.push(child1, new CommandListenerAdapter());
         uut.push(child2, new CommandListenerAdapter());
-        assertIsChildById(uut.getView(), child2.getView());
+        assertIsChild(uut.getView(), child2.getView());
         uut.popSpecific(child1, new CommandListenerAdapter());
         assertContainsOnlyId(child2.getId());
-        assertIsChildById(uut.getView(), child2.getView());
+        assertIsChild(uut.getView(), child2.getView());
     }
 
     @Test

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ViewControllerTest.java

@@ -185,11 +185,6 @@ public class ViewControllerTest extends BaseTest {
         verify(spy, times(1)).onViewDisappear();
     }
 
-    @Test
-    public void assignsIdToCreatedView() {
-        assertThat(uut.getView().getId()).isPositive();
-    }
-
     @Test
     public void onDestroy_RemovesSelfFromParentIfExists() {
         LinearLayout parent = new LinearLayout(activity);