Additional Android functionality

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

@@ -1,11 +1,13 @@
 package com.reactnativenavigation.activities;
 
 import android.content.Intent;
+import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings;
 import android.support.annotation.CallSuper;
+import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -48,8 +50,10 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
     protected static final String KEY_ANIMATED = "animated";
     protected static final String KEY_BADGE = "badge";
     protected static final String KEY_HIDDEN = "hidden";
+    protected static final String KEY_SIDE = "side";
     protected static final String KEY_TAB_INDEX = "tabIndex";
     protected static final String KEY_TITLE = "title";
+    protected static final String KEY_TO = "to";
     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";
@@ -59,6 +63,7 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
     private boolean mDoRefresh = false;
     private Menu mMenu;
     protected RnnToolBar mToolbar;
+    protected ActionBarDrawerToggle mDrawerToggle;
 
     /**
      * Returns the name of the bundle in assets. If this is null, and no file path is specified for
@@ -223,7 +228,7 @@ public void push(Screen screen) {
 
             if (getCurrentNavigatorId().equals(screen.navigatorId) &&
                 getScreenStackSize() >= 1) {
-                mToolbar.showBackButton(screen);
+                mToolbar.setNavUpButton(screen);
             }
         }
     }
@@ -233,15 +238,16 @@ public Screen pop(String navigatorId) {
         if (mToolbar != null &&
             getCurrentNavigatorId().equals(navigatorId) &&
             getScreenStackSize() <= 2) {
-            mToolbar.hideBackButton();
+            mToolbar.setNavUpButton();
         }
+
         return null;
     }
 
     @CallSuper
     public Screen popToRoot(String navigatorId) {
         if (mToolbar != null) {
-            mToolbar.hideBackButton();
+            mToolbar.setNavUpButton();
         }
 
         return null;
@@ -251,7 +257,7 @@ public Screen popToRoot(String navigatorId) {
     public Screen resetTo(Screen screen) {
         StyleHelper.updateStyles(mToolbar, screen);
         if (mToolbar != null) {
-            mToolbar.hideBackButton();
+            mToolbar.setNavUpButton();
         }
 
         return null;
@@ -273,6 +279,14 @@ public Screen getCurrentScreen() {
 
     public abstract int getScreenStackSize();
 
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        if (mDrawerToggle != null) {
+            mDrawerToggle.onConfigurationChanged(newConfig);
+        }
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         mMenu = menu;
@@ -285,6 +299,12 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        if (mDrawerToggle != null &&
+            getScreenStackSize() == 1 &&
+            mDrawerToggle.onOptionsItemSelected(item)) {
+            return true;
+        }
+
         if (item.getItemId() == android.R.id.home) {
             onBackPressed();
         } else {
@@ -297,6 +317,14 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    public void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        if (mDrawerToggle != null) {
+            mDrawerToggle.syncState();
+        }
+    }
+
     public Menu getMenu() {
         return mMenu;
     }
@@ -384,4 +412,25 @@ public void toggleNavigationBar(ReadableMap params) {
             mToolbar.showToolbar(animated);
         }
     }
+
+    public void toggleDrawer(ReadableMap params) {
+        if (mToolbar == null || mDrawerToggle == null) {
+            return;
+        }
+
+        boolean animated = params.getBoolean(KEY_ANIMATED);
+        String side = params.getString(KEY_SIDE);
+        String to = params.getString(KEY_TO);
+        switch (to) {
+            case "open":
+                mToolbar.showDrawer(animated);
+                break;
+            case "closed":
+                mToolbar.hideDrawer(animated);
+                break;
+            default:
+                mToolbar.toggleDrawer(animated);
+                break;
+        }
+    }
 }

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

@@ -4,6 +4,7 @@
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.support.v4.widget.DrawerLayout;
 import android.view.Menu;
 import android.widget.FrameLayout;
 
@@ -12,6 +13,7 @@
 import com.facebook.react.bridge.ReadableMap;
 import com.reactnativenavigation.R;
 import com.reactnativenavigation.core.RctManager;
+import com.reactnativenavigation.core.objects.Drawer;
 import com.reactnativenavigation.core.objects.Screen;
 import com.reactnativenavigation.utils.StyleHelper;
 import com.reactnativenavigation.views.RnnToolBar;
@@ -25,6 +27,7 @@
  * Created by guyc on 02/04/16.
  */
 public class BottomTabActivity extends BaseReactActivity implements AHBottomNavigation.OnTabSelectedListener {
+    public static final String DRAWER_PARAMS = "drawerParams";
     public static final String EXTRA_SCREENS = "extraScreens";
 
     private static final String TAB_STYLE_BUTTON_COLOR = "tabBarButtonColor";
@@ -40,6 +43,8 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
     private AHBottomNavigation mBottomNavigation;
     private FrameLayout mContentFrame;
     private ArrayList<ScreenStack> mScreenStacks;
+    private ScreenStack mDrawerStack;
+    private DrawerLayout mDrawerLayout;
     private int mCurrentStackPosition = -1;
 
     @Override
@@ -52,7 +57,9 @@ protected void handleOnCreate() {
         mContentFrame = (FrameLayout) findViewById(R.id.contentFrame);
 
         final ArrayList<Screen> screens = (ArrayList<Screen>) getIntent().getSerializableExtra(EXTRA_SCREENS);
+        Drawer drawer = (Drawer) getIntent().getSerializableExtra(DRAWER_PARAMS);
         mBottomNavigation.setForceTint(true);
+        setupDrawer(drawer, screens.get(0));
         setupTabs(getIntent().getExtras());
         setupPages(screens);
 
@@ -65,6 +72,20 @@ public void run() {
         });
     }
 
