Display correct tab title in ToolBar

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

@@ -38,8 +38,10 @@ public class TabActivity extends BaseReactActivity {
     }
 
     private void setupToolbar(ArrayList<Screen> screens) {
-        setNavigationColors(screens.get(0));
+        Screen initialScreen = screens.get(0);
+        setNavigationColors(initialScreen);
         mToolbar.setScreens(screens);
+        mToolbar.setTitle(initialScreen.title == null ? "" : initialScreen.title);
         setSupportActionBar(mToolbar);
     }
 

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

@@ -92,7 +92,7 @@ public class ViewPagerAdapter extends PagerAdapter implements TabLayout.OnTabSel
 
     @Override
     public CharSequence getPageTitle(int position) {
-        return mScreenStacks.get(position).peek().title;
+        return mScreenStacks.get(position).peek().label;
     }
 
     @Override
@@ -101,10 +101,14 @@ public class ViewPagerAdapter extends PagerAdapter implements TabLayout.OnTabSel
         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);
+
         // Send tab selected event
         WritableMap params = Arguments.createMap();
         Screen screen = mScreenStacks.get(position).peek();

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

@@ -20,6 +20,7 @@ public class Screen extends JsonObject implements Serializable {
 
     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";
@@ -36,6 +37,7 @@ public class Screen extends JsonObject implements Serializable {
     private static final String KEY_TAB_INDICATOR_COLOR = "tabIndicatorColor";
 
     public String title;
+    public String label;
     public String screenId;
     public String screenInstanceId;
     public String navigatorId;
@@ -60,6 +62,7 @@ public class Screen extends JsonObject implements Serializable {
 
     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);