Toolbar and ImageLoader

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

@@ -3,9 +3,10 @@ package com.reactnativenavigation;
 import android.app.Application;
 import android.os.Handler;
 
-public class NavigationApplication extends Application {
+public abstract class NavigationApplication extends Application {
 
     public static NavigationApplication instance;
+
     private Handler handler;
 
     @Override
@@ -15,6 +16,8 @@ public class NavigationApplication extends Application {
         handler = new Handler(getMainLooper());
     }
 
+    public abstract boolean isDebug();
+
     public Handler getMainHandler() {
         return handler;
     }

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

@@ -5,7 +5,7 @@ import android.graphics.drawable.Drawable;
 import android.view.MenuItem;
 
 import com.facebook.react.bridge.ReadableMap;
-import com.reactnativenavigation.utils.IconUtils;
+import com.reactnativenavigation.react.ImageLoader;
 
 import java.io.Serializable;
 import java.util.HashMap;
@@ -49,7 +49,7 @@ public class Button extends JsonObject implements Serializable {
      * @param dimensions The requested icon dimensions
      */
     public Drawable getIcon(Context ctx, int dimensions) {
-       return IconUtils.getIcon(ctx, mIconSource, dimensions);
+       return ImageLoader.getIcon(ctx, mIconSource, dimensions);
     }
 
     public int getItemId() {

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

@@ -5,12 +5,11 @@ import android.graphics.drawable.Drawable;
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.util.Log;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeMap;
-import com.reactnativenavigation.utils.IconUtils;
+import com.reactnativenavigation.react.ImageLoader;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -122,7 +121,7 @@ public class Screen extends JsonObject implements Serializable {
     }
 
     public Drawable getIcon(Context ctx) {
-        return IconUtils.getIcon(ctx, icon);
+        return ImageLoader.getIcon(ctx, icon);
     }
 
     public void setToolbarStyle(ReadableMap screen) {

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

@@ -0,0 +1,16 @@
+package com.reactnativenavigation.react;
+
+import android.graphics.drawable.Drawable;
+
+import com.reactnativenavigation.NavigationApplication;
+
+public class ImageLoader {
+
+    public static Drawable loadImage(String iconSource) {
+        if (NavigationApplication.instance.isDebug()) {
+            return JsDevImageLoader.loadIcon(iconSource);
+        } else {
+            return ResourceDrawableIdHelper.instance.getResourceDrawable(NavigationApplication.instance, iconSource);
+        }
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.reactnativenavigation.react;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.StrictMode;
+import android.support.annotation.NonNull;
+
+import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.utils.ImageUtils;
+
+import java.io.IOException;
+import java.net.URL;
+
+public class JsDevImageLoader {
+
+    public static Drawable loadIcon(String iconDevUri) {
+        try {
+            StrictMode.ThreadPolicy threadPolicy = StrictMode.getThreadPolicy();
+            StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder().permitNetwork().build());
+
+            Drawable drawable = tryLoadIcon(iconDevUri);
+
+            StrictMode.setThreadPolicy(threadPolicy);
+            return drawable;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @NonNull
+    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, NavigationApplication.instance);
+        // 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

@@ -9,7 +9,6 @@ import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
-import com.reactnativenavigation.BuildConfig;
 import com.reactnativenavigation.NavigationApplication;
 
 import java.util.List;
@@ -27,7 +26,7 @@ public class NavigationReactInstance {
     public NavigationReactInstance(final ReactContextCreator reactContextCreator) {
         reactInstanceManager = createReactInstanceManager(reactContextCreator);
 
-        if (BuildConfig.DEBUG) {
+        if (NavigationApplication.instance.isDebug()) {
             replaceJsDevReloadListener(reactContextCreator);
         }
     }
@@ -85,7 +84,7 @@ public class NavigationReactInstance {
                 .setApplication(NavigationApplication.instance)
                 .setJSMainModuleName("index.android")
                 .setBundleAssetName("index.android.bundle")
-                .setUseDeveloperSupport(BuildConfig.DEBUG)
+                .setUseDeveloperSupport(NavigationApplication.instance.isDebug())
                 .setInitialLifecycleState(LifecycleState.BEFORE_RESUME);
 
         for (ReactPackage reactPackage : reactContextCreator.createReactPackages()) {

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

@@ -8,12 +8,14 @@ import android.util.Log;
 import android.widget.Toast;
 
 import com.facebook.react.common.ReactConstants;
-import com.reactnativenavigation.BuildConfig;
+import com.reactnativenavigation.NavigationApplication;
 
 public class RedboxPermission {
 
     public static void permissionToShowRedboxIfNeeded(Context context) {
-        if (BuildConfig.DEBUG && Build.VERSION.SDK_INT >= 23 && !Settings.canDrawOverlays(context)) {
+        if (NavigationApplication.instance.isDebug() &&
+            Build.VERSION.SDK_INT >= 23 &&
+            !Settings.canDrawOverlays(context)) {
             Intent serviceIntent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
             context.startActivity(serviceIntent);
             String msg = "Overlay permissions needs to be granted in order for react native apps to run in dev mode";

android/app/src/main/java/com/reactnativenavigation/utils/ResourceDrawableIdHelper.java → android/app/src/main/java/com/reactnativenavigation/react/ResourceDrawableIdHelper.java

@@ -1,4 +1,4 @@
-package com.reactnativenavigation.utils;// Copyright 2004-present Facebook. All Rights Reserved.
+package com.reactnativenavigation.react;// Copyright 2004-present Facebook. All Rights Reserved.
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -15,6 +15,7 @@ import javax.annotation.Nullable;
  * Helper class for obtaining information about local images.
  */
 public class ResourceDrawableIdHelper {
+    public static final ResourceDrawableIdHelper instance = new ResourceDrawableIdHelper();
 
     private Map<String, Integer> mResourceDrawableIdMap;
 

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

@@ -1,76 +0,0 @@
-package com.reactnativenavigation.utils;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-
-import com.reactnativenavigation.BuildConfig;
-
-import java.net.URL;
-
-/**
- * Created by yedidyak on 29/05/2016.
- */
-public class IconUtils {
-    public static final String LOCAL_RESOURCE_URI_SCHEME = "res";
-    private static ResourceDrawableIdHelper sResDrawableIdHelper = new ResourceDrawableIdHelper();
-
-    public static Drawable getIcon(Context ctx, String iconSource) {
-        return getIcon(ctx, iconSource, -1);
-    }
-
-    /**
-     * @param iconSource Icon source. In release builds this would be a path in assets, In debug it's
-     *                   a url and the image needs to be decoded from input stream.
-     * @param dimensions The requested icon dimensions
-     */
-    public static Drawable getIcon(Context ctx, String iconSource, int dimensions) {
-        if (iconSource == null) {
-            return null;
-        }
-
-        try {
-            Drawable icon;
-            Uri iconUri = getIconUri(ctx, iconSource);
-
-            if (LOCAL_RESOURCE_URI_SCHEME.equals(iconUri.getScheme())) {
-                icon = sResDrawableIdHelper.getResourceDrawable(ctx, iconSource);
-            } else {
-                URL url = new URL(iconUri.toString());
-                Bitmap bitmap = BitmapFactory.decodeStream(url.openStream());
-                bitmap = dimensions > 0 ?
-                        Bitmap.createScaledBitmap(bitmap, dimensions, dimensions, false) : bitmap;
-                icon = new BitmapDrawable(ctx.getResources(), bitmap);
-            }
-            return icon;
-        } catch (Exception e) {
-            if (BuildConfig.DEBUG) {
-                e.printStackTrace();
-            }
-        }
-        return null;
-    }
-
-    private static Uri getIconUri(Context context, String iconSource) {
-        Uri ret = null;
-        if (iconSource != null) {
-            try {
-                ret = Uri.parse(iconSource);
-                // Verify scheme is set, so that relative uri (used by static resources) are not handled.
-                if (ret.getScheme() == null) {
-                    ret = null;
-                }
-            } catch (Exception e) {
-                // Ignore malformed uri, then attempt to extract resource ID.
-            }
-            if (ret == null) {
-                ret = sResDrawableIdHelper.getResourceDrawableUri(context, iconSource);
-            }
-        }
-        return ret;
-    }
-
-}

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

@@ -8,7 +8,6 @@ import android.os.AsyncTask;
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.annotation.UiThread;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarDrawerToggle;
@@ -28,7 +27,7 @@ import com.reactnativenavigation.activities.BaseReactActivity;
 import com.reactnativenavigation.core.objects.Button;
 import com.reactnativenavigation.core.objects.Screen;
 import com.reactnativenavigation.utils.ContextProvider;
-import com.reactnativenavigation.utils.IconUtils;
+import com.reactnativenavigation.react.ImageLoader;
 import com.reactnativenavigation.utils.ImageUtils;
 
 import java.lang.ref.WeakReference;
@@ -56,16 +55,6 @@ public class RnnToolBar extends Toolbar {
         init();
     }
 
-    public RnnToolBar(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public RnnToolBar(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init();
-    }
-
     private void init() {
         mMenuItems = new ArrayList<>();
         mBackground = getBackground();
@@ -76,9 +65,9 @@ public class RnnToolBar extends Toolbar {
     }
 
     public void handleOnCreateOptionsMenuAsync() {
-        if (mScreens != null) {
-            setupToolbarButtonsAsync(null, mScreens.get(0));
-        }
+//        if (mScreens != null) {
+//            setupToolbarButtonsAsync(null, mScreens.get(0));
+//        }
     }
 
     public ActionBarDrawerToggle setupDrawer(DrawerLayout drawerLayout, Screen drawerScreen, Screen screen) {
@@ -258,7 +247,7 @@ public class RnnToolBar extends Toolbar {
                 return null;
             }
 
-            return IconUtils.getIcon(context, mDrawerIconSource);
+            return ImageLoader.loadImage(mDrawerIconSource);
         }
 
         @Override

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

@@ -1,11 +1,45 @@
 package com.reactnativenavigation.views;
 
-import android.content.Context;
+import android.app.Activity;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.ColorInt;
+import android.support.v7.widget.ActionMenuView;
 import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuInflater;
+
+import com.reactnativenavigation.R;
+
+import java.util.List;
 
 public class TitleBar extends Toolbar {
 
-    public TitleBar(Context context) {
+    public static class Button {
+        public enum ShowAsAction {
+            IfRoom, Always, Never, WithText
+        }
+
+        String label;
+        Drawable icon;
+        @ColorInt int color;
+        ShowAsAction showAsAction;
+    }
+
+    public TitleBar(Activity context) {
         super(context);
+        createMenu();
+    }
+
+    private void createMenu() {
+        MenuInflater menuInflater = ((Activity) getContext()).getMenuInflater();
+        ActionMenuView actionMenuView = new ActionMenuView(getContext());
+        Menu menu = actionMenuView.getMenu();
+        menuInflater.inflate(R.menu.stub, menu);
+        addView(actionMenuView);
+        // TODO: Maybe setSupportActionBar
+    }
+
+    public void setButtons(List<Button> buttons) {
+        Menu menu = new
     }
 }

android/app/src/main/res/menu/stub.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+</menu>