+    protected void setupDrawer(Drawer drawer, Screen screen) {
+        if (drawer == null || drawer.left == null) {
+            return;
+        }
+
+        mDrawerStack = new ScreenStack(this);
+        FrameLayout drawerFrame = (FrameLayout) findViewById(R.id.drawerFrame);
+        drawerFrame.addView(mDrawerStack);
+        mDrawerStack.push(drawer.left);
+
+        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout);
+        mDrawerToggle = mToolbar.setupDrawer(mDrawerLayout, drawer.left, screen);
+    }
+
     private void setupPages(ArrayList<Screen> screens) {
         new SetupTabsTask(this, mToolbar, screens).execute();
     }
@@ -157,6 +178,7 @@ public Screen getCurrentScreen() {
 
     public Screen resetTo(Screen screen) {
         super.resetTo(screen);
+        StyleHelper.updateStyles(mToolbar, screen);
         return mScreenStacks.get(mCurrentStackPosition).resetTo(screen);
     }
 
@@ -189,13 +211,21 @@ public void onTabSelected(int position, boolean wasSelected) {
 
         // Hide or show back button if needed
         if (getScreenStackSize() > 1) {
-            mToolbar.showBackButton(getCurrentScreen());
+            mToolbar.setNavUpButton(getCurrentScreen());
         } else {
-            mToolbar.hideBackButton();
+            mToolbar.setNavUpButton();
         }
     }
 
-    public void setTabBadge(ReadableMap params) {
+    @Override
+    public void setNavigationTitle(ReadableMap title) {
+        super.setNavigationTitle(title);
+
+        AHBottomNavigationItem currentItem = mBottomNavigation.getItem(mBottomNavigation.getCurrentItem());
+        currentItem.setTitle(title.getString(KEY_TITLE));
+        mBottomNavigation.refresh();
+    }
+	public void setTabBadge(ReadableMap params) {
         // Badge comes across as int, but if it's 0 clear the notification
         int badgeCount = params.getInt(KEY_BADGE);
         String badge = (badgeCount > 0) ? Integer.toString(badgeCount) : "";

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

@@ -1,9 +1,11 @@
 package com.reactnativenavigation.activities;
 
+import android.support.v4.widget.DrawerLayout;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.R;
 import com.reactnativenavigation.core.RctManager;
+import com.reactnativenavigation.core.objects.Drawer;
 import com.reactnativenavigation.core.objects.Screen;
 import com.reactnativenavigation.utils.StyleHelper;
 import com.reactnativenavigation.views.RnnToolBar;
@@ -13,11 +15,13 @@
  * Created by guyc on 05/04/16.
  */
 public class SingleScreenActivity extends BaseReactActivity {
-
+    public static final String DRAWER_PARAMS = "drawerParams";
     public static final String EXTRA_SCREEN = "extraScreen";
 
-    private ScreenStack mScreenStack;
     private String mNavigatorId;
+    private ScreenStack mScreenStack;
+    private ScreenStack mDrawerStack;
+    private DrawerLayout mDrawerLayout;
 
     @Override
     protected void handleOnCreate() {
@@ -27,7 +31,11 @@ protected void handleOnCreate() {
         mToolbar = (RnnToolBar) findViewById(R.id.toolbar);
 
         final Screen screen = (Screen) getIntent().getSerializableExtra(EXTRA_SCREEN);
+        final Drawer drawer = (Drawer) getIntent().getSerializableExtra(DRAWER_PARAMS);
+
         mNavigatorId = screen.navigatorId;
+        setupToolbar(screen);
+        setupDrawer(drawer, screen);
 
         mScreenStack = new ScreenStack(this);
         FrameLayout contentFrame = (FrameLayout) findViewById(R.id.contentFrame);
@@ -44,11 +52,25 @@ public void run() {
         });
     }
 
+    protected void setupDrawer(Drawer drawer, Screen screen) {
+        if (drawer == null || drawer.left == null) {
+            return;
+        }
+
+        mDrawerStack = new ScreenStack(this);
+        FrameLayout drawerFrame = (FrameLayout) findViewById(R.id.drawerFrame);
+        drawerFrame.addView(mDrawerStack);
+        mDrawerStack.push(drawer.left);
+
+        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout);
+        mDrawerToggle = mToolbar.setupDrawer(mDrawerLayout, drawer.left, screen);
+    }
+
     protected void setupToolbar(Screen screen) {
         mToolbar.update(screen);
         StyleHelper.updateStyles(mToolbar, screen);
     }
-    
+
     @Override
     public void push(Screen screen) {
         super.push(screen);
@@ -76,6 +98,7 @@ public Screen popToRoot(String navigatorId) {
     public Screen resetTo(Screen screen) {
         super.resetTo(screen);
         Screen popped = mScreenStack.resetTo(screen);
+        StyleHelper.updateStyles(mToolbar, screen);
         return popped;
     }
 

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

@@ -7,6 +7,7 @@
 import com.reactnativenavigation.adapters.ViewPagerAdapter;
 import com.reactnativenavigation.core.RctManager;
 import com.reactnativenavigation.core.objects.Screen;
+import com.reactnativenavigation.utils.StyleHelper;
 import com.reactnativenavigation.views.RnnTabLayout;
 import com.reactnativenavigation.views.RnnToolBar;
 
@@ -68,7 +69,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
     @Override
     public void push(Screen screen) {
         super.push(screen);
-        setNavigationStyle(screen);
+        StyleHelper.updateStyles(mToolbar, screen);
         mAdapter.push(screen);
     }
 

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

@@ -107,9 +107,6 @@ public void onTabSelected(TabLayout.Tab tab) {
         Screen newScreen = mScreenStacks.get(position).peek();
         mToolbar.setupToolbarButtonsAsync(prevScreen, newScreen);
 
-        // Set title
-        mToolbar.setTitle(newScreen.title == null ? "" : newScreen.title);
-
         // Set navigation color
         StyleHelper.updateStyles(mToolbar, newScreen);
 

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

@@ -0,0 +1,23 @@
+package com.reactnativenavigation.core.objects;
+
+import com.facebook.react.bridge.ReadableMap;
+
+import java.io.Serializable;
+
+public class Drawer extends JsonObject implements Serializable {
+    private static final long serialVersionUID = 982836768712398756L;
+
+    private static final String KEY_LEFT = "left";
+    private static final String KEY_RIGHT = "right";
+    private static final String KEY_DISABLE_OPEN_GESTURE = "disableOpenGesture";
+
+    public final Screen left;
+    public final Screen right;
+    public final boolean disableOpenGesture;
+
+    public Drawer(ReadableMap params) {
+        left = params.hasKey(KEY_LEFT) ? new Screen(params.getMap(KEY_LEFT)) : null;
+        right = params.hasKey(KEY_RIGHT) ? new Screen(params.getMap(KEY_RIGHT)) : null;
+        disableOpenGesture = getBoolean(params, KEY_DISABLE_OPEN_GESTURE);
+    }
+}

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

@@ -34,7 +34,7 @@ public class Screen extends JsonObject implements Serializable {
     private static final String KEY_RIGHT_BUTTONS = "rightButtons";
     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_COLOR = "navBarBackgroundColor";
     private static final String KEY_TOOL_BAR_HIDDEN = "navBarHidden";
     private static final String KEY_NAVIGATION_BAR_COLOR = "navigationBarColor";
     private static final String KEY_NAV_BAR_BUTTON_COLOR = "navBarButtonColor";
@@ -44,7 +44,7 @@ public class Screen extends JsonObject implements Serializable {
     private static final String KEY_TAB_INDICATOR_COLOR = "tabIndicatorColor";
     private static final String KEY_PROPS = "passProps";
 
-    public final String title;
+    public String title;
     public final String label;
     public final String screenId;
     public final String screenInstanceId;
@@ -85,6 +85,10 @@ public Screen(ReadableMap screen) {
         setToolbarStyle(screen);
     }
 
+    public void setTitle(ReadableMap params) {
+        this.title = getString(params, KEY_TITLE);
+    }
+
     public void setButtons(ReadableMap params) {
         this.buttons = getButtons(params);
     }