Change toolbar buttons when selected tab changes

android/app/react-native-navigation.iml

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":react-native-navigation" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../../../android" external.system.id="GRADLE" external.system.module.group="exampleRedux" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":react-native-navigation" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="libraryDebug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleLibraryDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileLibraryDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleLibraryDebugAndroidTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileLibraryDebugAndroidTestSources" />
-        <afterSyncTasks>
-          <task>generateLibraryDebugAndroidTestSources</task>
-          <task>generateLibraryDebugSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/library/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/library/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/library/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/library/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/library/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/library/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/library/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/library/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/libraryDebug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/libraryDebug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/libraryDebug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/libraryDebug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/libraryDebug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/libraryDebug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/libraryDebug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/library/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/library/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/library/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/library/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/library/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/library/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/library/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/library/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/library/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/library/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/library/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/library/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/library/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLibrary/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLibrary/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLibrary/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLibrary/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLibrary/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLibrary/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestLibrary/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.20.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="fresco-0.8.1" level="project" />
-    <orderEntry type="library" exported="" name="design-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="imagepipeline-okhttp-0.8.1" level="project" />
-    <orderEntry type="library" exported="" name="imagepipeline-0.8.1" level="project" />
-    <orderEntry type="library" exported="" name="stetho-1.2.0" level="project" />
-    <orderEntry type="library" exported="" name="jsr305-3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="jackson-core-2.2.3" level="project" />
-    <orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="react-native-0.20.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
-    <orderEntry type="library" exported="" name="okhttp-2.5.0" level="project" />
-    <orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
-    <orderEntry type="library" exported="" name="okhttp-ws-2.5.0" level="project" />
-    <orderEntry type="library" exported="" name="fbcore-0.8.1" level="project" />
-    <orderEntry type="library" exported="" name="android-jsc-r174650" level="project" />
-    <orderEntry type="library" exported="" name="drawee-0.8.1" level="project" />
-    <orderEntry type="library" exported="" name="stetho-okhttp-1.2.0" level="project" />
-    <orderEntry type="library" exported="" name="bolts-android-1.1.4" level="project" />
-    <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
-    <orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
-  </component>
-</module>

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

@@ -10,6 +10,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
+import android.view.MenuItem;
 import android.widget.EditText;
 import android.widget.Toast;
 
