Move drawer setup to BaseReactActivity

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

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings;
 import android.support.annotation.CallSuper;
+import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
@@ -14,6 +15,7 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.EditText;
+import android.widget.FrameLayout;
 import android.widget.Toast;
 
 import com.facebook.common.logging.FLog;
@@ -30,12 +32,14 @@ import com.reactnativenavigation.BuildConfig;
 import com.reactnativenavigation.controllers.ModalController;
 import com.reactnativenavigation.core.RctManager;
 import com.reactnativenavigation.core.objects.Button;
+import com.reactnativenavigation.core.objects.Drawer;
 import com.reactnativenavigation.core.objects.Screen;
 import com.reactnativenavigation.modal.RnnModal;
 import com.reactnativenavigation.packages.RnnPackage;
 import com.reactnativenavigation.utils.ContextProvider;
 import com.reactnativenavigation.utils.StyleHelper;
 import com.reactnativenavigation.views.RnnToolBar;
+import com.reactnativenavigation.views.ScreenStack;
 
 import java.util.Arrays;
 import java.util.List;
@@ -64,6 +68,8 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
     private Menu mMenu;
     protected RnnToolBar mToolbar;
     protected ActionBarDrawerToggle mDrawerToggle;
+    protected DrawerLayout mDrawerLayout;
+    protected ScreenStack mDrawerStack;
 
     /**
      * Returns the name of the bundle in assets. If this is null, and no file path is specified for
@@ -383,6 +389,20 @@ public abstract class BaseReactActivity extends AppCompatActivity implements Def
         super.onBackPressed();
     }
 
+    protected void setupDrawer(Screen screen, Drawer drawer, int drawerFrameId, int drawerLayoutId) {
+        if (drawer == null || drawer.left == null) {
+            return;
+        }
+
+        mDrawerStack = new ScreenStack(this);
+        FrameLayout drawerFrame = (FrameLayout) findViewById(drawerFrameId);
+        drawerFrame.addView(mDrawerStack);
+        mDrawerStack.push(drawer.left);
+
+        mDrawerLayout = (DrawerLayout) findViewById(drawerLayoutId);
+        mDrawerToggle = mToolbar.setupDrawer(mDrawerLayout, drawer.left, screen);
+    }
+
     public void setNavigationButtons(ReadableMap buttons){
         if (mToolbar == null) {
             return;

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

@@ -4,7 +4,6 @@ import android.graphics.Color;
 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;
 
@@ -43,8 +42,6 @@ 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
@@ -59,7 +56,7 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
         final ArrayList<Screen> screens = (ArrayList<Screen>) getIntent().getSerializableExtra(EXTRA_SCREENS);
         final Drawer drawer = (Drawer) getIntent().getSerializableExtra(DRAWER_PARAMS);
         mBottomNavigation.setForceTint(true);
-        setupDrawer(drawer, screens.get(0));
+        setupDrawer(screens.get(0), drawer, R.id.drawerFrame, R.id.drawerLayout);
         setupTabs(getIntent().getExtras());
         setupPages(screens);
 
@@ -72,20 +69,6 @@ public class BottomTabActivity extends BaseReactActivity implements AHBottomNavi
         });
     }
 
-    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();
     }

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

@@ -1,6 +1,5 @@
 package com.reactnativenavigation.activities;
 
-import android.support.v4.widget.DrawerLayout;
 import android.widget.FrameLayout;
 
 import com.reactnativenavigation.R;
@@ -21,8 +20,6 @@ public class SingleScreenActivity extends BaseReactActivity {
 
     private ScreenStack mScreenStack;
     private String mNavigatorId;
-    private ScreenStack mDrawerStack;
-    private DrawerLayout mDrawerLayout;
 
     @Override
     protected void handleOnCreate() {
@@ -36,7 +33,7 @@ public class SingleScreenActivity extends BaseReactActivity {
 
         mNavigatorId = screen.navigatorId;
         setupToolbar(screen);
-        setupDrawer(drawer, screen);
+        setupDrawer(screen, drawer, R.id.drawerFrame, R.id.drawerLayout);
 
         mScreenStack = new ScreenStack(this);
         FrameLayout contentFrame = (FrameLayout) findViewById(R.id.contentFrame);
@@ -53,25 +50,11 @@ public class SingleScreenActivity extends BaseReactActivity {
         });
     }
 
-    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);