refactored

android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -69,4 +69,7 @@ public abstract class NavigationApplication extends Application {
     @NonNull
     public abstract List<ReactPackage> createAdditionalReactPackages();
 
+    public void sendEvent(String eventId, String navigatorEventId) {
+        navigationReactInstance.getReactEventEmitter().sendEvent(eventId, navigatorEventId);
+    }
 }

android/app/src/main/java/com/reactnativenavigation/layouts/SingleScreenLayout.java

@@ -5,6 +5,8 @@ import android.widget.FrameLayout;
 
 import com.reactnativenavigation.params.ScreenParams;
 
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+
 public class SingleScreenLayout extends FrameLayout implements Layout {
 
     private final ScreenParams screenParams;
@@ -13,11 +15,12 @@ public class SingleScreenLayout extends FrameLayout implements Layout {
     public SingleScreenLayout(Context context, ScreenParams screenParams) {
         super(context);
         this.screenParams = screenParams;
+        createLayout();
     }
 
-    public void createLayout() {
+    private void createLayout() {
         screenLayout = new ScreenLayout(getContext(), screenParams);
-        addView(screenLayout);
+        addView(screenLayout, new FrameLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
     }
 
     @Override

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

@@ -8,4 +8,16 @@ public class Parser {
         return bundle.keySet().contains(key);
     }
 
+
+    protected static void assertKeyExists(Bundle bundle, String key) {
+        if (!hasKey(bundle, key)) {
+            throw new KeyDoesNotExistsException(key);
+        }
+    }
+
+    public static class KeyDoesNotExistsException extends RuntimeException {
+        public KeyDoesNotExistsException(String key) {
+            super(key);
+        }
+    }
 }

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

@@ -4,7 +4,7 @@ import android.os.Bundle;
 
 import com.reactnativenavigation.params.ScreenParams;
 
-public class ScreenParamsParser {
+public class ScreenParamsParser extends Parser {
     private static final String KEY_TITLE = "title";
     private static final String KEY_SCREEN_ID = "screenId";
     private static final String KEY_SCREEN_INSTANCE_ID = "screenInstanceID";
@@ -14,13 +14,14 @@ public class ScreenParamsParser {
     private static final String KEY_BUTTONS = "titleBarButtons";
     private static final String STYLE_PARAMS = "styleParams";
 
+    @SuppressWarnings("ConstantConditions")
     public static ScreenParams parse(Bundle params) {
         ScreenParams result = new ScreenParams();
         result.screenId = params.getString(KEY_SCREEN_ID);
         result.screenInstanceId = params.getString(KEY_SCREEN_INSTANCE_ID);
         result.passProps = params.getBundle(KEY_PROPS);
+        assertKeyExists(params, KEY_NAVIGATION_PARAMS);
         result.navigationParams = params.getBundle(KEY_NAVIGATION_PARAMS);
-        assert result.navigationParams != null;
         result.navigatorEventId = result.navigationParams.getString(KEY_NAVIGATOR_EVENT_ID);
         result.buttons = TitleBarButtonParamsParser.parse(params.getBundle(KEY_BUTTONS));
         result.title = params.getString(KEY_TITLE);

android/app/src/main/java/com/reactnativenavigation/react/JsDevImageLoader.java

@@ -8,7 +8,7 @@ import android.os.StrictMode;
 import android.support.annotation.NonNull;
 
 import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.utils.ImageUtils;
+import com.reactnativenavigation.utils.ViewUtils;
 
 import java.io.IOException;
 import java.net.URL;
@@ -33,7 +33,7 @@ public class JsDevImageLoader {
     private static Drawable tryLoadIcon(String iconDevUri) throws IOException {
         URL url = new URL(iconDevUri);
         Bitmap bitmap = BitmapFactory.decodeStream(url.openStream());
-        final int dimensions = (int) ImageUtils.convertDpToPixel(48);
+        final int dimensions = (int) ViewUtils.convertDpToPixel(48);
         // TODO: fix hard coded dimensions -add options to decodeStream
         bitmap = Bitmap.createScaledBitmap(bitmap, dimensions, dimensions, false);
         return new BitmapDrawable(NavigationApplication.instance.getResources(), bitmap);

android/app/src/main/java/com/reactnativenavigation/react/NavigationReactInstance.java

@@ -48,6 +48,7 @@ public class NavigationReactInstance {
     public void onResume(NavigationActivity activity, DefaultHardwareBackBtnHandler defaultHardwareBackBtnHandler, OnJsDevReloadListener onJsDevReloadListener) {
         this.onJsDevReloadListener = onJsDevReloadListener;
         reactInstanceManager.onHostResume(activity, defaultHardwareBackBtnHandler);
+        reactEventEmitter = new NavigationReactEventEmitter(reactInstanceManager.getCurrentReactContext());
     }
 
     public void onPause() {
@@ -86,10 +87,6 @@ public class NavigationReactInstance {
     }
 
     public NavigationReactEventEmitter getReactEventEmitter() {
-        if (reactEventEmitter == null) {
-            reactEventEmitter = new NavigationReactEventEmitter(reactInstanceManager.getCurrentReactContext());
-        }
-
         return reactEventEmitter;
     }
 }

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

@@ -1,121 +0,0 @@
-package com.reactnativenavigation.utils;
-
-import android.os.Bundle;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-/**
- * Created by yedidyak on 26/05/2016.
- */
-public class BridgeUtils {
-
-    @SuppressWarnings("unchecked")
-    public static Bundle addMapToBundle(HashMap<String, ?> map, Bundle bundle) {
-        for (String key : map.keySet()) {
-            Object value = map.get(key);
-            if (value instanceof String) {
-                bundle.putString(key, (String) value);
-            } else if (value instanceof Integer) {
-                bundle.putInt(key, (Integer) value);
-            } else if (value instanceof Double) {
-                bundle.putDouble(key, ((Double) value));
-            } else if (value instanceof Boolean) {
-                bundle.putBoolean(key, (Boolean) value);
-            } else if (value instanceof HashMap) {
-                bundle.putBundle(key, addMapToBundle((HashMap<String, Object>) value, new Bundle()));
-            } else if (value instanceof ArrayList) {
-                putArray(key, (ArrayList) value, bundle);
-            }
-        }
-        return bundle;
-    }
-
-    @SuppressWarnings("unchecked")
-    private static void putArray(String key, ArrayList arrayList, Bundle bundle) {
-        if (arrayList.size() == 0) {
-            bundle.putBooleanArray(key, new boolean[]{});
-        } else {
-            verifyArrayListIsSingleType(arrayList);
-            if (arrayList.get(0) instanceof String) {
-                bundle.putStringArray(key, toStringArray((ArrayList<String>) arrayList));
-            } else if (arrayList.get(0) instanceof Integer) {
-                bundle.putIntArray(key, toIntArray((ArrayList<Integer>) arrayList));
-            } else if (arrayList.get(0) instanceof Float) {
-                bundle.putFloatArray(key, toFloatArray((ArrayList<Float>) arrayList));
-            } else if (arrayList.get(0) instanceof Double) {
-                bundle.putDoubleArray(key, toDoubleArray((ArrayList<Double>) arrayList));
-            } else if (arrayList.get(0) instanceof Boolean) {
-                bundle.putBooleanArray(key, toBooleanArray((ArrayList<Boolean>) arrayList));
-            } else if (arrayList.get(0) instanceof HashMap) {
-                bundle.putParcelableArray(key, toBundleArray((ArrayList<HashMap>) arrayList));
-            } else if (arrayList.get(0) instanceof ArrayList) {
-                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);
-                }
-                bundle.putParcelable(key, innerArray);
-            }
-        }
-    }
-
-    private static void verifyArrayListIsSingleType(ArrayList arrayList) {
-        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");
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private static Bundle[] toBundleArray(ArrayList<HashMap> arrayList) {
-        Bundle[] ret = new Bundle[arrayList.size()];
-        for (int i=0; i < ret.length; i++) {
-            ret[i] = addMapToBundle(arrayList.get(i), new Bundle());
-        }
-        return ret;
-    }
-
-    private static int[] toIntArray(ArrayList<Integer> arrayList) {
-        int[] ret = new int[arrayList.size()];
-        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++) {
-            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++) {
-            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++) {
-            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++) {
-            ret[i] = arrayList.get(i);
-        }
-        return ret;
-    }
-
-}

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

@@ -1,14 +0,0 @@
-package com.reactnativenavigation.utils;
-
-import java.util.Collection;
-
-/**
- * Created by guyc on 11/04/16.
- */
-public class CollectionUtils {
-
-    public static boolean isNullOrEmpty(Collection collection) {
-        return collection == null || collection.size() == 0;
-    }
-
-}

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

@@ -1,19 +0,0 @@
-package com.reactnativenavigation.utils;
-
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
-import android.graphics.drawable.Drawable;
-
-import com.reactnativenavigation.NavigationApplication;
-
-public class ImageUtils {
-
-    public static void tint(Drawable drawable, int tint) {
-        drawable.setColorFilter(new PorterDuffColorFilter(tint, PorterDuff.Mode.SRC_IN));
-    }
-
-    public static float convertDpToPixel(float dp) {
-        float scale = NavigationApplication.instance.getResources().getDisplayMetrics().density;
-        return dp * scale + 0.5f;
-    }
-}

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

@@ -1,20 +0,0 @@
-package com.reactnativenavigation.utils;
-
-import java.lang.ref.WeakReference;
-
-/**
- * Created by guyc on 06/05/16.
- */
-public class RefUtils {
-    /**
-     * Extract the object within a WeakReference object
-     * @param wr the WeakReference to extract
-     * @return the object within the WR or null when object not available.
-     */
-    public static <T> T get(WeakReference<T> wr) {
-        if (wr != null) {
-            return wr.get();
-        }
-        return null;
-    }
-}

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

@@ -1,41 +1,25 @@
 package com.reactnativenavigation.utils;
 
+import android.support.annotation.Nullable;
+
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 
-/**
- * Created by guyc on 14/04/16.
- */
 public class ReflectionUtils {
 
-    public static boolean setField(Object obj, String name, Object value) {
+    public static void setField(Object obj, String name, Object value) {
         try {
             Field field = getField(obj.getClass(), name);
             if (field == null) {
-                return false;
+                return;
             }
             field.setAccessible(true);
             field.set(obj, value);
-            return true;
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return false;
     }
 
-    private static Field getField(Class clazz, String name) {
-        try {
-            return clazz.getDeclaredField(name);
-        } catch (NoSuchFieldException nsfe) {
-            return getField(clazz.getSuperclass(), name);
-        } catch (Exception e) {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the value of the field
-     */
+    @Nullable
     public static Object getDeclaredField(Object obj, String fieldName) {
         try {
             Field f = getField(obj.getClass(), fieldName);
@@ -50,14 +34,24 @@ public class ReflectionUtils {
         return null;
     }
 
-    public static Object invoke(Object object, String methodName) {
+    private static Field getField(Class clazz, String name) {
         try {
-            Method method = object.getClass().getDeclaredMethod(methodName);
-            method.setAccessible(true);
-            return method.invoke(object);
+            return clazz.getDeclaredField(name);
+        } catch (NoSuchFieldException nsfe) {
+            return getField(clazz.getSuperclass(), name);
         } catch (Exception e) {
-            e.printStackTrace();
+            return null;
         }
-        return null;
     }
+
+//    public static Object invoke(Object object, String methodName) {
+//        try {
+//            Method method = object.getClass().getDeclaredMethod(methodName);
+//            method.setAccessible(true);
+//            return method.invoke(object);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//        return null;
+//    }
 }

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

@@ -2,9 +2,6 @@ package com.reactnativenavigation.utils;
 
 import android.os.Build;
 
-/**
- * Created by guyc on 23/04/16.
- */
 public class SdkSupports {
 
     public static boolean lollipop() {

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

@@ -1,41 +0,0 @@
-package com.reactnativenavigation.utils;
-
-/**
- * Created by guyc on 07/05/16.
- */
-public class StyleHelper {
-//
-//    public static void updateStyles(RnnToolBar toolBar, _Screen screen) {
-//        try {
-//            toolBar.updateAndSetButtons(screen);
-//            setWindowStyle(screen);
-//        } catch (Exception e) {
-//            Log.w("RNNavigation", "Tried to update styles with no screen!");
-//        }
-//    }
-//
-//    private static void setWindowStyle(_Screen screen) {
-//        BaseReactActivity context = ContextProvider.getActivityContext();
-//        if (context != null) {
-//            StyleHelper.setWindowStyle(context.getWindow(), context, screen);
-//        }
-//    }
-//
-//    public static void setWindowStyle(Window window, Context context, _Screen screen) {
-//        if (SdkSupports.lollipop()) {
-//            final int black = ContextCompat.getColor(context, android.R.color.black);
-//            if (screen.statusBarColor != null) {
-//                window.setStatusBarColor(screen.statusBarColor);
-//            } else {
-//                window.setStatusBarColor(black);
-//            }
-//
-//            if (screen.navigationBarColor != null) {
-//                window.setNavigationBarColor(screen.navigationBarColor);
-//            } else {
-//                window.setNavigationBarColor(black);
-//            }
-//        }
-//
-//    }
-}

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

@@ -1,8 +1,13 @@
 package com.reactnativenavigation.utils;
 
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.view.ViewTreeObserver;
 
+import com.reactnativenavigation.NavigationApplication;
+
 public class ViewUtils {
     public static void runOnPreDraw(final View view, final Runnable task) {
         view.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
@@ -17,5 +22,14 @@ public class ViewUtils {
             }
         });
     }
+
+    public static void tintDrawable(Drawable drawable, int tint) {
+        drawable.setColorFilter(new PorterDuffColorFilter(tint, PorterDuff.Mode.SRC_IN));
+    }
+
+    public static float convertDpToPixel(float dp) {
+        float scale = NavigationApplication.instance.getResources().getDisplayMetrics().density;
+        return dp * scale + 0.5f;
+    }
 }
 

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

@@ -8,7 +8,6 @@ import android.widget.TextView;
 
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.params.TitleBarButtonParams;
-import com.reactnativenavigation.utils.ImageUtils;
 import com.reactnativenavigation.utils.ViewUtils;
 
 import java.util.ArrayList;
@@ -57,7 +56,7 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
     }
 
     private void setIconColor() {
-        ImageUtils.tint(buttonParams.icon, buttonParams.color.getColor());
+        ViewUtils.tintDrawable(buttonParams.icon, buttonParams.color.getColor());
     }
 
     private void setTextColor() {
@@ -93,11 +92,7 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 
     @Override
     public boolean onMenuItemClick(MenuItem item) {
-        NavigationApplication.
-                instance.
-                getNavigationReactInstance().
-                getReactEventEmitter().
-                sendEvent(buttonParams.eventId, navigatorEventId);
+        NavigationApplication.instance.sendEvent(buttonParams.eventId, navigatorEventId);
         return true;
     }
 }