Corrected styling

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

@@ -1,6 +1,5 @@
 package com.reactnativenavigation.core.objects;
 
-import android.os.Bundle;
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -48,7 +47,7 @@ public class Screen extends JsonObject implements Serializable {
     public final String navigatorEventId;
     public final int icon;
     public final ArrayList<Button> buttons;
-    public final HashMap passedProps;
+    public HashMap<String, Object> passedProps = new HashMap<>();
 
     // Navigation styling
     @Nullable @ColorInt public Integer toolBarColor;
@@ -62,7 +61,7 @@ public class Screen extends JsonObject implements Serializable {
 
     @NonNull
     public List<Button> getButtons() {
-        return buttons == null ? Collections.EMPTY_LIST : buttons;
+        return buttons == null ? Collections.<Button>emptyList() : buttons;
     }
 
     public Screen(ReadableMap screen) {
@@ -73,17 +72,15 @@ public class Screen extends JsonObject implements Serializable {
         navigatorId = getString(screen, KEY_NAVIGATOR_ID);
         navigatorEventId = getString(screen, KEY_NAVIGATOR_EVENT_ID);
         icon = getInt(screen, KEY_ICON);
-        if(screen.hasKey(KEY_PROPS))
-            passedProps = ((ReadableNativeMap)screen.getMap(KEY_PROPS)).toHashMap();
-        else
-            passedProps = null;
-
+        if(screen.hasKey(KEY_PROPS)) {
+            passedProps = ((ReadableNativeMap) screen.getMap(KEY_PROPS)).toHashMap();
+        }
         buttons = getButtons(screen);
         setToolbarStyle(screen);
     }
 
     private ArrayList<Button> getButtons(ReadableMap screen) {
-        ArrayList<Button> ret = new ArrayList();
+        ArrayList<Button> ret = new ArrayList<>();
         if (screen.hasKey(KEY_RIGHT_BUTTONS)) {
             ReadableArray rightButtons = screen.getArray(KEY_RIGHT_BUTTONS);
             for (int i = 0; i < rightButtons.size(); i++) {
@@ -93,7 +90,6 @@ public class Screen extends JsonObject implements Serializable {
         return ret;
     }
 
-
     public void setToolbarStyle(ReadableMap screen) {
         ReadableMap style = getMap(screen, KEY_TOOL_BAR_STYLE);
         if (style != null) {

android/app/src/main/java/com/reactnativenavigation/utils/BridgeUtils.java

@@ -51,7 +51,7 @@ public class BridgeUtils {
             } else if (arrayList.get(0) instanceof HashMap) {
                 bundle.putParcelableArray(key, toBundleArray((ArrayList<HashMap>) arrayList));
             } else if (arrayList.get(0) instanceof ArrayList) {
-                Log.w("RNNNavigation", "Arrays of arrays passed in props are converted to dictionaries with indexes as keys");
+                Log.w("RNNavigation", "Arrays of arrays passed in props are converted to dictionaries with indexes as keys");
                 Bundle innerArray = new Bundle();
                 for (int i = 0; i < arrayList.size(); i++) {
                     putArray(String.valueOf(i), (ArrayList) arrayList.get(i), innerArray);
@@ -62,11 +62,10 @@ public class BridgeUtils {
     }
 
     private static void verifyArrayListIsSingleType(ArrayList arrayList) {
-        int i = 1;
-        while (i < arrayList.size()) {
-            if (!arrayList.get(i - 1).getClass().isInstance(arrayList.get(i)))
+        for (int i = 1; i < arrayList.size(); i++) {
+            if (!arrayList.get(i - 1).getClass().isInstance(arrayList.get(i))) {
                 throw new IllegalArgumentException("Cannot pass array of multiple types via props");
-            i++;
+            }
         }
     }
 
@@ -80,36 +79,41 @@ public class BridgeUtils {
 
     private static int[] toIntArray(ArrayList<Integer> arrayList) {
         int[] ret = new int[arrayList.size()];
-        for (int i=0; i < ret.length; i++)
+        for (int i=0; i < ret.length; i++) {
             ret[i] = arrayList.get(i);
+        }
         return ret;
     }
 
     private static float[] toFloatArray(ArrayList<Float> arrayList) {
         float[] ret = new float[arrayList.size()];
-        for (int i=0; i < ret.length; i++)
+        for (int i=0; i < ret.length; i++) {
             ret[i] = arrayList.get(i);
+        }
         return ret;
     }
 
     private static double[] toDoubleArray(ArrayList<Double> arrayList) {
         double[] ret = new double[arrayList.size()];
-        for (int i=0; i < ret.length; i++)
+        for (int i=0; i < ret.length; i++) {
             ret[i] = arrayList.get(i);
+        }
         return ret;
     }
 
     private static boolean[] toBooleanArray(ArrayList<Boolean> arrayList) {
         boolean[] ret = new boolean[arrayList.size()];
-        for (int i=0; i < ret.length; i++)
+        for (int i=0; i < ret.length; i++) {
             ret[i] = arrayList.get(i);
+        }
         return ret;
     }
 
     private static String[] toStringArray(ArrayList<String> arrayList) {
         String[] ret = new String[arrayList.size()];
-        for (int i=0; i < ret.length; i++)
+        for (int i=0; i < ret.length; i++) {
             ret[i] = arrayList.get(i);
+        }
         return ret;
     }