titlebarbuttons

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

@@ -119,7 +119,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
 //        if (item.getItemId() == android.R.id.home) {
 //            onBackPressed();
 //        } else {
-//            String eventId = Button.getButtonEventId(item);
+//            String eventId = TitleBarButton.getButtonEventId(item);
 //            assert eventId != null;
 //
 //            WritableMap params = Arguments.createMap();

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

@@ -5,7 +5,7 @@ import android.os.Bundle;
 import android.widget.LinearLayout;
 
 import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.core.Button;
+import com.reactnativenavigation.views.TitleBarButton;
 import com.reactnativenavigation.views.ContentView;
 import com.reactnativenavigation.views.ScrollDirectionListener;
 import com.reactnativenavigation.views.TitleBar;
@@ -20,13 +20,13 @@ public class ScreenLayout extends LinearLayout implements ScrollDirectionListene
     public static class Params {
         String moduleName;
         Bundle passProps;
-        List<Button> buttons;
+        List<TitleBarButton> buttons;
     }
 
     private final ReactInstanceManager reactInstanceManager;
     private final String moduleName;
     private final Bundle passProps;
-    private final List<Button> buttons;
+    private final List<TitleBarButton> buttons;
     private ContentView contentView;
     private TopBar topBar;
 

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

@@ -76,11 +76,11 @@ public class RnnToolBar extends Toolbar {
 
         mDrawerLayout = drawerLayout;
         mDrawerToggle = new ActionBarDrawerToggle(
-            ContextProvider.getActivityContext(),
-            mDrawerLayout,
-            this,
-            R.string.drawer_open,
-            R.string.drawer_close
+                ContextProvider.getActivityContext(),
+                mDrawerLayout,
+                this,
+                R.string.drawer_open,
+                R.string.drawer_close
         );
         mDrawerLayout.setDrawerListener(mDrawerToggle);
         setupDrawerIconAsync(drawerScreen.icon, screen);
@@ -214,6 +214,7 @@ public class RnnToolBar extends Toolbar {
     /**
      * Update the ToolBar from screen. This function sets any properties that are defined
      * in the screen.
+     *
      * @param screen The currently displayed screen
      */
     @UiThread
@@ -268,7 +269,8 @@ public class RnnToolBar extends Toolbar {
         private final List<_Button> mOldButtons;
         private final List<_Button> mNewButtons;
         private final WeakReference<RnnToolBar> mToolbarWR;
-        @ColorInt private final Integer mTintColor;
+        @ColorInt
+        private final Integer mTintColor;
         private final int mIconDimensions;
 
         public SetupToolbarButtonsTask(RnnToolBar toolBar, _Screen oldScreen, _Screen newScreen) {
@@ -313,7 +315,7 @@ public class RnnToolBar extends Toolbar {
             }
 
             // Remove prev screen buttons
-            if(mOldButtons == null) {
+            if (mOldButtons == null) {
                 menu.clear();
             } else {
                 for (_Button btn : mOldButtons) {

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

@@ -9,7 +9,6 @@ import android.view.MenuInflater;
 
 import com.reactnativenavigation.R;
 import com.reactnativenavigation.animation.HideOnScrollAnimator;
-import com.reactnativenavigation.core.Button;
 
 import java.util.List;
 
@@ -23,7 +22,20 @@ public class TitleBar extends Toolbar {
     public TitleBar(Context context) {
         super(context);
         createMenu();
+    }
+
+    public void setButtons(List<TitleBarButton.Params> buttons) {
+        menu.clear();
+
+        for (int i = 0; i < buttons.size(); i++) {
+            final TitleBarButton button = new TitleBarButton(menu, actionMenuView, buttons.get(i));
+            // Add button in reverse order because in iOS index 0 starts at right
+            final int index = buttons.size() - i - 1;
+            button.addToMenu(index);
+        }
+    }
 
+    public void setupMenuButton() {
     }
 
     private void createMenu() {
@@ -35,17 +47,6 @@ public class TitleBar extends Toolbar {
         // TODO: Maybe setSupportActionBar
     }
 
-    public void setButtons(List<Button.Params> buttons) {
-        menu.clear();
-
-        for (int i = 0; i < buttons.size(); i++) {
-            final Button button = new Button(menu, actionMenuView, buttons.get(i));
-            // Add button in reverse order because in iOS index 0 starts at right
-            final int index = buttons.size() - i - 1;
-            button.addToMenu(index);
-        }
-    }
-
     public void setHideOnScroll(boolean hideOnScroll) {
         this.hideOnScroll = hideOnScroll;
     }

android/app/src/main/java/com/reactnativenavigation/core/Button.java → android/app/src/main/java/com/reactnativenavigation/views/TitleBarButton.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.core;
+package com.reactnativenavigation.views;
 
 import android.graphics.drawable.Drawable;
 import android.support.annotation.ColorInt;
@@ -14,7 +14,7 @@ import com.reactnativenavigation.utils.ViewUtils;
 
 import java.util.ArrayList;
 
-public class Button {
+public class TitleBarButton {
     public static class Params {
         public enum ShowAsAction {
             IfRoom(MenuItem.SHOW_AS_ACTION_IF_ROOM),
@@ -42,7 +42,7 @@ public class Button {
     private final ActionMenuView parent;
     private Params buttonParams;
 
-    public Button(Menu menu, ActionMenuView parent, Params buttonParams) {
+    public TitleBarButton(Menu menu, ActionMenuView parent, Params buttonParams) {
         this.menu = menu;
         this.parent = parent;
         this.buttonParams = buttonParams;

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

@@ -0,0 +1,7 @@
+package com.reactnativenavigation.views;
+
+public class TitleBarMenuButton {
+
+    public TitleBarMenuButton() {
+    }
+}