merged from master

.npmignore

@@ -153,6 +153,7 @@ fastlane/screenshots
 android/bin/
 android/gen/
 android/out/
+android/app/build/
 
 # Gradle files
 android/.gradle/

README.md

@@ -173,7 +173,7 @@ Navigation.startTabBasedApp({
     {
       label: 'One', // tab label as appears under the icon in iOS (optional)
       screen: 'example.FirstTabScreen', // unique ID registered with Navigation.registerScreen
-      icon: require('../img/one.png'), // local image asset for the tab icon unselected state (optional)
+      icon: require('../img/one.png'), // local image asset for the tab icon unselected state (optional on iOS)
       selectedIcon: require('../img/one_selected.png'), // local image asset for the tab icon selected state (optional)
       title: 'Screen One', // title of the screen as appears in the nav bar (optional)
       navigatorStyle: {}, // override the navigator style for the tab screen, see "Styling the navigator" below (optional),

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

@@ -1,9 +1,6 @@
 package com.reactnativenavigation.activities;
 
-import android.content.BroadcastReceiver;
-import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
@@ -29,7 +26,6 @@ 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.devsupport.DevServerHelper;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.shell.MainReactPackage;
 import com.reactnativenavigation.BuildConfig;
@@ -299,7 +295,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
     public boolean onCreateOptionsMenu(Menu menu) {
         mMenu = menu;
         Screen currentScreen = getCurrentScreen();
-        if (mToolbar != null && currentScreen != null) {
+        if (mToolbar != null && currentScreen != null && !isFinishing()) {
             mToolbar.setupToolbarButtonsAsync(currentScreen);
         }
         return super.onCreateOptionsMenu(menu);
@@ -384,14 +380,18 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
 
     @Override
     public void onBackPressed() {
+        ModalController modalController = ModalController.getInstance();
+        if (modalController.isModalDisplayed()) {
+            modalController.dismissModal();
+            return;
+        }
+
         if (getScreenStackSize() > 1) {
             pop(getCurrentNavigatorId());
+        } else if (mReactInstanceManager != null) {
+            mReactInstanceManager.onBackPressed();
         } else {
-            if (mReactInstanceManager != null) {
-                mReactInstanceManager.onBackPressed();
-            } else {
-                super.onBackPressed();
-            }
+            super.onBackPressed();
         }
     }
 

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

@@ -5,6 +5,7 @@ import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.Menu;
+import android.view.View;
 import android.widget.FrameLayout;
 
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
@@ -102,13 +103,6 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
         }
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        boolean ret = super.onCreateOptionsMenu(menu);
-        mToolbar.handleOnCreateOptionsMenuAsync();
-        return ret;
-    }
-
     @Override
     public void push(Screen screen) {
         super.push(screen);
@@ -118,6 +112,10 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
             }
         }
         StyleHelper.updateStyles(mToolbar, getCurrentScreen());
+
+        if (shouldToggleTabs(screen)) {
+            toggleTabs(screen.bottomTabsHidden, false);
+        }
     }
 
     @Override
@@ -126,7 +124,13 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
         for (ScreenStack stack : mScreenStacks) {
             if (stack.peek().navigatorId.equals(navigatorId)) {
                 Screen popped = stack.pop();
-                StyleHelper.updateStyles(mToolbar, getCurrentScreen());
+                Screen currentScreen = getCurrentScreen();
+                StyleHelper.updateStyles(mToolbar, currentScreen);
+
+                if (shouldToggleTabs(currentScreen)) {
+                    toggleTabs(currentScreen.bottomTabsHidden, false);
+                }
+
                 return popped;
             }
         }
@@ -139,7 +143,13 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
         for (ScreenStack stack : mScreenStacks) {
             if (stack.peek().navigatorId.equals(navigatorId)) {
                 Screen popped = stack.popToRoot();
-                StyleHelper.updateStyles(mToolbar, getCurrentScreen());
+                Screen currentScreen = getCurrentScreen();
+                StyleHelper.updateStyles(mToolbar, currentScreen);
+
+                if (shouldToggleTabs(currentScreen)) {
+                    toggleTabs(currentScreen.bottomTabsHidden, false);
+                }
+
                 return popped;
             }
         }
@@ -225,13 +235,24 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
     public void toggleTabs(ReadableMap params) {
         boolean hide = params.getBoolean(KEY_HIDDEN);
         boolean animated = params.getBoolean(KEY_ANIMATED);
+        toggleTabs(hide, animated);
+    }
+
+    // TODO: support animated = false -guyca
+    private void toggleTabs(boolean hide, boolean animated) {
         if (hide) {
-            mBottomNavigation.hideBottomNavigation(animated);
+//            mBottomNavigation.hideBottomNavigation(animated);
+            mBottomNavigation.setVisibility(View.GONE);
         } else {
-            mBottomNavigation.restoreBottomNavigation(animated);
+            mBottomNavigation.setVisibility(View.VISIBLE);
+//            mBottomNavigation.restoreBottomNavigation(animated);
         }
     }
 
+    private boolean shouldToggleTabs(Screen newScreen) {
+        return mBottomNavigation.isShown() == newScreen.bottomTabsHidden;
+    }
+
     private static class SetupTabsTask extends AsyncTask<Void, Void, Map<Screen, Drawable>> {
         private BottomTabActivity mActivity;
         private RnnToolBar mToolBar;

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

@@ -18,8 +18,10 @@ public class RootActivity extends BaseReactActivity {
     @Override
     protected void handleOnCreate() {
         super.handleOnCreate();
-        // Trigger react context initialization, global javascript code will now execute
-        getReactInstanceManager().createReactContextInBackground();
+        if (!getReactInstanceManager().hasStartedCreatingInitialContext()) {
+            // Trigger react context initialization, global javascript code will now execute
+            getReactInstanceManager().createReactContextInBackground();
+        }
     }
 
     @Override

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

@@ -49,7 +49,6 @@ public class SingleScreenActivity extends BaseReactActivity {
     }
 
     protected void setupToolbar(Screen screen) {
-        mToolbar.update(screen);
         StyleHelper.updateStyles(mToolbar, screen);
     }
 

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

@@ -25,6 +25,8 @@ import static com.facebook.react.modules.core.DeviceEventManagerModule.RCTDevice
 public class RctManager {
     private static final String TAG = "RctManager";
     private static final String KEY_EVENT_ID = "id";
+    private static final String KEY_EVENT_TYPE = "type";
+    private static final String EVENT_TYPE = "NavBarButtonPress";
     private static RctManager sInstance;
 
     private ReactInstanceManager mReactManager;
@@ -136,6 +138,7 @@ public class RctManager {
             return;
         }
 
+        params.putString(KEY_EVENT_TYPE, EVENT_TYPE);
         params.putString(KEY_EVENT_ID, eventName);
         params.putString(Screen.KEY_NAVIGATOR_EVENT_ID, screen.navigatorEventId);
         eventEmitter.emit(screen.navigatorEventId, params);

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

@@ -43,6 +43,7 @@ public class Screen extends JsonObject implements Serializable {
     private static final String KEY_TAB_NORMAL_TEXT_COLOR = "tabNormalTextColor";
     private static final String KEY_TAB_SELECTED_TEXT_COLOR = "tabSelectedTextColor";
     private static final String KEY_TAB_INDICATOR_COLOR = "tabIndicatorColor";
+    private static final String KEY_BOTTOM_TABS_HIDDEN = "tabBarHidden";
     private static final String KEY_PROPS = "passProps";
 
     public String title;
@@ -66,6 +67,7 @@ public class Screen extends JsonObject implements Serializable {
     @Nullable @ColorInt public Integer tabNormalTextColor;
     @Nullable @ColorInt public Integer tabSelectedTextColor;
     @Nullable @ColorInt public Integer tabIndicatorColor;
+    public Boolean bottomTabsHidden;
 
     @NonNull
     public List<Button> getButtons() {
@@ -132,6 +134,7 @@ public class Screen extends JsonObject implements Serializable {
             tabNormalTextColor = getColor(style, KEY_TAB_NORMAL_TEXT_COLOR);
             tabSelectedTextColor = getColor(style, KEY_TAB_SELECTED_TEXT_COLOR);
             tabIndicatorColor = getColor(style, KEY_TAB_INDICATOR_COLOR);
+            bottomTabsHidden = getBoolean(style, KEY_BOTTOM_TABS_HIDDEN);
         }
     }
 }

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

@@ -1,5 +1,7 @@
 package com.reactnativenavigation.utils;
 
+import android.support.annotation.Nullable;
+
 import com.reactnativenavigation.activities.BaseReactActivity;
 
 import java.lang.ref.WeakReference;
@@ -19,7 +21,7 @@ public class ContextProvider {
     /**
      * Returns the currently resumed activity or {@code null} if there is none.
      */
-    public static BaseReactActivity getActivityContext() {
+    public static @Nullable BaseReactActivity getActivityContext() {
         return sActivityWR != null ? sActivityWR.get() : null;
     }
 

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

@@ -18,7 +18,6 @@ public class StyleHelper {
         try {
             toolBar.updateAndSetButtons(screen);
             setWindowStyle(screen);
-            toolBar.setupToolbarButtonsAsync(screen);
         } catch (Exception e) {
             Log.w("RNNavigation", "Tried to update styles with no screen!");
         }

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

@@ -212,7 +212,12 @@ public class RnnToolBar extends Toolbar {
 
     @SuppressWarnings({"ConstantConditions"})
     public void setNavUpButton(Screen screen) {
-        ActionBar actionBar = ContextProvider.getActivityContext().getSupportActionBar();
+        BaseReactActivity context = ContextProvider.getActivityContext();
+        if (context == null) {
+            return;
+        }
+
+        ActionBar actionBar = context.getSupportActionBar();
         if (actionBar == null) {
             return;
         }
@@ -226,7 +231,7 @@ public class RnnToolBar extends Toolbar {
             navArrow = (DrawerArrowDrawable) this.getNavigationIcon();
         } else {
             if (isBack && !screen.backButtonHidden) {
-                navArrow = new DrawerArrowDrawable(ContextProvider.getActivityContext());
+                navArrow = new DrawerArrowDrawable(context);
             } else if (hasDrawer) {
                 navIcon = mDrawerIcon;
             }

src/platformSpecific.android.js

@@ -33,12 +33,7 @@ function startTabBasedApp(params) {
     addNavigatorParams(tab, null, idx);
     addNavigatorButtons(tab);
     addNavigationStyleParams(tab);
-    if (tab.icon) {
-      const icon = resolveAssetSource(tab.icon);
-      if (icon) {
-        tab.icon = icon.uri;
-      }
-    }
+    addTabIcon(tab);
     tab.passProps = params.passProps;
   });
 
@@ -46,6 +41,19 @@ function startTabBasedApp(params) {
   RctActivity.startTabBasedApp(params.tabs, params.tabsStyle, drawer);
 }
 
+function addTabIcon(tab) {
+  if (tab.icon) {
+    const icon = resolveAssetSource(tab.icon);
+    if (icon) {
+      tab.icon = icon.uri;
+    }
+  }
+
+  if (!tab.icon) {
+    throw new Error("No icon defined for tab " + tab.screen);
+  }
+}
+
 function navigatorPush(navigator, params) {
   addNavigatorParams(params, navigator);
   addNavigatorButtons(params);