rename navigationOptions

lib/android/app/src/main/java/com/reactnativenavigation/parse/LayoutFactory.java

@@ -96,12 +96,12 @@ public class LayoutFactory {
 	private ViewController createComponent(LayoutNode node) {
 		String id = node.id;
 		String name = node.data.optString("name");
-		NavigationOptions navigationOptions = NavigationOptions.parse(typefaceManager, node.data.optJSONObject("navigationOptions"), defaultOptions);
+		NavigationOptions options = NavigationOptions.parse(typefaceManager, node.data.optJSONObject("options"), defaultOptions);
 		return new ComponentViewController(activity,
                 id,
                 name,
                 new ComponentViewCreator(reactInstanceManager),
-                navigationOptions
+                options
         );
 	}
 
@@ -137,19 +137,19 @@ public class LayoutFactory {
             tabController.setTabIndex(i);
             tabs.add(tabController);
         }
-        NavigationOptions navigationOptions = NavigationOptions.parse(typefaceManager, node.getNavigationOptions(), defaultOptions);
-        return new TopTabsController(activity, node.id, tabs, new TopTabsLayoutCreator(activity, tabs), navigationOptions);
+        NavigationOptions options = NavigationOptions.parse(typefaceManager, node.getNavigationOptions(), defaultOptions);
+        return new TopTabsController(activity, node.id, tabs, new TopTabsLayoutCreator(activity, tabs), options);
     }
 
     private ViewController createTopTab(LayoutNode node) {
         String id = node.id;
         String name = node.data.optString("name");
-        NavigationOptions navigationOptions = NavigationOptions.parse(typefaceManager, node.getNavigationOptions(), defaultOptions);
+        NavigationOptions options = NavigationOptions.parse(typefaceManager, node.getNavigationOptions(), defaultOptions);
         return new TopTabController(activity,
                 id,
                 name,
                 new ReactComponentViewCreator(reactInstanceManager),
-                navigationOptions
+                options
         );
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/parse/LayoutNode.java

@@ -35,6 +35,6 @@ public class LayoutNode {
 	}
 
     JSONObject getNavigationOptions() {
-	    return data.optJSONObject("navigationOptions");
+	    return data.optJSONObject("options");
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/parse/NavigationOptions.java

@@ -1,12 +1,10 @@
 package com.reactnativenavigation.parse;
 
-import android.support.annotation.NonNull;
+import android.support.annotation.*;
 
-import com.reactnativenavigation.utils.TypefaceLoader;
+import com.reactnativenavigation.utils.*;
 
-import org.json.JSONObject;
-
-import java.util.ArrayList;
+import org.json.*;
 
 public class NavigationOptions implements DEFAULT_VALUES {
 

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

@@ -35,7 +35,7 @@ public class ComponentViewController extends ViewController implements Navigatio
 	private final String componentName;
 
 	private final ReactViewCreator viewCreator;
-	private NavigationOptions navigationOptions;
+	private NavigationOptions options;
 	private ReactComponent component;
 
 	public ComponentViewController(final Activity activity,
@@ -46,7 +46,7 @@ public class ComponentViewController extends ViewController implements Navigatio
 		super(activity, id);
 		this.componentName = componentName;
 		this.viewCreator = viewCreator;
-		this.navigationOptions = initialNavigationOptions;
+		this.options = initialNavigationOptions;
 	}
 
     @RestrictTo(RestrictTo.Scope.TESTS)
@@ -65,7 +65,7 @@ public class ComponentViewController extends ViewController implements Navigatio
 	public void onViewAppeared() {
 		super.onViewAppeared();
 		ensureViewIsCreated();
-		component.applyOptions(navigationOptions);
+		component.applyOptions(options);
 		component.sendComponentStart();
 	}
 
@@ -89,11 +89,11 @@ public class ComponentViewController extends ViewController implements Navigatio
 
 	@Override
 	public void mergeNavigationOptions(NavigationOptions options) {
-		navigationOptions.mergeWith(options);
-        component.applyOptions(navigationOptions);
+		this.options.mergeWith(options);
+        component.applyOptions(options);
 	}
 
-	NavigationOptions getNavigationOptions() {
-		return navigationOptions;
+	NavigationOptions getOptions() {
+		return options;
 	}
 }

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

@@ -63,7 +63,7 @@ public class ModalStack {
 
 	@Nullable
     ViewController findControllerById(String id) {
-        Modal modal = findModalByContainerId(id);
+        Modal modal = findModalByComponentId(id);
         return modal != null ? modal.viewController : null;
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabsController.java

@@ -20,12 +20,12 @@ public class TopTabsController extends ParentController implements NavigationOpt
     private List<TopTabController> tabs;
     private TopTabsLayout topTabsLayout;
     private TopTabsLayoutCreator viewCreator;
-    private NavigationOptions navigationOptions;
+    private NavigationOptions options;
 
-    public TopTabsController(Activity activity, String id, List<TopTabController> tabs, TopTabsLayoutCreator viewCreator, NavigationOptions navigationOptions) {
+    public TopTabsController(Activity activity, String id, List<TopTabController> tabs, TopTabsLayoutCreator viewCreator, NavigationOptions options) {
         super(activity, id);
         this.viewCreator = viewCreator;
-        this.navigationOptions = navigationOptions;
+        this.options = options;
         this.tabs = tabs;
         for (ViewController tab : tabs) {
             tab.setParentController(this);
@@ -47,7 +47,7 @@ public class TopTabsController extends ParentController implements NavigationOpt
 
     @Override
     public void onViewAppeared() {
-        applyOptions(navigationOptions);
+        applyOptions(options);
         performOnCurrentTab(TopTabController::onViewAppeared);
     }
 

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

@@ -197,13 +197,13 @@ public class NavigatorTest extends BaseTest {
 	public void setOptions_CallsApplyNavigationOptions() {
 		ComponentViewController componentVc = new SimpleComponentViewController(activity, "theId");
 		uut.setRoot(componentVc);
-		assertThat(componentVc.getNavigationOptions().topBarOptions.title).isEmpty();
+		assertThat(componentVc.getOptions().topBarOptions.title).isEmpty();
 
 		NavigationOptions options = new NavigationOptions();
 		options.topBarOptions.title = "new title";
 
 		uut.setOptions("theId", options);
-		assertThat(componentVc.getNavigationOptions().topBarOptions.title).isEqualTo("new title");
+		assertThat(componentVc.getOptions().topBarOptions.title).isEqualTo("new title");
 	}
 
 	@Test

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

@@ -44,7 +44,7 @@ public class OptionsApplyingTest extends BaseTest {
 
 	@Test
 	public void initialOptionsAppliedOnAppear() throws Exception {
-		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
+		assertThat(uut.getOptions()).isSameAs(initialNavigationOptions);
 		initialNavigationOptions.topBarOptions.title = "the title";
 		StackController stackController = new StackController(activity, "stackId");
 		stackController.push(uut);
@@ -56,12 +56,12 @@ public class OptionsApplyingTest extends BaseTest {
 
 	@Test
 	public void mergeNavigationOptionsUpdatesCurrentOptions() throws Exception {
-		assertThat(uut.getNavigationOptions().topBarOptions.title).isEmpty();
+		assertThat(uut.getOptions().topBarOptions.title).isEmpty();
 		NavigationOptions options = new NavigationOptions();
 		options.topBarOptions.title = "new title";
 		uut.mergeNavigationOptions(options);
-		assertThat(uut.getNavigationOptions().topBarOptions.title).isEqualTo("new title");
-		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
+		assertThat(uut.getOptions().topBarOptions.title).isEqualTo("new title");
+		assertThat(uut.getOptions()).isSameAs(initialNavigationOptions);
 	}
 
 	@Test
@@ -91,7 +91,7 @@ public class OptionsApplyingTest extends BaseTest {
 
 	@Test
 	public void appliesTopBarTextColor() throws Exception {
-		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
+		assertThat(uut.getOptions()).isSameAs(initialNavigationOptions);
 		initialNavigationOptions.topBarOptions.title = "the title";
 		uut.onViewAppeared();
 		assertThat(uut.getTopBar().getTitleTextView().getCurrentTextColor()).isNotEqualTo(Color.RED);
@@ -107,7 +107,7 @@ public class OptionsApplyingTest extends BaseTest {
 
 	@Test
 	public void appliesTopBarTextSize() throws Exception {
-		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
+		assertThat(uut.getOptions()).isSameAs(initialNavigationOptions);
 		initialNavigationOptions.topBarOptions.title = "the title";
 		uut.onViewAppeared();
 		assertThat(uut.getTopBar().getTitleTextView().getTextSize()).isNotEqualTo(18);
@@ -123,7 +123,7 @@ public class OptionsApplyingTest extends BaseTest {
 
 	@Test
 	public void appliesTopBarHidden() throws Exception {
-		assertThat(uut.getNavigationOptions()).isSameAs(initialNavigationOptions);
+		assertThat(uut.getOptions()).isSameAs(initialNavigationOptions);
 		initialNavigationOptions.topBarOptions.title = "the title";
 		uut.onViewAppeared();
 		assertThat(uut.getTopBar().getVisibility()).isNotEqualTo(View.GONE);

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

@@ -31,7 +31,7 @@ public class TopTabsViewControllerTest extends BaseTest {
     private List<TopTabLayoutMock> tabs = new ArrayList<>(SIZE);
     private List<TopTabController> tabControllers = new ArrayList<>(SIZE);
     private List<NavigationOptions> tabOptions = new ArrayList<>(SIZE);
-    private NavigationOptions navigationOptions;
+    private NavigationOptions options;
     private TopTabsLayout topTabsLayout;
 
     @Override
@@ -41,12 +41,12 @@ public class TopTabsViewControllerTest extends BaseTest {
         tabs.clear();
         Activity activity = newActivity();
         createTabs(activity);
-        navigationOptions = new NavigationOptions();
+        options = new NavigationOptions();
         topTabsLayout = spy(new TopTabsLayout(activity, tabControllers, new TopTabsAdapter(tabControllers)));
 
         TopTabsLayoutCreator layoutCreator = Mockito.mock(TopTabsLayoutCreator.class);
         Mockito.when(layoutCreator.create()).thenReturn(topTabsLayout);
-        uut = new TopTabsController(activity, "componentId", tabControllers, layoutCreator, navigationOptions);
+        uut = new TopTabsController(activity, "componentId", tabControllers, layoutCreator, options);
     }
 
     private void createTabs(Activity activity) {
@@ -130,7 +130,7 @@ public class TopTabsViewControllerTest extends BaseTest {
     public void appliesOptionsOnLayoutWhenVisible() throws Exception {
         uut.ensureViewIsCreated();
         uut.onViewAppeared();
-        verify(topTabsLayout, times(1)).applyOptions(navigationOptions);
+        verify(topTabsLayout, times(1)).applyOptions(options);
     }
 
     private IReactView tab(TopTabsLayout topTabs, final int index) {