@@ -36,9 +37,9 @@ import javax.annotation.Nullable;
  */
 public class BaseReactActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler {
 
+    private static final String TAG = "BaseReactActivity";
     private static final String REDBOX_PERMISSION_MESSAGE =
             "Overlay permissions needs to be granted in order for react native apps to run in dev mode";
-    private static final String TAG = "ReactActivity";
 
     protected  @Nullable ReactInstanceManager mReactInstanceManager;
     private LifecycleState mLifecycleState = LifecycleState.BEFORE_RESUME;

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

@@ -3,7 +3,6 @@ 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;
 
@@ -14,6 +13,7 @@ import com.reactnativenavigation.activities.BaseReactActivity;
 import com.reactnativenavigation.core.RctManager;
 import com.reactnativenavigation.core.objects.Screen;
 import com.reactnativenavigation.views.RctView;
+import com.reactnativenavigation.views.RnnToolBar;
 
 import java.util.ArrayList;
 
@@ -26,11 +26,12 @@ public class ViewPagerAdapter extends PagerAdapter implements TabLayout.OnTabSel
 
     private BaseReactActivity mContext;
     private ViewPager mViewPager;
-    private Toolbar mToolbar;
+    private RnnToolBar mToolbar;
     private final ArrayList<Screen> mScreens;
     private final ReactInstanceManager mReactInstanceManager;
 
-    public ViewPagerAdapter(BaseReactActivity context, ViewPager viewPager, Toolbar toolbar, ArrayList<Screen> screens) {
+    public ViewPagerAdapter(BaseReactActivity context, ViewPager viewPager, RnnToolBar toolbar,
+                            ArrayList<Screen> screens) {
         mContext = context;
         mViewPager = viewPager;
         mToolbar = toolbar;
@@ -77,6 +78,8 @@ public class ViewPagerAdapter extends PagerAdapter implements TabLayout.OnTabSel
         Screen screen = mScreens.get(position);
         params.putString(Screen.KEY_NAVIGATOR_EVENT_ID, screen.navigatorEventId);
 
+        mToolbar.setupToolbarButtonsAsync(mScreens.get(position));
+
         RctManager.getInstance().sendEvent(EVENT_ON_TAB_SELECTED, screen.navigatorEventId, params);
     }
 

android/app/src/main/java/com/reactnativenavigation/core/RctManager.java

@@ -18,7 +18,6 @@ import static com.facebook.react.modules.core.DeviceEventManagerModule.RCTDevice
  * Created by guyc on 22/02/16.
  */
 public class RctManager {
-    private static final String TAG = "RctManager";
     private static final String KEY_EVENT_ID = "id";
     private static RctManager sInstance;
 

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

@@ -0,0 +1,14 @@
+package com.reactnativenavigation.utils;
+
+import java.util.Collection;
+
+/**
+ * Created by guyc on 11/04/16.
+ */
+public class CollectionUtils {
+
+    public static boolean isNullOrEmpty(Collection collection) {
+        return collection == null || collection.size() == 0;
+    }
+
+}

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

@@ -13,6 +13,8 @@ import com.reactnativenavigation.core.objects.Button;
 import com.reactnativenavigation.core.objects.Screen;
 import com.reactnativenavigation.utils.ContextProvider;
 
+import java.lang.ref.WeakReference;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -23,7 +25,7 @@ import java.util.Map;
 public class RnnToolBar extends Toolbar {
 
     private List<Screen> mScreens;
-    private static boolean sIsSettingUpToolbar = false;
+    private AsyncTask mSetupToolbarTask;
 
     public RnnToolBar(Context context) {
         super(context);
@@ -42,21 +44,26 @@ public class RnnToolBar extends Toolbar {
     }
 
     public void handleOnCreateOptionsMenuAsync() {
-        if (!sIsSettingUpToolbar) {
-            new SetupToolbarButtons().execute(mScreens.get(0));
+        setupToolbarButtonsAsync(mScreens.get(0));
+    }
+
+    public void setupToolbarButtonsAsync(Screen screen) {
+        if (mSetupToolbarTask == null) {
+            mSetupToolbarTask = new SetupToolbarButtonsTask(this, screen).execute();
         }
     }
 
-    private static class SetupToolbarButtons extends AsyncTask<Screen, Void, Map<String, Drawable>> {
-        private List<Button> mButtons;
+    private static class SetupToolbarButtonsTask extends AsyncTask<Void, Void, Map<String, Drawable>> {
+        private final List<Button> mButtons;
+        private final WeakReference<RnnToolBar> mToolbarWR;
 
-        public SetupToolbarButtons() {
-            sIsSettingUpToolbar = true;
+        public SetupToolbarButtonsTask(RnnToolBar toolBar, Screen newScreen) {
+            mToolbarWR = new WeakReference<>(toolBar);
+            mButtons = newScreen.buttons == null ? Collections.EMPTY_LIST : newScreen.buttons;
         }
 
         @Override
-        protected Map<String, Drawable> doInBackground(Screen... screen) {
-            mButtons = screen[0].buttons;
+        protected Map<String, Drawable> doInBackground(Void... params) {
             Context context = ContextProvider.getActivityContext();
             if (context == null) {
                 return null;
@@ -80,16 +87,27 @@ public class RnnToolBar extends Toolbar {
 
             Menu menu = ((BaseReactActivity) context).getMenu();
 
-            for (Button button : mButtons) {
-                MenuItem item = menu.add(Menu.NONE, button.getItemId(), Menu.NONE, button.title);
+            // Add new screen buttons
+            int i;
+            for (i = 0; i < mButtons.size(); i++) {
+                Button button = mButtons.get(i);
+                MenuItem item = menu.add(Menu.NONE, button.getItemId(), i, 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;
+            // Remove prev screen buttons
+            for (int j = i; j < menu.size(); j++) {
+                menu.removeItem(j);
+            }
+
+            RnnToolBar toolBar = mToolbarWR.get();
+            if (toolBar != null) {
+                toolBar.mSetupToolbarTask = null;
+                mToolbarWR.clear();
+            }
         }
     }
 }