Reset to (#671)

* Don’t create SideMenu button automatically on Android

* Remove left button and add it dynamically

* Fix resetTo animation on Android

Up until now resetTo would destroy the current stack and create a new
one. This was an easy implementation but resulted in jurky
(none existent) animations.
This commit changes resetTo behavior. Instead of recreating the stack,
the we reset to is pushed to the stack, and the other elements are
removed when show animation ends.

android/app/src/main/java/com/reactnativenavigation/layouts/BottomTabsLayout.java

@@ -283,16 +283,9 @@ public class BottomTabsLayout extends BaseLayout implements AHBottomNavigation.O
     }
 
     @Override
-    public void newStack(ScreenParams params) {
+    public void newStack(final ScreenParams params) {
         ScreenStack currentScreenStack = getCurrentScreenStack();
-        removeView(currentScreenStack.peek());
-        currentScreenStack.destroy();
-
-        ScreenStack newStack = new ScreenStack(getActivity(), getScreenStackParent(), params.getNavigatorId(), this);
-        LayoutParams lp = createScreenLayoutParams(params);
-        newStack.pushInitialScreenWithAnimation(params, lp);
-        screenStacks[currentStackIndex] = newStack;
-
+        currentScreenStack.newStack(params, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
         bottomTabs.setStyleFromScreen(params.styleParams);
         EventBus.instance.post(new ScreenChangedEvent(params));
     }

android/app/src/main/java/com/reactnativenavigation/layouts/SingleScreenLayout.java

@@ -128,8 +128,7 @@ public class SingleScreenLayout extends BaseLayout {
 
     @Override
     public void push(ScreenParams params) {
-        LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
-        stack.push(params, lp);
+        stack.push(params, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
         EventBus.instance.post(new ScreenChangedEvent(params));
     }
 
@@ -154,15 +153,8 @@ public class SingleScreenLayout extends BaseLayout {
     }
 
     @Override
-    public void newStack(ScreenParams params) {
-        removeView(stack.peek());
-        stack.destroy();
-
-        ScreenStack newStack = new ScreenStack(getActivity(), getScreenStackParent(), params.getNavigatorId(), this);
-        LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
-        newStack.pushInitialScreenWithAnimation(params, lp);
-        stack = newStack;
-
+    public void newStack(final ScreenParams params) {
+        stack.newStack(params, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
         EventBus.instance.post(new ScreenChangedEvent(params));
     }
 

android/app/src/main/java/com/reactnativenavigation/params/TitleBarLeftButtonParams.java

@@ -1,9 +1,11 @@
 package com.reactnativenavigation.params;
 
+import android.support.annotation.Nullable;
+
 import com.balysv.materialmenu.MaterialMenuDrawable;
 
 public class TitleBarLeftButtonParams extends TitleBarButtonParams {
-    public MaterialMenuDrawable.IconState iconState;
+    @Nullable public MaterialMenuDrawable.IconState iconState;
     public boolean overrideBackPressInJs;
 
     public TitleBarLeftButtonParams(TitleBarButtonParams params) {
@@ -17,6 +19,10 @@ public class TitleBarLeftButtonParams extends TitleBarButtonParams {
         return eventId.equals("back");
     }
 
+    public boolean hasIcon() {
+        return iconState != null;
+    }
+
     public void setOverrideBackPressInJs(boolean overrideBackPressInJs) {
         this.overrideBackPressInJs = overrideBackPressInJs;
     }

android/app/src/main/java/com/reactnativenavigation/params/parsers/TitleBarLeftButtonParamsParser.java

@@ -9,6 +9,9 @@ public class TitleBarLeftButtonParamsParser extends TitleBarButtonParamsParser {
 
     public TitleBarLeftButtonParams parseSingleButton(Bundle params) {
         TitleBarLeftButtonParams leftButtonParams = new TitleBarLeftButtonParams(super.parseSingleButton(params));
+        if (params.isEmpty()) {
+            return leftButtonParams;
+        }
         leftButtonParams.iconState = getIconStateFromId(leftButtonParams.eventId);
         return leftButtonParams;
     }
@@ -22,8 +25,9 @@ public class TitleBarLeftButtonParamsParser extends TitleBarButtonParamsParser {
             case "accept":
                 return MaterialMenuDrawable.IconState.CHECK;
             case "sideMenu":
-            default:
                 return MaterialMenuDrawable.IconState.BURGER;
+            default:
+                return null;
         }
     }
 }

android/app/src/main/java/com/reactnativenavigation/screens/ScreenStack.java

@@ -52,6 +52,31 @@ public class ScreenStack {
         keyboardVisibilityDetector = new KeyboardVisibilityDetector(parent);
     }
 
+    public void newStack(final ScreenParams params, LayoutParams layoutParams) {
+        final Screen nextScreen = ScreenFactory.create(activity, params, leftButtonOnClickListener);
+        final Screen previousScreen = stack.peek();
+        if (isStackVisible) {
+            pushScreenToVisibleStack(layoutParams, nextScreen, previousScreen, new Screen.OnDisplayListener() {
+                @Override
+                public void onDisplay() {
+                    removeElementsBelowTop();
+                }
+            });
+        } else {
+            pushScreenToInvisibleStack(layoutParams, nextScreen, previousScreen);
+            removeElementsBelowTop();
+        }
+    }
+
+    private void removeElementsBelowTop() {
+        while (stack.size() > 1) {
+            Screen screen = stack.get(0);
+            parent.removeView(screen);
+            screen.destroy();
+            stack.remove(0);
+        }
+    }
+
     public void pushInitialScreenWithAnimation(final ScreenParams initialScreenParams, LayoutParams params) {
         isStackVisible = true;
         pushInitialScreen(initialScreenParams, params);
@@ -81,7 +106,15 @@ public class ScreenStack {
         }
     }
 
-    private void pushScreenToVisibleStack(LayoutParams layoutParams, final Screen nextScreen, final Screen previousScreen) {
+    private void pushScreenToVisibleStack(LayoutParams layoutParams, final Screen nextScreen,
+                                          final Screen previousScreen) {
+        pushScreenToVisibleStack(layoutParams, nextScreen, previousScreen, null);
+    }
+
+    private void pushScreenToVisibleStack(LayoutParams layoutParams,
+                                          final Screen nextScreen,
+                                          final Screen previousScreen,
+                                          @Nullable final Screen.OnDisplayListener onDisplay) {
         nextScreen.setVisibility(View.INVISIBLE);
         addScreen(nextScreen, layoutParams);
         nextScreen.setOnDisplayListener(new Screen.OnDisplayListener() {
@@ -90,6 +123,7 @@ public class ScreenStack {
                 nextScreen.show(nextScreen.screenParams.animateScreenTransitions, new Runnable() {
                     @Override
                     public void run() {
+                        if (onDisplay != null) onDisplay.onDisplay();
                         parent.removeView(previousScreen);
                     }
                 });

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

@@ -53,10 +53,19 @@ public class TitleBar extends Toolbar {
         if (shouldSetLeftButton(leftButtonParams)) {
             createAndSetLeftButton(leftButtonParams, leftButtonOnClickListener, navigatorEventId, overrideBackPressInJs);
         } else if (hasLeftButton()) {
-            updateLeftButton(leftButtonParams);
+            if (leftButtonParams.hasIcon()) {
+                updateLeftButton(leftButtonParams);
+            } else {
+                removeLeftButton();
+            }
         }
     }
 
+    private void removeLeftButton() {
+        setNavigationIcon(null);
+        leftButton = null;
+    }
+
     public void setStyle(StyleParams params) {
         setVisibility(params.titleBarHidden ? GONE : VISIBLE);
         setTitleTextColor(params);
@@ -115,7 +124,7 @@ public class TitleBar extends Toolbar {
     }
 
     private boolean shouldSetLeftButton(TitleBarLeftButtonParams leftButtonParams) {
-        return leftButton == null && leftButtonParams != null;
+        return leftButton == null && leftButtonParams != null && leftButtonParams.iconState != null;
     }
 
     private void createAndSetLeftButton(TitleBarLeftButtonParams leftButtonParams,

src/deprecated/platformSpecificDeprecated.android.js

@@ -271,7 +271,7 @@ function navigatorSetButtons(navigator, navigatorEventID, _params) {
       }
     });
   }
-  const leftButton = getLeftButton(params);
+  let leftButton = getLeftButton(params);
   if (leftButton) {
     if (leftButton.icon) {
       const icon = resolveAssetSource(leftButton.icon);
@@ -279,11 +279,17 @@ function navigatorSetButtons(navigator, navigatorEventID, _params) {
         leftButton.icon = icon.uri;
       }
     }
+  } else if (shouldRemoveLeftButton(params)) {
+    leftButton = {};
   }
   const fab = getFab(params);
   newPlatformSpecific.setScreenButtons(navigator.screenInstanceID, navigatorEventID, params.rightButtons, leftButton, fab);
 }
 
+function shouldRemoveLeftButton(params) {
+  return params.leftButtons && params.leftButtons.length === 0;
+}
+
 function navigatorSetTabBadge(navigator, params) {
   const badge = params.badge ? params.badge.toString() : '';
   if (params.tabIndex >= 0) {
@@ -394,9 +400,6 @@ function addNavigatorButtons(screen, sideMenuParams) {
   }
 
   let leftButton = getLeftButton(screen);
-  if (sideMenuParams && !leftButton) {
-    leftButton = createSideMenuButton();
-  }
   if (leftButton) {
     if (leftButton.icon) {
       const icon = resolveAssetSource(leftButton.icon);