Initial commit for Toolbar items

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

@@ -9,6 +9,7 @@ import android.provider.Settings;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.KeyEvent;
+import android.view.Menu;
 import android.widget.EditText;
 import android.widget.Toast;
 
@@ -42,6 +43,7 @@ public class BaseReactActivity extends AppCompatActivity implements DefaultHardw
     protected  @Nullable ReactInstanceManager mReactInstanceManager;
     private LifecycleState mLifecycleState = LifecycleState.BEFORE_RESUME;
     private boolean mDoRefresh = false;
+    private Menu mMenu;
 
     /**
      * Returns the name of the bundle in assets. If this is null, and no file path is specified for
@@ -197,6 +199,16 @@ public class BaseReactActivity extends AppCompatActivity implements DefaultHardw
         }
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        mMenu = menu;
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    public Menu getMenu() {
+        return mMenu;
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (mReactInstanceManager != null) {

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

@@ -6,7 +6,7 @@ import android.widget.FrameLayout;
 
 import com.reactnativenavigation.R;
 import com.reactnativenavigation.core.RctManager;
-import com.reactnativenavigation.core.Screen;
+import com.reactnativenavigation.core.objects.Screen;
 import com.reactnativenavigation.views.RctView;
 
 /**

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

@@ -2,12 +2,13 @@ package com.reactnativenavigation.activities;
 
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
-import android.support.v7.widget.Toolbar;
+import android.view.Menu;
 
 import com.reactnativenavigation.R;
 import com.reactnativenavigation.adapters.ViewPagerAdapter;
 import com.reactnativenavigation.core.RctManager;
-import com.reactnativenavigation.core.Screen;
+import com.reactnativenavigation.core.objects.Screen;
+import com.reactnativenavigation.views.RnnToolBar;
 
 import java.util.ArrayList;
 
@@ -15,35 +16,46 @@ import java.util.ArrayList;
  * Created by guyc on 02/04/16.
  */
 public class TabActivity extends BaseReactActivity {
-    public static final String EXTRA_SCREENS = "extraTabs";
+    public static final String EXTRA_SCREENS = "extraScreens";
 
-    private Toolbar mToolbar;
+    private RnnToolBar mToolbar;
     private TabLayout mTabLayout;
     private ViewPager mViewPager;
 
+    private ArrayList<Screen> mScreens;
+
     @Override
     protected void handleOnCreate() {
         mReactInstanceManager = RctManager.getInstance().getReactInstanceManager();
 
         setContentView(R.layout.tab_activity);
-        mToolbar = (Toolbar) findViewById(R.id.toolbar);
+        mToolbar = (RnnToolBar) findViewById(R.id.toolbar);
         mTabLayout = (TabLayout) findViewById(R.id.tabLayout);
         mViewPager = (ViewPager) findViewById(R.id.viewPager);
 
+        mScreens = (ArrayList<Screen>) getIntent().getSerializableExtra(EXTRA_SCREENS);
+
         setupToolbar();
         setupViewPager();
     }
 
     private void setupToolbar() {
         setSupportActionBar(mToolbar);
+        mToolbar.setScreens(mScreens);
     }
 
     private void setupViewPager() {
-        ArrayList<Screen> screens = (ArrayList<Screen>) getIntent().getSerializableExtra(EXTRA_SCREENS);
-        ViewPagerAdapter adapter = new ViewPagerAdapter(this, mViewPager, screens);
+        ViewPagerAdapter adapter = new ViewPagerAdapter(this, mViewPager, mToolbar, mScreens);
         mViewPager.setAdapter(adapter);
         mTabLayout.setupWithViewPager(mViewPager);
         mTabLayout.setOnTabSelectedListener(adapter);
         adapter.notifyDataSetChanged();
     }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        boolean ret = super.onCreateOptionsMenu(menu);
+        mToolbar.handleOnCreateOptionsMenuAsync();
+        return ret;
+    }
 }

android/app/src/main/java/com/reactnativenavigation/adapters/ViewPagerAdapter.java

@@ -3,6 +3,7 @@ package com.reactnativenavigation.adapters;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -11,7 +12,7 @@ import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.reactnativenavigation.activities.BaseReactActivity;
 import com.reactnativenavigation.core.RctManager;
-import com.reactnativenavigation.core.Screen;
+import com.reactnativenavigation.core.objects.Screen;
 import com.reactnativenavigation.views.RctView;
 
 import java.util.ArrayList;
