Rename findControllerById to findController

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

@@ -72,19 +72,19 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
 
 	@Nullable
 	@Override
-	public ViewController findControllerById(final String id) {
-		ViewController fromSuper = super.findControllerById(id);
+	public ViewController findController(final String id) {
+		ViewController fromSuper = super.findController(id);
 		if (fromSuper != null) return fromSuper;
 
 		for (ViewController child : getChildControllers()) {
-			ViewController fromChild = child.findControllerById(id);
+			ViewController fromChild = child.findController(id);
 			if (fromChild != null) return fromChild;
 		}
 
 		return null;
 	}
 
-	@Override
+    @Override
     public boolean containsComponent(Component component) {
         if (super.containsComponent(component)) {
             return true;

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

@@ -177,7 +177,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
     }
 
     @Nullable
-    public ViewController findControllerById(String id) {
+    public ViewController findController(String id) {
         return isSameId(id) ? this : null;
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabFinder.java

@@ -27,7 +27,7 @@ public class BottomTabFinder {
     @IntRange(from = -1)
     public int findByControllerId(String id) {
         for (int i = 0; i < tabs.size(); i++) {
-            if (tabs.get(i).findControllerById(id) != null) {
+            if (tabs.get(i).findController(id) != null) {
                 return i;
             }
         }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java

@@ -137,7 +137,7 @@ public class ModalStack {
     @Nullable
     private ViewController findModalByComponentId(String componentId) {
         for (ViewController modal : modals) {
-            if (modal.findControllerById(componentId) != null) {
+            if (modal.findController(componentId) != null) {
                 return modal;
             }
         }
@@ -148,7 +148,7 @@ public class ModalStack {
     @Nullable
     public ViewController findControllerById(String componentId) {
         for (ViewController modal : modals) {
-            ViewController controllerById = modal.findControllerById(componentId);
+            ViewController controllerById = modal.findController(componentId);
             if (controllerById != null) {
                 return controllerById;
             }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/navigator/Navigator.java

@@ -137,7 +137,7 @@ public class Navigator extends ParentController {
     }
 
     public void mergeOptions(final String componentId, Options options) {
-        ViewController target = findControllerById(componentId);
+        ViewController target = findController(componentId);
         if (target != null) {
             target.mergeOptions(options);
         }
@@ -160,7 +160,7 @@ public class Navigator extends ParentController {
     }
 
     public void popTo(final String id, Options mergeOptions, CommandListener listener) {
-        ViewController target = findControllerById(id);
+        ViewController target = findController(id);
         if (target != null) {
             target.performOnParentStack(stack -> ((StackController) stack).popTo(target, mergeOptions, listener));
         } else {
@@ -194,13 +194,13 @@ public class Navigator extends ParentController {
 
     @Nullable
     @Override
-    public ViewController findControllerById(String id) {
-        ViewController controllerById = super.findControllerById(id);
+    public ViewController findController(String id) {
+        ViewController controllerById = super.findController(id);
         return controllerById != null ? controllerById : modalStack.findControllerById(id);
     }
 
     private void applyOnStack(String fromId, CommandListener listener, Task<StackController> task) {
-        ViewController from = findControllerById(fromId);
+        ViewController from = findController(fromId);
         if (from != null) {
             if (from instanceof StackController) {
                 task.run((StackController) from);

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

@@ -95,8 +95,8 @@ public class ParentControllerTest extends BaseTest {
         children.add(child1);
         children.add(child2);
 
-        assertThat(uut.findControllerById("uut")).isEqualTo(uut);
-        assertThat(uut.findControllerById("child1")).isEqualTo(child1);
+        assertThat(uut.findController("uut")).isEqualTo(uut);
+        assertThat(uut.findController("child1")).isEqualTo(child1);
     }
 
     @Test
@@ -109,7 +109,7 @@ public class ParentControllerTest extends BaseTest {
         stackController.push(child2, new CommandListenerAdapter());
         children.add(stackController);
 
-        assertThat(uut.findControllerById("child2")).isEqualTo(child2);
+        assertThat(uut.findController("child2")).isEqualTo(child2);
     }
 
     @Test

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

@@ -107,8 +107,8 @@ public class ViewControllerTest extends BaseTest {
 
     @Test
     public void findControllerById_SelfOrNull() {
-        assertThat(uut.findControllerById("456")).isNull();
-        assertThat(uut.findControllerById("uut")).isEqualTo(uut);
+        assertThat(uut.findController("456")).isNull();
+        assertThat(uut.findController("uut")).isEqualTo(uut);
     }
 
     @Test

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

@@ -629,10 +629,10 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void findControllerById_ReturnsSelfOrChildrenById() {
-        assertThat(uut.findControllerById("123")).isNull();
-        assertThat(uut.findControllerById(uut.getId())).isEqualTo(uut);
+        assertThat(uut.findController("123")).isNull();
+        assertThat(uut.findController(uut.getId())).isEqualTo(uut);
         uut.push(child1, new CommandListenerAdapter());
-        assertThat(uut.findControllerById(child1.getId())).isEqualTo(child1);
+        assertThat(uut.findController(child1.getId())).isEqualTo(child1);
     }
 
     @Test
@@ -641,7 +641,7 @@ public class StackControllerTest extends BaseTest {
         stack.ensureViewIsCreated();
         stack.push(child2, new CommandListenerAdapter());
         uut.push(stack, new CommandListenerAdapter());
-        assertThat(uut.findControllerById(child2.getId())).isEqualTo(child2);
+        assertThat(uut.findController(child2.getId())).isEqualTo(child2);
     }
 
     @Test