Navigation color

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

@@ -5,7 +5,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.ColorInt;
 import android.view.Window;
 import android.widget.LinearLayout;
 
@@ -64,36 +63,36 @@ public class ScreenLayout extends LinearLayout implements ScrollDirectionListene
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    private void setStatusBarColor(@ColorInt int statusBarColor) {
+    private void setStatusBarColor(ScreenStyleParams.Color statusBarColor) {
         if (!SdkSupports.lollipop()) {
             return;
         }
 
         final Activity context = (Activity) getContext();
         final Window window = context.getWindow();
-        if (statusBarColor > 0) {
-            window.setStatusBarColor(statusBarColor);
+        if (statusBarColor.hasColor()) {
+            window.setStatusBarColor(statusBarColor.getColor());
         } else {
             window.setStatusBarColor(Color.BLACK);
         }
     }
 
-    private void setTopBarColor(@ColorInt int topBarColor) {
-        if (topBarColor > 0) {
-            topBar.setBackgroundColor(topBarColor);
+    private void setTopBarColor(ScreenStyleParams.Color topBarColor) {
+        if (topBarColor.hasColor()) {
+            topBar.setBackgroundColor(topBarColor.getColor());
         }
     }
 
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public void setNavigationBarColor(int navigationBarColor) {
+    public void setNavigationBarColor(ScreenStyleParams.Color navigationBarColor) {
         if (!SdkSupports.lollipop()) {
             return;
         }
 
         final Activity context = (Activity) getContext();
         final Window window = context.getWindow();
-        if (navigationBarColor > 0) {
-            window.setNavigationBarColor(navigationBarColor);
+        if (navigationBarColor.hasColor()) {
+            window.setNavigationBarColor(navigationBarColor.getColor());
         } else {
             window.setNavigationBarColor(Color.BLACK);
         }

android/app/src/main/java/com/reactnativenavigation/params/ScreenStyleParams.java

@@ -3,12 +3,29 @@ package com.reactnativenavigation.params;
 import android.support.annotation.ColorInt;
 
 public class ScreenStyleParams {
-    @ColorInt
-    public int statusBarColor;
-    @ColorInt
-    public int topBarColor;
-    @ColorInt
-    public int navigationBarColor;
+    public static class Color {
+        @ColorInt
+        private int color = -1;
+
+        public Color(int color) {
+            this.color = color;
+        }
+
+        public boolean hasColor() {
+            return color != -1;
+        }
+
+        public int getColor() {
+            if (!hasColor()) {
+                throw new RuntimeException("Color undefined");
+            }
+            return color;
+        }
+    }
+
+    public Color statusBarColor;
+    public Color topBarColor;
+    public Color navigationBarColor;
     public boolean titleBarHidden;
     public boolean topBarHidden;
     public boolean backButtonHidden;

android/app/src/main/java/com/reactnativenavigation/params/TitleBarButtonParams.java

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.params;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ColorInt;
 import android.view.MenuItem;
 
 public class TitleBarButtonParams {
@@ -21,8 +20,7 @@ public class TitleBarButtonParams {
     // Todo: add id for click listener
     public String label;
     public Drawable icon;
-    @ColorInt
-    public int color;
+    public ScreenStyleParams.Color color;
     public ShowAsAction showAsAction;
     public boolean enabled = true;
 }

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

@@ -11,9 +11,9 @@ public class ScreenStyleParamsParser {
             return result;
         }
 
-        result.statusBarColor = ColorParser.parse(params.getString("statusBarColor"));
-        result.topBarColor = ColorParser.parse(params.getString("topBarColor"));
-        result.navigationBarColor = ColorParser.parse(params.getString("navigationBarColor"));
+        result.statusBarColor = new ScreenStyleParams.Color(ColorParser.parse(params.getString("statusBarColor")));
+        result.topBarColor = new ScreenStyleParams.Color(ColorParser.parse(params.getString("topBarColor")));
+        result.navigationBarColor = new ScreenStyleParams.Color(ColorParser.parse(params.getString("navigationBarColor")));
         result.titleBarHidden = params.getBoolean("titleBarHidden");
         result.backButtonHidden = params.getBoolean("backButtonHidden");
         result.topTabsHidden = params.getBoolean("topTabsHidden");

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

@@ -2,6 +2,7 @@ package com.reactnativenavigation.params.parsers;
 
 import android.os.Bundle;
 
+import com.reactnativenavigation.params.ScreenStyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.react.ImageLoader;
 
@@ -27,7 +28,7 @@ public class TitleBarButtonParamsParser extends Parser {
         if (hasKey(bundle,"icon")) {
             result.icon = ImageLoader.loadImage(bundle.getString("icon"));
         }
-        result.color = ColorParser.parse(bundle.getString("color"));
+        result.color = new ScreenStyleParams.Color(ColorParser.parse(bundle.getString("color")));
         result.showAsAction = parseShowAsAction(bundle.getString("showAsAction"));
         result.enabled = bundle.getBoolean("enabled", true);
         return result;

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

@@ -53,7 +53,7 @@ public class TitleBarButton {
     }
 
     private void setIconColor() {
-        ImageUtils.tint(buttonParams.icon, buttonParams.color);
+        ImageUtils.tint(buttonParams.icon, buttonParams.color.getColor());
     }
 
     private void setTextColor() {
@@ -75,7 +75,7 @@ public class TitleBarButton {
 
     private void setTextColorForFoundButtonViews(ArrayList<View> outViews) {
         for (View button : outViews) {
-            ((TextView) button).setTextColor(buttonParams.color);
+            ((TextView) button).setTextColor(buttonParams.color.getColor());
         }
     }
 
@@ -84,7 +84,6 @@ public class TitleBarButton {
     }
 
     private boolean hasColor() {
-        return buttonParams.color > 0;
+        return buttonParams.color.hasColor();
     }
-
 }