@@ -25,12 +26,14 @@ public class ViewPagerAdapter extends PagerAdapter implements TabLayout.OnTabSel
 
     private BaseReactActivity mContext;
     private ViewPager mViewPager;
+    private Toolbar mToolbar;
     private final ArrayList<Screen> mScreens;
     private final ReactInstanceManager mReactInstanceManager;
 
-    public ViewPagerAdapter(BaseReactActivity context, ViewPager viewPager, ArrayList<Screen> screens) {
+    public ViewPagerAdapter(BaseReactActivity context, ViewPager viewPager, Toolbar toolbar, ArrayList<Screen> screens) {
         mContext = context;
         mViewPager = viewPager;
+        mToolbar = toolbar;
         mScreens = screens;
         mReactInstanceManager = RctManager.getInstance().getReactInstanceManager();
     }
@@ -65,9 +68,11 @@ public class ViewPagerAdapter extends PagerAdapter implements TabLayout.OnTabSel
 
     @Override
     public void onTabSelected(TabLayout.Tab tab) {
+        // Set the viewPager's current item
         int position = tab.getPosition();
         mViewPager.setCurrentItem(position);
 
+        // Send tab selected event
         WritableMap params = Arguments.createMap();
         Screen screen = mScreens.get(position);
         params.putString(Screen.KEY_NAVIGATOR_EVENT_ID, screen.navigatorEventId);

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

@@ -0,0 +1,95 @@
+package com.reactnativenavigation.core.objects;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+
+import com.facebook.react.bridge.ReadableMap;
+import com.reactnativenavigation.BuildConfig;
+import com.reactnativenavigation.utils.ResourceDrawableIdHelper;
+
+import java.io.Serializable;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Created by guyc on 08/04/16.
+ */
+public class Button extends JsonObject implements Serializable {
+    private static final long serialVersionUID = -570145217281069067L;
+
+    private static ResourceDrawableIdHelper sResDrawableIdHelper = new ResourceDrawableIdHelper();
+
+    private static final String KEY_ID = "id";
+    private static final String KEY_TITLE = "title";
+    private static final String KEY_ICON = "icon";
+
+    public String id;
+    public String title;
+    private String mIconSource;
+
+    private static AtomicInteger sAtomicIdGenerator = new AtomicInteger();
+    private static Map<String, Integer> sStringToNumericId = new HashMap<>();
+
+    public Button(ReadableMap button) {
+        id = getString(button, KEY_ID);
+        title = getString(button, KEY_TITLE, "");
+        mIconSource = getString(button, KEY_ICON);
+    }
+
+    public boolean hasIcon() {
+        return mIconSource != null;
+    }
+
+    public Drawable getIcon(Context ctx) {
+        if (mIconSource == null) {
+            return null;
+        }
+
+        try {
+            Uri icon = getIconUri(ctx);
+            URL url = new URL(icon.toString());
+            Bitmap bitmap = BitmapFactory.decodeStream(url.openStream());
+            return new BitmapDrawable(bitmap);
+        } catch (Exception e) {
+            if (BuildConfig.DEBUG) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+    private Uri getIconUri(Context context) {
+        Uri ret = null;
+        if (mIconSource != null) {
+            try {
+                ret = Uri.parse(mIconSource);
+                // Verify scheme is set, so that relative uri (used by static resources) are not handled.
+                if (ret.getScheme() == null) {
+                    ret = null;
+                }
+            } catch (Exception e) {
+                // ignore malformed uri, then attempt to extract resource ID.
+            }
+            if (ret == null) {
+                ret = sResDrawableIdHelper.getResourceDrawableUri(context, mIconSource);
+            }
+        }
+        return ret;
+    }
+
+    public int getItemId() {
+        if (sStringToNumericId.containsKey(id)) {
+            return sStringToNumericId.get(id);
+        }
+
+        int itemId = sAtomicIdGenerator.addAndGet(1);
+        sStringToNumericId.put(id, itemId);
+        return itemId;
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.reactnativenavigation.core.objects;
+
+import com.facebook.react.bridge.ReadableMap;
+
+/**
+ * Created by guyc on 08/04/16.
+ */
+public class JsonObject {
+
+    protected String getString(ReadableMap map, String key) {
+        return getString(map, key, null);
+    }
+
+    protected String getString(ReadableMap map, String key, String defaultValue) {
+        return map.hasKey(key) ? map.getString(key) : defaultValue;
+    }
+
+    protected int getInt(ReadableMap map, String key) {
+        return map.hasKey(key) ? map.getInt(key) : -1;
+    }
+}

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

@@ -1,20 +1,26 @@
-package com.reactnativenavigation.core;
+package com.reactnativenavigation.core.objects;
 
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Created by guyc on 02/04/16.
  */
-public class Screen implements Serializable {
+public class Screen extends JsonObject implements Serializable {
     private static final long serialVersionUID = -1033475305421107791L;
+
     private static final String KEY_TITLE = "title";
     private static final String KEY_SCREEN = "screen";
     public static final String KEY_SCREEN_INSTANCE_ID = "screenInstanceID";
     public static final String KEY_STACK_ID = "stackID";
     public static final String KEY_NAVIGATOR_ID = "navigatorID";
     public static final String KEY_NAVIGATOR_EVENT_ID = "navigatorEventID";
+    private static final String KEY_ICON = "icon";
+    private static final String KEY_RIGHT_BUTTONS = "rightButtons";
 
     public String title;
     public String screenId;
@@ -22,6 +28,8 @@ public class Screen implements Serializable {
     public String stackId;
     public String navigatorId;
     public String navigatorEventId;
+    public int icon;
+    public List<Button> buttons;
 
     public Screen(ReadableMap screen) {
         title = getString(screen, KEY_TITLE);
@@ -30,9 +38,14 @@ public class Screen implements Serializable {
         stackId = getString(screen, KEY_STACK_ID);
         navigatorId = getString(screen, KEY_NAVIGATOR_ID);
         navigatorEventId = getString(screen, KEY_NAVIGATOR_EVENT_ID);
-    }
+        icon = getInt(screen, KEY_ICON);
 
-    private String getString(ReadableMap map, String key) {
-        return map.hasKey(key) ? map.getString(key) : null;
+        if (screen.hasKey(KEY_RIGHT_BUTTONS)) {
+            buttons = new ArrayList<>();
+            ReadableArray rightButtons = screen.getArray(KEY_RIGHT_BUTTONS);
+            for (int i = 0; i < rightButtons.size(); i++) {
+                buttons.add(new Button(rightButtons.getMap(i)));
+            }
+        }
     }
 }

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

@@ -12,7 +12,7 @@ import com.facebook.react.bridge.ReadableMap;
 import com.reactnativenavigation.activities.RctActivity;
 import com.reactnativenavigation.activities.SingleScreenActivity;
 import com.reactnativenavigation.activities.TabActivity;
-import com.reactnativenavigation.core.Screen;
+import com.reactnativenavigation.core.objects.Screen;
 import com.reactnativenavigation.utils.ContextProvider;
 
 import java.util.ArrayList;

android/app/src/main/java/com/reactnativenavigation/utils/ContextProvider.java

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.utils;
 
 import android.app.Activity;
+import android.support.annotation.Nullable;
 
 import java.lang.ref.WeakReference;
 
@@ -17,7 +18,7 @@ public class ContextProvider {
         }
     }
 
-    public static Activity getActivityContext() {
+    public static @Nullable Activity getActivityContext() {
         return sActivityWR != null ? sActivityWR.get() : null;
     }
 

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

@@ -6,7 +6,7 @@ import android.widget.FrameLayout;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.activities.BaseReactActivity;
-import com.reactnativenavigation.core.Screen;
+import com.reactnativenavigation.core.objects.Screen;
 
 /**
  * Created by guyc on 10/03/16.

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

@@ -0,0 +1,95 @@
+package com.reactnativenavigation.views;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.support.v7.widget.Toolbar;
+import android.util.AttributeSet;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.reactnativenavigation.activities.BaseReactActivity;
+import com.reactnativenavigation.core.objects.Button;
+import com.reactnativenavigation.core.objects.Screen;
+import com.reactnativenavigation.utils.ContextProvider;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by guyc on 09/04/16.
+ */
+public class RnnToolBar extends Toolbar {
+
+    private List<Screen> mScreens;
+    private static boolean sIsSettingUpToolbar = false;
+
+    public RnnToolBar(Context context) {
+        super(context);
+    }
+
+    public RnnToolBar(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public RnnToolBar(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public void setScreens(List<Screen> screens) {
+        mScreens = screens;
+    }
+
+    public void handleOnCreateOptionsMenuAsync() {
+        if (!sIsSettingUpToolbar) {
+            new SetupToolbarButtons().execute(mScreens.get(0));
+        }
+    }
+
+    private static class SetupToolbarButtons extends AsyncTask<Screen, Void, Map<String, Drawable>> {
+        private List<Button> mButtons;
+
+        public SetupToolbarButtons() {
+            sIsSettingUpToolbar = true;
+        }
+
+        @Override
+        protected Map<String, Drawable> doInBackground(Screen... screen) {
+            mButtons = screen[0].buttons;
+            Context context = ContextProvider.getActivityContext();
+            if (context == null) {
+                return null;
+            }
+
+            Map<String, Drawable> icons = new HashMap<>();
+            for (Button button : mButtons) {
+                if (button.hasIcon()) {
+                    icons.put(button.id, button.getIcon(context));
+                }
+            }
+            return icons;
+        }
+
+        @Override
+        protected void onPostExecute(Map<String, Drawable> icons) {
+            Context context = ContextProvider.getActivityContext();
+            if (context == null) {
+                return;
+            }
+
+            Menu menu = ((BaseReactActivity) context).getMenu();
+
+            for (Button button : mButtons) {
+                MenuItem item = menu.add(Menu.NONE, button.getItemId(), Menu.NONE, button.title);
+                if (icons.containsKey(button.id)) {
+                    Drawable icon = icons.get(button.id);
+
+                    item.setIcon(icon).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+                }
+            }
+
+            sIsSettingUpToolbar = false;
+        }
+    }
+}

android/app/src/main/res/layout/tab_activity.xml

@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:fitsSystemWindows="true">
-        <android.support.v7.widget.Toolbar
+        <com.reactnativenavigation.views.RnnToolBar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"

src/platformSpecific.android.js

@@ -5,6 +5,8 @@ import {
   RctActivity
 } from 'react-native-navigation';
 
+var resolveAssetSource = require('resolveAssetSource');
+
 function startSingleScreenApp(params) {
   let screen = params.screen;
   if (!screen.screen) {
@@ -13,7 +15,8 @@ function startSingleScreenApp(params) {
   }
 
   console.log(RctActivity);
-  addNavigationParams(screen);
+  addNavigatorParams(screen);
+  addNavigatorButtons(screen);
   RctActivity.startSingleScreenApp(screen);
 }
 
@@ -24,24 +27,45 @@ function startTabBasedApp(params) {
   }
 
   params.tabs.forEach(function (tab, idx) {
-    addNavigationParams(tab, idx)
+    addNavigatorParams(tab, idx)
+    addNavigatorButtons(tab);
   });
 
   RctActivity.startTabBasedApp(params.tabs);
 }
 
 function navigatorPush(navigator, params) {
-  addNavigationParams(params)
+  addNavigatorParams(params)
+  addNavigatorButtons(params);
   RctActivity.navigatorPush(params);
 }
 
-function addNavigationParams(screen, idx = '') {
+function addNavigatorParams(screen, idx = '') {
   screen.stackID = utils.getRandomId();
   screen.navigatorID = utils.getRandomId() + '_nav' + idx;
   screen.screenInstanceID = utils.getRandomId();
   screen.navigatorEventID = screen.screenInstanceID + '_events';
 }
 
+function addNavigatorButtons(screen) {
+  const Screen = Navigation.getRegisteredScreen(screen.screen);
+  Object.assign(screen, Screen.navigatorButtons);
+
+  // Get image uri from image id
+  if (screen.rightButtons) {
+    screen.rightButtons.forEach(function(button) {
+      if (button.icon) {
+        const icon = resolveAssetSource(button.icon);
+        console.log('This is an icon:\n' + JSON.stringify(icon));
+        if (icon) {
+          button.icon = icon.uri;
+        }
+        console.log('final icon: ' + button.icon);
+      }
+    });
+  }
+}
+
 export default {
   startSingleScreenApp,
   startTabBasedApp,

src/platformSpecific.ios.js

@@ -37,9 +37,8 @@ function startTabBasedApp(params) {
       return (
         <TabBarControllerIOS
           id={controllerID + '_tabs'}
-          style={params.tabsStyle}
-        >
-        {
+          style={params.tabsStyle}>
+          {
           params.tabs.map(function(tab, index) {
             const navigatorID = controllerID + '_nav' + index;
             const screenInstanceID = utils.getRandomId();
@@ -96,8 +95,7 @@ function startSingleScreenApp(params) {
             componentLeft={params.drawer.left ? params.drawer.left.screen : undefined}
             passPropsLeft={{navigatorID: navigatorID}}
             componentRight={params.drawer.right ? params.drawer.right.screen : undefined}
-            passPropsRight={{navigatorID: navigatorID}}
-          >
+            passPropsRight={{navigatorID: navigatorID}}>
             {this.renderBody()}
           </DrawerControllerIOS>
         );