Merge branch 'master' of https://github.com/wix/react-native-navigation

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

android/app/src/main/java/com/reactnativenavigation/activities/BaseReactActivity.java

@@ -19,6 +19,7 @@ import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.ReactRootView;
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
@@ -318,4 +319,12 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
     public void invokeDefaultOnBackPressed() {
         super.onBackPressed();
     }
+
+    public void setNavigationButtons(ReadableMap buttons){
+        if (mToolbar == null) {
+            return;
+        }
+        getCurrentScreen().setButtons(buttons);
+        mToolbar.setupToolbarButtonsAsync(getCurrentScreen());
+    }
 }

android/app/src/main/java/com/reactnativenavigation/activities/BottomTabActivity.java

@@ -138,7 +138,8 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
         mContentFrame.removeAllViews();
         mContentFrame.addView(mScreenStacks.get(position), new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
         mCurrentStackPosition = position;
-        setNavigationStyle(mScreenStacks.get(mCurrentStackPosition).peek());
+        mToolbar.setupToolbarButtonsAsync(getCurrentScreen());
+        setNavigationStyle(getCurrentScreen());
     }
 
     private static class SetupTabsTask extends AsyncTask<Void, Void, Map<Screen, Drawable>> {

android/app/src/main/java/com/reactnativenavigation/core/objects/Screen.java

@@ -49,7 +49,7 @@ public class Screen extends JsonObject implements Serializable {
     public final String navigatorId;
     public final String navigatorEventId;
     public final String icon;
-    public final ArrayList<Button> buttons;
+    public ArrayList<Button> buttons;
     public HashMap<String, Object> passedProps = new HashMap<>();
 
     // Navigation styling
@@ -82,6 +82,10 @@ public class Screen extends JsonObject implements Serializable {
         setToolbarStyle(screen);
     }
 
+    public void setButtons(ReadableMap params) {
+        this.buttons = getButtons(params);
+    }
+
     private ArrayList<Button> getButtons(ReadableMap screen) {
         ArrayList<Button> ret = new ArrayList<>();
         if (screen.hasKey(KEY_RIGHT_BUTTONS)) {

android/app/src/main/java/com/reactnativenavigation/modules/RctActivityModule.java

@@ -77,6 +77,20 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
         }
     }
 
+    @ReactMethod
+    public void setNavigatorButtons(final ReadableMap buttons) {
+        final BaseReactActivity context = ContextProvider.getActivityContext();
+        if (context == null || context.isFinishing()) {
+            return;
+        }
+        context.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                context.setNavigationButtons(buttons);
+            }
+        });
+    }
+
     @ReactMethod
     public void navigatorPush(final ReadableMap skreen) {
         final Screen screen = new Screen(skreen);
@@ -101,12 +115,12 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
         }
 
         // No Modal is displayed, Push to activity
-         context.runOnUiThread(new Runnable() {
-                 @Override
-                 public void run() {
-                     context.push(screen);
-                 }
-             });
+        context.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                context.push(screen);
+            }
+        });
     }
 
     @ReactMethod

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

@@ -134,7 +134,7 @@ public class RnnToolBar extends Toolbar {
 
         public SetupToolbarButtonsTask(RnnToolBar toolBar, Screen oldScreen, Screen newScreen) {
             mToolbarWR = new WeakReference<>(toolBar);
-            mOldButtons = oldScreen == null ? Collections.EMPTY_LIST : oldScreen.getButtons();
+            mOldButtons = oldScreen == null ? null : oldScreen.getButtons();
             mNewButtons = newScreen.getButtons();
             mTintColor = newScreen.buttonsTintColor;
         }
@@ -174,8 +174,13 @@ public class RnnToolBar extends Toolbar {
             }
 
             // Remove prev screen buttons
-            for (Button btn : mOldButtons) {
-                menu.removeItem(btn.getItemId());
+            if(mOldButtons == null) {
+                menu.clear();
+            }
+            else {
+                for (Button btn : mOldButtons) {
+                    menu.removeItem(btn.getItemId());
+                }
             }
 
             // Add new screen buttons

src/platformSpecific.android.js

@@ -51,6 +51,20 @@ function navigatorPush(navigator, params) {
   RctActivity.navigatorPush(params);
 }
 
+function navigatorSetButtons(navigator, navigatorEventID, params) {
+  if (params.rightButtons) {
+    params.rightButtons.forEach(function(button) {
+      if (button.icon) {
+        const icon = resolveAssetSource(button.icon);
+        if (icon) {
+          button.icon = icon.uri;
+        }
+      }
+    });
+  }
+  RctActivity.setNavigatorButtons(params);
+}
+
 function navigatorPop(navigator, params) {
   RctActivity.navigatorPop(navigator);
 }
@@ -105,5 +119,6 @@ export default {
   navigatorPop,
   showModal,
   dismissModal,
-  dismissAllModals
+  dismissAllModals,
+  navigatorSetButtons
 }