removed old v1 code

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

@@ -1,211 +0,0 @@
-package com.reactnativenavigation.activities;
-
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.view.Menu;
-
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
-import com.reactnativenavigation.views.RnnToolBar;
-import com.reactnativenavigation.views.ScreenStack;
-
-import javax.annotation.Nullable;
-
-public abstract class BaseReactActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler {
-
-    protected static final String KEY_ANIMATED = "animated";
-    protected static final String KEY_BADGE = "badge";
-    protected static final String KEY_HIDDEN = "hidden";
-    protected static final String KEY_SIDE = "side";
-    protected static final String KEY_TAB_INDEX = "tabIndex";
-    protected static final String KEY_TITLE = "title";
-    protected static final String KEY_TO = "to";
-    protected static final String KEY_NAVIGATOR_ID = "navigatorID";
-
-    private static final String TAG = "BaseReactActivity";
-
-    @Nullable
-    protected ReactInstanceManager reactInstanceManager;
-
-    private Menu menu;
-    protected RnnToolBar toolbar;
-    protected ActionBarDrawerToggle drawerToggle;
-    protected DrawerLayout drawerLayout;
-    protected ScreenStack drawerStack;
-
-
-//    @CallSuper
-//    public void push(Screen screen) {
-//        StyleHelper.updateStyles(toolbar, screen);
-//        if (toolbar != null) {
-//            toolbar.update(screen);
-//
-//            if (getCurrentNavigatorId().equals(screen.navigatorId) &&
-//                    getScreenStackSize() >= 1) {
-//                toolbar.setNavUpButton(screen);
-//            }
-//        }
-//    }
-
-//    @CallSuper
-//    public Screen pop(String navigatorId) {
-//        if (toolbar != null &&
-//                getCurrentNavigatorId().equals(navigatorId) &&
-//                getScreenStackSize() <= 2) {
-//            toolbar.setNavUpButton();
-//        }
-//
-//        return null;
-//    }
-//
-//    @CallSuper
-//    public Screen popToRoot(String navigatorId) {
-//        if (toolbar != null) {
-//            toolbar.setNavUpButton();
-//        }
-//
-//        return null;
-//    }
-//
-//    @CallSuper
-//    public Screen resetTo(Screen screen) {
-//        StyleHelper.updateStyles(toolbar, screen);
-//        if (toolbar != null) {
-//            toolbar.setNavUpButton();
-//        }
-//
-//        return null;
-//    }
-
-//    @CallSuper
-//    public Screen getCurrentScreen() {
-//        ModalController modalController = ModalController.getInstance();
-//        if (modalController.isModalDisplayed()) {
-//            RnnModal modal = modalController.get();
-//            assert modal != null;
-//            return modal.getCurrentScreen();
-//        }
-//
-//        return null;
-//    }
-
-//    @Override
-//    public void onConfigurationChanged(Configuration newConfig) {
-//        super.onConfigurationChanged(newConfig);
-//        if (drawerToggle != null) {
-//            drawerToggle.onConfigurationChanged(newConfig);
-//        }
-//    }
-
-//    @Override
-//    public boolean onCreateOptionsMenu(Menu menu) {
-//        this.menu = menu;
-//        Screen currentScreen = getCurrentScreen();
-//        if (toolbar != null && currentScreen != null && !isFinishing()) {
-//            toolbar.setupToolbarButtonsAsync(currentScreen);
-//        }
-//        return super.onCreateOptionsMenu(menu);
-//    }
-
-//    @Override
-//    public boolean onOptionsItemSelected(MenuItem item) {
-//        if (drawerToggle != null &&
-//                getScreenStackSize() == 1 &&
-//                drawerToggle.onOptionsItemSelected(item)) {
-//            return true;
-//        }
-//
-//        if (item.getItemId() == android.R.id.home) {
-//            onBackPressed();
-//        } else {
-//            String eventId = TitleBarButton.getButtonEventId(item);
-//            assert eventId != null;
-//
-//            WritableMap params = Arguments.createMap();
-//            RctManager.getInstance().sendEvent(eventId, getCurrentScreen(), params);
-//        }
-//        return super.onOptionsItemSelected(item);
-//    }
-
-//    @Override
-//    public void onPostCreate(Bundle savedInstanceState) {
-//        super.onPostCreate(savedInstanceState);
-//        if (drawerToggle != null) {
-//            drawerToggle.syncState();
-//        }
-//    }
-
-//    public Menu getMenu() {
-//        return menu;
-//    }
-
-
-//    protected void setupDrawer(Screen screen, Drawer drawer, int drawerFrameId, int drawerLayoutId) {
-//        if (drawer == null || drawer.left == null) {
-//            return;
-//        }
-//
-//        drawerStack = new ScreenStack(this);
-//        FrameLayout drawerFrame = (FrameLayout) findViewById(drawerFrameId);
-//        drawerFrame.addView(drawerStack);
-//        drawerStack.push(drawer.left);
-//
-//        drawerLayout = (DrawerLayout) findViewById(drawerLayoutId);
-//        drawerToggle = toolbar.setupDrawer(drawerLayout, drawer.left, screen);
-//    }
-
-//    public void setNavigationButtons(ReadableMap buttons) {
-//        if (toolbar == null) {
-//            return;
-//        }
-//        getCurrentScreen().setButtons(buttons);
-//        toolbar.setupToolbarButtonsAsync(getCurrentScreen());
-//    }
-//
-//    public void setNavigationTitle(ReadableMap title) {
-//        if (toolbar == null) {
-//            return;
-//        }
-//
-//        toolbar.setTitle(title.getString(KEY_TITLE));
-//    }
-
-//    public void toggleNavigationBar(ReadableMap params) {
-//        if (toolbar == null) {
-//            return;
-//        }
-//
-//        boolean hide = params.getBoolean(KEY_HIDDEN);
-//        boolean animated = params.getBoolean(KEY_ANIMATED);
-//        if (hide) {
-//            toolbar.hideToolbar(animated);
-//        } else {
-//            toolbar.showToolbar(animated);
-//        }
-//    }
-
-//    public void toggleDrawer(ReadableMap params) {
-//        if (toolbar == null || drawerToggle == null) {
-//            return;
-//        }
-//
-//        boolean animated = params.getBoolean(KEY_ANIMATED);
-//        String side = params.getString(KEY_SIDE);
-//        String to = params.getString(KEY_TO);
-//        switch (to) {
-//            case "open":
-//                toolbar.showDrawer(animated);
-//                break;
-//            case "closed":
-//                toolbar.hideDrawer(animated);
-//                break;
-//            default:
-//                toolbar.toggleDrawer(animated);
-//                break;
-//        }
-//    }
-//
-//    public void showFAB(ReadableMap params) {
-//    }
-}

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

