Fix tabs and right buttons getting parsed in wrong order

android/app/src/main/java/com/reactnativenavigation/params/parsers/ActivityParamsParser.java

@@ -18,7 +18,7 @@ public class ActivityParamsParser extends Parser {
 
         if (hasKey(params, "tabs")) {
             result.type = ActivityParams.Type.TabBased;
-            result.tabParams = ScreenParamsParser.parseTabs(params.getBundle("tabs"));
+            result.tabParams = new ScreenParamsParser().parseTabs(params.getBundle("tabs"));
         }
 
         if (hasKey(params, "sideMenu")) {

android/app/src/main/java/com/reactnativenavigation/params/parsers/Parser.java

@@ -2,8 +2,11 @@ package com.reactnativenavigation.params.parsers;
 
 import android.os.Bundle;
 
-public class Parser {
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
+public class Parser {
     protected static boolean hasKey(Bundle bundle, String key) {
         return bundle.keySet().contains(key);
     }
@@ -20,4 +23,16 @@ public class Parser {
             super(key);
         }
     }
+
+    protected interface ParseStrategy<T> {
+        T parse(Bundle params);
+    }
+
+    protected <T> List<T> parseBundle(Bundle params, ParseStrategy<T> strategy) {
+        ArrayList<T> result = new ArrayList<>(Collections.nCopies(params.keySet().size(), (T) null));
+        for (String key : params.keySet()) {
+            result.set(Integer.parseInt(key), strategy.parse(params.getBundle(key)));
+        }
+        return result;
+    }
 }

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

@@ -10,8 +10,6 @@ import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.params.TopTabParams;
 import com.reactnativenavigation.react.ImageLoader;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class ScreenParamsParser extends Parser {
@@ -75,7 +73,7 @@ public class ScreenParamsParser extends Parser {
     private static List<TopTabParams> parseTopTabs(Bundle params) {
         List<TopTabParams> topTabParams = null;
         if (hasKey(params, TOP_TABS)) {
-             topTabParams = TopTabParamsParser.parse(params.getBundle(TOP_TABS));
+            topTabParams = new TopTabParamsParser().parse(params.getBundle(TOP_TABS));
         }
         return topTabParams;
     }
@@ -101,11 +99,12 @@ public class ScreenParamsParser extends Parser {
         return leftButton;
     }
 
-    public static List<ScreenParams> parseTabs(Bundle params) {
-        ScreenParams result[] = new ScreenParams[params.keySet().size()];
-        for (String key : params.keySet()) {
-            result[Integer.parseInt(key)] = ScreenParamsParser.parse(params.getBundle(key));
-        }
-        return new ArrayList<>(Arrays.asList(result));
+    public List<ScreenParams> parseTabs(Bundle params) {
+        return parseBundle(params, new ParseStrategy<ScreenParams>() {
+            @Override
+            public ScreenParams parse(Bundle screen) {
+                return ScreenParamsParser.parse(screen);
+            }
+        });
     }
 }

android/app/src/main/java/com/reactnativenavigation/params/parsers/TitleBarButtonParamsParser.java

@@ -7,17 +7,16 @@ import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.react.ImageLoader;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class TitleBarButtonParamsParser extends Parser {
     public List<TitleBarButtonParams> parseButtons(Bundle params) {
-        List<TitleBarButtonParams> result = new ArrayList<>();
-
-        for (String key : params.keySet()) {
-            result.add(parseSingleButton(params.getBundle(key)));
-        }
-        return result;
+        return parseBundle(params, new ParseStrategy<TitleBarButtonParams>() {
+            @Override
+            public TitleBarButtonParams parse(Bundle button) {
+                return parseSingleButton(button);
+            }
+        });
     }
 
     public TitleBarButtonParams parseSingleButton(Bundle bundle) {

android/app/src/main/java/com/reactnativenavigation/params/parsers/TopTabParamsParser.java

@@ -6,7 +6,6 @@ import android.support.annotation.NonNull;
 import com.reactnativenavigation.params.NavigationParams;
 import com.reactnativenavigation.params.TopTabParams;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class TopTabParamsParser extends Parser {
@@ -15,12 +14,13 @@ public class TopTabParamsParser extends Parser {
     private static final String NAVIGATION_PARAMS = "navigationParams";
 
     @SuppressWarnings("ConstantConditions")
-    public static List<TopTabParams> parse(Bundle params) {
-        List<TopTabParams> result = new ArrayList<>();
-        for (String key : params.keySet()) {
-            result.add(parseItem(params.getBundle(key)));
-        }
-        return result;
+    public List<TopTabParams> parse(Bundle params) {
+        return parseBundle(params, new ParseStrategy<TopTabParams>() {
+            @Override
+            public TopTabParams parse(Bundle topTabs) {
+                return parseItem(topTabs);
+            }
+        });
     }
 
     @NonNull