commented all old code to make the example run

.babelrc

@@ -1,8 +0,0 @@
-{
-  "presets": [
-    "es2015",
-    "react",
-    "stage-0"
-  ],
-  "retainLines": true
-}

android/app/build.gradle

@@ -1,23 +1,3 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
-    }
-}
-
-allprojects {
-    repositories {
-        mavenLocal()
-        jcenter()
-        maven {
-            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url "$projectDir/../../node_modules/react-native/android"
-        }
-    }
-}
-
 apply plugin: 'com.android.library'
 
 android {
@@ -70,7 +50,4 @@ dependencies {
     compile "com.android.support:appcompat-v7:23.0.1"
     compile 'com.android.support:design:23.1.1'
     compile "com.facebook.react:react-native:+"  // From node_modules
-
-    testCompile 'junit:junit:4.12'
-    testCompile "org.robolectric:robolectric:3.1.1"
 }

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

@@ -1,308 +1,287 @@
 package com.reactnativenavigation.activities;
 
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.support.design.widget.CoordinatorLayout;
-
-import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
-import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem;
-import com.facebook.react.bridge.ReadableMap;
-import com.reactnativenavigation.R;
-import com.reactnativenavigation.core.objects.Drawer;
-import com.reactnativenavigation.core.objects._Screen;
-import com.reactnativenavigation.utils.StyleHelper;
-import com.reactnativenavigation.views.BottomNavigation;
-import com.reactnativenavigation.views.RnnToolBar;
-import com.reactnativenavigation.views.ScreenStack;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-public class BottomTabActivity extends BaseReactActivity implements AHBottomNavigation.OnTabSelectedListener {
-    private static final String TAG = "BottomTabActivity";
-    public static final String DRAWER_PARAMS = "drawerParams";
-    public static final String EXTRA_SCREENS = "extraScreens";
-
-    private static final String TAB_STYLE_BUTTON_COLOR = "tabBarButtonColor";
-    private static final String TAB_STYLE_SELECTED_COLOR = "tabBarSelectedButtonColor";
-    private static final String TAB_STYLE_BAR_BG_COLOR = "tabBarBackgroundColor";
-    private static final String TAB_STYLE_INACTIVE_TITLES = "tabShowInactiveTitles";
-
-    private static int DEFAULT_TAB_BAR_BG_COLOR = 0xFFFFFFFF;
-    private static int DEFAULT_TAB_BUTTON_COLOR = Color.GRAY;
-    private static int DEFAULT_TAB_SELECTED_COLOR = 0xFF0000FF;
-    private static boolean DEFAULT_TAB_INACTIVE_TITLES = true;
-
-    private BottomNavigation mBottomNavigation;
-    private CoordinatorLayout mContentFrame;
-    private ArrayList<ScreenStack> mScreenStacks;
-    private int mCurrentStackPosition = -1;
-
-    @Override
-    protected void handleOnCreate() {
-        super.handleOnCreate();
-        reactInstanceManager = RctManager.getInstance().getReactInstanceManager();
-
-        setContentView(R.layout.bottom_tab_activity);
-        mToolbar = (RnnToolBar) findViewById(R.id.toolbar);
-        mBottomNavigation = (BottomNavigation) findViewById(R.id.bottom_tab_bar);
-        mContentFrame = (CoordinatorLayout) findViewById(R.id.contentFrame);
-
-        final ArrayList<_Screen> screens = (ArrayList<_Screen>) getIntent().getSerializableExtra(EXTRA_SCREENS);
-        final Drawer drawer = (Drawer) getIntent().getSerializableExtra(DRAWER_PARAMS);
-        mBottomNavigation.setForceTint(true);
-        setupDrawer(screens.get(0), drawer, R.id.drawerFrame, R.id.drawerLayout);
-        setupTabs(getIntent().getExtras());
-        setupPages(screens);
-
-        // Setup Toolbar after it's measured since icon height is dependent on Toolbar height
-        mContentFrame.post(new Runnable() {
-            @Override
-            public void run() {
-                setupToolbar(screens);
-            }
-        });
-    }
-
-    private void setupPages(ArrayList<_Screen> screens) {
-        new SetupTabsTask(this, toolbar, screens).execute();
-    }
-
-    private void setupToolbar(ArrayList<_Screen> screens) {
-        toolbar.setScreens(screens);
-        _Screen initialScreen = screens.get(0);
-        toolbar.update(initialScreen);
-        StyleHelper.updateStyles(toolbar, initialScreen);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        if (mScreenStacks != null) {
-            StyleHelper.updateStyles(toolbar, getCurrentScreen());
-        }
-    }
-
-    private void setupTabs(Bundle style) {
-        mBottomNavigation.setForceTitlesDisplay(style.getBoolean(TAB_STYLE_INACTIVE_TITLES, DEFAULT_TAB_INACTIVE_TITLES));
-        mBottomNavigation.setForceTint(true);
-        mBottomNavigation.setDefaultBackgroundColor(getColor(style, TAB_STYLE_BAR_BG_COLOR, DEFAULT_TAB_BAR_BG_COLOR));
-        mBottomNavigation.setInactiveColor(getColor(style, TAB_STYLE_BUTTON_COLOR, DEFAULT_TAB_BUTTON_COLOR));
-        mBottomNavigation.setAccentColor(getColor(style, TAB_STYLE_SELECTED_COLOR, DEFAULT_TAB_SELECTED_COLOR));
-    }
-
-    private static int getColor(Bundle bundle, String key, int defaultColor) {
-        if (bundle.containsKey(key)) {
-            return Color.parseColor(bundle.getString(key));
-        } else {
-            return defaultColor;
-        }
-    }
-
-    @Override
-    public void push(_Screen screen) {
-        super.push(screen);
-        for (ScreenStack stack : mScreenStacks) {
-            if (stack.peek().navigatorId.equals(screen.navigatorId)) {
-                stack.push(screen);
-            }
-        }
-        StyleHelper.updateStyles(toolbar, getCurrentScreen());
-
-        if (shouldToggleTabs(screen)) {
-            mBottomNavigation.toggleTabs(screen.bottomTabsHidden, false);
-        }
-    }
-
-    @Override
-    public _Screen pop(String navigatorId) {
-        super.pop(navigatorId);
-        for (ScreenStack stack : mScreenStacks) {
-            if (stack.peek().navigatorId.equals(navigatorId)) {
-                _Screen popped = stack.pop();
-                _Screen currentScreen = getCurrentScreen();
-                StyleHelper.updateStyles(toolbar, currentScreen);
-
-                if (shouldToggleTabs(currentScreen)) {
-                    mBottomNavigation.toggleTabs(currentScreen.bottomTabsHidden, false);
-                }
-
-                return popped;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public _Screen popToRoot(String navigatorId) {
-        super.popToRoot(navigatorId);
-        for (ScreenStack stack : mScreenStacks) {
-            if (stack.peek().navigatorId.equals(navigatorId)) {
-                _Screen popped = stack.popToRoot();
-                _Screen currentScreen = getCurrentScreen();
-                StyleHelper.updateStyles(toolbar, currentScreen);
-
-                if (shouldToggleTabs(currentScreen)) {
-                    mBottomNavigation.toggleTabs(currentScreen.bottomTabsHidden, false);
-                }
-
-                return popped;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public _Screen getCurrentScreen() {
-        _Screen currentScreen = super.getCurrentScreen();
-        if (currentScreen != null) {
-            return currentScreen;
-        }
-
-        return mScreenStacks != null ? mScreenStacks.get(mCurrentStackPosition).peek() : null;
-    }
-
-    public _Screen resetTo(_Screen screen) {
-        super.resetTo(screen);
-        StyleHelper.updateStyles(toolbar, screen);
-        return mScreenStacks.get(mCurrentStackPosition).resetTo(screen);
-    }
-
-    @Override
-    protected String getCurrentNavigatorId() {
-        return mScreenStacks.get(mCurrentStackPosition).peek().navigatorId;
-    }
-
-    @Override
-    public int getScreenStackSize() {
-        return mScreenStacks.get(mCurrentStackPosition).getStackSize();
-    }
-
-    @Override
-    public void onTabSelected(int position, boolean wasSelected) {
-        if (wasSelected) {
-            return;
-        }
-
-        // Remove current ScreenStack
-        if (mCurrentStackPosition >= 0) {
-            mScreenStacks.get(mCurrentStackPosition).removeFromScreen(mContentFrame);
-        }
-
-        // Add new ScreenStack
-        mScreenStacks.get(position).addToScreen(mContentFrame);
-
-        mCurrentStackPosition = position;
-        StyleHelper.updateStyles(toolbar, getCurrentScreen());
-
-        // Hide or show back button if needed
-        if (getScreenStackSize() > 1) {
-            toolbar.setNavUpButton(getCurrentScreen());
-        } else {
-            toolbar.setNavUpButton();
-        }
-    }
-
-    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) : "";
-
-        // Tab index is optional, so default to current tab
-        int tabIndex = mBottomNavigation.getCurrentItem();
-        if (params.hasKey(KEY_TAB_INDEX)) {
-            tabIndex = params.getInt(KEY_TAB_INDEX);
-        }
-
-        mBottomNavigation.setNotification(badge, tabIndex);
-    }
-
-    public void switchToTab(ReadableMap params) {
-        Integer tabIndex;
-        if (params.hasKey(KEY_TAB_INDEX)) {
-            tabIndex = params.getInt(KEY_TAB_INDEX);
-        } else {
-            final String navigatorId = params.getString(KEY_NAVIGATOR_ID);
-            tabIndex = findNavigatorTabIndex(navigatorId);
-        }
-        mBottomNavigation.setCurrentItem(tabIndex);
-    }
-
-    public void toggleTabs(ReadableMap params) {
-        boolean hide = params.getBoolean(KEY_HIDDEN);
-        boolean animated = params.getBoolean(KEY_ANIMATED);
-        mBottomNavigation.toggleTabs(hide, animated);
-    }
-
-    private boolean shouldToggleTabs(_Screen newScreen) {
-        return mBottomNavigation.isShown() == newScreen.bottomTabsHidden;
-    }
-
-    public void onScrollChanged(int direction) {
-        mBottomNavigation.onScroll(direction);
-    }
-
-    private static class SetupTabsTask extends AsyncTask<Void, Void, Map<_Screen, Drawable>> {
-        private BottomTabActivity mActivity;
-        private RnnToolBar mToolBar;
-        private ArrayList<_Screen> mScreens;
-
-        public SetupTabsTask(BottomTabActivity context, RnnToolBar toolBar, ArrayList<_Screen> screens) {
-            mActivity = context;
-            mToolBar = toolBar;
-            mScreens = screens;
-        }
-
-        @Override
-        protected Map<_Screen, Drawable> doInBackground(Void... params) {
-            Map<_Screen, Drawable> icons = new HashMap<>();
-            for (_Screen screen : mScreens) {
-                if (screen.icon != null) {
-                    icons.put(screen, screen.getIcon(this.mActivity));
-                }
-            }
-            return icons;
-        }
-
-        @Override
-        protected void onPostExecute(Map<_Screen, Drawable> icons) {
-            mActivity.setTabsWithIcons(mScreens, icons);
-            StyleHelper.updateStyles(mToolBar, mActivity.getCurrentScreen());
-        }
-    }
-
-    protected Integer findNavigatorTabIndex(String navigatorId) {
-        for (int i = 0; i < mScreenStacks.size(); i++) {
-            ScreenStack stack = mScreenStacks.get(i);
-            if (!stack.isEmpty() && stack.peek().navigatorId.equals(navigatorId)) {
-                return i;
-            }
-        }
-
-        return null;
-    }
-
-    private void setTabsWithIcons(ArrayList<_Screen> screens, Map<_Screen, Drawable> icons) {
-        mScreenStacks = new ArrayList<>();
-        for (int i = 0; i < screens.size(); i++) {
-            final _Screen screen = screens.get(i);
-            ScreenStack stack = new ScreenStack(this);
-            stack.push(screen);
-            mScreenStacks.add(stack);
-            AHBottomNavigationItem item = new AHBottomNavigationItem(screen.label, icons.get(screen), Color.GRAY);
-            mBottomNavigation.addItem(item);
-            mBottomNavigation.setOnTabSelectedListener(this);
-        }
-        this.onTabSelected(0, false);
-    }
-
-    @Override
-    protected void removeAllReactViews() {
-        for (ScreenStack screenStack : mScreenStacks) {
-            screenStack.removeAllReactViews();
-        }
-    }
+public class BottomTabActivity  {
+//    private static final String TAG = "BottomTabActivity";
+//    public static final String DRAWER_PARAMS = "drawerParams";
+//    public static final String EXTRA_SCREENS = "extraScreens";
+//
+//    private static final String TAB_STYLE_BUTTON_COLOR = "tabBarButtonColor";
+//    private static final String TAB_STYLE_SELECTED_COLOR = "tabBarSelectedButtonColor";
+//    private static final String TAB_STYLE_BAR_BG_COLOR = "tabBarBackgroundColor";
+//    private static final String TAB_STYLE_INACTIVE_TITLES = "tabShowInactiveTitles";
+//
+//    private static int DEFAULT_TAB_BAR_BG_COLOR = 0xFFFFFFFF;
+//    private static int DEFAULT_TAB_BUTTON_COLOR = Color.GRAY;
+//    private static int DEFAULT_TAB_SELECTED_COLOR = 0xFF0000FF;
+//    private static boolean DEFAULT_TAB_INACTIVE_TITLES = true;
+//
+//    private BottomNavigation mBottomNavigation;
+//    private CoordinatorLayout mContentFrame;
+//    private ArrayList<ScreenStack> mScreenStacks;
+//    private int mCurrentStackPosition = -1;
+//
+//    @Override
+//    protected void handleOnCreate() {
+//        super.handleOnCreate();
+//        reactInstanceManager = RctManager.getInstance().getReactInstanceManager();
+//
+//        setContentView(R.layout.bottom_tab_activity);
+//        mToolbar = (RnnToolBar) findViewById(R.id.toolbar);
+//        mBottomNavigation = (BottomNavigation) findViewById(R.id.bottom_tab_bar);
+//        mContentFrame = (CoordinatorLayout) findViewById(R.id.contentFrame);
+//
+//        final ArrayList<_Screen> screens = (ArrayList<_Screen>) getIntent().getSerializableExtra(EXTRA_SCREENS);
+//        final Drawer drawer = (Drawer) getIntent().getSerializableExtra(DRAWER_PARAMS);
+//        mBottomNavigation.setForceTint(true);
+//        setupDrawer(screens.get(0), drawer, R.id.drawerFrame, R.id.drawerLayout);
+//        setupTabs(getIntent().getExtras());
+//        setupPages(screens);
+//
+//        // Setup Toolbar after it's measured since icon height is dependent on Toolbar height
+//        mContentFrame.post(new Runnable() {
+//            @Override
+//            public void run() {
+//                setupToolbar(screens);
+//            }
+//        });
+//    }
+//
+//    private void setupPages(ArrayList<_Screen> screens) {
+//        new SetupTabsTask(this, toolbar, screens).execute();
+//    }
+//
+//    private void setupToolbar(ArrayList<_Screen> screens) {
+//        toolbar.setScreens(screens);
+//        _Screen initialScreen = screens.get(0);
+//        toolbar.update(initialScreen);
+//        StyleHelper.updateStyles(toolbar, initialScreen);
+//    }
+//
+//    @Override
+//    protected void onResume() {
+//        super.onResume();
+//        if (mScreenStacks != null) {
+//            StyleHelper.updateStyles(toolbar, getCurrentScreen());
+//        }
+//    }
+//
+//    private void setupTabs(Bundle style) {
+//        mBottomNavigation.setForceTitlesDisplay(style.getBoolean(TAB_STYLE_INACTIVE_TITLES, DEFAULT_TAB_INACTIVE_TITLES));
+//        mBottomNavigation.setForceTint(true);
+//        mBottomNavigation.setDefaultBackgroundColor(getColor(style, TAB_STYLE_BAR_BG_COLOR, DEFAULT_TAB_BAR_BG_COLOR));
+//        mBottomNavigation.setInactiveColor(getColor(style, TAB_STYLE_BUTTON_COLOR, DEFAULT_TAB_BUTTON_COLOR));
+//        mBottomNavigation.setAccentColor(getColor(style, TAB_STYLE_SELECTED_COLOR, DEFAULT_TAB_SELECTED_COLOR));
+//    }
+//
+//    private static int getColor(Bundle bundle, String key, int defaultColor) {
+//        if (bundle.containsKey(key)) {
+//            return Color.parseColor(bundle.getString(key));
+//        } else {
+//            return defaultColor;
+//        }
+//    }
+//
+//    @Override
+//    public void push(_Screen screen) {
+//        super.push(screen);
+//        for (ScreenStack stack : mScreenStacks) {
+//            if (stack.peek().navigatorId.equals(screen.navigatorId)) {
+//                stack.push(screen);
+//            }
+//        }
+//        StyleHelper.updateStyles(toolbar, getCurrentScreen());
+//
+//        if (shouldToggleTabs(screen)) {
+//            mBottomNavigation.toggleTabs(screen.bottomTabsHidden, false);
+//        }
+//    }
+//
+//    @Override
+//    public _Screen pop(String navigatorId) {
+//        super.pop(navigatorId);
+//        for (ScreenStack stack : mScreenStacks) {
+//            if (stack.peek().navigatorId.equals(navigatorId)) {
+//                _Screen popped = stack.pop();
+//                _Screen currentScreen = getCurrentScreen();
+//                StyleHelper.updateStyles(toolbar, currentScreen);
+//
+//                if (shouldToggleTabs(currentScreen)) {
+//                    mBottomNavigation.toggleTabs(currentScreen.bottomTabsHidden, false);
+//                }
+//
+//                return popped;
+//            }
+//        }
+//        return null;
+//    }
+//
+//    @Override
+//    public _Screen popToRoot(String navigatorId) {
+//        super.popToRoot(navigatorId);
+//        for (ScreenStack stack : mScreenStacks) {
+//            if (stack.peek().navigatorId.equals(navigatorId)) {
+//                _Screen popped = stack.popToRoot();
+//                _Screen currentScreen = getCurrentScreen();
+//                StyleHelper.updateStyles(toolbar, currentScreen);
+//
+//                if (shouldToggleTabs(currentScreen)) {
+//                    mBottomNavigation.toggleTabs(currentScreen.bottomTabsHidden, false);
+//                }
+//
+//                return popped;
+//            }
+//        }
+//        return null;
+//    }
+//
+//    @Override
+//    public _Screen getCurrentScreen() {
+//        _Screen currentScreen = super.getCurrentScreen();
+//        if (currentScreen != null) {
+//            return currentScreen;
+//        }
+//
+//        return mScreenStacks != null ? mScreenStacks.get(mCurrentStackPosition).peek() : null;
+//    }
+//
+//    public _Screen resetTo(_Screen screen) {
+//        super.resetTo(screen);
+//        StyleHelper.updateStyles(toolbar, screen);
+//        return mScreenStacks.get(mCurrentStackPosition).resetTo(screen);
+//    }
+//
+//    @Override
+//    protected String getCurrentNavigatorId() {
+//        return mScreenStacks.get(mCurrentStackPosition).peek().navigatorId;
+//    }
+//
+//    @Override
+//    public int getScreenStackSize() {
+//        return mScreenStacks.get(mCurrentStackPosition).getStackSize();
+//    }
+//
+//    @Override
+//    public void onTabSelected(int position, boolean wasSelected) {
+//        if (wasSelected) {
+//            return;
+//        }
+//
+//        // Remove current ScreenStack
+//        if (mCurrentStackPosition >= 0) {
+//            mScreenStacks.get(mCurrentStackPosition).removeFromScreen(mContentFrame);
+//        }
+//
+//        // Add new ScreenStack
+//        mScreenStacks.get(position).addToScreen(mContentFrame);
+//
+//        mCurrentStackPosition = position;
+//        StyleHelper.updateStyles(toolbar, getCurrentScreen());
+//
+//        // Hide or show back button if needed
+//        if (getScreenStackSize() > 1) {
+//            toolbar.setNavUpButton(getCurrentScreen());
+//        } else {
+//            toolbar.setNavUpButton();
+//        }
+//    }
+//
+//    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) : "";
+//
+//        // Tab index is optional, so default to current tab
+//        int tabIndex = mBottomNavigation.getCurrentItem();
+//        if (params.hasKey(KEY_TAB_INDEX)) {
+//            tabIndex = params.getInt(KEY_TAB_INDEX);
+//        }
+//
+//        mBottomNavigation.setNotification(badge, tabIndex);
+//    }
+//
+//    public void switchToTab(ReadableMap params) {
+//        Integer tabIndex;
+//        if (params.hasKey(KEY_TAB_INDEX)) {
+//            tabIndex = params.getInt(KEY_TAB_INDEX);
+//        } else {
+//            final String navigatorId = params.getString(KEY_NAVIGATOR_ID);
+//            tabIndex = findNavigatorTabIndex(navigatorId);
+//        }
+//        mBottomNavigation.setCurrentItem(tabIndex);
+//    }
+//
+//    public void toggleTabs(ReadableMap params) {
+//        boolean hide = params.getBoolean(KEY_HIDDEN);
+//        boolean animated = params.getBoolean(KEY_ANIMATED);
+//        mBottomNavigation.toggleTabs(hide, animated);
+//    }
+//
+//    private boolean shouldToggleTabs(_Screen newScreen) {
+//        return mBottomNavigation.isShown() == newScreen.bottomTabsHidden;
+//    }
+//
+//    public void onScrollChanged(int direction) {
+//        mBottomNavigation.onScroll(direction);
+//    }
+//
+//    private static class SetupTabsTask extends AsyncTask<Void, Void, Map<_Screen, Drawable>> {
+//        private BottomTabActivity mActivity;
+//        private RnnToolBar mToolBar;
+//        private ArrayList<_Screen> mScreens;
+//
+//        public SetupTabsTask(BottomTabActivity context, RnnToolBar toolBar, ArrayList<_Screen> screens) {
+//            mActivity = context;
+//            mToolBar = toolBar;
+//            mScreens = screens;
+//        }
+//
+//        @Override
+//        protected Map<_Screen, Drawable> doInBackground(Void... params) {
+//            Map<_Screen, Drawable> icons = new HashMap<>();
+//            for (_Screen screen : mScreens) {
+//                if (screen.icon != null) {
+//                    icons.put(screen, screen.getIcon(this.mActivity));
+//                }
+//            }
+//            return icons;
+//        }
+//
+//        @Override
+//        protected void onPostExecute(Map<_Screen, Drawable> icons) {
+//            mActivity.setTabsWithIcons(mScreens, icons);
+//            StyleHelper.updateStyles(mToolBar, mActivity.getCurrentScreen());
+//        }
+//    }
+//
+//    protected Integer findNavigatorTabIndex(String navigatorId) {
+//        for (int i = 0; i < mScreenStacks.size(); i++) {
+//            ScreenStack stack = mScreenStacks.get(i);
+//            if (!stack.isEmpty() && stack.peek().navigatorId.equals(navigatorId)) {
+//                return i;
+//            }
+//        }
+//
+//        return null;
+//    }
+//
+//    private void setTabsWithIcons(ArrayList<_Screen> screens, Map<_Screen, Drawable> icons) {
+//        mScreenStacks = new ArrayList<>();
+//        for (int i = 0; i < screens.size(); i++) {
+//            final _Screen screen = screens.get(i);
+//            ScreenStack stack = new ScreenStack(this);
+//            stack.push(screen);
+//            mScreenStacks.add(stack);
+//            AHBottomNavigationItem item = new AHBottomNavigationItem(screen.label, icons.get(screen), Color.GRAY);
+//            mBottomNavigation.addItem(item);
+//            mBottomNavigation.setOnTabSelectedListener(this);
+//        }
+//        this.onTabSelected(0, false);
+//    }
+//
+//    @Override
+//    protected void removeAllReactViews() {
+//        for (ScreenStack screenStack : mScreenStacks) {
+//            screenStack.removeAllReactViews();
+//        }
+//    }
 }

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

@@ -1,124 +1,114 @@
 package com.reactnativenavigation.activities;
 
-import android.support.design.widget.CoordinatorLayout;
-
-import com.facebook.react.bridge.ReadableMap;
-import com.reactnativenavigation.R;
-import com.reactnativenavigation.core.objects.Drawer;
-import com.reactnativenavigation.core.objects._Screen;
-import com.reactnativenavigation.utils.StyleHelper;
-import com.reactnativenavigation.views.RnnToolBar;
-import com.reactnativenavigation.views.ScreenStack;
-
-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;
-
-    @Override
-    protected void handleOnCreate() {
-        super.handleOnCreate();
-        reactInstanceManager = RctManager.getInstance().getReactInstanceManager();
-
-        setContentView(R.layout.single_screen_activity);
-        toolbar = (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(screen, drawer, R.id.drawerFrame, R.id.drawerLayout);
-
-        mScreenStack = new ScreenStack(this);
-        CoordinatorLayout contentFrame = (CoordinatorLayout) findViewById(R.id.contentFrame);
-        assert contentFrame != null;
-        contentFrame.addView(mScreenStack);
-        mScreenStack.push(screen);
-
-        // Setup Toolbar after it's measured since icon height is dependent on Toolbar height
-        contentFrame.post(new Runnable() {
-            @Override
-            public void run() {
-                setupToolbar(screen);
-            }
-        });
-    }
-
-    protected void setupToolbar(_Screen screen) {
-        StyleHelper.updateStyles(toolbar, screen);
-    }
-
-    @Override
-    public void push(_Screen screen) {
-        super.push(screen);
-        mScreenStack.push(screen);
-        StyleHelper.updateStyles(toolbar, screen);
-    }
-
-    @Override
-    public _Screen pop(String navigatorId) {
-        super.pop(navigatorId);
-        _Screen popped = mScreenStack.pop();
-        StyleHelper.updateStyles(toolbar, getCurrentScreen());
-        return popped;
-    }
-
-    @Override
-    public _Screen popToRoot(String navigatorId) {
-        super.popToRoot(navigatorId);
-        _Screen screen = mScreenStack.popToRoot();
-        StyleHelper.updateStyles(toolbar, getCurrentScreen());
-        return screen;
-    }
-
-    @Override
-    public _Screen resetTo(_Screen screen) {
-        super.resetTo(screen);
-        _Screen popped = mScreenStack.resetTo(screen);
-        StyleHelper.updateStyles(toolbar, screen);
-        return popped;
-    }
-
-    @Override
-    public String getCurrentNavigatorId() {
-        return mNavigatorId;
-    }
-
-    @Override
-    public _Screen getCurrentScreen() {
-        _Screen currentScreen = super.getCurrentScreen();
-        if (currentScreen != null) {
-            return currentScreen;
-        }
-
-        return mScreenStack.peek();
-    }
-
-    @Override
-    public int getScreenStackSize() {
-        return mScreenStack.getStackSize();
-    }
-
-    @Override
-    protected void removeAllReactViews() {
-        mScreenStack.removeAllReactViews();
-    }
-
-    @Override
-    public void showFAB(ReadableMap params) {
-//        FloatingActionButton fab = new FloatingActionButton(this);
-//        fab.setImageDrawable(IconUtils.getIcon(this, params.getString("icon")));
-//        fab.setBackgroundColor(Color.parseColor(params.getString("backgroundColor")));
-//        fab.setImageResource(R.drawable.notification_background);
-//        CoordinatorLayout content = (CoordinatorLayout) findViewById(R.id.contentFrame);
-//        CoordinatorLayout.LayoutParams layoutParams = new CoordinatorLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
-//        layoutParams.gravity = Gravity.BOTTOM | Gravity.END;
-//        int m = (int) ImageUtils.convertDpToPixel(16, this);
-//        layoutParams.setMargins(m, m, m, m);
-//        content.addView(fab, layoutParams);
-    }
+public class SingleScreenActivity {
+//
+//    public static final String DRAWER_PARAMS = "drawerParams";
+//    public static final String EXTRA_SCREEN = "extraScreen";
+//
+//    private ScreenStack mScreenStack;
+//    private String mNavigatorId;
+//
+//    @Override
+//    protected void handleOnCreate() {
+//        super.handleOnCreate();
+//        reactInstanceManager = RctManager.getInstance().getReactInstanceManager();
+//
+//        setContentView(R.layout.single_screen_activity);
+//        toolbar = (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(screen, drawer, R.id.drawerFrame, R.id.drawerLayout);
+//
+//        mScreenStack = new ScreenStack(this);
+//        CoordinatorLayout contentFrame = (CoordinatorLayout) findViewById(R.id.contentFrame);
+//        assert contentFrame != null;
+//        contentFrame.addView(mScreenStack);
+//        mScreenStack.push(screen);
+//
+//        // Setup Toolbar after it's measured since icon height is dependent on Toolbar height
+//        contentFrame.post(new Runnable() {
+//            @Override
+//            public void run() {
+//                setupToolbar(screen);
+//            }
+//        });
+//    }
+//
+//    protected void setupToolbar(_Screen screen) {
+//        StyleHelper.updateStyles(toolbar, screen);
+//    }
+//
+//    @Override
+//    public void push(_Screen screen) {
+//        super.push(screen);
+//        mScreenStack.push(screen);
+//        StyleHelper.updateStyles(toolbar, screen);
+//    }
+//
+//    @Override
+//    public _Screen pop(String navigatorId) {
+//        super.pop(navigatorId);
+//        _Screen popped = mScreenStack.pop();
+//        StyleHelper.updateStyles(toolbar, getCurrentScreen());
+//        return popped;
+//    }
+//
+//    @Override
+//    public _Screen popToRoot(String navigatorId) {
+//        super.popToRoot(navigatorId);
+//        _Screen screen = mScreenStack.popToRoot();
+//        StyleHelper.updateStyles(toolbar, getCurrentScreen());
+//        return screen;
+//    }
+//
+//    @Override
+//    public _Screen resetTo(_Screen screen) {
+//        super.resetTo(screen);
+//        _Screen popped = mScreenStack.resetTo(screen);
+//        StyleHelper.updateStyles(toolbar, screen);
+//        return popped;
+//    }
+//
+//    @Override
+//    public String getCurrentNavigatorId() {
+//        return mNavigatorId;
+//    }
+//
+//    @Override
+//    public _Screen getCurrentScreen() {
+//        _Screen currentScreen = super.getCurrentScreen();
+//        if (currentScreen != null) {
+//            return currentScreen;
+//        }
+//
+//        return mScreenStack.peek();
+//    }
+//
+//    @Override
+//    public int getScreenStackSize() {
+//        return mScreenStack.getStackSize();
+//    }
+//
+//    @Override
+//    protected void removeAllReactViews() {
+//        mScreenStack.removeAllReactViews();
+//    }
+//
+//    @Override
+//    public void showFAB(ReadableMap params) {
+////        FloatingActionButton fab = new FloatingActionButton(this);
+////        fab.setImageDrawable(IconUtils.getIcon(this, params.getString("icon")));
+////        fab.setBackgroundColor(Color.parseColor(params.getString("backgroundColor")));
+////        fab.setImageResource(R.drawable.notification_background);
+////        CoordinatorLayout content = (CoordinatorLayout) findViewById(R.id.contentFrame);
+////        CoordinatorLayout.LayoutParams layoutParams = new CoordinatorLayout.LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
+////        layoutParams.gravity = Gravity.BOTTOM | Gravity.END;
+////        int m = (int) ImageUtils.convertDpToPixel(16, this);
+////        layoutParams.setMargins(m, m, m, m);
+////        content.addView(fab, layoutParams);
+//    }
 }

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

@@ -1,103 +1,91 @@
 package com.reactnativenavigation.activities;
 
-import android.support.v4.view.ViewPager;
-import android.view.Menu;
-
-import com.reactnativenavigation.R;
-import com.reactnativenavigation.adapters.ViewPagerAdapter;
-import com.reactnativenavigation.core.objects._Screen;
-import com.reactnativenavigation.utils.StyleHelper;
-import com.reactnativenavigation.views.RnnTabLayout;
-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";
-
-    private RnnTabLayout mTabLayout;
-    private ViewPager mViewPager;
-    private ViewPagerAdapter mAdapter;
-
-    @Override
-    protected void handleOnCreate() {
-        super.handleOnCreate();
-        reactInstanceManager = RctManager.getInstance().getReactInstanceManager();
-
-        setContentView(R.layout.tab_activity);
-        toolbar = (RnnToolBar) findViewById(R.id.toolbar);
-        mTabLayout = (RnnTabLayout) findViewById(R.id.tabLayout);
-        mViewPager = (ViewPager) findViewById(R.id.viewPager);
-
-        ArrayList<_Screen> screens = (ArrayList<_Screen>) getIntent().getSerializableExtra(EXTRA_SCREENS);
-
-        setupToolbar(screens);
-        setupViewPager(screens);
-    }
-
-    private void setupToolbar(ArrayList<_Screen> screens) {
-        _Screen initialScreen = screens.get(0);
-        toolbar.setScreens(screens);
-        toolbar.update(initialScreen);
-        setNavigationStyle(initialScreen);
-    }
-
-    public void setNavigationStyle(_Screen screen) {
-        mTabLayout.setStyle(screen);
-    }
-
-    private void setupViewPager(ArrayList<_Screen> screens) {
-        mAdapter = new ViewPagerAdapter(this, mViewPager, toolbar, screens);
-        mViewPager.setAdapter(mAdapter);
-        mTabLayout.setupWithViewPager(mViewPager);
-        mTabLayout.setOnTabSelectedListener(mAdapter);
-        mAdapter.notifyDataSetChanged();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        boolean ret = super.onCreateOptionsMenu(menu);
-        toolbar.handleOnCreateOptionsMenuAsync();
-        return ret;
-    }
-
-    @Override
-    public void removeAllReactViews() {
-
-    }
-
-    @Override
-    public void push(_Screen screen) {
-        super.push(screen);
-        StyleHelper.updateStyles(toolbar, screen);
-        mAdapter.push(screen);
-    }
-
-    @Override
-    public _Screen pop(String navigatorId) {
-        super.pop(navigatorId);
-        _Screen popped = mAdapter.pop(navigatorId);
-        setNavigationStyle(getCurrentScreen());
-        return popped;
-    }
-
-    @Override
-    public _Screen getCurrentScreen() {
-        return mAdapter.peek(getCurrentNavigatorId());
-    }
-
-    @Override
-    protected String getCurrentNavigatorId() {
-        return mAdapter.getNavigatorId(mViewPager.getCurrentItem());
-    }
-
-    @Override
-    public int getScreenStackSize() {
-        return mAdapter.getStackSizeForNavigatorId(getCurrentNavigatorId());
-    }
+public class TabActivity {
+//    public static final String EXTRA_SCREENS = "extraScreens";
+//
+//    private RnnTabLayout mTabLayout;
+//    private ViewPager mViewPager;
+//    private ViewPagerAdapter mAdapter;
+//
+//    @Override
+//    protected void handleOnCreate() {
+//        super.handleOnCreate();
+//        reactInstanceManager = RctManager.getInstance().getReactInstanceManager();
+//
+//        setContentView(R.layout.tab_activity);
+//        toolbar = (RnnToolBar) findViewById(R.id.toolbar);
+//        mTabLayout = (RnnTabLayout) findViewById(R.id.tabLayout);
+//        mViewPager = (ViewPager) findViewById(R.id.viewPager);
+//
+//        ArrayList<_Screen> screens = (ArrayList<_Screen>) getIntent().getSerializableExtra(EXTRA_SCREENS);
+//
+//        setupToolbar(screens);
+//        setupViewPager(screens);
+//    }
+//
+//    private void setupToolbar(ArrayList<_Screen> screens) {
+//        _Screen initialScreen = screens.get(0);
+//        toolbar.setScreens(screens);
+//        toolbar.update(initialScreen);
+//        setNavigationStyle(initialScreen);
+//    }
+//
+//    public void setNavigationStyle(_Screen screen) {
+//        mTabLayout.setStyle(screen);
+//    }
+//
+//    private void setupViewPager(ArrayList<_Screen> screens) {
+//        mAdapter = new ViewPagerAdapter(this, mViewPager, toolbar, screens);
+//        mViewPager.setAdapter(mAdapter);
+//        mTabLayout.setupWithViewPager(mViewPager);
+//        mTabLayout.setOnTabSelectedListener(mAdapter);
+//        mAdapter.notifyDataSetChanged();
+//    }
+//
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        boolean ret = super.onCreateOptionsMenu(menu);
+//        toolbar.handleOnCreateOptionsMenuAsync();
+//        return ret;
+//    }
+//
+//    @Override
+//    public void removeAllReactViews() {
+//
+//    }
+//
+//    @Override
+//    public void push(_Screen screen) {
+//        super.push(screen);
+//        StyleHelper.updateStyles(toolbar, screen);
+//        mAdapter.push(screen);
+//    }
+//
+//    @Override
+//    public _Screen pop(String navigatorId) {
+//        super.pop(navigatorId);
+//        _Screen popped = mAdapter.pop(navigatorId);
+//        setNavigationStyle(getCurrentScreen());
+//        return popped;
+//    }
+//
+//    @Override
+//    public _Screen getCurrentScreen() {
+//        return mAdapter.peek(getCurrentNavigatorId());
+//    }
+//
+//    @Override
+//    protected String getCurrentNavigatorId() {
+//        return mAdapter.getNavigatorId(mViewPager.getCurrentItem());
+//    }
+//
+//    @Override
+//    public int getScreenStackSize() {
+//        return mAdapter.getStackSizeForNavigatorId(getCurrentNavigatorId());
+//    }
 }

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

@@ -1,153 +1,135 @@
 package com.reactnativenavigation.adapters;
 
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-import com.reactnativenavigation.activities.BaseReactActivity;
-import com.reactnativenavigation.core.objects._Screen;
-import com.reactnativenavigation.utils.StyleHelper;
-import com.reactnativenavigation.views.RnnToolBar;
-import com.reactnativenavigation.views.ScreenStack;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Created by guyc on 02/04/16.
  */
-public class ViewPagerAdapter extends PagerAdapter implements TabLayout.OnTabSelectedListener, ViewPager.OnPageChangeListener {
-
-    private static final String EVENT_ON_TAB_SELECTED = "OnTabSelected";
-
-    private ViewPager mViewPager;
-    private RnnToolBar mToolbar;
-    private final ArrayList<ScreenStack> mScreenStacks;
-    private final ArrayList<String> mNavigatorIds;
-    private final Map<String, ScreenStack> mStackByNavigatorId;
-    private int mCurrentPage = 0;
-
-    public ViewPagerAdapter(BaseReactActivity context, ViewPager viewPager, RnnToolBar toolbar,
-                            ArrayList<_Screen> screens) {
-        mViewPager = viewPager;
-        mToolbar = toolbar;
-        mScreenStacks = new ArrayList<>();
-        mNavigatorIds = new ArrayList<>();
-        mStackByNavigatorId = new HashMap<>();
-        for (_Screen screen : screens) {
-            ScreenStack stack = new ScreenStack(context);
-            stack.push(screen);
-            mScreenStacks.add(stack);
-            mNavigatorIds.add(screen.navigatorId);
-            mStackByNavigatorId.put(screen.navigatorId, stack);
-        }
-    }
-
-    public void push(_Screen screen) {
-        ScreenStack stack = mStackByNavigatorId.get(screen.navigatorId);
-        _Screen prevScreen = mScreenStacks.get(mCurrentPage).peek();
-        mToolbar.setupToolbarButtonsAsync(prevScreen, screen);
-        stack.push(screen);
-    }
-
-    public _Screen pop(String navigatorId) {
-        ScreenStack stack = mStackByNavigatorId.get(navigatorId);
-        _Screen oldScreen = stack != null ? stack.pop() : null;
-        _Screen newScreen = stack.peek();
-        mToolbar.setupToolbarButtonsAsync(oldScreen, newScreen);
-        return oldScreen;
-    }
-
-    public _Screen peek(String navigatorId) {
-        ScreenStack stack = mStackByNavigatorId.get(navigatorId);
-        return stack != null ? stack.peek() : null;
-    }
-
-    @Override
-    public Object instantiateItem(ViewGroup container, int position) {
-        ScreenStack view = mScreenStacks.get(position);
-        container.addView(view);
-        return view;
-    }
-
-    @Override
-    public void destroyItem(ViewGroup container, int position, Object view) {
-        container.removeView((View) view);
-    }
-
-    @Override
-    public int getCount() {
-        return mScreenStacks.size();
-    }
-
-    @Override
-    public boolean isViewFromObject(View view, Object object) {
-        return view == object;
-    }
-
-    @Override
-    public CharSequence getPageTitle(int position) {
-        return mScreenStacks.get(position).peek().label;
-    }
-
-    @Override
-    public void onTabSelected(TabLayout.Tab tab) {
-        // Set the viewPager's current item
-        int position = tab.getPosition();
-        mViewPager.setCurrentItem(position);
-
-        // Set screen buttons
-        _Screen prevScreen = mScreenStacks.get(mCurrentPage).peek();
-        _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);
-
-        // Send tab selected event
-        WritableMap params = Arguments.createMap();
-        _Screen screen = mScreenStacks.get(position).peek();
-        RctManager.getInstance().sendEvent(EVENT_ON_TAB_SELECTED, screen, params);
-    }
-
-    @Override
-    public void onTabUnselected(TabLayout.Tab tab) {
-
-    }
-
-    @Override
-    public void onTabReselected(TabLayout.Tab tab) {
-
-    }
-
-    public String getNavigatorId(int position) {
-        return mNavigatorIds.get(position);
-    }
-
-    public int getStackSizeForNavigatorId(String activeNavigatorID) {
-        return mStackByNavigatorId.get(activeNavigatorID).getStackSize();
-    }
-
-    @Override
-    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-    }
-
-    @Override
-    public void onPageSelected(int position) {
-        mCurrentPage = position;
-    }
-
-    @Override
-    public void onPageScrollStateChanged(int state) {
-
-    }
+public class ViewPagerAdapter {
+
+//    private static final String EVENT_ON_TAB_SELECTED = "OnTabSelected";
+//
+//    private ViewPager mViewPager;
+//    private RnnToolBar mToolbar;
+//    private final ArrayList<ScreenStack> mScreenStacks;
+//    private final ArrayList<String> mNavigatorIds;
+//    private final Map<String, ScreenStack> mStackByNavigatorId;
+//    private int mCurrentPage = 0;
+//
+//    public ViewPagerAdapter(BaseReactActivity context, ViewPager viewPager, RnnToolBar toolbar,
+//                            ArrayList<_Screen> screens) {
+//        mViewPager = viewPager;
+//        mToolbar = toolbar;
+//        mScreenStacks = new ArrayList<>();
+//        mNavigatorIds = new ArrayList<>();
+//        mStackByNavigatorId = new HashMap<>();
+//        for (_Screen screen : screens) {
+//            ScreenStack stack = new ScreenStack(context);
+//            stack.push(screen);
+//            mScreenStacks.add(stack);
+//            mNavigatorIds.add(screen.navigatorId);
+//            mStackByNavigatorId.put(screen.navigatorId, stack);
+//        }
+//    }
+//
+//    public void push(_Screen screen) {
+//        ScreenStack stack = mStackByNavigatorId.get(screen.navigatorId);
+//        _Screen prevScreen = mScreenStacks.get(mCurrentPage).peek();
+//        mToolbar.setupToolbarButtonsAsync(prevScreen, screen);
+//        stack.push(screen);
+//    }
+//
+//    public _Screen pop(String navigatorId) {
+//        ScreenStack stack = mStackByNavigatorId.get(navigatorId);
+//        _Screen oldScreen = stack != null ? stack.pop() : null;
+//        _Screen newScreen = stack.peek();
+//        mToolbar.setupToolbarButtonsAsync(oldScreen, newScreen);
+//        return oldScreen;
+//    }
+//
+//    public _Screen peek(String navigatorId) {
+//        ScreenStack stack = mStackByNavigatorId.get(navigatorId);
+//        return stack != null ? stack.peek() : null;
+//    }
+//
+//    @Override
+//    public Object instantiateItem(ViewGroup container, int position) {
+//        ScreenStack view = mScreenStacks.get(position);
+//        container.addView(view);
+//        return view;
+//    }
+//
+//    @Override
+//    public void destroyItem(ViewGroup container, int position, Object view) {
+//        container.removeView((View) view);
+//    }
+//
+//    @Override
+//    public int getCount() {
+//        return mScreenStacks.size();
+//    }
+//
+//    @Override
+//    public boolean isViewFromObject(View view, Object object) {
+//        return view == object;
+//    }
+//
+//    @Override
+//    public CharSequence getPageTitle(int position) {
+//        return mScreenStacks.get(position).peek().label;
+//    }
+//
+//    @Override
+//    public void onTabSelected(TabLayout.Tab tab) {
+//        // Set the viewPager's current item
+//        int position = tab.getPosition();
+//        mViewPager.setCurrentItem(position);
+//
+//        // Set screen buttons
+//        _Screen prevScreen = mScreenStacks.get(mCurrentPage).peek();
+//        _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);
+//
+//        // Send tab selected event
+//        WritableMap params = Arguments.createMap();
+//        _Screen screen = mScreenStacks.get(position).peek();
+//        RctManager.getInstance().sendEvent(EVENT_ON_TAB_SELECTED, screen, params);
+//    }
+//
+//    @Override
+//    public void onTabUnselected(TabLayout.Tab tab) {
+//
+//    }
+//
+//    @Override
+//    public void onTabReselected(TabLayout.Tab tab) {
+//
+//    }
+//
+//    public String getNavigatorId(int position) {
+//        return mNavigatorIds.get(position);
+//    }
+//
+//    public int getStackSizeForNavigatorId(String activeNavigatorID) {
+//        return mStackByNavigatorId.get(activeNavigatorID).getStackSize();
+//    }
+//
+//    @Override
+//    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+//
+//    }
+//
+//    @Override
+//    public void onPageSelected(int position) {
+//        mCurrentPage = position;
+//    }
+//
+//    @Override
+//    public void onPageScrollStateChanged(int state) {
+//
+//    }
 }

android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactEventEmitter.java

@@ -17,7 +17,7 @@ public class NavigationReactEventEmitter {
 
         params.putString(KEY_EVENT_TYPE, EVENT_TYPE);
         params.putString(KEY_EVENT_ID, eventName);
-        params.putString(_Screen.KEY_NAVIGATOR_EVENT_ID, navigatorEventId);
+//        params.putString(_Screen.KEY_NAVIGATOR_EVENT_ID, navigatorEventId);
         eventEmitter.emit(navigatorEventId, params);
     }
 }

android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java

@@ -1,5 +1,7 @@
 package com.reactnativenavigation.bridge;
 
+import android.util.Log;
+
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -29,6 +31,7 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
 
     @ReactMethod
     public void startApp(final ReadableMap params) {
+        Log.d(NAME, "startApp: " + params);
     }
 
     @ReactMethod

android/app/src/main/java/com/reactnativenavigation/controllers/ModalController.java

@@ -1,54 +1,48 @@
 package com.reactnativenavigation.controllers;
 
-import android.support.annotation.Nullable;
-
-import com.reactnativenavigation.modal.RnnModal;
-
-import java.util.Stack;
-
 public class ModalController {
 
-    private final Stack<RnnModal> modals = new Stack<>();
-
-    public ModalController() {
-    }
-
-    public void add(RnnModal modal) {
-        modals.add(modal);
-    }
-
-    public boolean isModalDisplayed() {
-        return !modals.isEmpty();
-    }
-
-    @Nullable
-    public RnnModal get() {
-        return isModalDisplayed() ? modals.peek() : null;
-    }
-
-    public void remove() {
-        if (isModalDisplayed()) {
-            modals.pop();
-        }
-    }
-
-    public void dismissAllModals() {
-        while (isModalDisplayed()) {
-            dismissModal();
-        }
-    }
-
-    public void dismissModal() {
-        if (isModalDisplayed()) {
-            modals.pop().dismiss();
-        }
-    }
-
-    public void onDestroy() {
-
-    }
-
-    public boolean onBackPressed() {
-        return false;
-    }
+//    private final Stack<RnnModal> modals = new Stack<>();
+//
+//    public ModalController() {
+//    }
+//
+//    public void add(RnnModal modal) {
+//        modals.add(modal);
+//    }
+//
+//    public boolean isModalDisplayed() {
+//        return !modals.isEmpty();
+//    }
+//
+//    @Nullable
+//    public RnnModal get() {
+//        return isModalDisplayed() ? modals.peek() : null;
+//    }
+//
+//    public void remove() {
+//        if (isModalDisplayed()) {
+//            modals.pop();
+//        }
+//    }
+//
+//    public void dismissAllModals() {
+//        while (isModalDisplayed()) {
+//            dismissModal();
+//        }
+//    }
+//
+//    public void dismissModal() {
+//        if (isModalDisplayed()) {
+//            modals.pop().dismiss();
+//        }
+//    }
+//
+//    public void onDestroy() {
+//
+//    }
+//
+//    public boolean onBackPressed() {
+//        return false;
+//    }
 }

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -2,6 +2,7 @@ package com.reactnativenavigation.controllers;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
@@ -11,9 +12,11 @@ import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.shell.MainReactPackage;
 import com.reactnativenavigation.bridge.NavigationReactPackage;
 import com.reactnativenavigation.layouts.Layout;
+import com.reactnativenavigation.layouts.ScreenLayout;
 import com.reactnativenavigation.react.JsDevReloadHandler;
 import com.reactnativenavigation.react.NavigationReactInstance;
 import com.reactnativenavigation.react.RedboxPermission;
+import com.reactnativenavigation.views.TitleBarButton;
 
 import java.util.Arrays;
 import java.util.List;
@@ -30,7 +33,22 @@ public class NavigationActivity extends AppCompatActivity implements NavigationR
     private static Activity currentActivity;
     private NavigationReactInstance navigationReactInstance;
     private ModalController modalController;
-    private Layout layout;
+    private Layout layout = new Layout() {
+        @Override
+        public boolean onBackPressed() {
+            return false;
+        }
+
+        @Override
+        public void onDestroy() {
+
+        }
+
+        @Override
+        public void removeAllReactViews() {
+
+        }
+    };
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -39,6 +57,14 @@ public class NavigationActivity extends AppCompatActivity implements NavigationR
         navigationReactInstance = new NavigationReactInstance(this);
         navigationReactInstance.startReactContextOnceInBackgroundAndExecuteJS();
         RedboxPermission.permissionToShowRedboxIfNeeded(this);
+        createLayout();
+    }
+
+    private void createLayout() {
+        List<TitleBarButton.Params> btns = Arrays.asList(new TitleBarButton.Params("btn1", getResources().getDrawable(android.R.drawable.ic_media_play), Color.RED, TitleBarButton.Params.ShowAsAction.Always));
+        ScreenLayout.Params screenParams = new ScreenLayout.Params("v2.0", new Bundle(), btns);
+        ScreenLayout screenLayout = new ScreenLayout(this, navigationReactInstance.getReactInstanceManager(), screenParams);
+        setContentView(screenLayout);
     }
 
     @Override
@@ -57,7 +83,7 @@ public class NavigationActivity extends AppCompatActivity implements NavigationR
 
     @Override
     protected void onDestroy() {
-        modalController.onDestroy();
+//        modalController.onDestroy();
         layout.onDestroy();
         super.onDestroy();
         if (currentActivity == null || currentActivity.isFinishing()) {
@@ -90,9 +116,9 @@ public class NavigationActivity extends AppCompatActivity implements NavigationR
 
     @Override
     public void onBackPressed() {
-        if (modalController.onBackPressed()) {
-            return;
-        }
+//        if (modalController.onBackPressed()) {
+//            return;
+//        }
         if (layout.onBackPressed()) {
             return;
         }

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

@@ -1,23 +1,19 @@
 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);
-    }
+public class Drawer  {
+//    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/_Button.java

@@ -1,80 +1,68 @@
 package com.reactnativenavigation.core.objects;
 
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.view.MenuItem;
-
-import com.facebook.react.bridge.ReadableMap;
-import com.reactnativenavigation.react.ImageLoader;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
 /**
  * Created by guyc on 08/04/16.
  */
-public class _Button extends JsonObject implements Serializable {
-    private static final long serialVersionUID = -570145217281069067L;
-
-    private static final String KEY_ID = "id";
-    private static final String KEY_TITLE = "title";
-    private static final String KEY_ICON = "icon";
-    private static final String KEY_DISABLED = "disabled";
-    private static final String KEY_SHOW_AS_ACTION = "showAsAction";
-
-    public String id;
-    public String title;
-    private String mIconSource;
-    public boolean disabled;
-    public String showAsAction;
-
-    private static final AtomicInteger sAtomicIdGenerator = new AtomicInteger();
-    private static final Map<String, Integer> sStringToNumericId = new HashMap<>();
-
-    public _Button(ReadableMap button) {
-        id = getString(button, KEY_ID);
-        title = getString(button, KEY_TITLE, "");
-        mIconSource = getString(button, KEY_ICON);
-        disabled = getBoolean(button, KEY_DISABLED);
-        showAsAction = getString(button, KEY_SHOW_AS_ACTION, "");
-    }
-
-    public boolean hasIcon() {
-        return mIconSource != null;
-    }
-
-    /**
-     * @param dimensions The requested icon dimensions
-     */
-    public Drawable getIcon(Context ctx, int dimensions) {
-       return ImageLoader.getIcon(ctx, mIconSource, dimensions);
-    }
-
-    public int getItemId() {
-        if (sStringToNumericId.containsKey(id)) {
-            return sStringToNumericId.get(id);
-        }
-
-        int itemId = sAtomicIdGenerator.addAndGet(1);
-        sStringToNumericId.put(id, itemId);
-        return itemId;
-    }
-
-    /**
-     * Each button has a string id, defined in JS, which is used to identify the button when
-     * handling events.
-     * @param item Toolbar button
-     * @return Returns the event id associated with the given menu item
-     */
-    public static String getButtonEventId(MenuItem item) {
-        for (Map.Entry<String, Integer> entry : sStringToNumericId.entrySet()) {
-            if (entry.getValue() == item.getItemId()) {
-                return entry.getKey();
-            }
-        }
-
-        return null;
-    }
+public class _Button  {
+//    private static final long serialVersionUID = -570145217281069067L;
+//
+//    private static final String KEY_ID = "id";
+//    private static final String KEY_TITLE = "title";
+//    private static final String KEY_ICON = "icon";
+//    private static final String KEY_DISABLED = "disabled";
+//    private static final String KEY_SHOW_AS_ACTION = "showAsAction";
+//
+//    public String id;
+//    public String title;
+//    private String mIconSource;
+//    public boolean disabled;
+//    public String showAsAction;
+//
+//    private static final AtomicInteger sAtomicIdGenerator = new AtomicInteger();
+//    private static final Map<String, Integer> sStringToNumericId = new HashMap<>();
+//
+//    public _Button(ReadableMap button) {
+//        id = getString(button, KEY_ID);
+//        title = getString(button, KEY_TITLE, "");
+//        mIconSource = getString(button, KEY_ICON);
+//        disabled = getBoolean(button, KEY_DISABLED);
+//        showAsAction = getString(button, KEY_SHOW_AS_ACTION, "");
+//    }
+//
+//    public boolean hasIcon() {
+//        return mIconSource != null;
+//    }
+//
+//    /**
+//     * @param dimensions The requested icon dimensions
+//     */
+//    public Drawable getIcon(Context ctx, int dimensions) {
+//       return ImageLoader.getIcon(ctx, mIconSource, dimensions);
+//    }
+//
+//    public int getItemId() {
+//        if (sStringToNumericId.containsKey(id)) {
+//            return sStringToNumericId.get(id);
+//        }
+//
+//        int itemId = sAtomicIdGenerator.addAndGet(1);
+//        sStringToNumericId.put(id, itemId);
+//        return itemId;
+//    }
+//
+//    /**
+//     * Each button has a string id, defined in JS, which is used to identify the button when
+//     * handling events.
+//     * @param item Toolbar button
+//     * @return Returns the event id associated with the given menu item
+//     */
+//    public static String getButtonEventId(MenuItem item) {
+//        for (Map.Entry<String, Integer> entry : sStringToNumericId.entrySet()) {
+//            if (entry.getValue() == item.getItemId()) {
+//                return entry.getKey();
+//            }
+//        }
+//
+//        return null;
+//    }
 }

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

@@ -1,143 +1,126 @@
 package com.reactnativenavigation.core.objects;
 
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-
-import com.facebook.react.bridge.ReadableArray;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.ReadableNativeMap;
-import com.reactnativenavigation.react.ImageLoader;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-
 /**
  * Created by guyc on 02/04/16.
  */
-public class _Screen extends JsonObject implements Serializable {
-    private static final long serialVersionUID = -1033475305421107791L;
-
-    private static final String KEY_TITLE = "title";
-    private static final String KEY_SCREEN = "screen";
-    private static final String KEY_LABEL = "label";
-    public static final String KEY_SCREEN_INSTANCE_ID = "screenInstanceID";
-    public static final String KEY_NAVIGATOR_ID = "navigatorID";
-    public static final String KEY_NAVIGATOR_EVENT_ID = "navigatorEventID";
-    private static final String KEY_ICON = "icon";
-    private static final String KEY_NAVIGATOR_BUTTONS = "navigatorButtons";
-    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 = "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";
-    private static final String KEY_NAV_BAR_TEXT_COLOR = "navBarTextColor";
-    private static final String KEY_BACK_BUTTON_HIDDEN = "backButtonHidden";
-    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_BOTTOM_TABS_HIDDEN_ON_SCROLL = "bottomTabsHiddenOnScroll";
-    private static final String KEY_PROPS = "passProps";
-
-    public String title;
-    public final String label;
-    public final String screenId;
-    public final String screenInstanceId;
-    public final String navigatorId;
-    public final String navigatorEventId;
-    public final String icon;
-    public ArrayList<_Button> buttons;
-    public final boolean backButtonHidden;
-    public boolean bottomTabsHiddenOnScroll;
-    public HashMap<String, Object> passedProps = new HashMap<>();
-
-    // NavigationReactModule styling
-    @Nullable @ColorInt public Integer toolBarColor;
-    @Nullable public Boolean toolBarHidden;
-    @Nullable @ColorInt public Integer statusBarColor;
-    @Nullable @ColorInt public Integer navigationBarColor;
-    @Nullable @ColorInt public Integer navBarButtonColor;
-    @Nullable @ColorInt public Integer navBarTextColor;
-    @Nullable @ColorInt public Integer tabNormalTextColor;
-    @Nullable @ColorInt public Integer tabSelectedTextColor;
-    @Nullable @ColorInt public Integer tabIndicatorColor;
-    public Boolean bottomTabsHidden;
-
-    @NonNull
-    public List<_Button> getButtons() {
-        return buttons == null ? Collections.<_Button>emptyList() : buttons;
-    }
-
-    public _Screen(ReadableMap screen) {
-        title = getString(screen, KEY_TITLE);
-        label = getString(screen, KEY_LABEL);
-        screenId = getString(screen, KEY_SCREEN);
-        screenInstanceId = getString(screen, KEY_SCREEN_INSTANCE_ID);
-        navigatorId = getString(screen, KEY_NAVIGATOR_ID);
-        navigatorEventId = getString(screen, KEY_NAVIGATOR_EVENT_ID);
-        icon = getString(screen, KEY_ICON);
-        if(screen.hasKey(KEY_PROPS)) {
-            passedProps = ((ReadableNativeMap) screen.getMap(KEY_PROPS)).toHashMap();
-        }
-        buttons = getButtons(screen);
-        backButtonHidden = getBoolean(screen, KEY_BACK_BUTTON_HIDDEN);
-        setToolbarStyle(screen);
-    }
-
-    public void setTitle(ReadableMap params) {
-        this.title = getString(params, KEY_TITLE);
-    }
-
-    public void setButtons(ReadableMap params) {
-        this.buttons = getButtons(params);
-    }
-
-    private ArrayList<_Button> getButtons(ReadableMap screen) {
-        ArrayList<_Button> ret = new ArrayList<>();
-        if (hasButtons(screen)) {
-            ReadableArray rightButtons = getRightButtons(screen);
-            for (int i = 0; i < rightButtons.size(); i++) {
-                ret.add(new _Button(rightButtons.getMap(i)));
-            }
-        }
-        return ret;
-    }
-
-    private boolean hasButtons(ReadableMap screen) {
-        return screen.hasKey(KEY_RIGHT_BUTTONS) || screen.hasKey(KEY_NAVIGATOR_BUTTONS);
-    }
-
-    private ReadableArray getRightButtons(ReadableMap screen) {
-        return screen.hasKey(KEY_RIGHT_BUTTONS) ? screen.getArray(KEY_RIGHT_BUTTONS) :
-                screen.getMap(KEY_NAVIGATOR_BUTTONS).getArray(KEY_RIGHT_BUTTONS);
-    }
-
-    public Drawable getIcon(Context ctx) {
-        return ImageLoader.getIcon(ctx, icon);
-    }
-
-    public void setToolbarStyle(ReadableMap screen) {
-        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);
-            navBarButtonColor = getColor(style, KEY_NAV_BAR_BUTTON_COLOR);
-            navBarTextColor = getColor(style, KEY_NAV_BAR_TEXT_COLOR);
-            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);
-            bottomTabsHiddenOnScroll = getBoolean(style, KEY_BOTTOM_TABS_HIDDEN_ON_SCROLL);
-        }
-    }
+public class _Screen {
+//    private static final long serialVersionUID = -1033475305421107791L;
+//
+//    private static final String KEY_TITLE = "title";
+//    private static final String KEY_SCREEN = "screen";
+//    private static final String KEY_LABEL = "label";
+//    public static final String KEY_SCREEN_INSTANCE_ID = "screenInstanceID";
+//    public static final String KEY_NAVIGATOR_ID = "navigatorID";
+//    public static final String KEY_NAVIGATOR_EVENT_ID = "navigatorEventID";
+//    private static final String KEY_ICON = "icon";
+//    private static final String KEY_NAVIGATOR_BUTTONS = "navigatorButtons";
+//    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 = "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";
+//    private static final String KEY_NAV_BAR_TEXT_COLOR = "navBarTextColor";
+//    private static final String KEY_BACK_BUTTON_HIDDEN = "backButtonHidden";
+//    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_BOTTOM_TABS_HIDDEN_ON_SCROLL = "bottomTabsHiddenOnScroll";
+//    private static final String KEY_PROPS = "passProps";
+//
+//    public String title;
+//    public final String label;
+//    public final String screenId;
+//    public final String screenInstanceId;
+//    public final String navigatorId;
+//    public final String navigatorEventId;
+//    public final String icon;
+//    public ArrayList<_Button> buttons;
+//    public final boolean backButtonHidden;
+//    public boolean bottomTabsHiddenOnScroll;
+//    public HashMap<String, Object> passedProps = new HashMap<>();
+//
+//    // NavigationReactModule styling
+//    @Nullable @ColorInt public Integer toolBarColor;
+//    @Nullable public Boolean toolBarHidden;
+//    @Nullable @ColorInt public Integer statusBarColor;
+//    @Nullable @ColorInt public Integer navigationBarColor;
+//    @Nullable @ColorInt public Integer navBarButtonColor;
+//    @Nullable @ColorInt public Integer navBarTextColor;
+//    @Nullable @ColorInt public Integer tabNormalTextColor;
+//    @Nullable @ColorInt public Integer tabSelectedTextColor;
+//    @Nullable @ColorInt public Integer tabIndicatorColor;
+//    public Boolean bottomTabsHidden;
+//
+//    @NonNull
+//    public List<_Button> getButtons() {
+//        return buttons == null ? Collections.<_Button>emptyList() : buttons;
+//    }
+//
+//    public _Screen(ReadableMap screen) {
+//        title = getString(screen, KEY_TITLE);
+//        label = getString(screen, KEY_LABEL);
+//        screenId = getString(screen, KEY_SCREEN);
+//        screenInstanceId = getString(screen, KEY_SCREEN_INSTANCE_ID);
+//        navigatorId = getString(screen, KEY_NAVIGATOR_ID);
+//        navigatorEventId = getString(screen, KEY_NAVIGATOR_EVENT_ID);
+//        icon = getString(screen, KEY_ICON);
+//        if(screen.hasKey(KEY_PROPS)) {
+//            passedProps = ((ReadableNativeMap) screen.getMap(KEY_PROPS)).toHashMap();
+//        }
+//        buttons = getButtons(screen);
+//        backButtonHidden = getBoolean(screen, KEY_BACK_BUTTON_HIDDEN);
+//        setToolbarStyle(screen);
+//    }
+//
+//    public void setTitle(ReadableMap params) {
+//        this.title = getString(params, KEY_TITLE);
+//    }
+//
+//    public void setButtons(ReadableMap params) {
+//        this.buttons = getButtons(params);
+//    }
+//
+//    private ArrayList<_Button> getButtons(ReadableMap screen) {
+//        ArrayList<_Button> ret = new ArrayList<>();
+//        if (hasButtons(screen)) {
+//            ReadableArray rightButtons = getRightButtons(screen);
+//            for (int i = 0; i < rightButtons.size(); i++) {
+//                ret.add(new _Button(rightButtons.getMap(i)));
+//            }
+//        }
+//        return ret;
+//    }
+//
+//    private boolean hasButtons(ReadableMap screen) {
+//        return screen.hasKey(KEY_RIGHT_BUTTONS) || screen.hasKey(KEY_NAVIGATOR_BUTTONS);
+//    }
+//
+//    private ReadableArray getRightButtons(ReadableMap screen) {
+//        return screen.hasKey(KEY_RIGHT_BUTTONS) ? screen.getArray(KEY_RIGHT_BUTTONS) :
+//                screen.getMap(KEY_NAVIGATOR_BUTTONS).getArray(KEY_RIGHT_BUTTONS);
+//    }
+//
+//    public Drawable getIcon(Context ctx) {
+//        return ImageLoader.getIcon(ctx, icon);
+//    }
+//
+//    public void setToolbarStyle(ReadableMap screen) {
+//        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);
+//            navBarButtonColor = getColor(style, KEY_NAV_BAR_BUTTON_COLOR);
+//            navBarTextColor = getColor(style, KEY_NAV_BAR_TEXT_COLOR);
+//            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);
+//            bottomTabsHiddenOnScroll = getBoolean(style, KEY_BOTTOM_TABS_HIDDEN_ON_SCROLL);
+//        }
+//    }
 }

android/app/src/main/java/com/reactnativenavigation/layouts/BaseLayout.java

@@ -1,68 +1,57 @@
 package com.reactnativenavigation.layouts;
 
-import android.content.Context;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.FrameLayout;
-
-import com.reactnativenavigation.R;
-import com.reactnativenavigation.core.objects._Screen;
-import com.reactnativenavigation.views.RctView;
-import com.reactnativenavigation.views.RnnToolBar;
-import com.reactnativenavigation.views.ScreenStack;
-
-public abstract class BaseLayout extends FrameLayout implements Layout {
-
-    private OnScreenPoppedListener onScreenPoppedListener;
-
-    private RnnToolBar toolBar;
-    private ScreenStack screenStack;
-
-    public BaseLayout(Context context, _Screen initialScreen) {
-        super(context);
-        toolBar = (RnnToolBar) findViewById(R.id.toolbar);
-        screenStack = (ScreenStack) findViewById(R.id.screenStack);
-
-        toolBar.update(initialScreen);
-        addInitialScreen(initialScreen);
-    }
-
-    private void addInitialScreen(_Screen screen) {
-        screenStack.push(screen, new RctView.OnDisplayedListener() {
-            @Override
-            public void onDisplayed() {
-                Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.slide_up);
-                setAnimation(animation);
-                animate();
-            }
-        });
-    }
-
-    @Override
-    public void push(_Screen screen) {
-        screenStack.push(screen);
-    }
-
-    @Override
-    public _Screen pop() {
-        _Screen popped = screenStack.pop();
-        if (onScreenPoppedListener != null) {
-            onScreenPoppedListener.onScreenPopped(popped);
-        }
-        return popped;
-    }
-
-    @Override
-    public int getScreenCount() {
-        return screenStack.getStackSize();
-    }
-
-    @Override
-    public void removeAllReactViews() {
-        screenStack.removeAllReactViews();
-    }
-
-    public void setOnScreenPoppedListener(OnScreenPoppedListener onScreenPoppedListener) {
-        this.onScreenPoppedListener = onScreenPoppedListener;
-    }
+public abstract class BaseLayout {
+
+//    private OnScreenPoppedListener onScreenPoppedListener;
+//
+//    private RnnToolBar toolBar;
+//    private ScreenStack screenStack;
+//
+//    public BaseLayout(Context context, _Screen initialScreen) {
+//        super(context);
+//        toolBar = (RnnToolBar) findViewById(R.id.toolbar);
+//        screenStack = (ScreenStack) findViewById(R.id.screenStack);
+//
+//        toolBar.update(initialScreen);
+//        addInitialScreen(initialScreen);
+//    }
+//
+//    private void addInitialScreen(_Screen screen) {
+//        screenStack.push(screen, new RctView.OnDisplayedListener() {
+//            @Override
+//            public void onDisplayed() {
+//                Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.slide_up);
+//                setAnimation(animation);
+//                animate();
+//            }
+//        });
+//    }
+//
+//    @Override
+//    public void push(_Screen screen) {
+//        screenStack.push(screen);
+//    }
+//
+//    @Override
+//    public _Screen pop() {
+//        _Screen popped = screenStack.pop();
+//        if (onScreenPoppedListener != null) {
+//            onScreenPoppedListener.onScreenPopped(popped);
+//        }
+//        return popped;
+//    }
+//
+//    @Override
+//    public int getScreenCount() {
+//        return screenStack.getStackSize();
+//    }
+//
+//    @Override
+//    public void removeAllReactViews() {
+//        screenStack.removeAllReactViews();
+//    }
+//
+//    public void setOnScreenPoppedListener(OnScreenPoppedListener onScreenPoppedListener) {
+//        this.onScreenPoppedListener = onScreenPoppedListener;
+//    }
 }

android/app/src/main/java/com/reactnativenavigation/layouts/Layout.java

@@ -1,17 +1,9 @@
 package com.reactnativenavigation.layouts;
 
-import com.reactnativenavigation.core.objects._Screen;
-
 public interface Layout {
     boolean onBackPressed();
 
     void onDestroy();
 
     void removeAllReactViews();
-
-    void push(_Screen screen);
-
-    _Screen pop();
-
-    int getScreenCount();
 }

android/app/src/main/java/com/reactnativenavigation/layouts/ScreenLayout.java

@@ -18,15 +18,21 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 public class ScreenLayout extends LinearLayout implements ScrollDirectionListener.OnScrollChanged {
 
     public static class Params {
-        String moduleName;
-        Bundle passProps;
-        List<TitleBarButton> buttons;
+        private final String moduleName;
+        private final Bundle passProps;
+        private final List<TitleBarButton.Params> buttons;
+
+        public Params(String moduleName, Bundle passProps, List<TitleBarButton.Params> buttons) {
+            this.moduleName = moduleName;
+            this.passProps = passProps;
+            this.buttons = buttons;
+        }
     }
 
     private final ReactInstanceManager reactInstanceManager;
     private final String moduleName;
     private final Bundle passProps;
-    private final List<TitleBarButton> buttons;
+    private final List<TitleBarButton.Params> buttons;
     private ContentView contentView;
     private TopBar topBar;
 
@@ -65,6 +71,5 @@ public class ScreenLayout extends LinearLayout implements ScrollDirectionListene
 
     @Override
     public void onScrollChanged(ScrollDirectionListener.Direction direction) {
-
     }
 }

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

@@ -1,85 +1,68 @@
 package com.reactnativenavigation.modal;
 
-import android.annotation.SuppressLint;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.support.annotation.Nullable;
-import android.view.View;
-import android.view.Window;
-
-import com.reactnativenavigation.R;
-import com.reactnativenavigation.activities.BaseReactActivity;
-import com.reactnativenavigation.controllers.ModalController;
-import com.reactnativenavigation.core.objects._Screen;
-import com.reactnativenavigation.layouts.Layout;
-import com.reactnativenavigation.layouts.OnScreenPoppedListener;
-import com.reactnativenavigation.utils.ContextProvider;
-import com.reactnativenavigation.utils.StyleHelper;
-
-public class RnnModal extends Dialog implements DialogInterface.OnDismissListener, OnScreenPoppedListener {
-
-    private Layout contentView;
-
-    public RnnModal(Context context, ModalController modalController, _Screen screen) {
-        super(context, R.style.Modal);
-        modalController.add(this);
-        init(context, screen);
-    }
-
-    @SuppressLint("InflateParams")
-    private void init(final Context context, _Screen screen) {
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        contentView = null;
-        setContentView((View) contentView);
-
-//        // Set navigation colors
-//        if (SdkSupports.lollipop()) {
-//            Window window = getWindow();
-//            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-//            StyleHelper.setWindowStyle(window, context.getApplicationContext(), screen);
+public class RnnModal {
+//
+//    private Layout contentView;
+//
+//    public RnnModal(Context context, ModalController modalController, _Screen screen) {
+//        super(context, R.style.Modal);
+//        modalController.add(this);
+//        init(context, screen);
+//    }
+//
+//    @SuppressLint("InflateParams")
+//    private void init(final Context context, _Screen screen) {
+//        requestWindowFeature(Window.FEATURE_NO_TITLE);
+//        contentView = null;
+//        setContentView((View) contentView);
+//
+////        // Set navigation colors
+////        if (SdkSupports.lollipop()) {
+////            Window window = getWindow();
+////            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+////            StyleHelper.setWindowStyle(window, context.getApplicationContext(), screen);
+////        }
+//        setOnDismissListener(this);
+//    }
+//
+//    public void push(_Screen screen) {
+//        contentView.push(screen);
+//    }
+//
+//    public _Screen pop() {
+//        return contentView.pop();
+//    }
+//
+//    @Override
+//    public void onScreenPopped(_Screen popped) {
+//        if (contentView.getScreenCount() == 0) {
+//            dismiss();
 //        }
-        setOnDismissListener(this);
-    }
-
-    public void push(_Screen screen) {
-        contentView.push(screen);
-    }
-
-    public _Screen pop() {
-        return contentView.pop();
-    }
-
-    @Override
-    public void onScreenPopped(_Screen popped) {
-        if (contentView.getScreenCount() == 0) {
-            dismiss();
-        }
-    }
-
-    @Nullable
-    public _Screen getCurrentScreen() {
-        return mScreenStack.isEmpty() ? null : mScreenStack.peek();
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (mScreenStack.getStackSize() == 1) {
-            super.onBackPressed();
-        } else {
-            pop();
-        }
-    }
-
-    @Override
-    public void onDismiss(DialogInterface dialog) {
-        mScreenStack.removeAllReactViews();
-        ModalController.getInstance().remove();
-        // After modal is dismissed, update Toolbar with screen from parent activity or previously displayed modal
-        BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context != null) {
-            _Screen currentScreen = context.getCurrentScreen();
-            StyleHelper.updateStyles(mToolBar, currentScreen);
-        }
-    }
+//    }
+//
+//    @Nullable
+//    public _Screen getCurrentScreen() {
+//        return mScreenStack.isEmpty() ? null : mScreenStack.peek();
+//    }
+//
+//    @Override
+//    public void onBackPressed() {
+//        if (mScreenStack.getStackSize() == 1) {
+//            super.onBackPressed();
+//        } else {
+//            pop();
+//        }
+//    }
+//
+//    @Override
+//    public void onDismiss(DialogInterface dialog) {
+//        mScreenStack.removeAllReactViews();
+//        ModalController.getInstance().remove();
+//        // After modal is dismissed, update Toolbar with screen from parent activity or previously displayed modal
+//        BaseReactActivity context = ContextProvider.getActivityContext();
+//        if (context != null) {
+//            _Screen currentScreen = context.getCurrentScreen();
+//            StyleHelper.updateStyles(mToolBar, currentScreen);
+//        }
+//    }
 }

android/app/src/main/java/com/reactnativenavigation/react/JsDevImageLoader.java

@@ -33,7 +33,7 @@ public class JsDevImageLoader {
     private static Drawable tryLoadIcon(String iconDevUri) throws IOException {
         URL url = new URL(iconDevUri);
         Bitmap bitmap = BitmapFactory.decodeStream(url.openStream());
-        final int dimensions = (int) ImageUtils.convertDpToPixel(48, NavigationApplication.instance);
+        final int dimensions = (int) ImageUtils.convertDpToPixel(48);
         // TODO: fix hard coded dimensions -add options to decodeStream
         bitmap = Bitmap.createScaledBitmap(bitmap, dimensions, dimensions, false);
         return new BitmapDrawable(NavigationApplication.instance.getResources(), bitmap);

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

@@ -1,50 +1,41 @@
 package com.reactnativenavigation.utils;
 
-import android.content.Context;
-import android.support.v4.content.ContextCompat;
-import android.util.Log;
-import android.view.Window;
-
-import com.reactnativenavigation.activities.BaseReactActivity;
-import com.reactnativenavigation.core.objects._Screen;
-import com.reactnativenavigation.views.RnnToolBar;
-
 /**
  * Created by guyc on 07/05/16.
  */
 public class StyleHelper {
-
-    public static void updateStyles(RnnToolBar toolBar, _Screen screen) {
-        try {
-            toolBar.updateAndSetButtons(screen);
-            setWindowStyle(screen);
-        } catch (Exception e) {
-            Log.w("RNNavigation", "Tried to update styles with no screen!");
-        }
-    }
-
-    private static void setWindowStyle(_Screen screen) {
-        BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context != null) {
-            StyleHelper.setWindowStyle(context.getWindow(), context, screen);
-        }
-    }
-
-    public static void setWindowStyle(Window window, Context context, _Screen screen) {
-        if (SdkSupports.lollipop()) {
-            final int black = ContextCompat.getColor(context, android.R.color.black);
-            if (screen.statusBarColor != null) {
-                window.setStatusBarColor(screen.statusBarColor);
-            } else {
-                window.setStatusBarColor(black);
-            }
-
-            if (screen.navigationBarColor != null) {
-                window.setNavigationBarColor(screen.navigationBarColor);
-            } else {
-                window.setNavigationBarColor(black);
-            }
-        }
-
-    }
+//
+//    public static void updateStyles(RnnToolBar toolBar, _Screen screen) {
+//        try {
+//            toolBar.updateAndSetButtons(screen);
+//            setWindowStyle(screen);
+//        } catch (Exception e) {
+//            Log.w("RNNavigation", "Tried to update styles with no screen!");
+//        }
+//    }
+//
+//    private static void setWindowStyle(_Screen screen) {
+//        BaseReactActivity context = ContextProvider.getActivityContext();
+//        if (context != null) {
+//            StyleHelper.setWindowStyle(context.getWindow(), context, screen);
+//        }
+//    }
+//
+//    public static void setWindowStyle(Window window, Context context, _Screen screen) {
+//        if (SdkSupports.lollipop()) {
+//            final int black = ContextCompat.getColor(context, android.R.color.black);
+//            if (screen.statusBarColor != null) {
+//                window.setStatusBarColor(screen.statusBarColor);
+//            } else {
+//                window.setStatusBarColor(black);
+//            }
+//
+//            if (screen.navigationBarColor != null) {
+//                window.setNavigationBarColor(screen.navigationBarColor);
+//            } else {
+//                window.setNavigationBarColor(black);
+//            }
+//        }
+//
+//    }
 }

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

@@ -1,145 +1,131 @@
 package com.reactnativenavigation.views;
 
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.FrameLayout;
-import android.widget.ScrollView;
-
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactRootView;
-import com.reactnativenavigation.activities.BaseReactActivity;
-import com.reactnativenavigation.activities.BottomTabActivity;
-import com.reactnativenavigation.core.objects._Screen;
-import com.reactnativenavigation.utils.BridgeUtils;
-
 /**
  * Created by guyc on 10/03/16.
  */
-public class RctView extends FrameLayout {
-
-    private BottomTabActivity context;
-    private ReactRootView reactRootView;
-    private ScrollView scrollView;
-    private int lastScrollY = -1;
-    private final ViewTreeObserver.OnScrollChangedListener scrollChangedListener = new ViewTreeObserver.OnScrollChangedListener() {
-        @Override
-        public void onScrollChanged() {
-            if (!scrollView.getViewTreeObserver().isAlive()) {
-                return;
-            }
-
-            final int scrollY = scrollView.getScrollY();
-            if (scrollY != lastScrollY && // Scroll position changed
-                scrollY > 0 && // Ignore top overscroll
-                scrollY < (scrollView.getChildAt(0).getHeight() - scrollView.getHeight())) { // Ignore bottom overscroll
-                int direction = scrollY > lastScrollY ?
-                        BottomNavigation.SCROLL_DIRECTION_DOWN :
-                        BottomNavigation.SCROLL_DIRECTION_UP;
-                lastScrollY = scrollY;
-                context.onScrollChanged(direction);
-            }
-        }
-    };
-    private boolean isScrollEventListenerRegistered = false;
-
-    private final View.OnAttachStateChangeListener stateChangeListener =
-            new View.OnAttachStateChangeListener() {
-                @Override
-                public void onViewAttachedToWindow(View v) {
-                    scrollView = getScrollView((ViewGroup) getParent());
-
-                    if (scrollView != null && !isScrollEventListenerRegistered) {
-                        addScrollListener();
-                    }
-                }
-
-                @Override
-                public void onViewDetachedFromWindow(final View detachedView) {
-                    removeScrollListener();
-
-                    post(new Runnable() {
-                        @Override
-                        public void run() {
-                            scrollView = getScrollView((ViewGroup) getParent());
-                            if (scrollView != null && !isScrollEventListenerRegistered) {
-                                isScrollEventListenerRegistered = true;
-                                addScrollListener();
-                            }
-                        }
-                    });
-                }
-            };
-
-    /**
-     * Interface used to run some code when the {@link ReactRootView} is visible.
-     */
-    public interface OnDisplayedListener {
-        /**
-         * This method will be invoked when the {@link ReactRootView} is visible.
-         */
-        void onDisplayed();
-    }
-
-    @SuppressWarnings("unchecked")
-    public RctView(BaseReactActivity ctx, ReactInstanceManager rctInstanceManager, final _Screen screen,
-                   final OnDisplayedListener onDisplayedListener) {
-        super(ctx);
-        setLayoutParams(new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
-
-        final OnDisplayedListener onDisplayedListenerInternal = screen.bottomTabsHiddenOnScroll ?
-            new OnDisplayedListener() {
-                @Override
-                public void onDisplayed() {
-                    if (onDisplayedListener != null) {
-                        onDisplayedListener.onDisplayed();
-                    }
-
-                    setupScrollViewWithBottomTabs();
-                }
-            } : onDisplayedListener;
-
-        reactRootView = new RnnReactRootView(ctx, onDisplayedListenerInternal);
-        reactRootView.setLayoutParams(new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
-        Bundle passProps = createPassProps(screen);
-        String componentName = screen.screenId;
-        reactRootView.startReactApplication(rctInstanceManager, componentName, passProps);
-
-        addView(reactRootView);
-    }
-
-    private Bundle createPassProps(_Screen screen) {
-        Bundle passProps = new Bundle();
-        passProps.putString(_Screen.KEY_SCREEN_INSTANCE_ID, screen.screenInstanceId);
-        passProps.putString(_Screen.KEY_NAVIGATOR_ID, screen.navigatorId);
-        passProps.putString(_Screen.KEY_NAVIGATOR_EVENT_ID, screen.navigatorEventId);
-        if (screen.passedProps != null) {
-            BridgeUtils.addMapToBundle(screen.passedProps, passProps);
-        }
-        return passProps;
-    }
-
-//    private void setupScrollViewWithBottomTabs() {
-//        scrollView = getScrollView((ViewGroup) getParent());
-//        if (scrollView != null) {
-//            context = (BottomTabActivity) getContext();
-//            attachStateChangeListener(scrollView);
-//            addScrollListener();
+public class RctView {
+//
+//    private BottomTabActivity context;
+//    private ReactRootView reactRootView;
+//    private ScrollView scrollView;
+//    private int lastScrollY = -1;
+//    private final ViewTreeObserver.OnScrollChangedListener scrollChangedListener = new ViewTreeObserver.OnScrollChangedListener() {
+//        @Override
+//        public void onScrollChanged() {
+//            if (!scrollView.getViewTreeObserver().isAlive()) {
+//                return;
+//            }
+//
+//            final int scrollY = scrollView.getScrollY();
+//            if (scrollY != lastScrollY && // Scroll position changed
+//                scrollY > 0 && // Ignore top overscroll
+//                scrollY < (scrollView.getChildAt(0).getHeight() - scrollView.getHeight())) { // Ignore bottom overscroll
+//                int direction = scrollY > lastScrollY ?
+//                        BottomNavigation.SCROLL_DIRECTION_DOWN :
+//                        BottomNavigation.SCROLL_DIRECTION_UP;
+//                lastScrollY = scrollY;
+//                context.onScrollChanged(direction);
+//            }
 //        }
-//    }
-
-
-//    private void attachStateChangeListener(ScrollView scrollView) {
-//        scrollView.addOnAttachStateChangeListener(stateChangeListener);
+//    };
+//    private boolean isScrollEventListenerRegistered = false;
+//
+//    private final View.OnAttachStateChangeListener stateChangeListener =
+//            new View.OnAttachStateChangeListener() {
+//                @Override
+//                public void onViewAttachedToWindow(View v) {
+//                    scrollView = getScrollView((ViewGroup) getParent());
+//
+//                    if (scrollView != null && !isScrollEventListenerRegistered) {
+//                        addScrollListener();
+//                    }
+//                }
+//
+//                @Override
+//                public void onViewDetachedFromWindow(final View detachedView) {
+//                    removeScrollListener();
+//
+//                    post(new Runnable() {
+//                        @Override
+//                        public void run() {
+//                            scrollView = getScrollView((ViewGroup) getParent());
+//                            if (scrollView != null && !isScrollEventListenerRegistered) {
+//                                isScrollEventListenerRegistered = true;
+//                                addScrollListener();
+//                            }
+//                        }
+//                    });
+//                }
+//            };
+//
+//    /**
+//     * Interface used to run some code when the {@link ReactRootView} is visible.
+//     */
+//    public interface OnDisplayedListener {
+//        /**
+//         * This method will be invoked when the {@link ReactRootView} is visible.
+//         */
+//        void onDisplayed();
 //    }
 //
-//    private void addScrollListener() {
-//        scrollView.getViewTreeObserver().addOnScrollChangedListener(scrollChangedListener);
+//    @SuppressWarnings("unchecked")
+//    public RctView(BaseReactActivity ctx, ReactInstanceManager rctInstanceManager, final _Screen screen,
+//                   final OnDisplayedListener onDisplayedListener) {
+//        super(ctx);
+//        setLayoutParams(new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+//
+//        final OnDisplayedListener onDisplayedListenerInternal = screen.bottomTabsHiddenOnScroll ?
+//            new OnDisplayedListener() {
+//                @Override
+//                public void onDisplayed() {
+//                    if (onDisplayedListener != null) {
+//                        onDisplayedListener.onDisplayed();
+//                    }
+//
+//                    setupScrollViewWithBottomTabs();
+//                }
+//            } : onDisplayedListener;
+//
+//        reactRootView = new RnnReactRootView(ctx, onDisplayedListenerInternal);
+//        reactRootView.setLayoutParams(new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+//        Bundle passProps = createPassProps(screen);
+//        String componentName = screen.screenId;
+//        reactRootView.startReactApplication(rctInstanceManager, componentName, passProps);
+//
+//        addView(reactRootView);
 //    }
 //
-//    private void removeScrollListener() {
-//        scrollView.getViewTreeObserver().removeOnScrollChangedListener(scrollChangedListener);
+//    private Bundle createPassProps(_Screen screen) {
+//        Bundle passProps = new Bundle();
+//        passProps.putString(_Screen.KEY_SCREEN_INSTANCE_ID, screen.screenInstanceId);
+//        passProps.putString(_Screen.KEY_NAVIGATOR_ID, screen.navigatorId);
+//        passProps.putString(_Screen.KEY_NAVIGATOR_EVENT_ID, screen.navigatorEventId);
+//        if (screen.passedProps != null) {
+//            BridgeUtils.addMapToBundle(screen.passedProps, passProps);
+//        }
+//        return passProps;
 //    }
+//
+////    private void setupScrollViewWithBottomTabs() {
+////        scrollView = getScrollView((ViewGroup) getParent());
+////        if (scrollView != null) {
+////            context = (BottomTabActivity) getContext();
+////            attachStateChangeListener(scrollView);
+////            addScrollListener();
+////        }
+////    }
+//
+//
+////    private void attachStateChangeListener(ScrollView scrollView) {
+////        scrollView.addOnAttachStateChangeListener(stateChangeListener);
+////    }
+////
+////    private void addScrollListener() {
+////        scrollView.getViewTreeObserver().addOnScrollChangedListener(scrollChangedListener);
+////    }
+////
+////    private void removeScrollListener() {
+////        scrollView.getViewTreeObserver().removeOnScrollChangedListener(scrollChangedListener);
+////    }
 }
 

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

@@ -1,34 +1,29 @@
 package com.reactnativenavigation.views;
 
-import android.content.Context;
-import android.view.ViewTreeObserver;
-
-import com.facebook.react.ReactRootView;
-
 /**
  * Created by guyc on 11/07/16.
  */
-public class RnnReactRootView extends ReactRootView implements ViewTreeObserver.OnGlobalLayoutListener {
-    private final RctView.OnDisplayedListener mOnDisplayedListener;
-
-    public RnnReactRootView(Context context, RctView.OnDisplayedListener onDisplayedListener) {
-        super(context);
-        mOnDisplayedListener = onDisplayedListener;
-
-        if (onDisplayedListener != null) {
-            detectOnDisplay();
-        }
-    }
-
-    private void detectOnDisplay() {
-        getViewTreeObserver().addOnGlobalLayoutListener(this);
-    }
-
-    @Override
-    public void onGlobalLayout() {
-        if (getChildCount() >= 1) {
-            getViewTreeObserver().removeOnGlobalLayoutListener(this);
-            mOnDisplayedListener.onDisplayed();
-        }
-    }
+public class RnnReactRootView {
+//    private final RctView.OnDisplayedListener mOnDisplayedListener;
+//
+//    public RnnReactRootView(Context context, RctView.OnDisplayedListener onDisplayedListener) {
+//        super(context);
+//        mOnDisplayedListener = onDisplayedListener;
+//
+//        if (onDisplayedListener != null) {
+//            detectOnDisplay();
+//        }
+//    }
+//
+//    private void detectOnDisplay() {
+//        getViewTreeObserver().addOnGlobalLayoutListener(this);
+//    }
+//
+//    @Override
+//    public void onGlobalLayout() {
+//        if (getChildCount() >= 1) {
+//            getViewTreeObserver().removeOnGlobalLayoutListener(this);
+//            mOnDisplayedListener.onDisplayed();
+//        }
+//    }
 }

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

@@ -1,77 +1,66 @@
 package com.reactnativenavigation.views;
 
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.support.design.widget.TabLayout;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-
-import com.reactnativenavigation.R;
-import com.reactnativenavigation.core.objects._Screen;
-
 /**
  * Created by guyc on 07/05/16.
  */
-public class RnnTabLayout extends TabLayout {
-    private Drawable mBackground;
-    private ColorStateList mTabTextColors;
-    private int mSelectedTabIndicatorColor;
-
-    public RnnTabLayout(Context context) {
-        this(context, null);
-    }
-
-    public RnnTabLayout(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public RnnTabLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init(context);
-    }
-
-    private void init(Context ctx) {
-        mBackground = getBackground();
-        mTabTextColors = getTabTextColors();
-
-        // Get default accent color which is used as the selected tab indicator color
-        TypedValue typedValue = new TypedValue();
-        TypedArray a = ctx.obtainStyledAttributes(typedValue.data, new int[]{R.attr.colorAccent});
-        mSelectedTabIndicatorColor = a.getColor(0, 0);
-        a.recycle();
-    }
-
-    public void setStyle(_Screen screen) {
-        if (screen.toolBarColor != null) {
-            setBackgroundColor(screen.toolBarColor);
-        } else {
-            resetBackground();
-        }
-
-        if (screen.tabNormalTextColor != null && screen.tabSelectedTextColor != null) {
-            setTabTextColors(screen.tabNormalTextColor, screen.tabSelectedTextColor);
-        } else {
-            resetTextColors();
-        }
-
-        if (screen.tabIndicatorColor != null) {
-            setSelectedTabIndicatorColor(screen.tabIndicatorColor);
-        } else {
-            resetSelectedTabIndicatorColor();
-        }
-    }
-
-    public void resetBackground() {
-        setBackground(mBackground);
-    }
-
-    public void resetTextColors() {
-        setTabTextColors(mTabTextColors);
-    }
-
-    public void resetSelectedTabIndicatorColor() {
-        setSelectedTabIndicatorColor(mSelectedTabIndicatorColor);
-    }
+public class RnnTabLayout {
+//    private Drawable mBackground;
+//    private ColorStateList mTabTextColors;
+//    private int mSelectedTabIndicatorColor;
+//
+//    public RnnTabLayout(Context context) {
+//        this(context, null);
+//    }
+//
+//    public RnnTabLayout(Context context, AttributeSet attrs) {
+//        this(context, attrs, 0);
+//    }
+//
+//    public RnnTabLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+//        super(context, attrs, defStyleAttr);
+//        init(context);
+//    }
+//
+//    private void init(Context ctx) {
+//        mBackground = getBackground();
+//        mTabTextColors = getTabTextColors();
+//
+//        // Get default accent color which is used as the selected tab indicator color
+//        TypedValue typedValue = new TypedValue();
+//        TypedArray a = ctx.obtainStyledAttributes(typedValue.data, new int[]{R.attr.colorAccent});
+//        mSelectedTabIndicatorColor = a.getColor(0, 0);
+//        a.recycle();
+//    }
+//
+//    public void setStyle(_Screen screen) {
+//        if (screen.toolBarColor != null) {
+//            setBackgroundColor(screen.toolBarColor);
+//        } else {
+//            resetBackground();
+//        }
+//
+//        if (screen.tabNormalTextColor != null && screen.tabSelectedTextColor != null) {
+//            setTabTextColors(screen.tabNormalTextColor, screen.tabSelectedTextColor);
+//        } else {
+//            resetTextColors();
+//        }
+//
+//        if (screen.tabIndicatorColor != null) {
+//            setSelectedTabIndicatorColor(screen.tabIndicatorColor);
+//        } else {
+//            resetSelectedTabIndicatorColor();
+//        }
+//    }
+//
+//    public void resetBackground() {
+//        setBackground(mBackground);
+//    }
+//
+//    public void resetTextColors() {
+//        setTabTextColors(mTabTextColors);
+//    }
+//
+//    public void resetSelectedTabIndicatorColor() {
+//        setSelectedTabIndicatorColor(mSelectedTabIndicatorColor);
+//    }
 }

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

@@ -1,399 +1,361 @@
 package com.reactnativenavigation.views;
 
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.graphics.drawable.DrawerArrowDrawable;
-import android.support.v7.widget.Toolbar;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewTreeObserver;
-import android.widget.TextView;
-
-import com.reactnativenavigation.R;
-import com.reactnativenavigation.activities.BaseReactActivity;
-import com.reactnativenavigation.core.objects._Button;
-import com.reactnativenavigation.core.objects._Screen;
-import com.reactnativenavigation.utils.ContextProvider;
-import com.reactnativenavigation.react.ImageLoader;
-import com.reactnativenavigation.utils.ImageUtils;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by guyc on 09/04/16.
- */
-public class RnnToolBar extends Toolbar {
-
-    private List<_Screen> mScreens;
-    private AsyncTask mDrawerIconTask;
-    private AsyncTask mSetupToolbarTask;
-    private Drawable mBackground;
-    private Drawable mDrawerIcon;
-    private DrawerLayout mDrawerLayout;
-    private ActionBarDrawerToggle mDrawerToggle;
-    private ArrayList<View> mMenuItems;
-
-    public RnnToolBar(Context context) {
-        super(context);
-        init();
-    }
-
-    private void init() {
-        mMenuItems = new ArrayList<>();
-        mBackground = getBackground();
-    }
-
-    public void setScreens(List<_Screen> screens) {
-        mScreens = screens;
-    }
-
-    public void handleOnCreateOptionsMenuAsync() {
-//        if (mScreens != null) {
-//            setupToolbarButtonsAsync(null, mScreens.get(0));
+public class RnnToolBar {
+
+//    private List<_Screen> mScreens;
+//    private AsyncTask mDrawerIconTask;
+//    private AsyncTask mSetupToolbarTask;
+//    private Drawable mBackground;
+//    private Drawable mDrawerIcon;
+//    private DrawerLayout mDrawerLayout;
+//    private ActionBarDrawerToggle mDrawerToggle;
+//    private ArrayList<View> mMenuItems;
+//
+//    public RnnToolBar(Context context) {
+//        super(context);
+//        init();
+//    }
+//
+//    private void init() {
+//        mMenuItems = new ArrayList<>();
+//        mBackground = getBackground();
+//    }
+//
+//    public void setScreens(List<_Screen> screens) {
+//        mScreens = screens;
+//    }
+//
+//    public void handleOnCreateOptionsMenuAsync() {
+////        if (mScreens != null) {
+////            setupToolbarButtonsAsync(null, mScreens.get(0));
+////        }
+//    }
+//
+//    public ActionBarDrawerToggle setupDrawer(DrawerLayout drawerLayout, _Screen drawerScreen, _Screen screen) {
+//        if (drawerLayout == null || drawerScreen == null) {
+//            return null;
 //        }
-    }
-
-    public ActionBarDrawerToggle setupDrawer(DrawerLayout drawerLayout, _Screen drawerScreen, _Screen screen) {
-        if (drawerLayout == null || drawerScreen == null) {
-            return null;
-        }
-
-        mDrawerLayout = drawerLayout;
-        mDrawerToggle = new ActionBarDrawerToggle(
-                ContextProvider.getActivityContext(),
-                mDrawerLayout,
-                this,
-                R.string.drawer_open,
-                R.string.drawer_close
-        );
-        mDrawerLayout.setDrawerListener(mDrawerToggle);
-        setupDrawerIconAsync(drawerScreen.icon, screen);
-
-        return mDrawerToggle;
-    }
-
-    public void setDrawerIcon(Drawable icon) {
-        mDrawerIcon = icon;
-    }
-
-    public void showDrawer(boolean animated) {
-        if (mDrawerLayout == null) {
-            return;
-        }
-
-        mDrawerLayout.openDrawer(Gravity.LEFT);
-    }
-
-    public void hideDrawer(boolean animated) {
-        if (mDrawerLayout == null) {
-            return;
-        }
-
-        mDrawerLayout.closeDrawer(Gravity.LEFT);
-    }
-
-    public void toggleDrawer(boolean animated) {
-        if (mDrawerLayout == null) {
-            return;
-        }
-
-        boolean visible = mDrawerLayout.isDrawerOpen(Gravity.LEFT);
-        if (visible) {
-            hideDrawer(animated);
-        } else {
-            showDrawer(animated);
-        }
-    }
-
-    public void setupDrawerIconAsync(String drawerIconSource, _Screen screen) {
-        if (mDrawerIconTask == null) {
-            mDrawerIconTask = new SetupDrawerIconTask(this, drawerIconSource, screen).execute();
-        }
-    }
-
-    public void setupToolbarButtonsAsync(_Screen newScreen) {
-        if (newScreen != null) {
-            this.setupToolbarButtonsAsync(null, newScreen);
-        }
-    }
-
-
-    public void setupToolbarButtonsAsync(_Screen oldScreen, _Screen newScreen) {
-        if (mSetupToolbarTask == null) {
-            mSetupToolbarTask = new SetupToolbarButtonsTask(this, oldScreen, newScreen).execute();
-        }
-    }
-
-    public void showToolbar(boolean animated) {
-        ActionBar actionBar = ((AppCompatActivity) getContext()).getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setShowHideAnimationEnabled(animated);
-            // We hide the ToolBar's parent (AppBarLayout) since this animates the shadow added by AppBar as well
-            ((View) getParent()).setVisibility(VISIBLE);
-        }
-    }
-
-    public void hideToolbar(boolean animated) {
-        ActionBar actionBar = ((AppCompatActivity) getContext()).getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setShowHideAnimationEnabled(animated);
-            // We hide the ToolBar's parent (AppBarLayout) since this animates the shadow added by AppBar as well
-            ((View) getParent()).setVisibility(GONE);
-        }
-    }
-
-    private void showToolbar() {
-        showToolbar(false);
-    }
-
-    private void hideToolbar() {
-        hideToolbar(false);
-    }
-
-    public void setNavUpButton() {
-        setNavUpButton(null);
-    }
-
-    @SuppressWarnings({"ConstantConditions"})
-    public void setNavUpButton(_Screen screen) {
-        BaseReactActivity context = ContextProvider.getActivityContext();
-        if (context == null) {
-            return;
-        }
-
-        ActionBar actionBar = context.getSupportActionBar();
-        if (actionBar == null) {
-            return;
-        }
-
-        boolean isBack = screen != null;
-        boolean hasDrawer = mDrawerToggle != null;
-
-        Drawable navIcon = null;
-        DrawerArrowDrawable navArrow = null;
-        if (hasDrawer && mDrawerIcon == null) {
-            navArrow = (DrawerArrowDrawable) this.getNavigationIcon();
-        } else {
-            if (isBack && !screen.backButtonHidden) {
-                navArrow = new DrawerArrowDrawable(context);
-            } else if (hasDrawer) {
-                navIcon = mDrawerIcon;
-            }
-        }
-
-        if (navArrow != null) {
-            navArrow.setProgress(isBack ? 1.0f : 0.0f);
-            if (screen != null && screen.navBarButtonColor != null) {
-                navArrow.setColor(screen.navBarButtonColor);
-            } else {
-                navArrow.setColor(Color.BLACK);
-            }
-            navIcon = navArrow;
-        }
-
-        actionBar.setHomeAsUpIndicator(navIcon);
-        actionBar.setDisplayHomeAsUpEnabled(navIcon != null);
-    }
-
-    /**
-     * 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(@NonNull _Screen screen) {
-        ((AppCompatActivity) getContext()).setSupportActionBar(this);
-        setTitle(screen.title);
-        setStyle(screen);
-    }
-
-    public void updateAndSetButtons(_Screen screen) {
-        update(screen);
-        setupToolbarButtonsAsync(screen);
-    }
-
-    private static class SetupDrawerIconTask extends AsyncTask<Void, Void, Drawable> {
-        private final WeakReference<RnnToolBar> mToolbarWR;
-        private final String mDrawerIconSource;
-        private final Integer mTintColor;
-
-        public SetupDrawerIconTask(RnnToolBar toolBar, String drawerIconSource, _Screen screen) {
-            mToolbarWR = new WeakReference<>(toolBar);
-            mDrawerIconSource = drawerIconSource;
-            mTintColor = screen.navBarButtonColor;
-        }
-
-        @Override
-        protected Drawable doInBackground(Void... params) {
-            Context context = ContextProvider.getActivityContext();
-            if (context == null || mDrawerIconSource == null) {
-                return null;
-            }
-
-            return ImageLoader.loadImage(mDrawerIconSource);
-        }
-
-        @Override
-        protected void onPostExecute(Drawable drawerIcon) {
-            RnnToolBar toolBar = mToolbarWR.get();
-            if (drawerIcon != null) {
-                if (mTintColor != null) {
-                    ImageUtils.tint(drawerIcon, mTintColor);
-                }
-                toolBar.setDrawerIcon(drawerIcon);
-            }
-
-            toolBar.setNavUpButton();
-            mToolbarWR.clear();
-        }
-    }
-
-    private static class SetupToolbarButtonsTask extends AsyncTask<Void, Void, Map<String, Drawable>> {
-        private final List<_Button> mOldButtons;
-        private final List<_Button> mNewButtons;
-        private final WeakReference<RnnToolBar> mToolbarWR;
-        @ColorInt
-        private final Integer mTintColor;
-        private final int mIconDimensions;
-
-        public SetupToolbarButtonsTask(RnnToolBar toolBar, _Screen oldScreen, _Screen newScreen) {
-            mToolbarWR = new WeakReference<>(toolBar);
-            mOldButtons = oldScreen == null ? null : oldScreen.getButtons();
-            mNewButtons = newScreen.getButtons();
-            mTintColor = newScreen.navBarButtonColor;
-            mIconDimensions = (int) ImageUtils.convertDpToPixel(48, toolBar.getContext());
-        }
-
-        @Override
-        protected Map<String, Drawable> doInBackground(Void... params) {
-            Context context = ContextProvider.getActivityContext();
-            if (context == null) {
-                return null;
-            }
-
-            Map<String, Drawable> icons = new HashMap<>();
-            for (_Button button : mNewButtons) {
-                if (button.hasIcon()) {
-                    icons.put(button.id, button.getIcon(context, mIconDimensions));
-                }
-            }
-            return icons;
-        }
-
-        @Override
-        protected void onPostExecute(Map<String, Drawable> icons) {
-            final Context context = ContextProvider.getActivityContext();
-            if (context == null) {
-                return;
-            }
-
-            Menu menu = ((BaseReactActivity) context).getMenu();
-            if (menu == null) {
-                RnnToolBar toolBar = mToolbarWR.get();
-                if (toolBar != null) {
-                    toolBar.mSetupToolbarTask = null;
-                }
-                mToolbarWR.clear();
-                return;
-            }
-
-            // Remove prev screen buttons
-            if (mOldButtons == null) {
-                menu.clear();
-            } else {
-                for (_Button btn : mOldButtons) {
-                    menu.removeItem(btn.getItemId());
-                }
-            }
-
-            // Add new screen buttons
-            final List<String> textButtons = new ArrayList<>();
-            final int size = mNewButtons.size();
-            for (int i = 0; i < size; i++) {
-                _Button button = mNewButtons.get(i);
-                MenuItem item = menu.add(Menu.NONE, button.getItemId(), size - i - 1, button.title);
-                item.setShowAsAction(getMenuItemShowAction(button.showAsAction));
-
-                // Set button icon
-                if (button.hasIcon()) {
-                    Drawable icon = icons.get(button.id);
-                    if (mTintColor != null) {
-                        ImageUtils.tint(icon, mTintColor);
-                    }
-                    item.setIcon(icon);
-                } else {
-                    textButtons.add(button.title);
-                }
-
-                // Disable button if needed
-                if (button.disabled) {
-                    item.setEnabled(false);
-                }
-            }
-
-            final RnnToolBar toolBar = mToolbarWR.get();
-            if (toolBar != null) {
-                // Tint overflow icon which appears when there's not enough space in Toolbar for icons
-                if (mTintColor != null) {
-                    ImageUtils.tint(toolBar.getOverflowIcon(), mTintColor);
-                }
-
-                // Tint text buttons
-                if (textButtons.size() > 0 && mTintColor != null) {
-                    final View decorView = ((Activity) context).getWindow().getDecorView();
-                    decorView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-                        @Override
-                        public void onGlobalLayout() {
-                            decorView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-
-                            // Find TextViews
-                            for (String text : textButtons) {
-                                decorView.findViewsWithText(toolBar.mMenuItems, text, View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION);
-                            }
-
-                            // Set text color
-                            for (View button : toolBar.mMenuItems) {
-                                ((TextView) button).setTextColor(mTintColor);
-                            }
-
-                            toolBar.mMenuItems.clear();
-                        }
-                    });
-                }
-
-                toolBar.mSetupToolbarTask = null;
-                mToolbarWR.clear();
-            }
-        }
-
-        private int getMenuItemShowAction(String action) {
-            switch (action) {
-                case "never":
-                    return MenuItem.SHOW_AS_ACTION_NEVER;
-                case "always":
-                    return MenuItem.SHOW_AS_ACTION_ALWAYS;
-                case "withText":
-                    return MenuItem.SHOW_AS_ACTION_WITH_TEXT;
-                default:
-                    return MenuItem.SHOW_AS_ACTION_IF_ROOM;
-            }
-        }
-    }
+//
+//        mDrawerLayout = drawerLayout;
+//        mDrawerToggle = new ActionBarDrawerToggle(
+//                ContextProvider.getActivityContext(),
+//                mDrawerLayout,
+//                this,
+//                R.string.drawer_open,
+//                R.string.drawer_close
+//        );
+//        mDrawerLayout.setDrawerListener(mDrawerToggle);
+//        setupDrawerIconAsync(drawerScreen.icon, screen);
+//
+//        return mDrawerToggle;
+//    }
+//
+//    public void setDrawerIcon(Drawable icon) {
+//        mDrawerIcon = icon;
+//    }
+//
+//    public void showDrawer(boolean animated) {
+//        if (mDrawerLayout == null) {
+//            return;
+//        }
+//
+//        mDrawerLayout.openDrawer(Gravity.LEFT);
+//    }
+//
+//    public void hideDrawer(boolean animated) {
+//        if (mDrawerLayout == null) {
+//            return;
+//        }
+//
+//        mDrawerLayout.closeDrawer(Gravity.LEFT);
+//    }
+//
+//    public void toggleDrawer(boolean animated) {
+//        if (mDrawerLayout == null) {
+//            return;
+//        }
+//
+//        boolean visible = mDrawerLayout.isDrawerOpen(Gravity.LEFT);
+//        if (visible) {
+//            hideDrawer(animated);
+//        } else {
+//            showDrawer(animated);
+//        }
+//    }
+//
+//    public void setupDrawerIconAsync(String drawerIconSource, _Screen screen) {
+//        if (mDrawerIconTask == null) {
+//            mDrawerIconTask = new SetupDrawerIconTask(this, drawerIconSource, screen).execute();
+//        }
+//    }
+//
+//    public void setupToolbarButtonsAsync(_Screen newScreen) {
+//        if (newScreen != null) {
+//            this.setupToolbarButtonsAsync(null, newScreen);
+//        }
+//    }
+//
+//
+//    public void setupToolbarButtonsAsync(_Screen oldScreen, _Screen newScreen) {
+//        if (mSetupToolbarTask == null) {
+//            mSetupToolbarTask = new SetupToolbarButtonsTask(this, oldScreen, newScreen).execute();
+//        }
+//    }
+//
+//    public void showToolbar(boolean animated) {
+//        ActionBar actionBar = ((AppCompatActivity) getContext()).getSupportActionBar();
+//        if (actionBar != null) {
+//            actionBar.setShowHideAnimationEnabled(animated);
+//            // We hide the ToolBar's parent (AppBarLayout) since this animates the shadow added by AppBar as well
+//            ((View) getParent()).setVisibility(VISIBLE);
+//        }
+//    }
+//
+//    public void hideToolbar(boolean animated) {
+//        ActionBar actionBar = ((AppCompatActivity) getContext()).getSupportActionBar();
+//        if (actionBar != null) {
+//            actionBar.setShowHideAnimationEnabled(animated);
+//            // We hide the ToolBar's parent (AppBarLayout) since this animates the shadow added by AppBar as well
+//            ((View) getParent()).setVisibility(GONE);
+//        }
+//    }
+//
+//    private void showToolbar() {
+//        showToolbar(false);
+//    }
+//
+//    private void hideToolbar() {
+//        hideToolbar(false);
+//    }
+//
+//    public void setNavUpButton() {
+//        setNavUpButton(null);
+//    }
+//
+//    @SuppressWarnings({"ConstantConditions"})
+//    public void setNavUpButton(_Screen screen) {
+//        BaseReactActivity context = ContextProvider.getActivityContext();
+//        if (context == null) {
+//            return;
+//        }
+//
+//        ActionBar actionBar = context.getSupportActionBar();
+//        if (actionBar == null) {
+//            return;
+//        }
+//
+//        boolean isBack = screen != null;
+//        boolean hasDrawer = mDrawerToggle != null;
+//
+//        Drawable navIcon = null;
+//        DrawerArrowDrawable navArrow = null;
+//        if (hasDrawer && mDrawerIcon == null) {
+//            navArrow = (DrawerArrowDrawable) this.getNavigationIcon();
+//        } else {
+//            if (isBack && !screen.backButtonHidden) {
+//                navArrow = new DrawerArrowDrawable(context);
+//            } else if (hasDrawer) {
+//                navIcon = mDrawerIcon;
+//            }
+//        }
+//
+//        if (navArrow != null) {
+//            navArrow.setProgress(isBack ? 1.0f : 0.0f);
+//            if (screen != null && screen.navBarButtonColor != null) {
+//                navArrow.setColor(screen.navBarButtonColor);
+//            } else {
+//                navArrow.setColor(Color.BLACK);
+//            }
+//            navIcon = navArrow;
+//        }
+//
+//        actionBar.setHomeAsUpIndicator(navIcon);
+//        actionBar.setDisplayHomeAsUpEnabled(navIcon != null);
+//    }
+//
+//    /**
+//     * 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(@NonNull _Screen screen) {
+//        ((AppCompatActivity) getContext()).setSupportActionBar(this);
+//        setTitle(screen.title);
+//        setStyle(screen);
+//    }
+//
+//    public void updateAndSetButtons(_Screen screen) {
+//        update(screen);
+//        setupToolbarButtonsAsync(screen);
+//    }
+//
+//    private static class SetupDrawerIconTask extends AsyncTask<Void, Void, Drawable> {
+//        private final WeakReference<RnnToolBar> mToolbarWR;
+//        private final String mDrawerIconSource;
+//        private final Integer mTintColor;
+//
+//        public SetupDrawerIconTask(RnnToolBar toolBar, String drawerIconSource, _Screen screen) {
+//            mToolbarWR = new WeakReference<>(toolBar);
+//            mDrawerIconSource = drawerIconSource;
+//            mTintColor = screen.navBarButtonColor;
+//        }
+//
+//        @Override
+//        protected Drawable doInBackground(Void... params) {
+//            Context context = ContextProvider.getActivityContext();
+//            if (context == null || mDrawerIconSource == null) {
+//                return null;
+//            }
+//
+//            return ImageLoader.loadImage(mDrawerIconSource);
+//        }
+//
+//        @Override
+//        protected void onPostExecute(Drawable drawerIcon) {
+//            RnnToolBar toolBar = mToolbarWR.get();
+//            if (drawerIcon != null) {
+//                if (mTintColor != null) {
+//                    ImageUtils.tint(drawerIcon, mTintColor);
+//                }
+//                toolBar.setDrawerIcon(drawerIcon);
+//            }
+//
+//            toolBar.setNavUpButton();
+//            mToolbarWR.clear();
+//        }
+//    }
+//
+//    private static class SetupToolbarButtonsTask extends AsyncTask<Void, Void, Map<String, Drawable>> {
+//        private final List<_Button> mOldButtons;
+//        private final List<_Button> mNewButtons;
+//        private final WeakReference<RnnToolBar> mToolbarWR;
+//        @ColorInt
+//        private final Integer mTintColor;
+//        private final int mIconDimensions;
+//
+//        public SetupToolbarButtonsTask(RnnToolBar toolBar, _Screen oldScreen, _Screen newScreen) {
+//            mToolbarWR = new WeakReference<>(toolBar);
+//            mOldButtons = oldScreen == null ? null : oldScreen.getButtons();
+//            mNewButtons = newScreen.getButtons();
+//            mTintColor = newScreen.navBarButtonColor;
+//            mIconDimensions = (int) ImageUtils.convertDpToPixel(48, toolBar.getContext());
+//        }
+//
+//        @Override
+//        protected Map<String, Drawable> doInBackground(Void... params) {
+//            Context context = ContextProvider.getActivityContext();
+//            if (context == null) {
+//                return null;
+//            }
+//
+//            Map<String, Drawable> icons = new HashMap<>();
+//            for (_Button button : mNewButtons) {
+//                if (button.hasIcon()) {
+//                    icons.put(button.id, button.getIcon(context, mIconDimensions));
+//                }
+//            }
+//            return icons;
+//        }
+//
+//        @Override
+//        protected void onPostExecute(Map<String, Drawable> icons) {
+//            final Context context = ContextProvider.getActivityContext();
+//            if (context == null) {
+//                return;
+//            }
+//
+//            Menu menu = ((BaseReactActivity) context).getMenu();
+//            if (menu == null) {
+//                RnnToolBar toolBar = mToolbarWR.get();
+//                if (toolBar != null) {
+//                    toolBar.mSetupToolbarTask = null;
+//                }
+//                mToolbarWR.clear();
+//                return;
+//            }
+//
+//            // Remove prev screen buttons
+//            if (mOldButtons == null) {
+//                menu.clear();
+//            } else {
+//                for (_Button btn : mOldButtons) {
+//                    menu.removeItem(btn.getItemId());
+//                }
+//            }
+//
+//            // Add new screen buttons
+//            final List<String> textButtons = new ArrayList<>();
+//            final int size = mNewButtons.size();
+//            for (int i = 0; i < size; i++) {
+//                _Button button = mNewButtons.get(i);
+//                MenuItem item = menu.add(Menu.NONE, button.getItemId(), size - i - 1, button.title);
+//                item.setShowAsAction(getMenuItemShowAction(button.showAsAction));
+//
+//                // Set button icon
+//                if (button.hasIcon()) {
+//                    Drawable icon = icons.get(button.id);
+//                    if (mTintColor != null) {
+//                        ImageUtils.tint(icon, mTintColor);
+//                    }
+//                    item.setIcon(icon);
+//                } else {
+//                    textButtons.add(button.title);
+//                }
+//
+//                // Disable button if needed
+//                if (button.disabled) {
+//                    item.setEnabled(false);
+//                }
+//            }
+//
+//            final RnnToolBar toolBar = mToolbarWR.get();
+//            if (toolBar != null) {
+//                // Tint overflow icon which appears when there's not enough space in Toolbar for icons
+//                if (mTintColor != null) {
+//                    ImageUtils.tint(toolBar.getOverflowIcon(), mTintColor);
+//                }
+//
+//                // Tint text buttons
+//                if (textButtons.size() > 0 && mTintColor != null) {
+//                    final View decorView = ((Activity) context).getWindow().getDecorView();
+//                    decorView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+//                        @Override
+//                        public void onGlobalLayout() {
+//                            decorView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+//
+//                            // Find TextViews
+//                            for (String text : textButtons) {
+//                                decorView.findViewsWithText(toolBar.mMenuItems, text, View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION);
+//                            }
+//
+//                            // Set text color
+//                            for (View button : toolBar.mMenuItems) {
+//                                ((TextView) button).setTextColor(mTintColor);
+//                            }
+//
+//                            toolBar.mMenuItems.clear();
+//                        }
+//                    });
+//                }
+//
+//                toolBar.mSetupToolbarTask = null;
+//                mToolbarWR.clear();
+//            }
+//        }
+//
+//        private int getMenuItemShowAction(String action) {
+//            switch (action) {
+//                case "never":
+//                    return MenuItem.SHOW_AS_ACTION_NEVER;
+//                case "always":
+//                    return MenuItem.SHOW_AS_ACTION_ALWAYS;
+//                case "withText":
+//                    return MenuItem.SHOW_AS_ACTION_WITH_TEXT;
+//                default:
+//                    return MenuItem.SHOW_AS_ACTION_IF_ROOM;
+//            }
+//        }
+//    }
 }

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

@@ -1,178 +1,164 @@
 package com.reactnativenavigation.views;
 
-import android.animation.LayoutTransition;
-import android.content.Context;
-import android.support.design.widget.CoordinatorLayout;
-import android.util.AttributeSet;
-import android.view.ViewGroup;
-
-import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.activities.BaseReactActivity;
-import com.reactnativenavigation.core.objects._Screen;
-
-import java.util.Stack;
-
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-
-public class ScreenStack extends android.support.design.widget.CoordinatorLayout {
-
-    private static final int DISAPPEAR_ANIMATION_DELAY = 200;
-
-    private static class ScreenView {
-        _Screen screen;
-        RctView view;
-
-        public ScreenView(_Screen screen, RctView view) {
-            this.screen = screen;
-            this.view = view;
-        }
-    }
-
-    private final Stack<ScreenView> mStack = new Stack<>();
-    private final ReactInstanceManager mReactInstanceManager = RctManager.getInstance().getReactInstanceManager();
-    private BaseReactActivity mReactActivity;
-
-    public ScreenStack(BaseReactActivity context) {
-        super(context);
-        init(context);
-    }
-
-    public ScreenStack(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(context);
-    }
-
-    private void init(Context context) {
-        mReactActivity = (BaseReactActivity) context;
-        setLayoutTransition(new LayoutTransition());
-    }
-
-    public void push(_Screen screen) {
-        push(screen, null);
-    }
-
-    public void push(_Screen screen, RctView.OnDisplayedListener onDisplayed) {
-        RctView oldView = mStack.isEmpty() ? null : mStack.peek().view;
-        RctView view = new RctView(mReactActivity, mReactInstanceManager, screen, onDisplayed);
-        if (oldView != null) {
-            addView(view, MATCH_PARENT, MATCH_PARENT);
-
-            oldView.onTemporallyRemovedFromScreen();
-            getLayoutTransition().setStartDelay(LayoutTransition.DISAPPEARING, DISAPPEAR_ANIMATION_DELAY);
-            removeView(oldView);
-            getLayoutTransition().setStartDelay(LayoutTransition.DISAPPEARING, 0);
-        } else {
-            addView(view, MATCH_PARENT, MATCH_PARENT);
-        }
-        mStack.push(new ScreenView(screen, view));
-    }
-
-    public _Screen pop() {
-        if (mStack.isEmpty() || getStackSize() == 1) {
-            return null;
-        }
-
-        ScreenView popped = mStack.pop();
-
-        RctView newView = mStack.peek().view;
-        addView(newView);
-        newView.onReAddToScreen();
-
-        popped.view.onRemoveFromScreen();
-        removeView(popped.view);
-        return popped.screen;
-    }
-
-    public _Screen popToRoot() {
-        if (mStack.isEmpty() || getStackSize() <= 1) {
-            return null;
-        }
-
-        ScreenView oldScreenView = null;
-        while (getStackSize() > 1) {
-            ScreenView popped = mStack.pop();
-            popped.view.onRemoveFromScreen();
-            removeView(popped.view);
-            if (oldScreenView == null) {
-                oldScreenView = popped;
-            }
-        }
-
-        if (!mStack.isEmpty()) {
-            addView(mStack.peek().view, 0);
-        }
-
-        return oldScreenView != null ? oldScreenView.screen : null;
-    }
-
-    public _Screen resetTo(_Screen screen) {
-        return resetTo(screen, null);
-    }
-
-    public _Screen resetTo(_Screen screen, RctView.OnDisplayedListener onDisplayed) {
-        RctView view = new RctView(mReactActivity, mReactInstanceManager, screen, onDisplayed);
-        addView(view, MATCH_PARENT, MATCH_PARENT);
-
-        ScreenView oldScreenView = null;
-        if (!mStack.isEmpty()) {
-            while (getStackSize() > 0) {
-                ScreenView popped = mStack.pop();
-                popped.view.onRemoveFromScreen();
-                removeView(popped.view);
-                if (oldScreenView == null) {
-                    oldScreenView = popped;
-                }
-            }
-        }
-
-        // Add screen to stack after it's clear
-        mStack.push(new ScreenView(screen, view));
-
-        if (oldScreenView == null) {
-            return null;
-        }
-
-        return oldScreenView.screen;
-    }
-
-    public boolean isEmpty() {
-        return mStack.isEmpty();
-    }
-
-    public int getStackSize() {
-        return mStack.size();
-    }
-
-    public _Screen peek() {
-        return mStack.peek().screen;
-    }
-
-    /**
-     * Remove the ScreenStack from {@code parent} while preventing all child react views from getting unmounted
-     */
-    public void removeFromScreen(ViewGroup parent) {
-        mStack.peek().view.onTemporallyRemovedFromScreen();
-
-        parent.removeView(this);
-    }
-
-    /**
-     * Add ScreenStack to {@code parent}
-     */
-    public void addToScreen(ViewGroup parent) {
-        mStack.peek().view.onReAddToScreen();
-
-        parent.addView(this, new CoordinatorLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
-    }
-
-    public void removeAllReactViews() {
-        while (!mStack.empty()) {
-            RctView view = mStack.pop().view;
-            // Ensure view will be properly detached and unmounted
-            view.onRemoveFromScreen();
-            // Unmount the view
-            view.detachFromScreen();
-        }
-        removeAllViews();
-    }
+public class ScreenStack  {
+//
+//    private static final int DISAPPEAR_ANIMATION_DELAY = 200;
+//
+//    private static class ScreenView {
+//        _Screen screen;
+//        RctView view;
+//
+//        public ScreenView(_Screen screen, RctView view) {
+//            this.screen = screen;
+//            this.view = view;
+//        }
+//    }
+//
+//    private final Stack<ScreenView> mStack = new Stack<>();
+//    private final ReactInstanceManager mReactInstanceManager = RctManager.getInstance().getReactInstanceManager();
+//    private BaseReactActivity mReactActivity;
+//
+//    public ScreenStack(BaseReactActivity context) {
+//        super(context);
+//        init(context);
+//    }
+//
+//    public ScreenStack(Context context, AttributeSet attrs) {
+//        super(context, attrs);
+//        init(context);
+//    }
+//
+//    private void init(Context context) {
+//        mReactActivity = (BaseReactActivity) context;
+//        setLayoutTransition(new LayoutTransition());
+//    }
+//
+//    public void push(_Screen screen) {
+//        push(screen, null);
+//    }
+//
+//    public void push(_Screen screen, RctView.OnDisplayedListener onDisplayed) {
+//        RctView oldView = mStack.isEmpty() ? null : mStack.peek().view;
+//        RctView view = new RctView(mReactActivity, mReactInstanceManager, screen, onDisplayed);
+//        if (oldView != null) {
+//            addView(view, MATCH_PARENT, MATCH_PARENT);
+//
+//            oldView.onTemporallyRemovedFromScreen();
+//            getLayoutTransition().setStartDelay(LayoutTransition.DISAPPEARING, DISAPPEAR_ANIMATION_DELAY);
+//            removeView(oldView);
+//            getLayoutTransition().setStartDelay(LayoutTransition.DISAPPEARING, 0);
+//        } else {
+//            addView(view, MATCH_PARENT, MATCH_PARENT);
+//        }
+//        mStack.push(new ScreenView(screen, view));
+//    }
+//
+//    public _Screen pop() {
+//        if (mStack.isEmpty() || getStackSize() == 1) {
+//            return null;
+//        }
+//
+//        ScreenView popped = mStack.pop();
+//
+//        RctView newView = mStack.peek().view;
+//        addView(newView);
+//        newView.onReAddToScreen();
+//
+//        popped.view.onRemoveFromScreen();
+//        removeView(popped.view);
+//        return popped.screen;
+//    }
+//
+//    public _Screen popToRoot() {
+//        if (mStack.isEmpty() || getStackSize() <= 1) {
+//            return null;
+//        }
+//
+//        ScreenView oldScreenView = null;
+//        while (getStackSize() > 1) {
+//            ScreenView popped = mStack.pop();
+//            popped.view.onRemoveFromScreen();
+//            removeView(popped.view);
+//            if (oldScreenView == null) {
+//                oldScreenView = popped;
+//            }
+//        }
+//
+//        if (!mStack.isEmpty()) {
+//            addView(mStack.peek().view, 0);
+//        }
+//
+//        return oldScreenView != null ? oldScreenView.screen : null;
+//    }
+//
+//    public _Screen resetTo(_Screen screen) {
+//        return resetTo(screen, null);
+//    }
+//
+//    public _Screen resetTo(_Screen screen, RctView.OnDisplayedListener onDisplayed) {
+//        RctView view = new RctView(mReactActivity, mReactInstanceManager, screen, onDisplayed);
+//        addView(view, MATCH_PARENT, MATCH_PARENT);
+//
+//        ScreenView oldScreenView = null;
+//        if (!mStack.isEmpty()) {
+//            while (getStackSize() > 0) {
+//                ScreenView popped = mStack.pop();
+//                popped.view.onRemoveFromScreen();
+//                removeView(popped.view);
+//                if (oldScreenView == null) {
+//                    oldScreenView = popped;
+//                }
+//            }
+//        }
+//
+//        // Add screen to stack after it's clear
+//        mStack.push(new ScreenView(screen, view));
+//
+//        if (oldScreenView == null) {
+//            return null;
+//        }
+//
+//        return oldScreenView.screen;
+//    }
+//
+//    public boolean isEmpty() {
+//        return mStack.isEmpty();
+//    }
+//
+//    public int getStackSize() {
+//        return mStack.size();
+//    }
+//
+//    public _Screen peek() {
+//        return mStack.peek().screen;
+//    }
+//
+//    /**
+//     * Remove the ScreenStack from {@code parent} while preventing all child react views from getting unmounted
+//     */
+//    public void removeFromScreen(ViewGroup parent) {
+//        mStack.peek().view.onTemporallyRemovedFromScreen();
+//
+//        parent.removeView(this);
+//    }
+//
+//    /**
+//     * Add ScreenStack to {@code parent}
+//     */
+//    public void addToScreen(ViewGroup parent) {
+//        mStack.peek().view.onReAddToScreen();
+//
+//        parent.addView(this, new CoordinatorLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
+//    }
+//
+//    public void removeAllReactViews() {
+//        while (!mStack.empty()) {
+//            RctView view = mStack.pop().view;
+//            // Ensure view will be properly detached and unmounted
+//            view.onRemoveFromScreen();
+//            // Unmount the view
+//            view.detachFromScreen();
+//        }
+//        removeAllViews();
+//    }
 }

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

@@ -36,6 +36,7 @@ public class TitleBar extends Toolbar {
     }
 
     public void setupMenuButton() {
+
     }
 
     private void createMenu() {

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

@@ -30,12 +30,19 @@ public class TitleBarButton {
         }
 
         // Todo: add id for click listener
-        String label;
-        Drawable icon;
+        private final String label;
+        private final Drawable icon;
         @ColorInt
-        int color;
-        ShowAsAction showAsAction;
-        boolean enabled = true;
+        private final int color;
+        private final ShowAsAction showAsAction;
+        private final boolean enabled = true;
+
+        public Params(String label, Drawable icon, int color, ShowAsAction showAsAction) {
+            this.label = label;
+            this.icon = icon;
+            this.color = color;
+            this.showAsAction = showAsAction;
+        }
     }
 
     private final Menu menu;

example-redux/android/app/src/main/java/com/exampleredux/MainActivity.java

@@ -1,7 +1,7 @@
 package com.exampleredux;
 
-import com.reactnativenavigation.activities.RootActivity;
+import com.reactnativenavigation.controllers.NavigationActivity;
 
-public class MainActivity extends RootActivity {
+public class MainActivity extends NavigationActivity {
 
 }

example-redux/package.json

@@ -11,7 +11,6 @@
   "dependencies": {
     "react-native": "0.25.1",
     "react": "0.14.5",
-    "fbjs": "^0.6.1",
     "react-redux": "^4.0.6",
     "redux": "^3.0.5",
     "redux-thunk": "^1.0.3",

src/platformSpecific.android.js

@@ -1,11 +1,9 @@
 import React, {Component} from 'react';
-import {AppRegistry} from 'react-native';
+import {AppRegistry, NativeModules} from 'react-native';
 
 import Navigation from './Navigation';
 import utils from './utils';
 
-import {RctActivity} from 'react-native-navigation';
-
 const resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource');
 
 function startSingleScreenApp(params) {
@@ -20,7 +18,7 @@ function startSingleScreenApp(params) {
   addNavigationStyleParams(screen);
   screen.passProps = params.passProps;
   const drawer = setupDrawer(params.drawer);
-  RctActivity.startSingleScreenApp(screen, drawer);
+  //NativeModules.NavigationReactModule.startApp(screen, drawer);
 }
 
 function startTabBasedApp(params) {
@@ -38,7 +36,7 @@ function startTabBasedApp(params) {
   });
 
   const drawer = setupDrawer(params.drawer);
-  RctActivity.startTabBasedApp(params.tabs, params.tabsStyle, drawer);
+  //RctActivity.startTabBasedApp(params.tabs, params.tabsStyle, drawer);
 }
 
 function addTabIcon(tab) {
@@ -58,7 +56,7 @@ function navigatorPush(navigator, params) {
   addNavigatorParams(params, navigator);
   addNavigatorButtons(params);
   addNavigationStyleParams(params);
-  RctActivity.navigatorPush(params);
+  //RctActivity.navigatorPush(params);
 }
 
 function navigatorSetButtons(navigator, navigatorEventID, params) {
@@ -72,81 +70,81 @@ function navigatorSetButtons(navigator, navigatorEventID, params) {
       }
     });
   }
-  RctActivity.setNavigatorButtons(params);
+  //RctActivity.setNavigatorButtons(params);
 }
 
 function navigatorPop(navigator, params) {
   addNavigatorParams(params, navigator);
-  RctActivity.navigatorPop(params);
+  //RctActivity.navigatorPop(params);
 }
 
 function navigatorPopToRoot(navigator, params) {
-  RctActivity.navigatorPopToRoot({
-    navigatorID: navigator.navigatorID,
-    animated: !(params.animated === false)
-  });
+  //RctActivity.navigatorPopToRoot({
+  //  navigatorID: navigator.navigatorID,
+  //  animated: !(params.animated === false)
+  //});
 }
 
 function navigatorResetTo(navigator, params) {
   addNavigatorParams(params, navigator);
   addNavigatorButtons(params);
   addNavigationStyleParams(params);
-  RctActivity.navigatorResetTo(params);
+  //RctActivity.navigatorResetTo(params);
 }
 
 function navigatorSetTabBadge(navigator, params) {
-  RctActivity.setTabBadge({
-    tabIndex: params.tabIndex,
-    badge: params.badge
-  });
+  //RctActivity.setTabBadge({
+  //  tabIndex: params.tabIndex,
+  //  badge: params.badge
+  //});
 }
 
 function navigatorSetTitle(navigator, params) {
-  RctActivity.setNavigatorTitle(params);
+  //RctActivity.setNavigatorTitle(params);
 }
 
 function navigatorSwitchToTab(navigator, params) {
-  RctActivity.switchToTab({
-    navigatorID: navigator.navigatorID,
-    tabIndex: params.tabIndex
-  });
+  //RctActivity.switchToTab({
+  //  navigatorID: navigator.navigatorID,
+  //  tabIndex: params.tabIndex
+  //});
 }
 
 function navigatorToggleDrawer(navigator, params) {
-  RctActivity.toggleDrawer({
-    side: params.side,
-    animated: !(params.animated === false),
-    to: params.to || ''
-  });
+  //RctActivity.toggleDrawer({
+  //  side: params.side,
+  //  animated: !(params.animated === false),
+  //  to: params.to || ''
+  //});
 }
 
 function navigatorToggleNavBar(navigator, params) {
-  RctActivity.toggleNavigationBar({
-    hidden: params.to === 'hidden',
-    animated: !(params.animated === false)
-  });
+  //RctActivity.toggleNavigationBar({
+  //  hidden: params.to === 'hidden',
+  //  animated: !(params.animated === false)
+  //});
 }
 
 function navigatorToggleTabs(navigator, params) {
-  RctActivity.toggleNavigatorTabs({
-    hidden: params.to === 'hidden',
-    animated: !(params.animated === false)
-  });
+  //RctActivity.toggleNavigatorTabs({
+  //  hidden: params.to === 'hidden',
+  //  animated: !(params.animated === false)
+  //});
 }
 
 function showModal(params) {
   addNavigatorParams(params);
   addNavigatorButtons(params);
   addNavigationStyleParams(params);
-  RctActivity.showModal(params);
+  //RctActivity.showModal(params);
 }
 
 function dismissModal() {
-  RctActivity.dismissModal();
+  //RctActivity.dismissModal();
 }
 
 function dismissAllModals(params) {
-  RctActivity.dismissAllModals(params.animationType);
+  //RctActivity.dismissAllModals(params.animationType);
 }
 
 function addNavigatorParams(screen, navigator = null, idx = '') {
@@ -161,7 +159,7 @@ function addNavigatorButtons(screen) {
 
   // Get image uri from image id
   const rightButtons = screen.rightButtons ? screen.rightButtons : screen.navigatorButtons ?
-    screen.navigatorButtons.rightButtons : null;
+                                                                   screen.navigatorButtons.rightButtons : null;
   if (rightButtons) {
     rightButtons.forEach(function(button) {
       if (button.icon) {
@@ -192,14 +190,15 @@ function setupDrawer(drawerParams) {
   });
   if (drawer.disableOpenGesture === undefined) {
     drawer.disableOpenGesture = false;
-  };
+  }
+  ;
 
   return drawer;
 }
 
 function showFAB(params) {
   params.icon = resolveAssetSource(params.icon).uri;
-  RctActivity.showFAB(params);
+  //RctActivity.showFAB(params);
 }
 
 export default {