@@ -1,287 +0,0 @@
-package com.reactnativenavigation.activities;
-
-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 tabIcon 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.tabIcon != 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.tabLabel, 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,114 +0,0 @@
-package com.reactnativenavigation.activities;
-
-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 tabIcon 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("tabIcon")));
-////        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,91 +0,0 @@
-package com.reactnativenavigation.activities;
-
-/**
- * This class is currently not supported and will be removed in future release.
- * Created by guyc on 02/04/16.
- */
-@Deprecated
-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,135 +0,0 @@
-package com.reactnativenavigation.adapters;
-
-/**
- * Created by guyc on 02/04/16.
- */
-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().tabLabel;
-//    }
-//
-//    @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

@@ -2,7 +2,6 @@ package com.reactnativenavigation.bridge;
 
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
-import com.reactnativenavigation.core.objects._Screen;
 
 public class NavigationReactEventEmitter {
 

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

@@ -1,19 +0,0 @@
-package com.reactnativenavigation.core.objects;
-
-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/JsonObject.java

@@ -1,35 +0,0 @@
-package com.reactnativenavigation.core.objects;
-
-import android.graphics.Color;
-
-import com.facebook.react.bridge.ReadableMap;
-
-/**
- * Created by guyc on 08/04/16.
- */
-public class JsonObject {
-
-    protected String getString(ReadableMap map, String key) {
-        return getString(map, key, null);
-    }
-
-    protected String getString(ReadableMap map, String key, String defaultValue) {
-        return map.hasKey(key) ? map.getString(key) : defaultValue;
-    }
-
-    protected int getInt(ReadableMap map, String key) {
-        return map.hasKey(key) ? map.getInt(key) : -1;
-    }
-
-    protected ReadableMap getMap(ReadableMap map, String key) {
-        return map.hasKey(key) ? map.getMap(key) : null;
-    }
-
-    protected Integer getColor(ReadableMap map, String key) {
-        return map.hasKey(key) ? Color.parseColor(map.getString(key)) : null;
-    }
-
-    protected Boolean getBoolean(ReadableMap map, String key) {
-        return map.hasKey(key) && map.getBoolean(key);
-    }
-}

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

@@ -1,68 +0,0 @@
-package com.reactnativenavigation.core.objects;
-
-/**
- * Created by guyc on 08/04/16.
- */
-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 = "tabIcon";
-//    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 tabIcon 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,126 +0,0 @@
-package com.reactnativenavigation.core.objects;
-
-/**
- * Created by guyc on 02/04/16.
- */
-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 = "tabLabel";
-//    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 = "tabIcon";
-//    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 tabLabel;
-//    public final String screenId;
-//    public final String screenInstanceId;
-//    public final String navigatorId;
-//    public final String navigatorEventId;
-//    public final String tabIcon;
-//    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);
-//        tabLabel = 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);
-//        tabIcon = 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, tabIcon);
-//    }
-//
-//    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/OnScreenPoppedListener.java

@@ -1,8 +1,6 @@
 package com.reactnativenavigation.layouts;
 
-import com.reactnativenavigation.core.objects._Screen;
 
 public interface OnScreenPoppedListener {
 
-    void onScreenPopped(_Screen popped);
 }

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

@@ -1,68 +0,0 @@
-package com.reactnativenavigation.modal;
-
-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();
-//        }
-//    }
-//
-//    @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/utils/ContextProvider.java

@@ -1,34 +0,0 @@
-package com.reactnativenavigation.utils;
-
-import android.support.annotation.Nullable;
-
-import com.reactnativenavigation.activities.BaseReactActivity;
-
-import java.lang.ref.WeakReference;
-
-/**
- * Created by guyc on 10/03/16.
- */
-public class ContextProvider {
-    private static WeakReference<BaseReactActivity> sActivityWR;
-
-    public static void setActivityContext(BaseReactActivity activity) {
-        if (sActivityWR == null) {
-            sActivityWR = new WeakReference<>(activity);
-        }
-    }
-
-    /**
-     * Returns the currently resumed activity or {@code null} if there is none.
-     */
-    public static @Nullable BaseReactActivity getActivityContext() {
-        return sActivityWR != null ? sActivityWR.get() : null;
-    }
-
-    public static void clearActivityContext() {
-        if (sActivityWR != null) {
-            sActivityWR.clear();
-        }
-        sActivityWR = null;
-    }
-}