Set left button dynamically

android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java

@@ -7,7 +7,9 @@ import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.reactnativenavigation.controllers.NavigationCommandsHandler;
 import com.reactnativenavigation.params.TitleBarButtonParams;
+import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.params.parsers.TitleBarButtonParamsParser;
+import com.reactnativenavigation.params.parsers.TitleBarLeftButtonParamsParser;
 
 import java.util.List;
 
@@ -46,11 +48,27 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void setScreenTitleBarButtons(String screenInstanceId, String navigatorEventId, ReadableArray rightButtons, ReadableMap leftButton) {
-        List<TitleBarButtonParams> titleBarButtons = new TitleBarButtonParamsParser().
-                parseButtons(BundleConverter.toBundle(rightButtons));
+    public void setScreenTitleBarButtons(String screenInstanceId, String navigatorEventId,
+                                         ReadableArray rightButtonsParams, ReadableMap leftButtonParams) {
+        if (rightButtonsParams != null) {
+            setScreenTitleBarRightButtons(screenInstanceId, navigatorEventId, rightButtonsParams);
+        }
 
-        NavigationCommandsHandler.setScreenTitleBarButtons(screenInstanceId, navigatorEventId, titleBarButtons);
+        if (leftButtonParams != null) {
+            setScreenTitleBarLeftButton(screenInstanceId, navigatorEventId, leftButtonParams);
+        }
+    }
+
+    private void setScreenTitleBarRightButtons(String screenInstanceId, String navigatorEventId, ReadableArray rightButtonsParams) {
+        List<TitleBarButtonParams> rightButtons = new TitleBarButtonParamsParser()
+                .parseButtons(BundleConverter.toBundle(rightButtonsParams));
+        NavigationCommandsHandler.setScreenTitleBarRightButtons(screenInstanceId, navigatorEventId, rightButtons);
+    }
+
+    private void setScreenTitleBarLeftButton(String screenInstanceId, String navigatorEventId, ReadableMap leftButtonParams) {
+        TitleBarLeftButtonParams leftButton = new TitleBarLeftButtonParamsParser()
+                .parseSingleButton(BundleConverter.toBundle(leftButtonParams));
+        NavigationCommandsHandler.setScreenTitleBarLeftButtons(screenInstanceId, navigatorEventId, leftButton);
     }
 
     @ReactMethod

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -12,6 +12,7 @@ import com.reactnativenavigation.layouts.LayoutFactory;
 import com.reactnativenavigation.params.ActivityParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
+import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.react.JsDevReloadHandler;
 import com.reactnativenavigation.react.NavigationReactInstance;
 import com.reactnativenavigation.react.RedboxPermission;
@@ -138,7 +139,11 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     }
 
     public void setTitleBarButtons(String screenInstanceId, String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
-        layout.setTitleBarButtons(screenInstanceId, navigatorEventId, titleBarButtons);
+        layout.setTitleBarRightButtons(screenInstanceId, navigatorEventId, titleBarButtons);
+    }
+
+    public void setTitleBarLeftButton(String screenInstanceId, String navigatorEventId, TitleBarLeftButtonParams titleBarLeftButton) {
+        layout.setTitleBarLeftButton(screenInstanceId, navigatorEventId, titleBarLeftButton);
     }
 
     void showModal(ScreenParams screenParams) {

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationCommandsHandler.java

@@ -7,6 +7,7 @@ import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.params.ActivityParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
+import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.params.parsers.ActivityParamsParser;
 import com.reactnativenavigation.params.parsers.ScreenParamsParser;
 
@@ -137,7 +138,9 @@ public class NavigationCommandsHandler {
         });
     }
 
