f

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

@@ -37,7 +37,7 @@ public class BottomTabActivity  {
 //        setupTabs(getIntent().getExtras());
 //        setupPages(screens);
 //
-//        // Setup Toolbar after it's measured since icon height is dependent on Toolbar height
+//        // Setup Toolbar after it's measured since tabIcon height is dependent on Toolbar height
 //        mContentFrame.post(new Runnable() {
 //            @Override
 //            public void run() {
@@ -239,7 +239,7 @@ public class BottomTabActivity  {
 //        protected Map<_Screen, Drawable> doInBackground(Void... params) {
 //            Map<_Screen, Drawable> icons = new HashMap<>();
 //            for (_Screen screen : mScreens) {
-//                if (screen.icon != null) {
+//                if (screen.tabIcon != null) {
 //                    icons.put(screen, screen.getIcon(this.mActivity));
 //                }
 //            }
@@ -271,7 +271,7 @@ public class BottomTabActivity  {
 //            ScreenStack stack = new ScreenStack(this);
 //            stack.push(screen);
 //            mScreenStacks.add(stack);
-//            AHBottomNavigationItem item = new AHBottomNavigationItem(screen.label, icons.get(screen), Color.GRAY);
+//            AHBottomNavigationItem item = new AHBottomNavigationItem(screen.tabLabel, icons.get(screen), Color.GRAY);
 //            mBottomNavigation.addItem(item);
 //            mBottomNavigation.setOnTabSelectedListener(this);
 //        }

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

@@ -29,7 +29,7 @@ public class SingleScreenActivity {
 //        contentFrame.addView(mScreenStack);
 //        mScreenStack.push(screen);
 //
-//        // Setup Toolbar after it's measured since icon height is dependent on Toolbar height
+//        // Setup Toolbar after it's measured since tabIcon height is dependent on Toolbar height
 //        contentFrame.post(new Runnable() {
 //            @Override
 //            public void run() {
@@ -101,7 +101,7 @@ public class SingleScreenActivity {
 //    @Override
 //    public void showFAB(ReadableMap params) {
 ////        FloatingActionButton fab = new FloatingActionButton(this);
-////        fab.setImageDrawable(IconUtils.getIcon(this, params.getString("icon")));
+////        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);

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

@@ -74,7 +74,7 @@ public class ViewPagerAdapter {
 //
 //    @Override
 //    public CharSequence getPageTitle(int position) {
-//        return mScreenStacks.get(position).peek().label;
+//        return mScreenStacks.get(position).peek().tabLabel;
 //    }
 //
 //    @Override

android/app/src/main/java/com/reactnativenavigation/bridge/parsers/ScreenParamsParser.java

@@ -7,11 +7,11 @@ import com.reactnativenavigation.controllers.ScreenParams;
 public class ScreenParamsParser implements ParamsParser<ScreenParams> {
     private static final String KEY_TITLE = "title";
     private static final String KEY_SCREEN = "screen";
-    private static final String KEY_LABEL = "label";
+    private static final String KEY_LABEL = "tabLabel";
     private static final String KEY_SCREEN_INSTANCE_ID = "screenInstanceID";
     private static final String KEY_NAVIGATOR_ID = "navigatorID";
     private static final String KEY_NAVIGATOR_EVENT_ID = "navigatorEventID";
-    private static final String KEY_ICON = "icon";
+    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";
@@ -33,12 +33,12 @@ public class ScreenParamsParser implements ParamsParser<ScreenParams> {
     public ScreenParams parse(ReadableMap params) {
         ScreenParams result = new ScreenParams();
         result.title = params.getString(KEY_TITLE);
-        result.label = params.getString(KEY_LABEL);
+        result.tabLabel = params.getString(KEY_LABEL);
         result.screenId = params.getString(KEY_SCREEN);
         result.screenInstanceId = params.getString(KEY_SCREEN_INSTANCE_ID);
         result.navigatorId = params.getString(KEY_NAVIGATOR_ID);
         result.navigatorEventId = params.getString(KEY_NAVIGATOR_EVENT_ID);
-        result.icon = getString(KEY_ICON);
+        result.tabIcon = getString(KEY_ICON);
         if (screen.hasKey(KEY_PROPS)) {
             passedProps = ((ReadableNativeMap) screen.getMap(KEY_PROPS)).toHashMap();
         }

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

@@ -8,15 +8,12 @@ import com.reactnativenavigation.views.TitleBarButton;
 import java.util.ArrayList;
 
 public class ScreenParams {
-    public String screenRegisteredId;
+    public String screenId;
+    public String screenInstanceId;
     public Bundle passProps;
     public ArrayList<TitleBarButton.Params> buttons;
     public String title;
-    public String label;
-    public String screenId;
-    public String screenInstanceId;
-    public String navigatorId;
-    public String navigatorEventId;
-    public Drawable icon;
+    public String tabLabel;
+    public Drawable tabIcon;
     public ScreenStyleParams styleParams;
 }

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

@@ -3,9 +3,12 @@ package com.reactnativenavigation.controllers;
 import android.support.annotation.ColorInt;
 
 public class ScreenStyleParams {
-    @ColorInt public int statusBarColor;
-    @ColorInt public int topBarColor;
-    @ColorInt public int navigationBarColor;
+    @ColorInt
+    public int statusBarColor;
+    @ColorInt
+    public int topBarColor;
+    @ColorInt
+    public int navigationBarColor;
     public boolean titleBarHidden;
     public boolean topBarHidden;
     public boolean backButtonHidden;

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

@@ -8,7 +8,7 @@ public class _Button  {
 //
 //    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_ICON = "tabIcon";
 //    private static final String KEY_DISABLED = "disabled";
 //    private static final String KEY_SHOW_AS_ACTION = "showAsAction";
 //
@@ -34,7 +34,7 @@ public class _Button  {
 //    }
 //
 //    /**
-//     * @param dimensions The requested icon dimensions
+//     * @param dimensions The requested tabIcon dimensions
 //     */
 //    public Drawable getIcon(Context ctx, int dimensions) {
 //       return ImageLoader.getIcon(ctx, mIconSource, dimensions);

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

@@ -8,11 +8,11 @@ public class _Screen {
 //
 //    private static final String KEY_TITLE = "title";
 //    private static final String KEY_SCREEN = "screen";
-//    private static final String KEY_LABEL = "label";
+//    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 = "icon";
+//    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";
@@ -31,12 +31,12 @@ public class _Screen {
 //    private static final String KEY_PROPS = "passProps";
 //
 //    public String title;
-//    public final String label;
+//    public final String tabLabel;
 //    public final String screenId;
 //    public final String screenInstanceId;
 //    public final String navigatorId;
 //    public final String navigatorEventId;
-//    public final String icon;
+//    public final String tabIcon;
 //    public ArrayList<_Button> buttons;
 //    public final boolean backButtonHidden;
 //    public boolean bottomTabsHiddenOnScroll;
@@ -61,12 +61,12 @@ public class _Screen {
 //
 //    public _Screen(ReadableMap screen) {
 //        title = getString(screen, KEY_TITLE);
-//        label = getString(screen, KEY_LABEL);
+//        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);
-//        icon = getString(screen, KEY_ICON);
+//        tabIcon = getString(screen, KEY_ICON);
 //        if(screen.hasKey(KEY_PROPS)) {
 //            passedProps = ((ReadableNativeMap) screen.getMap(KEY_PROPS)).toHashMap();
 //        }
@@ -104,7 +104,7 @@ public class _Screen {
 //    }
 //
 //    public Drawable getIcon(Context ctx) {
-//        return ImageLoader.getIcon(ctx, icon);
+//        return ImageLoader.getIcon(ctx, tabIcon);
 //    }
 //
 //    public void setToolbarStyle(ReadableMap screen) {

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

@@ -45,13 +45,13 @@ public class RnnToolBar {
 //                R.string.drawer_close
 //        );
 //        mDrawerLayout.setDrawerListener(mDrawerToggle);
-//        setupDrawerIconAsync(drawerScreen.icon, screen);
+//        setupDrawerIconAsync(drawerScreen.tabIcon, screen);
 //
 //        return mDrawerToggle;
 //    }
 //
-//    public void setDrawerIcon(Drawable icon) {
-//        mDrawerIcon = icon;
+//    public void setDrawerIcon(Drawable tabIcon) {
+//        mDrawerIcon = tabIcon;
 //    }
 //
 //    public void showDrawer(boolean animated) {
@@ -293,13 +293,13 @@ public class RnnToolBar {
 //                MenuItem item = menu.add(Menu.NONE, button.getItemId(), size - i - 1, button.title);
 //                item.setShowAsAction(getMenuItemShowAction(button.showAsAction));
 //
-//                // Set button icon
+//                // Set button tabIcon
 //                if (button.hasIcon()) {
-//                    Drawable icon = icons.get(button.id);
+//                    Drawable tabIcon = icons.get(button.id);
 //                    if (mTintColor != null) {
-//                        ImageUtils.tint(icon, mTintColor);
+//                        ImageUtils.tint(tabIcon, mTintColor);
 //                    }
-//                    item.setIcon(icon);
+//                    item.setIcon(tabIcon);
 //                } else {
 //                    textButtons.add(button.title);
 //                }
@@ -312,7 +312,7 @@ public class RnnToolBar {
 //
 //            final RnnToolBar toolBar = mToolbarWR.get();
 //            if (toolBar != null) {
-//                // Tint overflow icon which appears when there's not enough space in Toolbar for icons
+//                // Tint overflow tabIcon which appears when there's not enough space in Toolbar for icons
 //                if (mTintColor != null) {
 //                    ImageUtils.tint(toolBar.getOverflowIcon(), mTintColor);
 //                }