Rename presenters

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

@@ -5,8 +5,8 @@ import android.app.Activity;
 import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.presentation.BottomTabPresenter;
 import com.reactnativenavigation.presentation.BottomTabsPresenter;
-import com.reactnativenavigation.presentation.OptionsPresenter;
-import com.reactnativenavigation.presentation.SideMenuOptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
+import com.reactnativenavigation.presentation.SideMenuPresenter;
 import com.reactnativenavigation.presentation.StackPresenter;
 import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.ImageLoader;
@@ -84,8 +84,8 @@ public class LayoutFactory {
                 childRegistry,
                 node.id,
                 parse(typefaceManager, node.getOptions()),
-                new SideMenuOptionsPresenter(),
-                new OptionsPresenter(activity, defaultOptions)
+                new SideMenuPresenter(),
+                new Presenter(activity, defaultOptions)
         );
 		ViewController childControllerCenter = null, childControllerLeft = null, childControllerRight = null;
 
@@ -144,7 +144,7 @@ public class LayoutFactory {
                 name,
                 new ComponentViewCreator(reactInstanceManager),
                 parse(typefaceManager, node.getOptions()),
-                new OptionsPresenter(activity, defaultOptions)
+                new Presenter(activity, defaultOptions)
         );
 	}
 
@@ -169,7 +169,7 @@ public class LayoutFactory {
                 .setId(node.id)
                 .setInitialOptions(parse(typefaceManager, node.getOptions()))
                 .setStackPresenter(new StackPresenter(activity, new TitleBarReactViewCreator(reactInstanceManager), new TitleBarButtonCreator(reactInstanceManager), new ImageLoader(), defaultOptions))
-                .setPresenter(new OptionsPresenter(activity, defaultOptions))
+                .setPresenter(new Presenter(activity, defaultOptions))
                 .build();
 	}
 
@@ -193,7 +193,7 @@ public class LayoutFactory {
                 new ImageLoader(),
                 node.id,
                 parse(typefaceManager, node.getOptions()),
-                new OptionsPresenter(activity, defaultOptions),
+                new Presenter(activity, defaultOptions),
                 new BottomTabsPresenter(tabs, defaultOptions),
                 new BottomTabPresenter(activity, tabs, defaultOptions));
 	}
@@ -206,6 +206,6 @@ public class LayoutFactory {
             options.setTopTabIndex(i);
             tabs.add(tabController);
         }
-        return new TopTabsController(activity, childRegistry, node.id, tabs, new TopTabsLayoutCreator(activity, tabs), parse(typefaceManager, node.getOptions()), new OptionsPresenter(activity, defaultOptions));
+        return new TopTabsController(activity, childRegistry, node.id, tabs, new TopTabsLayoutCreator(activity, tabs), parse(typefaceManager, node.getOptions()), new Presenter(activity, defaultOptions));
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/presentation/FabOptionsPresenter.java → lib/android/app/src/main/java/com/reactnativenavigation/presentation/FabPresenter.java

@@ -21,7 +21,7 @@ import static android.widget.RelativeLayout.ALIGN_PARENT_TOP;
 import static com.github.clans.fab.FloatingActionButton.SIZE_MINI;
 import static com.github.clans.fab.FloatingActionButton.SIZE_NORMAL;
 
