Initial setButtons implementation

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

@@ -3,8 +3,13 @@ package com.reactnativenavigation.bridge;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+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.parsers.TitleBarButtonParamsParser;
+
+import java.util.List;
 
 /**
  * The basic abstract components we will expose:
@@ -39,7 +44,9 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void setScreenTitleBarButtons(final ReadableMap params) {
+    public void setScreenTitleBarButtons(String screenInstanceId, String navigatorEventId, ReadableArray buttons) {
+        List<TitleBarButtonParams> titleBarButtons = TitleBarButtonParamsParser.parse(BundleConverter.toBundle(buttons));
+        NavigationCommandsHandler.setScreenTitleBarButtons(screenInstanceId, navigatorEventId, titleBarButtons);
     }
 
     @ReactMethod

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

@@ -12,10 +12,13 @@ import com.reactnativenavigation.layouts.Layout;
 import com.reactnativenavigation.layouts.LayoutFactory;
 import com.reactnativenavigation.params.ActivityParams;
 import com.reactnativenavigation.params.ScreenParams;
+import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.react.JsDevReloadHandler;
 import com.reactnativenavigation.react.NavigationReactInstance;
 import com.reactnativenavigation.react.RedboxPermission;
 
+import java.util.List;
+
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler, NavigationReactInstance.OnJsDevReloadListener {
 
     /**
@@ -135,6 +138,10 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         layout.setTitleBarTitle(screenInstanceId, title);
     }
 
+    public void setTitleBarButtons(String screenInstanceId, String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
+        layout.setTitleBarButtons(screenInstanceId, navigatorEventId, titleBarButtons);
+    }
+
     void showModal(ScreenParams screenParams) {
         modalController.showModal(screenParams);
     }

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

@@ -6,9 +6,12 @@ import android.os.Bundle;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.params.ActivityParams;
 import com.reactnativenavigation.params.ScreenParams;
+import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.parsers.ActivityParamsParser;
 import com.reactnativenavigation.params.parsers.ScreenParamsParser;
 
+import java.util.List;
+
 public class NavigationCommandsHandler {
 
     private static final String ACTIVITY_PARAMS_BUNDLE = "ACTIVITY_PARAMS_BUNDLE";
@@ -118,7 +121,6 @@ public class NavigationCommandsHandler {
         });
     }
 
-
     public static void showModal(Bundle params) {
         final NavigationActivity currentActivity = NavigationActivity.currentActivity;
         if (currentActivity == null) {
@@ -132,5 +134,20 @@ public class NavigationCommandsHandler {
             public void run() {
                 currentActivity.showModal(screenParams);
             }
+        });
+    }
+
+    public static void setScreenTitleBarButtons(final String screenInstanceId, final String navigatorEventId, final List<TitleBarButtonParams> titleBarButtons) {
+        final NavigationActivity currentActivity = NavigationActivity.currentActivity;
+        if (currentActivity == null) {
+            return;
         }
+
+        NavigationApplication.instance.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                currentActivity.setTitleBarButtons(screenInstanceId, navigatorEventId, titleBarButtons);
+            }
+        });
+    }
 }

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

@@ -1,6 +1,9 @@
 package com.reactnativenavigation.layouts;
 
 import com.reactnativenavigation.params.ScreenParams;
+import com.reactnativenavigation.params.TitleBarButtonParams;
+
+import java.util.List;
 
 public interface Layout {
     boolean onBackPressed();
@@ -20,4 +23,6 @@ public interface Layout {
     void setTopBarVisible(String screenInstanceId, boolean hidden, boolean animated);
 
     void setTitleBarTitle(String screenInstanceId, String title);
+
+    void setTitleBarButtons(String screenInstanceId, String navigatorEventId, List<TitleBarButtonParams> titleBarButtons);
 }

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

@@ -11,11 +11,14 @@ import android.widget.RelativeLayout;
 import com.reactnativenavigation.animation.VisibilityAnimator;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.ScreenStyleParams;
+import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.utils.SdkSupports;
 import com.reactnativenavigation.utils.ViewUtils;
 import com.reactnativenavigation.views.ScrollDirectionListener;
 import com.reactnativenavigation.views.TopBar;
 
+import java.util.List;
+
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
@@ -119,4 +122,8 @@ public abstract class Screen extends RelativeLayout implements ScrollDirectionLi
     public void setTitleBarTitle(String title) {
         topBar.setTitle(title);
     }
+
+    public void setTitleBarButtons(String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
+        topBar.setTitleBarButtons(navigatorEventId, titleBarButtons);
+    }
 }

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

@@ -5,7 +5,9 @@ import android.content.Context;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.params.ScreenParams;
+import com.reactnativenavigation.params.TitleBarButtonParams;
 
+import java.util.List;
 import java.util.Stack;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
@@ -113,6 +115,13 @@ public class ScreenStack extends FrameLayout {
         }
     }
 
+    public void setTitleBarButtons(String screenInstanceId, String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
+        Screen screen = findScreenByScreenInstanceId(screenInstanceId);
+        if (screen != null) {
+            screen.setTitleBarButtons(navigatorEventId, titleBarButtons);
+        }
+    }
+
 
     //    /**
 //     * Remove the ScreenStack from {@code parent} while preventing all child react views from getting unmounted

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

@@ -4,6 +4,9 @@ import android.content.Context;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.params.ScreenParams;
+import com.reactnativenavigation.params.TitleBarButtonParams;
+
+import java.util.List;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 
@@ -76,4 +79,9 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
     public void setTitleBarTitle(String screenInstanceId, String title) {
         stack.setTitleBarTitle(screenInstanceId, title);
     }
+
+    @Override
+    public void setTitleBarButtons(String screenInstanceId, String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
+        stack.setTitleBarButtons(screenInstanceId, navigatorEventId, titleBarButtons);
+    }
 }

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

@@ -36,4 +36,8 @@ public class TopBar extends AppBarLayout {
         setVisibility(styleParams.topBarHidden ? GONE : VISIBLE);
         titleBar.setVisibility(styleParams.titleBarHidden ? GONE : VISIBLE);
     }
+
+    public void setTitleBarButtons(String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
+        titleBar.setButtons(titleBarButtons, navigatorEventId);
+    }
 }

src/deprecated/platformSpecificDeprecated.android.js

@@ -138,17 +138,17 @@ function addTabIcon(tab) {
 }
 
 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);
+  if (params.rightButtons) {
+   params.rightButtons.forEach(function(button) {
+     if (button.icon) {
+       const icon = resolveAssetSource(button.icon);
+       if (icon) {
+         button.icon = icon.uri;
+       }
+     }
+   });
+  }
+  newPlatformSpecific.setScreenTitleBarButtons(navigator.screenInstanceID, navigatorEventID, params.rightButtons);
 }
 
 function navigatorSetTabBadge(navigator, params) {

src/platformSpecific.android.js

@@ -40,6 +40,10 @@ function setScreenTitleBarTitle(screenInstanceID, title) {
   NativeModules.NavigationReactModule.setScreenTitleBarTitle(screenInstanceID, title);
 }
 
+function setScreenTitleBarButtons(screenInstanceID, navigatorEventID, buttons) {
+  NativeModules.NavigationReactModule.setScreenTitleBarButtons(screenInstanceID, navigatorEventID, buttons);
+}
+
 module.exports = {
   startApp,
   push,
@@ -47,5 +51,6 @@ module.exports = {
   popToRoot,
   newStack,
   toggleTopBarVisible,
-  setScreenTitleBarTitle
+  setScreenTitleBarTitle,
+  setScreenTitleBarButtons
 };