Merge branch 'master' of https://github.com/wix/react-native-navigation

# Conflicts:
#	package.json

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

@@ -219,10 +219,13 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
     @CallSuper
     public void push(Screen screen) {
         setNavigationStyle(screen);
-        if (mToolbar != null &&
-            getCurrentNavigatorId().equals(screen.navigatorId) &&
-            getScreenStackSize() >= 1) {
-            mToolbar.showBackButton(screen);
+        if (mToolbar != null) {
+            mToolbar.update(screen);
+
+            if (getCurrentNavigatorId().equals(screen.navigatorId) &&
+                getScreenStackSize() >= 1) {
+                mToolbar.showBackButton(screen);
+            }
         }
     }
 

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

@@ -63,17 +63,10 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
     }
 
     private void setupToolbar(ArrayList<Screen> screens) {
+        mToolbar.setScreens(screens);
         Screen initialScreen = screens.get(0);
+        mToolbar.update(initialScreen);
         setNavigationStyle(initialScreen);
-        mToolbar.setScreens(screens);
-        mToolbar.setTitle(initialScreen.title);
-        setSupportActionBar(mToolbar);
-    }
-
-    @Override
-    public void setNavigationStyle(Screen screen) {
-        super.setNavigationStyle(screen);
-        mToolbar.setTitle(screen.title);
     }
 
     private void setupTabs(Bundle style) {
@@ -111,7 +104,9 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
     public Screen pop(String navigatorId) {
         super.pop(navigatorId);
         Screen screen = mScreenStacks.get(mCurrentStackPosition).pop();
-        setNavigationStyle(screen);
+        Screen currentScreen = getCurrentScreen();
+        setNavigationStyle(currentScreen);
+        mToolbar.update(currentScreen);
         return screen;
     }
 

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

@@ -36,15 +36,13 @@ public class SingleScreenActivity extends BaseReactActivity {
     }
 
     protected void setupToolbar(Screen screen) {
+        mToolbar.update(screen);
         setNavigationStyle(screen);
-        mToolbar.setTitle(screen.title);
-        setSupportActionBar(mToolbar);
     }
     
     @Override
     public void push(Screen screen) {
         super.push(screen);
-        setNavigationStyle(screen);
         mScreenStack.push(screen);
     }
 
@@ -52,7 +50,9 @@ public class SingleScreenActivity extends BaseReactActivity {
     public Screen pop(String navigatorId) {
         super.pop(navigatorId);
         Screen screen = mScreenStack.pop();
-        setNavigationStyle(screen);
+        Screen currentScreen = getCurrentScreen();
+        setNavigationStyle(currentScreen);
+        mToolbar.update(currentScreen);
         return screen;
     }
 

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

@@ -13,8 +13,10 @@ import com.reactnativenavigation.views.RnnToolBar;
 import java.util.ArrayList;
 
 /**
+ * This class is currently not supported and will be removed in future release.
  * Created by guyc on 02/04/16.
  */
+@Deprecated
 public class TabActivity extends BaseReactActivity {
     public static final String EXTRA_SCREENS = "extraScreens";
 
@@ -39,11 +41,9 @@ public class TabActivity extends BaseReactActivity {
 
     private void setupToolbar(ArrayList<Screen> screens) {
         Screen initialScreen = screens.get(0);
-        setNavigationStyle(initialScreen);
         mToolbar.setScreens(screens);
-        mToolbar.setTitle(initialScreen.title);
-        mToolbar.setupToolbarButtonsAsync(initialScreen);
-        setSupportActionBar(mToolbar);
+        mToolbar.update(initialScreen);
+        setNavigationStyle(initialScreen);
     }
 
     @Override
@@ -70,6 +70,7 @@ public class TabActivity extends BaseReactActivity {
     @Override
     public void push(Screen screen) {
         super.push(screen);
+        setNavigationStyle(screen);
         mAdapter.push(screen);
     }
 
@@ -77,7 +78,7 @@ public class TabActivity extends BaseReactActivity {
     public Screen pop(String navigatorId) {
         super.pop(navigatorId);
         Screen screen = mAdapter.pop(navigatorId);
-        setNavigationStyle(screen);
+        setNavigationStyle(getCurrentScreen());
         return screen;
     }
 

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

@@ -28,4 +28,8 @@ public class JsonObject {
     protected Integer getColor(ReadableMap map, String key) {
         return map.hasKey(key) ? Color.parseColor(map.getString(key)) : null;
     }
+    
+    protected Boolean getBoolean(ReadableMap map, String key) {
+        return map.hasKey(key) ? map.getBoolean(key) : null;
+    }
 }

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

@@ -34,6 +34,7 @@ public class Screen extends JsonObject implements Serializable {
     private static final String KEY_TOOL_BAR_STYLE = "navigatorStyle";
     private static final String KEY_STATUS_BAR_COLOR = "statusBarColor";
     private static final String KEY_TOOL_BAR_COLOR = "toolBarColor";
+    private static final String KEY_TOOL_BAR_HIDDEN = "navBarHidden";
     private static final String KEY_NAVIGATION_BAR_COLOR = "navigationBarColor";
     private static final String KEY_BUTTONS_TINT_COLOR = "buttonsTint";
     private static final String KEY_TITLE_COLOR = "titleColor";
@@ -54,6 +55,7 @@ public class Screen extends JsonObject implements Serializable {
 
     // Navigation styling
     @Nullable @ColorInt public Integer toolBarColor;
+    @Nullable public Boolean toolBarHidden;
     @Nullable @ColorInt public Integer statusBarColor;
     @Nullable @ColorInt public Integer navigationBarColor;
     @Nullable @ColorInt public Integer buttonsTintColor;
@@ -105,6 +107,7 @@ public class Screen extends JsonObject implements Serializable {
         ReadableMap style = getMap(screen, KEY_TOOL_BAR_STYLE);
         if (style != null) {
             toolBarColor = getColor(style, KEY_TOOL_BAR_COLOR);
+            toolBarHidden = getBoolean(style, KEY_TOOL_BAR_HIDDEN);
             statusBarColor = getColor(style, KEY_STATUS_BAR_COLOR);
             navigationBarColor = getColor(style, KEY_NAVIGATION_BAR_COLOR);
             buttonsTintColor = getColor(style, KEY_BUTTONS_TINT_COLOR);

android/app/src/main/java/com/reactnativenavigation/modal/RnnModal.java

@@ -28,27 +28,23 @@ public class RnnModal extends Dialog implements DialogInterface.OnDismissListene
 
     private ScreenStack mScreenStack;
     private View mContentView;
-    private Screen mScreen;
+    private RnnToolBar mToolBar;
 
     public RnnModal(BaseReactActivity context, Screen screen) {
         super(context, R.style.Modal);
-        mScreen = screen;
         ModalController.getInstance().add(this);
-        init(context);
+        init(context, screen);
     }
 
     @SuppressLint("InflateParams")
-    private void init(final Context context) {
+    private void init(final Context context, Screen screen) {
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         mContentView = LayoutInflater.from(context).inflate(R.layout.modal_layout, null, false);
-        RnnToolBar toolBar = (RnnToolBar) mContentView.findViewById(R.id.toolbar);
+        mToolBar = (RnnToolBar) mContentView.findViewById(R.id.toolbar);
         mScreenStack = (ScreenStack) mContentView.findViewById(R.id.screenStack);
-
         setContentView(mContentView);
-        toolBar.setStyle(mScreen);
-        toolBar.setTitle(mScreen.title);
-        toolBar.setupToolbarButtonsAsync(mScreen);
-        mScreenStack.push(mScreen, new RctView.OnDisplayedListener() {
+        mToolBar.update(screen);
+        mScreenStack.push(screen, new RctView.OnDisplayedListener() {
             @Override
             public void onDisplayed() {
                 Animation animation = AnimationUtils.loadAnimation(context, R.anim.slide_up);
@@ -61,25 +57,32 @@ public class RnnModal extends Dialog implements DialogInterface.OnDismissListene
         if (SdkSupports.lollipop()) {
             Window window = getWindow();
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-            StyleHelper.setWindowStyle(window, context.getApplicationContext(), mScreen);
+            StyleHelper.setWindowStyle(window, context.getApplicationContext(), screen);
         }
     }
 
     public void push(Screen screen) {
         mScreenStack.push(screen);
+        mToolBar.update(screen);
     }
 
     public Screen pop() {
-        return mScreenStack.pop();
+        if (mScreenStack.isEmpty()) {
+            ModalController.getInstance().remove();
+            super.onBackPressed();
+            return null;
+        } else {
+            return mScreenStack.pop();
+        }
     }
 
     @Override
     public void onBackPressed() {
-        if (mScreenStack.getStackSize() > 1) {
-            mScreenStack.pop();
-        } else {
+        if (mScreenStack.isEmpty()) {
             ModalController.getInstance().remove();
             super.onBackPressed();
+        } else {
+            mScreenStack.pop();
         }
     }
 

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

@@ -5,9 +5,11 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
+import android.support.annotation.UiThread;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.content.res.ResourcesCompat;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.AttributeSet;
 import android.view.Menu;
@@ -21,7 +23,6 @@ import com.reactnativenavigation.utils.ContextProvider;
 import com.reactnativenavigation.utils.ImageUtils;
 
 import java.lang.ref.WeakReference;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -70,6 +71,12 @@ public class RnnToolBar extends Toolbar {
         } else {
             resetTitleTextColor();
         }
+        
+        if (screen.toolBarHidden != null && screen.toolBarHidden) {
+            hideToolbar();
+        } else {
+            showToolbar();
+        }
     }
 
     private void resetBackground() {
@@ -95,6 +102,20 @@ public class RnnToolBar extends Toolbar {
         }
     }
 
+    private void showToolbar() {
+        ActionBar actionBar = ContextProvider.getActivityContext().getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.show();
+        }
+    }
+
+    private void hideToolbar() {
+        ActionBar actionBar = ContextProvider.getActivityContext().getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.hide();
+        }
+    }
+
     @SuppressWarnings({"ConstantConditions"})
     public void showBackButton(Screen screen) {
         ActionBar actionBar = ContextProvider.getActivityContext().getSupportActionBar();
@@ -126,6 +147,19 @@ public class RnnToolBar extends Toolbar {
         ContextProvider.getActivityContext().getSupportActionBar().setDisplayHomeAsUpEnabled(false);
     }
 
+    /**
+     * Update the ToolBar from screen. This function sets any properties that are defined
+     * in the screen.
+     * @param screen The currently displayed screen
+     */
+    @UiThread
+    public void update(Screen screen) {
+        ((AppCompatActivity) getContext()).setSupportActionBar(this);
+        setTitle(screen.title);
+        setStyle(screen);
+        setupToolbarButtonsAsync(screen);
+    }
+
     private static class SetupToolbarButtonsTask extends AsyncTask<Void, Void, Map<String, Drawable>> {
         private final List<Button> mOldButtons;
         private final List<Button> mNewButtons;

src/platformSpecific.ios.js

@@ -28,6 +28,8 @@ function startTabBasedApp(params) {
             componentRight={params.drawer.right ? params.drawer.right.screen : undefined}
             passPropsRight={{navigatorID: navigatorID}}
             disableOpenGesture={params.drawer.disableOpenGesture}
+            type={params.drawer.type ? params.drawer.type : undefined}
+            animationType={params.drawer.animationType ? params.drawer.animationType : undefined}
           >
             {this.renderBody()}
           </DrawerControllerIOS>