-public class FabOptionsPresenter {
+public class FabPresenter {
     private ViewGroup viewGroup;
     private ReactComponent component;
 

lib/android/app/src/main/java/com/reactnativenavigation/presentation/OptionsPresenter.java → lib/android/app/src/main/java/com/reactnativenavigation/presentation/Presenter.java

@@ -14,12 +14,12 @@ import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.utils.UiUtils;
 
 @SuppressWarnings("FieldCanBeLocal")
-public class OptionsPresenter {
+public class Presenter {
 
     private Activity activity;
     private Options defaultOptions;
 
-    public OptionsPresenter(Activity activity, Options defaultOptions) {
+    public Presenter(Activity activity, Options defaultOptions) {
         this.activity = activity;
         this.defaultOptions = defaultOptions;
     }

lib/android/app/src/main/java/com/reactnativenavigation/presentation/SideMenuOptionsPresenter.java → lib/android/app/src/main/java/com/reactnativenavigation/presentation/SideMenuPresenter.java

@@ -5,7 +5,7 @@ import android.view.Gravity;
 
 import com.reactnativenavigation.parse.SideMenuRootOptions;
 
-public class SideMenuOptionsPresenter {
+public class SideMenuPresenter {
 
     private DrawerLayout sideMenu;
 

lib/android/app/src/main/java/com/reactnativenavigation/presentation/StackPresenter.java

@@ -20,7 +20,7 @@ import com.reactnativenavigation.parse.TopTabOptions;
 import com.reactnativenavigation.parse.TopTabsOptions;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Colour;
-import com.reactnativenavigation.utils.ButtonOptionsPresenter;
+import com.reactnativenavigation.utils.ButtonPresenter;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.viewcontrollers.IReactView;
@@ -281,7 +281,7 @@ public class StackPresenter {
         return new TitleBarButtonController(activity,
                 new NavigationIconResolver(activity, imageLoader),
                 imageLoader,
-                new ButtonOptionsPresenter(topBar.getTitleBar(), button),
+                new ButtonPresenter(topBar.getTitleBar(), button),
                 button,
                 buttonCreator,
                 onClickListener

lib/android/app/src/main/java/com/reactnativenavigation/utils/ButtonOptionsPresenter.java → lib/android/app/src/main/java/com/reactnativenavigation/utils/ButtonPresenter.java

@@ -19,12 +19,12 @@ import com.reactnativenavigation.parse.params.Button;
 
 import java.util.ArrayList;
 
-public class ButtonOptionsPresenter {
+public class ButtonPresenter {
     private final Toolbar toolbar;
     private final ActionMenuView actionMenuView;
     private Button button;
 
-    public ButtonOptionsPresenter(Toolbar toolbar, Button button) {
+    public ButtonPresenter(Toolbar toolbar, Button button) {
         this.toolbar = toolbar;
         actionMenuView = ViewUtils.findChildrenByClass(toolbar, ActionMenuView.class).get(0);
         this.button = button;

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

@@ -5,19 +5,19 @@ import android.support.annotation.CallSuper;
 import android.view.ViewGroup;
 
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+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 OptionsPresenter presenter;
+    final Presenter presenter;
     private final ChildControllersRegistry childRegistry;
 
     public ChildControllersRegistry getChildRegistry() {
         return childRegistry;
     }
 
-    public ChildController(Activity activity, ChildControllersRegistry childRegistry, String id, OptionsPresenter presenter, Options initialOptions) {
+    public ChildController(Activity activity, ChildControllersRegistry childRegistry, String id, Presenter presenter, Options initialOptions) {
         super(activity, id, new NoOpYellowBoxDelegate(), initialOptions);
         this.presenter = presenter;
         this.childRegistry = childRegistry;

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

@@ -4,7 +4,7 @@ import android.app.Activity;
 import android.support.annotation.NonNull;
 
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.views.ComponentLayout;
 import com.reactnativenavigation.views.ReactComponent;
 
@@ -20,7 +20,7 @@ public class ComponentViewController extends ChildController<ComponentLayout> {
                                    final String componentName,
                                    final ReactViewCreator viewCreator,
                                    final Options initialOptions,
-                                   final OptionsPresenter presenter) {
+                                   final Presenter presenter) {
         super(activity, childRegistry, id, presenter, initialOptions);
         this.componentName = componentName;
         this.viewCreator = viewCreator;

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

@@ -10,7 +10,7 @@ import android.view.ViewGroup;
 
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.utils.CollectionUtils;
 import com.reactnativenavigation.views.Component;
 
@@ -18,7 +18,7 @@ import java.util.Collection;
 
 public abstract class ParentController<T extends ViewGroup> extends ChildController {
 
-	public ParentController(Activity activity, ChildControllersRegistry childRegistry, String id, OptionsPresenter presenter, Options initialOptions) {
+	public ParentController(Activity activity, ChildControllersRegistry childRegistry, String id, Presenter presenter, Options initialOptions) {
 		super(activity, childRegistry, id, presenter, initialOptions);
 	}
 

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

@@ -17,7 +17,7 @@ import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.ArrayUtils;
-import com.reactnativenavigation.utils.ButtonOptionsPresenter;
+import com.reactnativenavigation.utils.ButtonPresenter;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.ImageLoadingListenerAdapter;
 import com.reactnativenavigation.utils.UiUtils;
@@ -35,7 +35,7 @@ public class TitleBarButtonController extends ViewController<TitleBarReactButton
 
     private final NavigationIconResolver navigationIconResolver;
     private final ImageLoader imageLoader;
-    private ButtonOptionsPresenter optionsPresenter;
+    private ButtonPresenter optionsPresenter;
     private final Button button;
     private final ReactViewCreator viewCreator;
     private TitleBarButtonController.OnClickListener onPressListener;
@@ -53,7 +53,7 @@ public class TitleBarButtonController extends ViewController<TitleBarReactButton
     public TitleBarButtonController(Activity activity,
                                     NavigationIconResolver navigationIconResolver,
                                     ImageLoader imageLoader,
-                                    ButtonOptionsPresenter optionsPresenter,
+                                    ButtonPresenter optionsPresenter,
                                     Button button,
                                     ReactViewCreator viewCreator,
                                     OnClickListener onClickListener) {

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

@@ -14,7 +14,7 @@ import android.view.ViewTreeObserver;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.NullBool;
-import com.reactnativenavigation.presentation.FabOptionsPresenter;
+import com.reactnativenavigation.presentation.FabPresenter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.StringUtils;
 import com.reactnativenavigation.utils.Task;
@@ -56,7 +56,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
     private boolean isShown;
     private boolean isDestroyed;
     private ViewVisibilityListener viewVisibilityListener = new ViewVisibilityListenerAdapter();
-    protected FabOptionsPresenter fabOptionsPresenter;
+    protected FabPresenter fabOptionsPresenter;
 
     public boolean isDestroyed() {
         return isDestroyed;
@@ -66,7 +66,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         this.activity = activity;
         this.id = id;
         this.yellowBoxDelegate = yellowBoxDelegate;
-        fabOptionsPresenter = new FabOptionsPresenter();
+        fabOptionsPresenter = new FabPresenter();
         this.initialOptions = initialOptions;
         options = initialOptions.copy();
     }

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

@@ -14,7 +14,7 @@ import com.reactnativenavigation.parse.BottomTabOptions;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.BottomTabPresenter;
 import com.reactnativenavigation.presentation.BottomTabsPresenter;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.ImageLoader;
@@ -42,7 +42,7 @@ public class BottomTabsController extends ParentController implements AHBottomNa
     private BottomTabsPresenter presenter;
     private BottomTabPresenter tabPresenter;
 
-    public BottomTabsController(Activity activity, List<ViewController> tabs, ChildControllersRegistry childRegistry, EventEmitter eventEmitter, ImageLoader imageLoader, String id, Options initialOptions, OptionsPresenter presenter, BottomTabsPresenter bottomTabsPresenter, BottomTabPresenter bottomTabPresenter) {
+    public BottomTabsController(Activity activity, List<ViewController> tabs, ChildControllersRegistry childRegistry, EventEmitter eventEmitter, ImageLoader imageLoader, String id, Options initialOptions, Presenter presenter, BottomTabsPresenter bottomTabsPresenter, BottomTabPresenter bottomTabPresenter) {
 		super(activity, childRegistry, id, presenter, initialOptions);
         this.tabs = tabs;
         this.eventEmitter = eventEmitter;

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

@@ -8,7 +8,7 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.presentation.OverlayManager;
 import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListener;
@@ -62,7 +62,7 @@ public class Navigator extends ParentController {
     }
 
     public Navigator(final Activity activity, ChildControllersRegistry childRegistry, ModalStack modalStack, OverlayManager overlayManager, RootPresenter rootPresenter) {
-        super(activity, childRegistry,"navigator" + CompatUtils.generateViewId(), new OptionsPresenter(activity, new Options()), new Options());
+        super(activity, childRegistry,"navigator" + CompatUtils.generateViewId(), new Presenter(activity, new Options()), new Options());
         this.modalStack = modalStack;
         this.overlayManager = overlayManager;
         this.rootPresenter = rootPresenter;

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuController.java

@@ -11,8 +11,8 @@ import android.view.View;
 
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.SideMenuOptions;
-import com.reactnativenavigation.presentation.OptionsPresenter;
-import com.reactnativenavigation.presentation.SideMenuOptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
+import com.reactnativenavigation.presentation.SideMenuPresenter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ParentController;
@@ -29,9 +29,9 @@ public class SideMenuController extends ParentController<DrawerLayout> {
 	private ViewController center;
 	private ViewController left;
 	private ViewController right;
-    private SideMenuOptionsPresenter presenter;
+    private SideMenuPresenter presenter;
 
-    public SideMenuController(Activity activity, ChildControllersRegistry childRegistry, String id, Options initialOptions, SideMenuOptionsPresenter sideMenuOptionsPresenter, OptionsPresenter presenter) {
+    public SideMenuController(Activity activity, ChildControllersRegistry childRegistry, String id, Options initialOptions, SideMenuPresenter sideMenuOptionsPresenter, Presenter presenter) {
 		super(activity, childRegistry, id, presenter, initialOptions);
         this.presenter = sideMenuOptionsPresenter;
     }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java

@@ -11,7 +11,7 @@ import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.anim.NavigationAnimator;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.presentation.StackPresenter;
 import com.reactnativenavigation.react.Constants;
 import com.reactnativenavigation.utils.CommandListener;
@@ -42,7 +42,7 @@ public class StackController extends ParentController<StackLayout> {
     private BackButtonHelper backButtonHelper;
     private final StackPresenter presenter;
 
-    public StackController(Activity activity, List<ViewController> children, ChildControllersRegistry childRegistry, TopBarBackgroundViewController topBarBackgroundViewController, TopBarController topBarController, NavigationAnimator animator, String id, Options initialOptions, BackButtonHelper backButtonHelper, StackPresenter stackPresenter, OptionsPresenter presenter) {
+    public StackController(Activity activity, List<ViewController> children, ChildControllersRegistry childRegistry, TopBarBackgroundViewController topBarBackgroundViewController, TopBarController topBarController, NavigationAnimator animator, String id, Options initialOptions, BackButtonHelper backButtonHelper, StackPresenter stackPresenter, Presenter presenter) {
         super(activity, childRegistry, id, presenter, initialOptions);
         this.topBarController = topBarController;
         this.topBarBackgroundViewController = topBarBackgroundViewController;

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerBuilder.java

@@ -4,7 +4,7 @@ import android.app.Activity;
 
 import com.reactnativenavigation.anim.NavigationAnimator;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.presentation.StackPresenter;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
@@ -26,13 +26,13 @@ public class StackControllerBuilder {
     private Options initialOptions = new Options();
     private NavigationAnimator animator;
     private BackButtonHelper backButtonHelper = new BackButtonHelper();
-    private OptionsPresenter presenter;
+    private Presenter presenter;
     private StackPresenter stackPresenter;
     private List<ViewController> children = new ArrayList<>();
 
     public StackControllerBuilder(Activity activity) {
         this.activity = activity;
-        presenter = new OptionsPresenter(activity, new Options());
+        presenter = new Presenter(activity, new Options());
         animator = new NavigationAnimator(activity, new ElementTransitionManager());
     }
 
@@ -46,7 +46,7 @@ public class StackControllerBuilder {
         return this;
     }
 
-    public StackControllerBuilder setPresenter(OptionsPresenter presenter) {
+    public StackControllerBuilder setPresenter(Presenter presenter) {
         this.presenter = presenter;
         return this;
     }

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

@@ -6,7 +6,7 @@ import android.support.annotation.NonNull;
 import android.view.View;
 
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.utils.Task;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ParentController;
@@ -24,7 +24,7 @@ public class TopTabsController extends ParentController<TopTabsViewPager> {
     private List<ViewController> tabs;
     private TopTabsLayoutCreator viewCreator;
 
-    public TopTabsController(Activity activity, ChildControllersRegistry childRegistry, String id, List<ViewController> tabs, TopTabsLayoutCreator viewCreator, Options options, OptionsPresenter presenter) {
+    public TopTabsController(Activity activity, ChildControllersRegistry childRegistry, String id, List<ViewController> tabs, TopTabsLayoutCreator viewCreator, Options options, Presenter presenter) {
         super(activity, childRegistry, id, presenter, options);
         this.viewCreator = viewCreator;
         this.tabs = tabs;

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

@@ -3,11 +3,11 @@ package com.reactnativenavigation.mocks;
 import android.app.*;
 
 import com.reactnativenavigation.parse.*;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.viewcontrollers.*;
 
 public class SimpleComponentViewController extends ComponentViewController {
     public SimpleComponentViewController(Activity activity, ChildControllersRegistry childRegistry, String id, Options initialOptions) {
-        super(activity, childRegistry,id, "theComponentName", new TestComponentViewCreator(), initialOptions, new OptionsPresenter(activity, new Options()));
+        super(activity, childRegistry,id, "theComponentName", new TestComponentViewCreator(), initialOptions, new Presenter(activity, new Options()));
     }
 }

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

@@ -9,7 +9,7 @@ import android.widget.RelativeLayout;
 import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.interfaces.ScrollEventListener;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.react.ReactView;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.viewcontrollers.ChildController;
@@ -23,10 +23,10 @@ public class SimpleViewController extends ChildController<SimpleViewController.S
 
 
     public SimpleViewController(Activity activity, ChildControllersRegistry childRegistry, String id, Options options) {
-        this(activity, childRegistry, id, new OptionsPresenter(activity, new Options()), options);
+        this(activity, childRegistry, id, new Presenter(activity, new Options()), options);
     }
 
-    public SimpleViewController(Activity activity, ChildControllersRegistry childRegistry, String id, OptionsPresenter presenter, Options options) {
+    public SimpleViewController(Activity activity, ChildControllersRegistry childRegistry, String id, Presenter presenter, Options options) {
         super(activity, childRegistry, id, presenter, options);
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/utils/TitleBarHelper.java

@@ -46,7 +46,7 @@ public class TitleBarHelper {
         return new TitleBarButtonController(activity,
                 new NavigationIconResolver(activity, ImageLoaderMock.mock()),
                 ImageLoaderMock.mock(),
-                new ButtonOptionsPresenter(titleBar, button),
+                new ButtonPresenter(titleBar, button),
                 button,
                 new TopBarButtonCreatorMock(),
                 buttonId -> {}

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

@@ -18,7 +18,7 @@ import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.presentation.BottomTabPresenter;
 import com.reactnativenavigation.presentation.BottomTabsPresenter;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.ImageLoader;
@@ -229,7 +229,7 @@ public class BottomTabsControllerTest extends BaseTest {
                 imageLoaderMock,
                 "uut",
                 initialOptions,
-                new OptionsPresenter(activity, new Options()),
+                new Presenter(activity, new Options()),
                 presenter,
                 new BottomTabPresenter(activity, tabs, new Options())) {
             @Override
@@ -338,7 +338,7 @@ public class BottomTabsControllerTest extends BaseTest {
                 imageLoaderMock,
                 "uut",
                 initialOptions,
-                new OptionsPresenter(activity, new Options()),
+                new Presenter(activity, new Options()),
                 presenter,
                 new BottomTabPresenter(activity, tabs, new Options())) {
             @Override

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

@@ -7,7 +7,7 @@ import com.reactnativenavigation.TestUtils;
 import com.reactnativenavigation.mocks.TestComponentLayout;
 import com.reactnativenavigation.mocks.TestReactView;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.views.StackLayout;
 
 import org.junit.Test;
@@ -29,7 +29,7 @@ public class ComponentViewControllerTest extends BaseTest {
         Activity activity = newActivity();
         view = spy(new TestComponentLayout(activity, new TestReactView(activity)));
         ParentController<StackLayout> parentController = TestUtils.newStackController(activity).build();
-        OptionsPresenter presenter = new OptionsPresenter(activity, new Options());
+        Presenter presenter = new Presenter(activity, new Options());
         uut = new ComponentViewController(activity, new ChildControllersRegistry(), "componentId1", "componentName", (activity1, componentId, componentName) -> view, new Options(), presenter);
         uut.setParentController(parentController);
         parentController.ensureViewIsCreated();

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

@@ -22,7 +22,7 @@ import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.parse.params.Text;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.presentation.StackPresenter;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.ImageLoader;
@@ -65,7 +65,7 @@ public class OptionsApplyingTest extends BaseTest {
                 "componentName",
                 (activity1, componentId, componentName) -> view,
                 initialNavigationOptions,
-                new OptionsPresenter(activity, new Options())
+                new Presenter(activity, new Options())
         ) {
             @Override
             public boolean isViewShown() {

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

@@ -10,7 +10,7 @@ import com.reactnativenavigation.TestUtils;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Text;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
 import com.reactnativenavigation.views.ReactComponent;
@@ -36,7 +36,7 @@ public class ParentControllerTest extends BaseTest {
     private ChildControllersRegistry childRegistry;
     private List<ViewController> children;
     private ParentController uut;
-    private OptionsPresenter presenter;
+    private Presenter presenter;
 
     @Override
     public void beforeEach() {
@@ -46,7 +46,7 @@ public class ParentControllerTest extends BaseTest {
         children = new ArrayList<>();
         Options initialOptions = new Options();
         initialOptions.topBar.title.text = new Text(INITIAL_TITLE);
-        presenter = spy(new OptionsPresenter(activity, new Options()));
+        presenter = spy(new Presenter(activity, new Options()));
         uut = spy(new ParentController(activity, childRegistry, "uut", presenter, initialOptions) {
 
             @Override

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

@@ -16,7 +16,7 @@ import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.NullText;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
-import com.reactnativenavigation.utils.ButtonOptionsPresenter;
+import com.reactnativenavigation.utils.ButtonPresenter;
 import com.reactnativenavigation.viewcontrollers.button.NavigationIconResolver;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
 
@@ -35,7 +35,7 @@ public class TopBarButtonControllerTest extends BaseTest {
     private TitleBarButtonController uut;
     private StackController stackController;
     private Button button;
-    private ButtonOptionsPresenter optionsPresenter;
+    private ButtonPresenter optionsPresenter;
 
     @Override
     public void beforeEach() {
@@ -52,7 +52,7 @@ public class TopBarButtonControllerTest extends BaseTest {
         stackController.getTopBar().layout(0, 0, 1080, 200);
         getTitleBar().layout(0, 0, 1080, 200);
 
-        optionsPresenter = spy(new ButtonOptionsPresenter(getTitleBar(), button));
+        optionsPresenter = spy(new ButtonPresenter(getTitleBar(), button));
         uut = new TitleBarButtonController(activity, new NavigationIconResolver(activity, ImageLoaderMock.mock()), ImageLoaderMock.mock(), optionsPresenter, button, buttonCreatorMock, (buttonId) -> {});
 
         stackController.ensureViewIsCreated();

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

@@ -12,7 +12,7 @@ import com.reactnativenavigation.mocks.TestReactView;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Text;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.ViewHelper;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
@@ -59,7 +59,7 @@ public class TopTabsViewControllerTest extends BaseTest {
         topTabsLayout = spy(new TopTabsViewPager(activity, tabControllers, new TopTabsAdapter(tabControllers)));
         TopTabsLayoutCreator layoutCreator = Mockito.mock(TopTabsLayoutCreator.class);
         Mockito.when(layoutCreator.create()).thenReturn(topTabsLayout);
-        OptionsPresenter presenter = new OptionsPresenter(activity, new Options());
+        Presenter presenter = new Presenter(activity, new Options());
         options.topBar.buttons.back.visible = new Bool(false);
         uut = spy(new TopTabsController(activity, childRegistry, "componentId", tabControllers, layoutCreator, options, presenter));
         tabControllers.forEach(viewController -> viewController.setParentController(uut));
@@ -90,7 +90,7 @@ public class TopTabsViewControllerTest extends BaseTest {
                     "theComponentName",
                     new TestComponentViewCreator(),
                     tabOptions.get(i),
-                    new OptionsPresenter(activity, new Options())
+                    new Presenter(activity, new Options())
             );
             tabControllers.add(spy(viewController));
         }

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

@@ -3,7 +3,7 @@ package com.reactnativenavigation.viewcontrollers.child;
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.viewcontrollers.ChildController;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ParentController;
@@ -20,13 +20,13 @@ public class ChildControllerTest extends BaseTest {
 
     private ChildController uut;
     private ChildControllersRegistry childRegistry;
-    private OptionsPresenter presenter;
+    private Presenter presenter;
     private Options resolvedOptions = new Options();
 
     @Override
     public void beforeEach() {
         childRegistry = spy(new ChildControllersRegistry());
-        presenter = Mockito.mock(OptionsPresenter.class);
+        presenter = Mockito.mock(Presenter.class);
         uut = new SimpleViewController(newActivity(), childRegistry, "childId", presenter, new Options()) {
             @Override
             public Options resolveCurrentOptions() {

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

@@ -16,7 +16,7 @@ import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.presentation.BottomTabPresenter;
 import com.reactnativenavigation.presentation.BottomTabsPresenter;
-import com.reactnativenavigation.presentation.OptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
 import com.reactnativenavigation.presentation.OverlayManager;
 import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListener;
@@ -346,7 +346,7 @@ public class NavigatorTest extends BaseTest {
 
     @NonNull
     private BottomTabsController newTabs(List<ViewController> tabs) {
-        return new BottomTabsController(activity, tabs, childRegistry, eventEmitter, imageLoaderMock, "tabsController", new Options(), new OptionsPresenter(activity, new Options()), new BottomTabsPresenter(tabs, new Options()), new BottomTabPresenter(activity, tabs, new Options()));
+        return new BottomTabsController(activity, tabs, childRegistry, eventEmitter, imageLoaderMock, "tabsController", new Options(), new Presenter(activity, new Options()), new BottomTabsPresenter(tabs, new Options()), new BottomTabPresenter(activity, tabs, new Options()));
     }
 
     @NonNull

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/sidemenu/SideMenuControllerTest.java

@@ -12,8 +12,8 @@ import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.SideMenuOptions;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Number;
-import com.reactnativenavigation.presentation.OptionsPresenter;
-import com.reactnativenavigation.presentation.SideMenuOptionsPresenter;
+import com.reactnativenavigation.presentation.Presenter;
+import com.reactnativenavigation.presentation.SideMenuPresenter;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 
@@ -31,7 +31,7 @@ public class SideMenuControllerTest extends BaseTest {
     private SideMenuController uut;
     private Activity activity;
     private ChildControllersRegistry childRegistry;
-    private SideMenuOptionsPresenter presenter;
+    private SideMenuPresenter presenter;
     private SimpleComponentViewController left;
     private SimpleComponentViewController right;
     private SimpleComponentViewController center;
@@ -40,11 +40,11 @@ public class SideMenuControllerTest extends BaseTest {
     public void beforeEach() {
         activity = newActivity();
         childRegistry = new ChildControllersRegistry();
-        presenter = spy(new SideMenuOptionsPresenter());
+        presenter = spy(new SideMenuPresenter());
         left = new SimpleComponentViewController(activity, childRegistry, "left", new Options());
         right = new SimpleComponentViewController(activity, childRegistry, "right", new Options());
         center = spy(new SimpleComponentViewController(activity, childRegistry, "center", new Options()));
-        uut = new SideMenuController(activity, childRegistry, "sideMenu", new Options(), presenter, new OptionsPresenter(activity, new Options()));
+        uut = new SideMenuController(activity, childRegistry, "sideMenu", new Options(), presenter, new Presenter(activity, new Options()));
         uut.setCenterController(center);
     }