-    public static void setScreenTitleBarButtons(final String screenInstanceId, final String navigatorEventId, final List<TitleBarButtonParams> titleBarButtons) {
+    public static void setScreenTitleBarRightButtons(final String screenInstanceId,
+                                                     final String navigatorEventId,
+                                                     final List<TitleBarButtonParams> titleBarButtons) {
         final NavigationActivity currentActivity = NavigationActivity.currentActivity;
         if (currentActivity == null) {
             return;
@@ -151,6 +154,22 @@ public class NavigationCommandsHandler {
         });
     }
 
+    public static void setScreenTitleBarLeftButtons(final String screenInstanceId,
+                                                     final String navigatorEventId,
+                                                     final TitleBarLeftButtonParams titleBarButtons) {
+        final NavigationActivity currentActivity = NavigationActivity.currentActivity;
+        if (currentActivity == null) {
+            return;
+        }
+
+        NavigationApplication.instance.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                currentActivity.setTitleBarLeftButton(screenInstanceId, navigatorEventId, titleBarButtons);
+            }
+        });
+    }
+
     public static void dismissTopModal() {
         final NavigationActivity currentActivity = NavigationActivity.currentActivity;
         if (currentActivity == null) {

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.layouts;
 import android.view.View;
 
 import com.reactnativenavigation.params.TitleBarButtonParams;
+import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 
 import java.util.List;
 
@@ -15,5 +16,7 @@ public interface Layout extends ScreenStackContainer {
 
     void setTitleBarTitle(String screenInstanceId, String title);
 
-    void setTitleBarButtons(String screenInstanceId, String navigatorEventId, List<TitleBarButtonParams> titleBarButtons);
+    void setTitleBarRightButtons(String screenInstanceId, String navigatorEventId, List<TitleBarButtonParams> titleBarButtons);
+
+    void setTitleBarLeftButton(String screenInstanceId, String navigatorEventId, TitleBarLeftButtonParams titleBarLeftButtonParams);
 }

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

@@ -6,6 +6,7 @@ import android.widget.FrameLayout;
 
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
+import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.screens.ScreenStack;
 
 import java.util.List;
@@ -83,7 +84,13 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
     }
 
     @Override
-    public void setTitleBarButtons(String screenInstanceId, String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
-        stack.setTitleBarButtons(screenInstanceId, navigatorEventId, titleBarButtons);
+    public void setTitleBarRightButtons(String screenInstanceId, String navigatorEventId,
+                                        List<TitleBarButtonParams> titleBarRightButtons) {
+        stack.setTitleBarRightButtons(screenInstanceId, navigatorEventId, titleBarRightButtons);
+    }
+
+    @Override
+    public void setTitleBarLeftButton(String screenInstanceId, String navigatorEventId, TitleBarLeftButtonParams titleBarLeftButtonParams) {
+        stack.setTitleBarLeftButton(screenInstanceId, navigatorEventId, titleBarLeftButtonParams);
     }
 }

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

@@ -3,7 +3,7 @@ package com.reactnativenavigation.params;
 import com.balysv.materialmenu.MaterialMenuDrawable;
 
 public class TitleBarLeftButtonParams extends TitleBarButtonParams {
-    public MaterialMenuDrawable.IconState initialIconState;
+    public MaterialMenuDrawable.IconState iconState;
 
     public TitleBarLeftButtonParams(TitleBarButtonParams params) {
         icon = params.icon;

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

@@ -9,7 +9,7 @@ public class TitleBarLeftButtonParamsParser extends TitleBarButtonParamsParser {
 
     public TitleBarLeftButtonParams parseSingleButton(Bundle params) {
         TitleBarLeftButtonParams backButtonParams = new TitleBarLeftButtonParams(super.parseSingleButton(params));
-        backButtonParams.initialIconState = getIconStateFromId(backButtonParams.eventId);
+        backButtonParams.iconState = getIconStateFromId(backButtonParams.eventId);
         return backButtonParams;
     }
 

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

@@ -13,6 +13,7 @@ import com.reactnativenavigation.animation.VisibilityAnimator;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.ScreenStyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
+import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.utils.SdkSupports;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.ScrollDirectionListener;
@@ -140,7 +141,12 @@ public abstract class Screen extends RelativeLayout implements ScrollDirectionLi
         topBar.setTitle(title);
     }
 
-    public void setTitleBarButtons(String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
-        topBar.setTitleBarButtons(navigatorEventId, titleBarButtons);
+    public void setTitleBarRightButtons(String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
+        topBar.setTitleBarRightButtons(navigatorEventId, titleBarButtons);
+    }
+
+    public void setTitleBarLeftButton(String navigatorEventId, TitleBarBackButtonListener backButtonListener,
+                                      TitleBarLeftButtonParams titleBarLeftButtonParams) {
+        topBar.setTitleBarRightButton(navigatorEventId, backButtonListener, titleBarLeftButtonParams);
     }
 }

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

@@ -6,6 +6,7 @@ import android.widget.FrameLayout;
 
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
+import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.views.TitleBarBackButtonListener;
 
 import java.util.List;
@@ -112,10 +113,17 @@ public class ScreenStack extends FrameLayout implements TitleBarBackButtonListen
         }
     }
 
-    public void setTitleBarButtons(String screenInstanceId, String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
+    public void setTitleBarRightButtons(String screenInstanceId, String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
         Screen screen = findScreenByScreenInstanceId(screenInstanceId);
         if (screen != null) {
-            screen.setTitleBarButtons(navigatorEventId, titleBarButtons);
+            screen.setTitleBarRightButtons(navigatorEventId, titleBarButtons);
+        }
+    }
+
+    public void setTitleBarLeftButton(String screenInstanceId, String navigatorEventId, TitleBarLeftButtonParams titleBarLeftButtonParams) {
+        Screen screen = findScreenByScreenInstanceId(screenInstanceId);
+        if (screen != null) {
+            screen.setTitleBarLeftButton(navigatorEventId, this, titleBarLeftButtonParams);
         }
     }
 
@@ -125,23 +133,4 @@ public class ScreenStack extends FrameLayout implements TitleBarBackButtonListen
             pop();
         }
     }
