V2 back button refactor (#3333)

* Refactored backButton api

* Move StackController to separate package

Implement BackButtonOptions

* Somewhat simplify StackController creation in tests

* Pull backButton logic from StackController

* Handle all TopBar button options in TopBarButtons

* fix back button on iOS

docs/docs/styling.md

@@ -172,10 +172,12 @@ Navigation.mergeOptions(this.props.componentId, {
     transparent: false,
     noBorder: false,
     blur: false,
-    backButtonImage: require('icon.png'),
-    backButtonHidden: false,
-    backButtonTitle: 'Back',
-    hideBackButtonTitle: false,
+    backButton: {
+      image: require('icon.png'),
+      visible: true,
+      title: 'Back',
+      hideTitle: false,
+    },
     largeTitle: {
       visible: true,
       fontSize: 30,

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

@@ -0,0 +1,55 @@
+package com.reactnativenavigation.parse;
+
+import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.parse.params.Button;
+import com.reactnativenavigation.parse.params.NullBool;
+import com.reactnativenavigation.parse.parsers.BoolParser;
+import com.reactnativenavigation.parse.parsers.ColorParser;
+import com.reactnativenavigation.parse.parsers.TextParser;
+import com.reactnativenavigation.react.Constants;
+
+import org.json.JSONObject;
+
+public class BackButton extends Button {
+    public static BackButton parse(JSONObject json) {
+        BackButton result = new BackButton();
+        if (json == null) return result;
+
+        result.visible = BoolParser.parse(json, "visible");
+        if (json.has("icon")) result.icon = TextParser.parse(json.optJSONObject("icon"), "uri");
+        result.id = json.optString("id", Constants.BACK_BUTTON_ID);
+        result.enabled = BoolParser.parse(json, "enabled");
+        result.disableIconTint = BoolParser.parse(json, "disableIconTint");
+        result.color = ColorParser.parse(json, "color");
+        result.disabledColor = ColorParser.parse(json, "disabledColor");
+        result.testId = TextParser.parse(json, "testID");
+
+        return result;
+    }
+
+    public BackButton() {
+        id = Constants.BACK_BUTTON_ID;
+    }
+
+    public Bool visible = new NullBool();
+
+    public void mergeWith(BackButton other) {
+        if (other.icon.hasValue()) icon = other.icon;
+        if (other.visible.hasValue()) visible = other.visible;
+        if (other.color.hasValue()) color = other.color;
+        if (other.disabledColor.hasValue()) disabledColor = other.disabledColor;
+        if (other.disableIconTint.hasValue()) disableIconTint = other.disableIconTint;
+        if (other.enabled.hasValue()) enabled = other.enabled;
+        if (other.testId.hasValue()) testId = other.testId;
+    }
+
+    void mergeWithDefault(final BackButton defaultOptions) {
+        if (!icon.hasValue()) icon = defaultOptions.icon;
+        if (!visible.hasValue()) visible = defaultOptions.visible;
+        if (!color.hasValue()) color = defaultOptions.color;
+        if (!disabledColor.hasValue()) disabledColor = defaultOptions.disabledColor;
+        if (!disableIconTint.hasValue()) disableIconTint = defaultOptions.disableIconTint;
+        if (!enabled.hasValue()) enabled = defaultOptions.enabled;
+        if (!testId.hasValue()) testId = defaultOptions.testId;
+    }
+}

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

@@ -10,8 +10,8 @@ import com.reactnativenavigation.utils.TypefaceLoader;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ComponentViewController;
 import com.reactnativenavigation.viewcontrollers.SideMenuController;
-import com.reactnativenavigation.viewcontrollers.StackController;
-import com.reactnativenavigation.viewcontrollers.StackControllerBuilder;
+import com.reactnativenavigation.viewcontrollers.stack.StackController;
+import com.reactnativenavigation.viewcontrollers.stack.StackControllerBuilder;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.bottomtabs.BottomTabsController;
 import com.reactnativenavigation.viewcontrollers.externalcomponent.ExternalComponentCreator;
@@ -161,7 +161,7 @@ public class LayoutFactory {
                 .setTopBarController(new TopBarController())
                 .setId(node.id)
                 .setInitialOptions(parseNodeOptions(node))
-                .createStackController();
+                .build();
         addChildrenToStack(node.children, stackController);
         return stackController;
 	}

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

@@ -0,0 +1,40 @@
+package com.reactnativenavigation.parse;
+
+import android.support.annotation.Nullable;
+
+import com.reactnativenavigation.parse.params.Button;
+import com.reactnativenavigation.utils.TypefaceLoader;
+
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+
+public class TopBarButtons {
+
+    public static TopBarButtons parse(TypefaceLoader typefaceLoader, JSONObject json) {
+        TopBarButtons result = new TopBarButtons();
+        if (json == null) return result;
+
+        result.right = Button.parseJsonArray(json.optJSONArray("rightButtons"), typefaceLoader);
+        result.left = Button.parseJsonArray(json.optJSONArray("leftButtons"), typefaceLoader);
+        result.back = BackButton.parse(json.optJSONObject("backButton"));
+
+        return result;
+    }
+
+    public BackButton back = new BackButton();
+    @Nullable public ArrayList<Button> left;
+    @Nullable public ArrayList<Button> right;
+
+    void mergeWith(TopBarButtons other) {
+        if (other.left != null) left = other.left;
+        if (other.right != null) right = other.right;
+        back.mergeWith(other.back);
+    }
+
+    void mergeWithDefault(TopBarButtons defaultOptions) {
+        if (left == null) left = defaultOptions.left;
+        if (right == null) right = defaultOptions.right;
+        back.mergeWithDefault(defaultOptions.back);
+    }
+}

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

@@ -1,12 +1,10 @@
 package com.reactnativenavigation.parse;
 
 
-import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.reactnativenavigation.BuildConfig;
 import com.reactnativenavigation.parse.params.Bool;
-import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Color;
 import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.parse.params.NullBool;
@@ -25,8 +23,6 @@ import com.reactnativenavigation.utils.TypefaceLoader;
 
 import org.json.JSONObject;
 
-import java.util.ArrayList;
-
 public class TopBarOptions {
 
     public static TopBarOptions parse(TypefaceLoader typefaceLoader, JSONObject json) {
@@ -40,13 +36,12 @@ public class TopBarOptions {
         options.animate = BoolParser.parse(json,"animate");
         options.hideOnScroll = BoolParser.parse(json,"hideOnScroll");
         options.drawBehind = BoolParser.parse(json,"drawBehind");
-        options.rightButtons = Button.parseJsonArray(json.optJSONArray("rightButtons"), typefaceLoader);
-        options.leftButtons = Button.parseJsonArray(json.optJSONArray("leftButtons"), typefaceLoader);
         options.testId = TextParser.parse(json, "testID");
         options.height = NumberParser.parse(json, "height");
         options.borderColor = ColorParser.parse(json, "borderColor");
         options.borderHeight = FractionParser.parse(json, "borderHeight");
         options.elevation = FractionParser.parse(json, "elevation");
+        options.buttons = TopBarButtons.parse(typefaceLoader, json);
 
         options.validate();
         return options;
@@ -54,6 +49,7 @@ public class TopBarOptions {
 
     public TitleOptions title = new TitleOptions();
     public SubtitleOptions subtitle = new SubtitleOptions();
+    public TopBarButtons buttons = new TopBarButtons();
     public Text testId = new NullText();
     public TopBarBackgroundOptions background = new TopBarBackgroundOptions();
     public Bool visible = new NullBool();
@@ -64,20 +60,17 @@ public class TopBarOptions {
     public Fraction elevation = new NullFraction();
     public Fraction borderHeight = new NullFraction();
     public Color borderColor = new NullColor();
-    @Nullable public ArrayList<Button> leftButtons;
-    @Nullable public ArrayList<Button> rightButtons;
 
     void mergeWith(final TopBarOptions other) {
         title.mergeWith(other.title);
         subtitle.mergeWith(other.subtitle);
         background.mergeWith(other.background);
+        buttons.mergeWith(other.buttons);
         if (other.testId.hasValue()) testId = other.testId;
         if (other.visible.hasValue()) visible = other.visible;
         if (other.animate.hasValue()) animate = other.animate;
         if (other.hideOnScroll.hasValue()) hideOnScroll = other.hideOnScroll;
         if (other.drawBehind.hasValue()) drawBehind = other.drawBehind;
-        if (other.leftButtons != null) leftButtons = other.leftButtons;
-        if (other.rightButtons != null) rightButtons = other.rightButtons;
         if (other.height.hasValue()) height = other.height;
         if (other.borderHeight.hasValue()) borderHeight = other.borderHeight;
         if (other.borderColor.hasValue()) borderColor = other.borderColor;
@@ -89,12 +82,11 @@ public class TopBarOptions {
         title.mergeWithDefault(defaultOptions.title);
         subtitle.mergeWithDefault(defaultOptions.subtitle);
         background.mergeWithDefault(defaultOptions.background);
+        buttons.mergeWithDefault(defaultOptions.buttons);
         if (!visible.hasValue()) visible = defaultOptions.visible;
         if (!animate.hasValue()) animate = defaultOptions.animate;
         if (!hideOnScroll.hasValue()) hideOnScroll = defaultOptions.hideOnScroll;
         if (!drawBehind.hasValue()) drawBehind = defaultOptions.drawBehind;
-        if (leftButtons == null) leftButtons = defaultOptions.leftButtons;
-        if (rightButtons == null) rightButtons = defaultOptions.rightButtons;
         if (!testId.hasValue()) testId = defaultOptions.testId;
         if (!height.hasValue()) height = defaultOptions.height;
         if (!borderHeight.hasValue()) borderHeight = defaultOptions.borderHeight;

lib/android/app/src/main/java/com/reactnativenavigation/parse/params/Button.java

@@ -31,7 +31,7 @@ public class Button {
     public Text testId = new NullText();
     public Component component = new Component();
 
-    private static Button parseJson(JSONObject json, TypefaceLoader typefaceManager) {
+    protected static Button parseJson(JSONObject json, TypefaceLoader typefaceManager) {
         Button button = new Button();
         button.id = json.optString("id");
         button.title = TextParser.parse(json, "title");

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

@@ -7,17 +7,15 @@ import android.view.ViewGroup.LayoutParams;
 import com.reactnativenavigation.parse.AnimationsOptions;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.OrientationOptions;
+import com.reactnativenavigation.parse.TopBarButtons;
 import com.reactnativenavigation.parse.TopBarOptions;
 import com.reactnativenavigation.parse.TopTabOptions;
 import com.reactnativenavigation.parse.TopTabsOptions;
-import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.viewcontrollers.IReactView;
 import com.reactnativenavigation.views.Component;
 import com.reactnativenavigation.views.topbar.TopBar;
 
-import java.util.ArrayList;
-
 public class StackOptionsPresenter {
     private static final int DEFAULT_TITLE_COLOR = Color.BLACK;
     private static final int DEFAULT_SUBTITLE_COLOR = Color.GRAY;
@@ -35,7 +33,7 @@ public class StackOptionsPresenter {
 
     public void applyChildOptions(Options options, Component child) {
         applyOrientation(options.layout.orientation);
-        applyButtons(options.topBar.leftButtons, options.topBar.rightButtons);
+        applyButtons(options.topBar.buttons);
         applyTopBarOptions(options.topBar, options.animations, child, options);
         applyTopTabsOptions(options.topTabs);
         applyTopTabOptions(options.topTabOptions);
@@ -98,9 +96,10 @@ public class StackOptionsPresenter {
         }
     }
 
-    private void applyButtons(ArrayList<Button> leftButtons, ArrayList<Button> rightButtons) {
-        topBar.setLeftButtons(leftButtons);
-        topBar.setRightButtons(rightButtons);
+    private void applyButtons(TopBarButtons buttons) {
+        topBar.setLeftButtons(buttons.left);
+        topBar.setRightButtons(buttons.right);
+        if (buttons.back.visible.isTrue()) topBar.setBackButton(buttons.back);
     }
 
     private void applyTopTabsOptions(TopTabsOptions options) {
@@ -126,7 +125,7 @@ public class StackOptionsPresenter {
 
     public void mergeChildOptions(Options options, Component child) {
         mergeOrientation(options.layout.orientation);
-        mergeButtons(options.topBar.leftButtons, options.topBar.rightButtons);
+        mergeButtons(options.topBar.buttons);
         mergeTopBarOptions(options.topBar, options.animations, child);
         mergeTopTabsOptions(options.topTabs);
         mergeTopTabOptions(options.topTabOptions);
@@ -136,9 +135,10 @@ public class StackOptionsPresenter {
         if (orientationOptions.hasValue()) applyOrientation(orientationOptions);
     }
 
-    private void mergeButtons(ArrayList<Button> leftButtons, ArrayList<Button> rightButtons) {
-        if (leftButtons != null) topBar.setLeftButtons(leftButtons);
-        if (rightButtons != null) topBar.setRightButtons(rightButtons);
+    private void mergeButtons(TopBarButtons buttons) {
+        if (buttons.left != null) topBar.setLeftButtons(buttons.left);
+        if (buttons.right != null) topBar.setRightButtons(buttons.right);
+        if (buttons.back != null) topBar.setBackButton(buttons.back);
     }
 
     private void mergeTopBarOptions(TopBarOptions options, AnimationsOptions animationsOptions, Component component) {

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

@@ -20,6 +20,7 @@ import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.utils.NativeCommandListener;
 import com.reactnativenavigation.viewcontrollers.modal.ModalPresenter;
 import com.reactnativenavigation.viewcontrollers.modal.ModalStack;
+import com.reactnativenavigation.viewcontrollers.stack.StackController;
 
 import java.util.Collection;
 import java.util.Collections;

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

@@ -79,7 +79,7 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
 	}
 
 	@CallSuper
-    void clearOptions() {
+    protected void clearOptions() {
 	    applyOnParentController(parent -> ((ParentController) parent).clearOptions());
         options = initialOptions.copy();
     }

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

@@ -16,6 +16,7 @@ import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.StringUtils;
 import com.reactnativenavigation.utils.Task;
 import com.reactnativenavigation.utils.UiUtils;
+import com.reactnativenavigation.viewcontrollers.stack.StackController;
 import com.reactnativenavigation.views.Component;
 
 public abstract class ViewController<T extends ViewGroup> implements ViewTreeObserver.OnGlobalLayoutListener {
@@ -44,7 +45,7 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
     private boolean isShown;
     private boolean isDestroyed;
     private ViewVisibilityListener viewVisibilityListener = new ViewVisibilityListenerAdapter();
-    FabOptionsPresenter fabOptionsPresenter;
+    protected FabOptionsPresenter fabOptionsPresenter;
 
     public ViewController(Activity activity, String id, Options initialOptions) {
         this.activity = activity;
@@ -93,8 +94,8 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         if (parentController != null) task.run(parentController);
     }
 
-    @Nullable
-    ParentController getParentController() {
+    @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
+    public ParentController getParentController() {
         return parentController;
     }
 

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

@@ -0,0 +1,14 @@
+package com.reactnativenavigation.viewcontrollers.stack;
+
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.viewcontrollers.ViewController;
+
+public class BackButtonHelper {
+    public void addToChild(StackController stack, ViewController child) {
+        if (stack.size() <= 1 || child.options.topBar.buttons.left != null || child.options.topBar.buttons.back.visible.isFalse()) return;
+        Options options = new Options();
+        options.topBar.buttons.back.visible = new Bool(true);
+        child.mergeOptions(options);
+    }
+}

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

@@ -1,17 +1,22 @@
-package com.reactnativenavigation.viewcontrollers;
+package com.reactnativenavigation.viewcontrollers.stack;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.support.annotation.RestrictTo;
+import android.support.annotation.VisibleForTesting;
 import android.support.v4.view.ViewPager;
 
 import com.reactnativenavigation.anim.NavigationAnimator;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.presentation.OptionsPresenter;
 import com.reactnativenavigation.react.Constants;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
+import com.reactnativenavigation.viewcontrollers.IdStack;
+import com.reactnativenavigation.viewcontrollers.ParentController;
+import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
+import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 import com.reactnativenavigation.views.Component;
@@ -20,9 +25,7 @@ import com.reactnativenavigation.views.StackLayout;
 import com.reactnativenavigation.views.titlebar.TitleBarReactViewCreator;
 import com.reactnativenavigation.views.topbar.TopBar;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
@@ -35,14 +38,16 @@ public class StackController extends ParentController<StackLayout> {
     private final TitleBarReactViewCreator titleBarReactViewCreator;
     private TopBarBackgroundViewController topBarBackgroundViewController;
     private TopBarController topBarController;
+    private BackButtonHelper backButtonHelper;
 
-    public StackController(Activity activity, ChildControllersRegistry childRegistry, ReactViewCreator topBarButtonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarController topBarController, NavigationAnimator animator, String id, Options initialOptions) {
+    public StackController(Activity activity, ChildControllersRegistry childRegistry, ReactViewCreator topBarButtonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarController topBarController, NavigationAnimator animator, String id, Options initialOptions, BackButtonHelper backButtonHelper) {
         super(activity, childRegistry, id, new OptionsPresenter(activity), initialOptions);
         this.topBarController = topBarController;
         this.topBarButtonCreator = topBarButtonCreator;
         this.titleBarReactViewCreator = titleBarReactViewCreator;
         this.topBarBackgroundViewController = topBarBackgroundViewController;
         this.animator = animator;
+        this.backButtonHelper = backButtonHelper;
     }
 
     @Override
@@ -94,7 +99,7 @@ public class StackController extends ParentController<StackLayout> {
     }
 
     @Override
-    void clearOptions() {
+    public void clearOptions() {
         super.clearOptions();
         topBarController.clear();
     }
@@ -122,12 +127,7 @@ public class StackController extends ParentController<StackLayout> {
     }
 
     private void addBackButton(ViewController child) {
-        if (size() <= 1 || child.options.topBar.leftButtons != null) return;
-        Options options = new Options();
-        Button back = new Button();
-        back.id = Constants.BACK_BUTTON_ID;
-        options.topBar.leftButtons = new ArrayList<>(Collections.singleton(back));
-        child.mergeOptions(options);
+        backButtonHelper.addToChild(this, child);
     }
 
     public void setRoot(ViewController child, CommandListener listener) {
@@ -150,7 +150,7 @@ public class StackController extends ParentController<StackLayout> {
         }
     }
 
-    void pop(CommandListener listener) {
+    public void pop(CommandListener listener) {
         if (!canPop()) {
             listener.onError("Nothing to pop");
             return;
@@ -176,7 +176,7 @@ public class StackController extends ParentController<StackLayout> {
         listener.onSuccess(disappearing.getId());
     }
 
-    void popSpecific(ViewController childController, CommandListener listener) {
+    public void popSpecific(ViewController childController, CommandListener listener) {
         if (stack.isTop(childController.getId())) {
             pop(listener);
         } else {
@@ -185,7 +185,7 @@ public class StackController extends ParentController<StackLayout> {
         }
     }
 
-    void popTo(final ViewController viewController, CommandListener listener) {
+    public void popTo(final ViewController viewController, CommandListener listener) {
         if (!stack.containsId(viewController.getId())) {
             listener.onError("Nothing to pop");
             return;
@@ -205,7 +205,7 @@ public class StackController extends ParentController<StackLayout> {
         pop(listener);
     }
 
-    void popToRoot(CommandListener listener) {
+    public void popToRoot(CommandListener listener) {
         if (!canPop()) {
             listener.onError("Nothing to pop");
             return;
@@ -227,7 +227,7 @@ public class StackController extends ParentController<StackLayout> {
         controller.destroy();
     }
 
-    ViewController peek() {
+    public ViewController peek() {
         return stack.peek();
     }
 
@@ -248,7 +248,8 @@ public class StackController extends ParentController<StackLayout> {
         return false;
     }
 
-    boolean canPop() {
+    @VisibleForTesting()
+    public boolean canPop() {
         return stack.size() > 1;
     }
 
@@ -295,12 +296,12 @@ public class StackController extends ParentController<StackLayout> {
     }
 
     @RestrictTo(RestrictTo.Scope.TESTS)
-    TopBar getTopBar() {
+    public TopBar getTopBar() {
         return topBarController.getView();
     }
 
     @RestrictTo(RestrictTo.Scope.TESTS)
-    StackLayout getStackLayout() {
+    public StackLayout getStackLayout() {
         return getView();
     }
 }

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

@@ -1,9 +1,11 @@
-package com.reactnativenavigation.viewcontrollers;
+package com.reactnativenavigation.viewcontrollers.stack;
 
 import android.app.Activity;
 
 import com.reactnativenavigation.anim.NavigationAnimator;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
+import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 import com.reactnativenavigation.views.titlebar.TitleBarReactViewCreator;
@@ -18,6 +20,7 @@ public class StackControllerBuilder {
     private String id;
     private Options initialOptions = new Options();
     private NavigationAnimator animator;
+    private BackButtonHelper backButtonHelper = new BackButtonHelper();
 
     public StackControllerBuilder(Activity activity) {
         this.activity = activity;
@@ -64,7 +67,12 @@ public class StackControllerBuilder {
         return this;
     }
 
-    public StackController createStackController() {
-        return new StackController(activity, childRegistry, topBarButtonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarController, animator, id, initialOptions);
+    public StackControllerBuilder setBackButtonHelper(BackButtonHelper backButtonHelper) {
+        this.backButtonHelper = backButtonHelper;
+        return this;
+    }
+
+    public StackController build() {
+        return new StackController(activity, childRegistry, topBarButtonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarController, animator, id, initialOptions, backButtonHelper);
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/topbar/TopBarController.java

@@ -5,6 +5,7 @@ import android.support.v4.view.ViewPager;
 import android.view.View;
 
 import com.reactnativenavigation.utils.CompatUtils;
+import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
 import com.reactnativenavigation.views.StackLayout;
@@ -17,14 +18,14 @@ public class TopBarController {
 
     public View createView(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarButtonController.OnClickListener topBarButtonClickListener, StackLayout stackLayout) {
         if (topBar == null) {
-            topBar = createTopBar(context, buttonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarButtonClickListener, stackLayout);
+            topBar = createTopBar(context, buttonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarButtonClickListener, stackLayout, new ImageLoader());
             topBar.setId(CompatUtils.generateViewId());
         }
         return topBar;
     }
 
-    protected TopBar createTopBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarButtonController.OnClickListener topBarButtonClickListener, StackLayout stackLayout) {
-        return new TopBar(context, buttonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarButtonClickListener, stackLayout);
+    protected TopBar createTopBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarButtonController.OnClickListener topBarButtonClickListener, StackLayout stackLayout, ImageLoader imageLoader) {
+        return new TopBar(context, buttonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarButtonClickListener, stackLayout, imageLoader);
     }
 
     public void clear() {

lib/android/app/src/main/java/com/reactnativenavigation/views/titlebar/TitleBar.java

@@ -11,6 +11,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 
 import com.reactnativenavigation.parse.Alignment;
+import com.reactnativenavigation.parse.BackButton;
 import com.reactnativenavigation.parse.Component;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Color;
@@ -38,11 +39,13 @@ public class TitleBar extends Toolbar {
     private final TopBarButtonController.OnClickListener onClickListener;
     private final List<TopBarButtonController> rightButtonControllers = new ArrayList<>();
     private TopBarButtonController leftButtonController;
+    private ImageLoader imageLoader;
 
-    public TitleBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator reactViewCreator, TopBarButtonController.OnClickListener onClickListener) {
+    public TitleBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator reactViewCreator, TopBarButtonController.OnClickListener onClickListener, ImageLoader imageLoader) {
         super(context);
         this.buttonCreator = buttonCreator;
         this.reactViewCreator = reactViewCreator;
+        this.imageLoader = imageLoader;
         reactViewController = new TitleBarReactViewController((Activity) context, reactViewCreator);
         this.onClickListener = onClickListener;
         getMenu();
@@ -167,6 +170,10 @@ public class TitleBar extends Toolbar {
         if (getMenu().size() > 0) getMenu().clear();
     }
 
+    public void setBackButton(BackButton button) {
+        setLeftButton(button);
+    }
+
     public void setLeftButtons(List<Button> leftButtons) {
         if (leftButtons == null) return;
         if (leftButtons.isEmpty()) {
@@ -196,7 +203,6 @@ public class TitleBar extends Toolbar {
     }
 
     public TopBarButtonController createButtonController(Button button) {
-        ImageLoader imageLoader = new ImageLoader();
         return new TopBarButtonController((Activity) getContext(),
                 new NavigationIconResolver(getContext(), imageLoader),
                 imageLoader,

lib/android/app/src/main/java/com/reactnativenavigation/views/topbar/TopBar.java

@@ -25,12 +25,14 @@ import com.reactnativenavigation.anim.TopBarCollapseBehavior;
 import com.reactnativenavigation.interfaces.ScrollEventListener;
 import com.reactnativenavigation.parse.Alignment;
 import com.reactnativenavigation.parse.AnimationOptions;
+import com.reactnativenavigation.parse.BackButton;
 import com.reactnativenavigation.parse.Component;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Color;
 import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.utils.CompatUtils;
+import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
@@ -57,9 +59,11 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
     private StackLayout parentView;
     private TopBarBackgroundViewController topBarBackgroundViewController;
     private View border;
+    private ImageLoader imageLoader;
 
-    public TopBar(final Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarButtonController.OnClickListener onClickListener, StackLayout parentView) {
+    public TopBar(final Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarButtonController.OnClickListener onClickListener, StackLayout parentView, ImageLoader imageLoader) {
         super(context);
+        this.imageLoader = imageLoader;
         collapsingBehavior = new TopBarCollapseBehavior(this);
         this.topBarBackgroundViewController = topBarBackgroundViewController;
         this.parentView = parentView;
@@ -70,7 +74,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
 
     private void createLayout(ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarButtonController.OnClickListener onClickListener) {
         setId(CompatUtils.generateViewId());
-        titleBar = createTitleBar(getContext(), buttonCreator, titleBarReactViewCreator, onClickListener);
+        titleBar = createTitleBar(getContext(), buttonCreator, titleBarReactViewCreator, onClickListener, imageLoader);
         topTabs = createTopTabs();
         border = createBorder();
         content = createContentLayout();
@@ -110,8 +114,8 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         return border;
     }
 
-    protected TitleBar createTitleBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator reactViewCreator, TopBarButtonController.OnClickListener onClickListener) {
-        TitleBar titleBar = new TitleBar(context, buttonCreator, reactViewCreator, onClickListener);
+    protected TitleBar createTitleBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator reactViewCreator, TopBarButtonController.OnClickListener onClickListener, ImageLoader imageLoader) {
+        TitleBar titleBar = new TitleBar(context, buttonCreator, reactViewCreator, onClickListener, imageLoader);
         titleBar.setId(CompatUtils.generateViewId());
         return titleBar;
     }
@@ -209,6 +213,10 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         topTabs.setLayoutParams(topTabs.getLayoutParams());
     }
 
+    public void setBackButton(BackButton backButton) {
+        titleBar.setBackButton(backButton);
+    }
+
     public void setLeftButtons(List<Button> leftButtons) {
         titleBar.setLeftButtons(leftButtons);
     }

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

@@ -0,0 +1,25 @@
+package com.reactnativenavigation;
+
+import android.app.Activity;
+
+import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
+import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
+import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
+import com.reactnativenavigation.viewcontrollers.stack.StackControllerBuilder;
+import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
+import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
+
+public class TestUtils {
+    public static StackControllerBuilder newStackController(Activity activity) {
+        return new StackControllerBuilder(activity)
+                .setId("stack")
+                .setChildRegistry(new ChildControllersRegistry())
+                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
+                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
+                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+                .setTopBarController(new TopBarController())
+                .setInitialOptions(new Options());
+    }
+}

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

@@ -8,7 +8,7 @@ import java.util.ArrayList;
 public class OptionHelper {
     public static Options createBottomTabOptions() {
         Options options = new Options();
-        options.topBar.leftButtons = new ArrayList<>();
+        options.topBar.buttons.left = new ArrayList<>();
         options.bottomTabOptions.title = new Text("Tab");
         options.bottomTabOptions.icon = new Text("http://127.0.0.1/icon.png");
         return options;

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

@@ -6,11 +6,9 @@ import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.TestUtils;
 import com.reactnativenavigation.mocks.ImageLoaderMock;
 import com.reactnativenavigation.mocks.SimpleViewController;
-import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Color;
@@ -21,8 +19,7 @@ import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.OptionHelper;
 import com.reactnativenavigation.viewcontrollers.bottomtabs.BottomTabsController;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
+import com.reactnativenavigation.viewcontrollers.stack.StackController;
 import com.reactnativenavigation.views.BottomTabs;
 import com.reactnativenavigation.views.ReactComponent;
 
@@ -234,14 +231,10 @@ public class BottomTabsControllerTest extends BaseTest {
     }
 
     private StackController createStack(String id) {
-        return new StackControllerBuilder(activity)
-                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
-                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
-                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
-                .setTopBarController(new TopBarController())
+        return TestUtils.newStackController(activity)
                 .setId(id)
                 .setInitialOptions(tabOptions)
-                .createStackController();
+                .build();
     }
 
     private ViewGroup.MarginLayoutParams childLayoutParams(int index) {

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

@@ -3,14 +3,10 @@ package com.reactnativenavigation.viewcontrollers;
 import android.app.Activity;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.TestUtils;
 import com.reactnativenavigation.mocks.TestComponentLayout;
 import com.reactnativenavigation.mocks.TestReactView;
-import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 import com.reactnativenavigation.views.StackLayout;
 
 import org.junit.Test;
@@ -30,14 +26,7 @@ public class ComponentViewControllerTest extends BaseTest {
         super.beforeEach();
         Activity activity = newActivity();
         view = spy(new TestComponentLayout(activity, new TestReactView(activity)));
-        ParentController<StackLayout> parentController = new StackControllerBuilder(activity)
-                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
-                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
-                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
-                .setTopBarController(new TopBarController())
-                .setId("stack")
-                .setInitialOptions(new Options())
-                .createStackController();
+        ParentController<StackLayout> parentController = TestUtils.newStackController(activity).build();
         uut = new ComponentViewController(activity, new ChildControllersRegistry(), "componentId1", "componentName", (activity1, componentId, componentName) -> view, new Options());
         uut.setParentController(parentController);
         parentController.ensureViewIsCreated();

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

@@ -6,16 +6,13 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.TestUtils;
 import com.reactnativenavigation.mocks.SimpleViewController;
-import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.FabOptions;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
+import com.reactnativenavigation.viewcontrollers.stack.StackController;
 import com.reactnativenavigation.views.Fab;
 import com.reactnativenavigation.views.FabMenu;
 import com.reactnativenavigation.views.StackLayout;
@@ -39,14 +36,7 @@ public class FloatingActionButtonTest extends BaseTest {
         super.beforeEach();
         activity = newActivity();
         childRegistry = new ChildControllersRegistry();
-        stackController = new StackControllerBuilder(activity)
-                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
-                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
-                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
-                .setTopBarController(new TopBarController())
-                .setId("stackController")
-                .setInitialOptions(new Options())
-                .createStackController();
+        stackController = TestUtils.newStackController(activity).build();
         Options options = getOptionsWithFab();
         childFab = new SimpleViewController(activity, childRegistry, "child1", options);
         childNoFab = new SimpleViewController(activity, childRegistry, "child2", new Options());

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

@@ -4,12 +4,10 @@ import android.support.annotation.NonNull;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.TestActivity;
+import com.reactnativenavigation.TestUtils;
 import com.reactnativenavigation.mocks.ImageLoaderMock;
 import com.reactnativenavigation.mocks.SimpleComponentViewController;
 import com.reactnativenavigation.mocks.SimpleViewController;
-import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Text;
@@ -21,8 +19,7 @@ import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.OptionHelper;
 import com.reactnativenavigation.viewcontrollers.bottomtabs.BottomTabsController;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
+import com.reactnativenavigation.viewcontrollers.stack.StackController;
 
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -279,15 +276,11 @@ public class NavigatorTest extends BaseTest {
 
     @NonNull
     private StackController newStack() {
-        return new StackControllerBuilder(activity)
+        return TestUtils.newStackController(activity)
                 .setChildRegistry(childRegistry)
-                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
-                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
-                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
-                .setTopBarController(new TopBarController())
                 .setId("stack" + CompatUtils.generateViewId())
                 .setInitialOptions(tabOptions)
-                .createStackController();
+                .build();
     }
 
     @Test

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

@@ -8,6 +8,7 @@ import android.view.View;
 import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.TestUtils;
 import com.reactnativenavigation.mocks.TestComponentLayout;
 import com.reactnativenavigation.mocks.TestReactView;
 import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
@@ -21,6 +22,9 @@ import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
+import com.reactnativenavigation.utils.ImageLoader;
+import com.reactnativenavigation.viewcontrollers.stack.StackController;
+import com.reactnativenavigation.viewcontrollers.stack.StackControllerBuilder;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 import com.reactnativenavigation.views.StackLayout;
@@ -44,7 +48,6 @@ public class OptionsApplyingTest extends BaseTest {
     private ComponentViewController uut;
     private IReactView view;
     private Options initialNavigationOptions;
-    private TopBarController topBarController;
     private TopBar topBar;
 
     @Override
@@ -61,27 +64,24 @@ public class OptionsApplyingTest extends BaseTest {
                 (activity1, componentId, componentName) -> view,
                 initialNavigationOptions
         );
-        topBarController = new TopBarController() {
+        TopBarController topBarController = new TopBarController() {
             @Override
-            protected TopBar createTopBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarButtonController.OnClickListener topBarButtonClickListener, StackLayout stackLayout) {
-                topBar = spy(super.createTopBar(context, buttonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarButtonClickListener, stackLayout));
+            protected TopBar createTopBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarButtonController.OnClickListener topBarButtonClickListener, StackLayout stackLayout, ImageLoader imageLoader) {
+                topBar =
+                        spy(super.createTopBar(context, buttonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarButtonClickListener, stackLayout, imageLoader));
                 return topBar;
             }
         };
-        stackController = new StackControllerBuilder(activity)
-                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
-                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
-                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+        stackController = TestUtils.newStackController(activity)
                 .setTopBarController(topBarController)
-                .setId("stack")
-                .setInitialOptions(new Options())
-                .createStackController();
+                .build();
         stackController.ensureViewIsCreated();
         stackController.getView().layout(0, 0, 1000, 1000);
         stackController.getTopBar().layout(0, 0, 1000, 100);
         uut.setParentController(stackController);
     }
 
+    @SuppressWarnings("ConstantConditions")
     @Test
     public void applyNavigationOptionsHandlesNoParentStack() {
         uut.setParentController(null);
@@ -102,7 +102,7 @@ public class OptionsApplyingTest extends BaseTest {
                         .setTopBarController(new TopBarController())
                         .setId("stackId")
                         .setInitialOptions(new Options())
-                        .createStackController();
+                        .build();
         stackController.push(uut, new CommandListenerAdapter());
         assertThat(stackController.getTopBar().getTitle()).isEmpty();
 

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

@@ -67,11 +67,11 @@ public class OptionsMergingTest extends BaseTest {
         verify(topBar, times(0)).setRightButtons(any());
         verify(topBar, times(0)).setLeftButtons(any());
 
-        options.topBar.rightButtons = new ArrayList<>();
+        options.topBar.buttons.right = new ArrayList<>();
         uut.mergeChildOptions(options, child);
         verify(topBar, times(1)).setRightButtons(any());
 
-        options.topBar.leftButtons = new ArrayList<>();
+        options.topBar.buttons.left = new ArrayList<>();
         uut.mergeChildOptions(options, child);
         verify(topBar, times(1)).setLeftButtons(any());
     }

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

@@ -6,16 +6,13 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.TestUtils;
 import com.reactnativenavigation.mocks.SimpleViewController;
-import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.presentation.OptionsPresenter;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
+import com.reactnativenavigation.viewcontrollers.stack.StackController;
 import com.reactnativenavigation.views.ReactComponent;
 
 import org.junit.Test;
@@ -98,7 +95,7 @@ public class ParentControllerTest extends BaseTest {
 
     @Test
     public void findControllerById_Recursive() {
-        StackController stackController = createStack();
+        StackController stackController = TestUtils.newStackController(activity).build();
         SimpleViewController child1 = new SimpleViewController(activity, childRegistry, "child1", new Options());
         SimpleViewController child2 = new SimpleViewController(activity, childRegistry, "child2", new Options());
         stackController.push(child1, new CommandListenerAdapter());
@@ -120,7 +117,7 @@ public class ParentControllerTest extends BaseTest {
 
     @Test
     public void optionsAreClearedWhenChildIsAppeared() {
-        StackController stackController = spy(createStack());
+        StackController stackController = spy(TestUtils.newStackController(activity).build());
         SimpleViewController child1 = new SimpleViewController(activity, childRegistry, "child1", new Options());
         stackController.push(child1, new CommandListenerAdapter());
 
@@ -178,15 +175,4 @@ public class ParentControllerTest extends BaseTest {
         uut.applyChildOptions(options, child1.getView());
         verify(presenter, times(0)).applyRootOptions(uut.getView(), options);
     }
-
-    private StackController createStack() {
-        return new StackControllerBuilder(activity)
-                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
-                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
-                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
-                .setTopBarController(new TopBarController())
-                .setId("stack")
-                .setInitialOptions(new Options())
-                .createStackController();
-    }
 }

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

@@ -6,6 +6,7 @@ import android.view.Gravity;
 import android.view.ViewGroup;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.ImageLoaderMock;
 import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.Alignment;
@@ -49,7 +50,7 @@ public class TitleBarTest extends BaseTest {
         createButtons();
         buttonControllers = new HashMap<>();
         TitleBarReactViewCreatorMock reactViewCreator = new TitleBarReactViewCreatorMock();
-        uut = spy(new TitleBar(activity, buttonCreator, reactViewCreator, (buttonId -> {})) {
+        uut = spy(new TitleBar(activity, buttonCreator, reactViewCreator, (buttonId -> {}), ImageLoaderMock.mock()) {
             @Override
             public TopBarButtonController createButtonController(Button button) {
                 TopBarButtonController controller = spy(super.createButtonController(button));

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

@@ -6,11 +6,9 @@ import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.TestUtils;
 import com.reactnativenavigation.mocks.ImageLoaderMock;
-import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
-import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Color;
@@ -19,8 +17,7 @@ import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.ButtonOptionsPresenter;
 import com.reactnativenavigation.viewcontrollers.button.NavigationIconResolver;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
+import com.reactnativenavigation.viewcontrollers.stack.StackController;
 
 import org.junit.Test;
 
@@ -45,14 +42,10 @@ public class TopBarButtonControllerTest extends BaseTest {
         final Activity activity = newActivity();
 
         TopBarButtonCreatorMock buttonCreatorMock = new TopBarButtonCreatorMock();
-        stackController = spy(new StackControllerBuilder(activity)
-                .setTopBarButtonCreator(buttonCreatorMock)
-                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
-                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
-                .setTopBarController(new TopBarController())
-                .setId("stack")
-                .setInitialOptions(new Options())
-                .createStackController()
+        stackController = spy(
+                TestUtils.newStackController(activity)
+                        .setTopBarButtonCreator(buttonCreatorMock)
+                        .build()
         );
         stackController.getView().layout(0, 0, 1080, 1920);
         stackController.getTopBar().layout(0, 0, 1080, 200);

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

@@ -8,6 +8,7 @@ import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
+import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 import com.reactnativenavigation.views.StackLayout;
@@ -37,11 +38,11 @@ public class TopBarControllerTest extends BaseTest {
         uut = new TopBarController() {
             @NonNull
             @Override
-            protected TopBar createTopBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarButtonController.OnClickListener topBarButtonClickListener, StackLayout stackLayout) {
-                return new TopBar(context, buttonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarButtonClickListener, stackLayout) {
+            protected TopBar createTopBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarButtonController.OnClickListener topBarButtonClickListener, StackLayout stackLayout, ImageLoader imageLoader) {
+                return new TopBar(context, buttonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarButtonClickListener, stackLayout, imageLoader) {
                     @Override
-                    protected TitleBar createTitleBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator reactViewCreator, TopBarButtonController.OnClickListener onClickListener) {
-                        titleBar[0] = spy(super.createTitleBar(context, buttonCreator, reactViewCreator, onClickListener));
+                    protected TitleBar createTitleBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator reactViewCreator, TopBarButtonController.OnClickListener onClickListener, ImageLoader imageLoader) {
+                        titleBar[0] = spy(super.createTitleBar(context, buttonCreator, reactViewCreator, onClickListener, imageLoader));
                         return titleBar[0];
                     }
                 };

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

@@ -5,18 +5,15 @@ import android.support.annotation.NonNull;
 import android.view.ViewGroup;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.TestUtils;
 import com.reactnativenavigation.mocks.TestComponentViewCreator;
 import com.reactnativenavigation.mocks.TestReactView;
-import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.ViewHelper;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
+import com.reactnativenavigation.viewcontrollers.stack.StackController;
 import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsAdapter;
 import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsController;
 import com.reactnativenavigation.views.ReactComponent;
@@ -43,7 +40,6 @@ public class TopTabsViewControllerTest extends BaseTest {
     private StackController stack;
     private TopTabsController uut;
     private List<ViewController> tabControllers = new ArrayList<>(SIZE);
-    private List<Options> tabOptions = new ArrayList<>(SIZE);
     private final Options options = new Options();
     private TopTabsViewPager topTabsLayout;
     private Activity activity;
@@ -55,7 +51,7 @@ public class TopTabsViewControllerTest extends BaseTest {
 
         activity = newActivity();
         childRegistry = new ChildControllersRegistry();
-        tabOptions = createOptions();
+        List<Options> tabOptions = createOptions();
         tabControllers = createTabsControllers(activity, tabOptions);
 
         topTabsLayout = spy(new TopTabsViewPager(activity, tabControllers, new TopTabsAdapter(tabControllers)));
@@ -64,23 +60,11 @@ public class TopTabsViewControllerTest extends BaseTest {
         uut = spy(new TopTabsController(activity, childRegistry, "componentId", tabControllers, layoutCreator, options));
         tabControllers.forEach(viewController -> viewController.setParentController(uut));
 
-        stack = spy(createStackController("stackId"));
+        stack = spy(TestUtils.newStackController(activity).build());
         stack.push(uut, new CommandListenerAdapter());
         uut.setParentController(stack);
     }
 
-    @NonNull
-    private StackController createStackController(String id) {
-        return new StackControllerBuilder(activity)
-                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
-                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
-                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
-                .setTopBarController(new TopBarController())
-                .setId(id)
-                .setInitialOptions(new Options())
-                .createStackController();
-    }
-
     @NonNull
     private ArrayList<Options> createOptions() {
         ArrayList result = new ArrayList();
@@ -222,7 +206,7 @@ public class TopTabsViewControllerTest extends BaseTest {
     public void applyOptions_tabsAreRemovedAfterViewDisappears() {
         stack.getView().removeAllViews();
 
-        StackController stackController = spy(createStackController("stack"));
+        StackController stackController = spy(TestUtils.newStackController(activity).build());
         ComponentViewController first = new ComponentViewController(
                 activity,
                 childRegistry,

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

@@ -7,14 +7,11 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.TestUtils;
 import com.reactnativenavigation.mocks.SimpleViewController;
-import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
-import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
-import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
+import com.reactnativenavigation.viewcontrollers.stack.StackController;
 
 import org.assertj.android.api.Assertions;
 import org.junit.Test;
@@ -71,20 +68,13 @@ public class ViewControllerTest extends BaseTest {
         assertThat(myController.getView()).isEqualTo(otherView);
     }
 
+    @SuppressWarnings("ConstantConditions")
     @Test
     public void holdsAReferenceToStackControllerOrNull() {
-        //noinspection ConstantConditions
         uut.setParentController(null);
 
         assertThat(uut.getParentController()).isNull();
-        StackController nav = new StackControllerBuilder(activity)
-                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
-                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
-                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
-                .setTopBarController(new TopBarController())
-                .setId("stack")
-                .setInitialOptions(new Options())
-                .createStackController();
+        StackController nav = TestUtils.newStackController(activity).build();
         nav.push(uut, new CommandListenerAdapter());
         assertThat(uut.getParentController()).isEqualTo(nav);
     }

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

@@ -0,0 +1,68 @@
+package com.reactnativenavigation.viewcontrollers.stack;
+
+import android.app.Activity;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.TestUtils;
+import com.reactnativenavigation.mocks.SimpleViewController;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.utils.CommandListenerAdapter;
+import com.reactnativenavigation.viewcontrollers.ChildController;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
+
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+public class BackButtonHelperTest extends BaseTest {
+    private BackButtonHelper uut;
+    private StackController stack;
+    private ChildController child1;
+    private ChildController child2;
+
+    @Override
+    public void beforeEach() {
+        uut = new BackButtonHelper();
+        Activity activity = newActivity();
+        ChildControllersRegistry childRegistry = new ChildControllersRegistry();
+        stack = TestUtils.newStackController(activity)
+                .setChildRegistry(childRegistry)
+                .setBackButtonHelper(uut)
+                .build();
+        child1 = spy(new SimpleViewController(activity, childRegistry, "child1", new Options()));
+        child2 = spy(new SimpleViewController(activity, childRegistry, "child2", new Options()));
+    }
+
+    @Test
+    public void addToChild_doesNotAddIfStackContainsOneChild() {
+        uut.addToChild(stack, child1);
+        verify(child1, times(0)).mergeOptions(any());
+    }
+
+    @Test
+    public void addToChild_addsIfStackContainsMoreThenOneChild() {
+        disablePushAnimation(child1, child2);
+        stack.push(child1, new CommandListenerAdapter());
+        stack.push(child2, new CommandListenerAdapter());
+
+        ArgumentCaptor<Options> optionWithBackButton = ArgumentCaptor.forClass(Options.class);
+        verify(child2, times(1)).mergeOptions(optionWithBackButton.capture());
+        assertThat(optionWithBackButton.getValue().topBar.buttons.back.visible.get()).isTrue();
+    }
+
+    @Test
+    public void addToChild_doesNotAddIfBackButtonHidden() {
+        disablePushAnimation(child1, child2);
+        stack.push(child1, new CommandListenerAdapter());
+        child2.options.topBar.buttons.back.visible = new Bool(false);
+        stack.push(child2, new CommandListenerAdapter());
+
+        verify(child2, times(0)).mergeOptions(any());
+    }
+}

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

@@ -1,11 +1,13 @@
-package com.reactnativenavigation.viewcontrollers;
+package com.reactnativenavigation.viewcontrollers.stack;
 
 import android.app.Activity;
 import android.content.Context;
 import android.view.View;
 
 import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.TestUtils;
 import com.reactnativenavigation.anim.NavigationAnimator;
+import com.reactnativenavigation.mocks.ImageLoaderMock;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
@@ -16,7 +18,13 @@ import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
+import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.ViewHelper;
+import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
+import com.reactnativenavigation.viewcontrollers.ParentController;
+import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
+import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
+import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 import com.reactnativenavigation.views.Component;
@@ -95,28 +103,34 @@ public class StackControllerTest extends BaseTest {
     public void push_backButtonIsAddedIfStackContainsMoreThenOneScreen() {
         uut.push(child1, new CommandListenerAdapter());
         verify(child1, times(0)).mergeOptions(any());
+        assertThat(child1.options.topBar.buttons.back.visible.isFalseOrUndefined()).isTrue();
 
         uut.push(child2, new CommandListenerAdapter());
         ArgumentCaptor<Options> captor = ArgumentCaptor.forClass(Options.class);
         verify(child2, times(1)).mergeOptions(captor.capture());
-        assertThat(captor.getValue().topBar.leftButtons).isNotNull();
-        assertThat(captor.getValue().topBar.leftButtons.get(0).id).isEqualTo("RNN.back");
+        assertThat(captor.getValue().topBar.buttons.back.visible.get()).isTrue();
     }
 
     @Test
-    public void push_backButtonIsNotAddedIfScreenContainsLeftButtons() {
+    public void push_backButtonIsNotAddedIfScreenContainsLeftButton() {
+        disablePushAnimation(child1, child2);
         uut.push(child1, new CommandListenerAdapter());
 
         Button leftButton = new Button();
         leftButton.id = "someButton";
-        child2.options.topBar.leftButtons = new ArrayList<>(Collections.singleton(leftButton));
+        leftButton.icon = new Text("icon.png");
+        child2.options.topBar.buttons.left = new ArrayList<>(Collections.singleton(leftButton));
+
         uut.push(child2, new CommandListenerAdapter());
-        verify(child2, times(0)).mergeOptions(any());
+        child2.onViewAppeared();
+        assertThat(topBarController.getView().getTitleBar().getNavigationIcon()).isNotNull();
+        verify(topBarController.getView(), times(1)).setLeftButtons(any());
+        verify(topBarController.getView(), times(0)).setBackButton(any());
     }
 
     @Test
     public void push_backButtonIsNotAddedIfScreenClearsLeftButton() {
-        child1.options.topBar.leftButtons = new ArrayList<>();
+        child1.options.topBar.buttons.left = new ArrayList<>();
         uut.push(child1, new CommandListenerAdapter());
         verify(child1, times(0)).mergeOptions(any());
     }
@@ -136,6 +150,7 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void setRoot() {
+        disablePushAnimation(child1, child2);
         assertThat(uut.isEmpty()).isTrue();
         uut.push(child1, new CommandListenerAdapter());
         uut.push(child2, new CommandListenerAdapter());
@@ -184,7 +199,7 @@ public class StackControllerTest extends BaseTest {
                         .setTopBarController(new TopBarController())
                         .setId("uut")
                         .setInitialOptions(new Options())
-                        .createStackController();
+                        .build();
         uut.push(child1, new CommandListenerAdapter());
         uut.push(child2, new CommandListenerAdapter() {
             @Override
@@ -680,7 +695,7 @@ public class StackControllerTest extends BaseTest {
                         .setTopBarController(new TopBarController())
                         .setId("stack")
                         .setInitialOptions(new Options())
-                        .createStackController());
+                        .build());
         Options optionsToMerge = new Options();
         Component component = mock(Component.class);
         uut.mergeChildOptions(optionsToMerge, component);
@@ -696,7 +711,7 @@ public class StackControllerTest extends BaseTest {
                         .setTopBarController(new TopBarController())
                         .setId("stack")
                         .setInitialOptions(new Options())
-                        .createStackController();
+                        .build();
         ParentController parentController = Mockito.mock(ParentController.class);
         uut.setParentController(parentController);
         Options optionsToMerge = new Options();
@@ -753,28 +768,24 @@ public class StackControllerTest extends BaseTest {
     }
 
     private StackController createStackController() {
-        return createStackController("stackId");
+        return createStackController("stack");
     }
 
     private StackController createStackController(String id) {
         createTopBarController();
-        return new StackControllerBuilder(activity)
-                .setChildRegistry(childRegistry)
-                .setTopBarButtonCreator(new TopBarButtonCreatorMock())
-                .setTitleBarReactViewCreator(new TitleBarReactViewCreatorMock())
-                .setTopBarBackgroundViewController(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()))
+        return TestUtils.newStackController(activity)
+                .setId(id)
                 .setTopBarController(topBarController)
+                .setChildRegistry(childRegistry)
                 .setAnimator(animator)
-                .setId(id)
-                .setInitialOptions(new Options())
-                .createStackController();
+                .build();
     }
 
     private void createTopBarController() {
         topBarController = spy(new TopBarController() {
             @Override
-            protected TopBar createTopBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarButtonController.OnClickListener topBarButtonClickListener, StackLayout stackLayout) {
-                return spy(super.createTopBar(context, buttonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarButtonClickListener, stackLayout));
+            protected TopBar createTopBar(Context context, ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarButtonController.OnClickListener topBarButtonClickListener, StackLayout stackLayout, ImageLoader imageLoader) {
+                return spy(super.createTopBar(context, buttonCreator, titleBarReactViewCreator, topBarBackgroundViewController, topBarButtonClickListener, stackLayout, ImageLoaderMock.mock()));
             }
         });
     }

lib/android/app/src/test/java/com/reactnativenavigation/views/TopBarBackgroundComponentTest.java

@@ -6,6 +6,7 @@ import android.view.ViewGroup;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.R;
+import com.reactnativenavigation.mocks.ImageLoaderMock;
 import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
@@ -41,7 +42,7 @@ public class TopBarBackgroundComponentTest extends BaseTest {
         Activity activity = newActivity();
         topBarBackgroundViewController = spy(new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock()));
         StackLayout parent = new StackLayout(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), topBarBackgroundViewController, new TopBarController(), onClickListener, null);
-        uut = new TopBar(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), topBarBackgroundViewController, onClickListener, parent);
+        uut = new TopBar(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), topBarBackgroundViewController, onClickListener, parent, ImageLoaderMock.mock());
         parent.addView(uut);
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/views/TopBarTest.java

@@ -6,6 +6,7 @@ import android.view.MenuItem;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.anim.TopBarAnimator;
+import com.reactnativenavigation.mocks.ImageLoaderMock;
 import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarBackgroundViewCreatorMock;
 import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
@@ -49,7 +50,7 @@ public class TopBarTest extends BaseTest {
         Activity activity = newActivity();
         TopBarBackgroundViewController topBarBackgroundViewController = new TopBarBackgroundViewController(activity, new TopBarBackgroundViewCreatorMock());
         StackLayout parent = new StackLayout(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), topBarBackgroundViewController, new TopBarController(), this.onClickListener, null);
-        uut = new TopBar(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), topBarBackgroundViewController, this.onClickListener, parent);
+        uut = new TopBar(activity, new TopBarButtonCreatorMock(), new TitleBarReactViewCreatorMock(), topBarBackgroundViewController, this.onClickListener, parent, ImageLoaderMock.mock());
         animator = spy(new TopBarAnimator(uut));
         uut.setAnimator(animator);
         leftButton = createLeftButton();

lib/ios/RNNBackButtonOptions.h

@@ -0,0 +1,11 @@
+#import "RNNOptions.h"
+
+@interface RNNBackButtonOptions : RNNOptions
+
+@property (nonatomic, strong) NSDictionary* image;
+@property (nonatomic, strong) NSNumber* visible;
+@property (nonatomic, strong) NSString* title;
+@property (nonatomic, strong) NSString* transition;
+@property (nonatomic, strong) NSNumber* hideTitle;
+
+@end

lib/ios/RNNBackButtonOptions.m

@@ -0,0 +1,26 @@
+#import "RNNBackButtonOptions.h"
+
+@implementation RNNBackButtonOptions
+
+- (void)applyOn:(UIViewController *)viewController {
+	UIImage *image = self.image ? [RCTConvert UIImage:self.image] : nil;
+	[viewController.navigationController.navigationBar setBackIndicatorImage:image];
+	[viewController.navigationController.navigationBar setBackIndicatorTransitionMaskImage:image];
+	
+	if ([self.hideTitle boolValue]) {
+		self.title = @"";
+	}
+	
+	if (self.title) {
+		UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithTitle:self.title
+																	 style:UIBarButtonItemStylePlain
+																	target:nil
+																	action:nil];
+		
+		viewController.navigationItem.backBarButtonItem = backItem;
+	}
+	
+	viewController.navigationItem.hidesBackButton = ![self.visible boolValue];
+}
+
+@end

lib/ios/RNNNavigationOptions.h

@@ -31,7 +31,6 @@ extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 @property (nonatomic, strong) RNNLayoutOptions* layout;
 
 @property (nonatomic, strong) NSMutableDictionary* originalTopBarImages;
-@property (nonatomic, strong) NSString* backButtonTransition;
 @property (nonatomic, strong) NSNumber* popGesture;
 @property (nonatomic, strong) NSDictionary* backgroundImage;
 @property (nonatomic, strong) NSDictionary* rootBackgroundImage;

lib/ios/RNNRootViewController.m

@@ -225,7 +225,7 @@
 
 - (void)navigationController:(UINavigationController *)navigationController didShowViewController:(UIViewController *)viewController animated:(BOOL)animated{
 	RNNRootViewController* vc =  (RNNRootViewController*)viewController;
-	if (![vc.options.backButtonTransition isEqualToString:@"custom"]){
+	if (![vc.options.topBar.backButton.transition isEqualToString:@"custom"]){
 		navigationController.delegate = nil;
 	}
 }

lib/ios/RNNTopBarOptions.h

@@ -4,6 +4,7 @@
 #import "RNNSubtitleOptions.h"
 #import "RNNBackgroundOptions.h"
 #import "RNNComponentOptions.h"
+#import "RNNBackButtonOptions.h"
 
 @interface RNNTopBarOptions : RNNOptions
 
@@ -23,10 +24,7 @@
 @property (nonatomic, strong) RNNTitleOptions* title;
 @property (nonatomic, strong) RNNSubtitleOptions* subtitle;
 @property (nonatomic, strong) RNNBackgroundOptions* background;
-@property (nonatomic, strong) NSNumber* backButtonImage;
-@property (nonatomic, strong) NSNumber* backButtonHidden;
-@property (nonatomic, strong) NSString* backButtonTitle;
-@property (nonatomic, strong) NSNumber* hideBackButtonTitle;
+@property (nonatomic, strong) RNNBackButtonOptions* backButton;
 @property (nonatomic, strong) NSNumber* searchBar;
 @property (nonatomic, strong) NSNumber* searchBarHiddenWhenScrolling;
 @property (nonatomic, strong) NSString* searchBarPlaceholder;

lib/ios/RNNTopBarOptions.m

@@ -30,6 +30,7 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 	[self.title applyOn:viewController];
 	[self.largeTitle applyOn:viewController];
 	[self.background applyOn:viewController];
+	[self.backButton applyOn:viewController];
 	
 	if (@available(iOS 11.0, *)) {
 		if ([self.searchBar boolValue] && !viewController.navigationItem.searchController) {
@@ -149,17 +150,17 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 		_navigationButtons = [[RNNNavigationButtons alloc] initWithViewController:(RNNRootViewController*)viewController];
 		[_navigationButtons applyLeftButtons:self.leftButtons rightButtons:self.rightButtons];
 	}
-	
-	UIImage *image = self.backButtonImage ? [RCTConvert UIImage:self.backButtonImage] : nil;
+
+	UIImage *image = self.backButton.image ? [RCTConvert UIImage:self.backButton.image] : nil;
 	[viewController.navigationController.navigationBar setBackIndicatorImage:image];
 	[viewController.navigationController.navigationBar setBackIndicatorTransitionMaskImage:image];
 	
-	if (self.hideBackButtonTitle) {
-		self.backButtonTitle = @"";
+	if (![self.backButton.visible boolValue]) {
+		self.backButton.title = @"";
 	}
 	
-	if (self.backButtonTitle) {
-		UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithTitle:self.backButtonTitle
+	if (self.backButton.title) {
+		UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithTitle:self.backButton.title
 																	 style:UIBarButtonItemStylePlain
 																	target:nil
 																	action:nil];
@@ -167,7 +168,7 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 		viewController.navigationItem.backBarButtonItem = backItem;
 	}
 	
-	viewController.navigationItem.hidesBackButton = [self.backButtonHidden boolValue];
+	viewController.navigationItem.hidesBackButton = ![self.backButton.visible boolValue];
 }
 
 -(void)storeOriginalTopBarImages:(UIViewController*)viewController {

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -68,6 +68,8 @@
 		50175CD1207A2AA1004FE91B /* RNNComponentOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50175CCF207A2AA1004FE91B /* RNNComponentOptions.h */; };
 		50175CD2207A2AA1004FE91B /* RNNComponentOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50175CD0207A2AA1004FE91B /* RNNComponentOptions.m */; };
 		502CB43A20CBCA180019B2FE /* RNNBridgeManagerDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 502CB43920CBCA140019B2FE /* RNNBridgeManagerDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		502CB46E20CD1DDA0019B2FE /* RNNBackButtonOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 502CB46C20CD1DDA0019B2FE /* RNNBackButtonOptions.h */; };
+		502CB46F20CD1DDA0019B2FE /* RNNBackButtonOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 502CB46D20CD1DDA0019B2FE /* RNNBackButtonOptions.m */; };
 		50415CBA20553B8E00BB682E /* RNNScreenTransition.h in Headers */ = {isa = PBXBuildFile; fileRef = 50415CB820553B8E00BB682E /* RNNScreenTransition.h */; };
 		50415CBB20553B8E00BB682E /* RNNScreenTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = 50415CB920553B8E00BB682E /* RNNScreenTransition.m */; };
 		50451D052042DAEB00695F00 /* RNNPushAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 50451D032042DAEB00695F00 /* RNNPushAnimation.h */; };
@@ -279,6 +281,8 @@
 		50175CCF207A2AA1004FE91B /* RNNComponentOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNComponentOptions.h; sourceTree = "<group>"; };
 		50175CD0207A2AA1004FE91B /* RNNComponentOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNComponentOptions.m; sourceTree = "<group>"; };
 		502CB43920CBCA140019B2FE /* RNNBridgeManagerDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBridgeManagerDelegate.h; sourceTree = "<group>"; };
+		502CB46C20CD1DDA0019B2FE /* RNNBackButtonOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBackButtonOptions.h; sourceTree = "<group>"; };
+		502CB46D20CD1DDA0019B2FE /* RNNBackButtonOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBackButtonOptions.m; sourceTree = "<group>"; };
 		50415CB820553B8E00BB682E /* RNNScreenTransition.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNScreenTransition.h; sourceTree = "<group>"; };
 		50415CB920553B8E00BB682E /* RNNScreenTransition.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNScreenTransition.m; sourceTree = "<group>"; };
 		50451D032042DAEB00695F00 /* RNNPushAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNPushAnimation.h; sourceTree = "<group>"; };
@@ -538,6 +542,8 @@
 				50175CD0207A2AA1004FE91B /* RNNComponentOptions.m */,
 				A7626BFE1FC2FB6700492FB8 /* RNNTopBarOptions.h */,
 				A7626BFC1FC2FB2C00492FB8 /* RNNTopBarOptions.m */,
+				502CB46C20CD1DDA0019B2FE /* RNNBackButtonOptions.h */,
+				502CB46D20CD1DDA0019B2FE /* RNNBackButtonOptions.m */,
 				50570B242061473D006A1B5C /* RNNTitleOptions.h */,
 				50570B252061473D006A1B5C /* RNNTitleOptions.m */,
 				50C4A494206BDDBB00DB292E /* RNNSubtitleOptions.h */,
@@ -807,6 +813,7 @@
 				50451D052042DAEB00695F00 /* RNNPushAnimation.h in Headers */,
 				507F43C51FF4F17C00D9425B /* RNNTopTabsViewController.h in Headers */,
 				263905C61E4C6F440023D7D3 /* SidebarFeedlyAnimation.h in Headers */,
+				502CB46E20CD1DDA0019B2FE /* RNNBackButtonOptions.h in Headers */,
 				7B1126A31E2D2B6C00F9B03B /* RNNSplashScreen.h in Headers */,
 				261F0E641E6EC94900989DE2 /* RNNModalManager.h in Headers */,
 				263905C01E4C6F440023D7D3 /* SidebarAirbnbAnimation.h in Headers */,
@@ -968,6 +975,7 @@
 				263905C71E4C6F440023D7D3 /* SidebarFeedlyAnimation.m in Sources */,
 				50C4A497206BDDBB00DB292E /* RNNSubtitleOptions.m in Sources */,
 				263905B41E4C6F440023D7D3 /* MMDrawerVisualState.m in Sources */,
+				502CB46F20CD1DDA0019B2FE /* RNNBackButtonOptions.m in Sources */,
 				263905C51E4C6F440023D7D3 /* SidebarFacebookAnimation.m in Sources */,
 				50451D0E2042F70900695F00 /* RNNTransition.m in Sources */,
 				5048862E20BE976D000908DE /* RNNLayoutOptions.m in Sources */,

playground/src/screens/CustomTransitionDestination.js

@@ -12,12 +12,14 @@ class CustomTransitionDestination extends Component {
 
   static get options() {
     return {
-      backButtonTransition: 'custom',
       topBar: {
         title: {
           text: 'ye babyyyyyy',
           fontFamily: 'HelveticaNeue-Italic'
         },
+        backButton: {
+          transition: 'custom'
+        },
         largeTitle: {
           visible: false
         }