fixed top tabs

src/deprecated/platformSpecificDeprecated.android.js

@@ -19,18 +19,13 @@ function startSingleScreenApp(params) {
   addNavigationStyleParams(screen);
   screen.passProps = params.passProps;
 
-  if (screen.topTabs) {
-    _.forEach(screen.topTabs, (tab) => {
-      addNavigatorParams(tab);
-      adaptNavigationParams(tab);
-    });
-  }
 
   //const drawer = setupDrawer(params.drawer);
 
   /*
    * adapt to new API
    */
+  adaptTopTabs(screen);
   screen.screenId = screen.screen;
   params.screen = adaptNavigationStyleToScreenStyle(screen);
   params.screen = adaptNavigationParams(screen);
@@ -39,12 +34,21 @@ function startSingleScreenApp(params) {
   newPlatformSpecific.startApp(params);
 }
 
+function adaptTopTabs(topTabs) {
+  _.forEach(topTabs, (tab) => {
+    addNavigatorParams(tab);
+    adaptNavigationParams(tab);
+  });
+}
+
 function navigatorPush(navigator, params) {
   addNavigatorParams(params, navigator);
   addNavigatorButtons(params);
   addTitleBarBackButtonIfNeeded(params);
   addNavigationStyleParams(params);
 
+  adaptTopTabs(params);
+
   params.screenId = params.screen;
   let adapted = adaptNavigationStyleToScreenStyle(params);
   adapted = adaptNavigationParams(adapted);
@@ -77,6 +81,8 @@ function navigatorResetTo(navigator, params) {
   addNavigatorButtons(params);
   addNavigationStyleParams(params);
 
+  adaptTopTabs(params);
+
   params.screenId = params.screen;
   let adapted = adaptNavigationStyleToScreenStyle(params);
   adapted = adaptNavigationParams(adapted);
@@ -153,6 +159,8 @@ function startTabBasedApp(params) {
     addTabIcon(tab);
     tab.passProps = params.passProps;
 
+    adaptTopTabs(params);
+
     tab.screenId = tab.screen;
 
     let newtab = adaptNavigationStyleToScreenStyle(tab);
@@ -255,6 +263,7 @@ function showModal(params) {
   /*
    * adapt to new API
    */
+  adaptTopTabs(params);
   params.screenId = params.screen;
   let adapted = adaptNavigationStyleToScreenStyle(params);
   adapted = adaptNavigationParams(adapted);