-
-    //    /**
-//     * Remove the ScreenStack from {@code parent} while preventing all child react views from getting unmounted
-//        -= USE WHEN SWITCHING TABS =-
-//     */
-//    public void removeFromScreen(ViewGroup parent) {
-//        mStack.peek().view.onTemporallyRemovedFromScreen();
-//
-//        parent.removeView(this);
-//    }
-//    /**
-//     * Add ScreenStack to {@code parent}
-//       -= USE WHEN SWITCHING TABS =-
-//     */
-//    public void addToScreen(ViewGroup parent) {
-//        mStack.peek().view.onReAddToScreen();
-//
-//        parent.addView(this, new CoordinatorLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
-//    }
 }

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

@@ -34,7 +34,7 @@ public class LeftButton extends MaterialMenuDrawable implements View.OnClickList
 
     private void setInitialState() {
         if (params != null) {
-            setIconState(params.initialIconState);
+            setIconState(params.iconState);
         } else {
             setVisible(false);
         }

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

@@ -14,6 +14,7 @@ public class TitleBar extends Toolbar {
 
     private boolean hideOnScroll = false;
     private VisibilityAnimator visibilityAnimator;
+    private LeftButton leftButton;
 
     public TitleBar(Context context) {
         super(context);
@@ -44,7 +45,15 @@ public class TitleBar extends Toolbar {
 
     public void setLeftButton(TitleBarLeftButtonParams leftButtonParams,
                                TitleBarBackButtonListener titleBarBackButtonListener, String navigatorEventId) {
-        LeftButton leftButton = new LeftButton(getContext(), leftButtonParams, titleBarBackButtonListener, navigatorEventId);
+        if (leftButton == null) {
+            createAndSetLeftButton(leftButtonParams, titleBarBackButtonListener, navigatorEventId);
+        } else {
+            leftButton.animateIconState(leftButtonParams.iconState);
+        }
+    }
+
+    private void createAndSetLeftButton(TitleBarLeftButtonParams leftButtonParams, TitleBarBackButtonListener titleBarBackButtonListener, String navigatorEventId) {
+        leftButton = new LeftButton(getContext(), leftButtonParams, titleBarBackButtonListener, navigatorEventId);
         setNavigationOnClickListener(leftButton);
         setNavigationIcon(leftButton);
     }

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

@@ -43,7 +43,7 @@ public class TopBar extends AppBarLayout {
         titleBar.setVisibility(styleParams.titleBarHidden ? GONE : VISIBLE);
     }
 
-    public void setTitleBarButtons(String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
+    public void setTitleBarRightButtons(String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
         titleBar.setRightButtons(titleBarButtons, navigatorEventId);
     }
 
@@ -52,4 +52,10 @@ public class TopBar extends AppBarLayout {
         addView(tabLayout);
         return tabLayout;
     }
+
+    public void setTitleBarRightButton(String navigatorEventId,
+                                       TitleBarBackButtonListener titleBarBackButtonListener,
+                                       TitleBarLeftButtonParams titleBarLeftButtonParams) {
+        titleBar.setLeftButton(titleBarLeftButtonParams, titleBarBackButtonListener, navigatorEventId);
+    }
 }

src/deprecated/platformSpecificDeprecated.android.js

@@ -148,14 +148,12 @@ function navigatorSetButtons(navigator, navigatorEventID, params) {
     });
   }
   if (params.leftButton) {
-    params.leftButton.forEach(function(button) {
-      if (button.icon) {
-        const icon = resolveAssetSource(button.icon);
-        if (icon) {
-          button.icon = icon.uri;
-        }
+    if (params.leftButton.icon) {
+      const icon = resolveAssetSource(params.leftButton.icon);
+      if (icon) {
+        params.leftButton.icon = icon.uri;
       }
-    });
+    }
   }
   newPlatformSpecific.setScreenTitleBarButtons(navigator.screenInstanceID, navigatorEventID, params.rightButtons, params.leftButton);
 }