Revert "Always merge options with parent controller (#5606)"

This reverts commit de2ea4e.

Author: guyca

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

@@ -2,15 +2,13 @@
 
 import android.app.Activity;
 import android.support.annotation.CallSuper;
-import android.view.View;
 import android.view.ViewGroup;
 
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.viewcontrollers.navigator.Navigator;
 import com.reactnativenavigation.views.Component;
 
-
 public abstract class ChildController<T extends ViewGroup> extends ViewController<T>  {
     final Presenter presenter;
     private final ChildControllersRegistry childRegistry;
@@ -61,7 +59,6 @@ public void applyOptions(Options options) {
     public void mergeOptions(Options options) {
         if (options == Options.EMPTY) return;
         if (isViewShown()) presenter.mergeOptions(getView(), options);
-        performOnParentController(parentController -> parentController.mergeChildOptions(options, this));
         super.mergeOptions(options);
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/mocks/SimpleViewController.java

@@ -19,7 +19,6 @@
 
 import org.mockito.Mockito;
 
-
 public class SimpleViewController extends ChildController<SimpleViewController.SimpleView> {
 
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/child/ChildControllerTest.java

@@ -18,7 +18,6 @@
 
 public class ChildControllerTest extends BaseTest {
 
-    private ParentController parent;
     private ChildController uut;
     private ChildControllersRegistry childRegistry;
     private Presenter presenter;
@@ -34,8 +33,6 @@ public Options resolveCurrentOptions() {
                 return resolvedOptions;
             }
         };
-        parent = Mockito.mock(ParentController.class);
-        uut.setParentController(parent);
     }
 
     @Test
@@ -82,13 +79,6 @@ public void mergeOptions_emptyOptionsAreIgnored() {
         verify(presenter, times(0)).mergeOptions(any(), any());
     }
 
-    @Test
-    public void mergeOptions_mergeWithParentViewController() {
-        Options options = new Options();
-        uut.mergeOptions(options);
-        verify(uut.getParentController()).mergeChildOptions(options, uut);
-    }
-
     @Test
     public void destroy() {
         uut.destroy();

playground/android/build.gradle

@@ -29,8 +29,9 @@ allprojects {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
             url "$rootDir/../../node_modules/react-native/android"
         }
-        maven { url "$rootDir/../../node_modules/detox/Detox-android" }
+        maven { url 'https://jitpack.io' }
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
         maven { url "$rootDir/../../node_modules/jsc-android/dist" }
+        maven { url "$rootDir/../../node_modules/detox/Detox-android" }
     }
 }

playground/src/screens/FirstBottomTabScreen.js

@@ -60,7 +60,7 @@ class FirstBottomTabScreen extends React.Component {
     }
   });
 
-  switchTabByComponentId = () => Navigation.mergeOptions('SecondTab', {
+  switchTabByComponentId = () => Navigation.mergeOptions(this, {
     bottomTabs: {
       currentTabId: 'SecondTab'
     }