remove default values (#2942)

* remove default values

* fix test

lib/android/app/src/main/java/com/reactnativenavigation/parse/BottomTabOptions.java

@@ -6,7 +6,7 @@ import com.reactnativenavigation.parse.parsers.TextParser;
 
 import org.json.JSONObject;
 
-public class BottomTabOptions implements DEFAULT_VALUES {
+public class BottomTabOptions {
 
     public static BottomTabOptions parse(JSONObject json) {
         BottomTabOptions options = new BottomTabOptions();

lib/android/app/src/main/java/com/reactnativenavigation/parse/BottomTabsOptions.java

@@ -15,7 +15,7 @@ import com.reactnativenavigation.parse.parsers.TextParser;
 
 import org.json.JSONObject;
 
-public class BottomTabsOptions implements DEFAULT_VALUES {
+public class BottomTabsOptions {
 
 	public static BottomTabsOptions parse(JSONObject json) {
 		BottomTabsOptions options = new BottomTabsOptions();

lib/android/app/src/main/java/com/reactnativenavigation/parse/DEFAULT_VALUES.java

@@ -1,6 +0,0 @@
-package com.reactnativenavigation.parse;
-
-
-public interface DEFAULT_VALUES {
-	int NO_INT_VALUE = Integer.MIN_VALUE;
-}

lib/android/app/src/main/java/com/reactnativenavigation/parse/FabOptions.java

@@ -16,7 +16,7 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-public class FabOptions implements DEFAULT_VALUES {
+public class FabOptions {
 
     public static FabOptions parse(JSONObject json) {
         FabOptions options = new FabOptions();

lib/android/app/src/main/java/com/reactnativenavigation/parse/Options.java

@@ -7,7 +7,7 @@ import com.reactnativenavigation.utils.TypefaceLoader;
 
 import org.json.JSONObject;
 
-public class Options implements DEFAULT_VALUES {
+public class Options {
 
     @NonNull
     public static Options parse(TypefaceLoader typefaceManager, JSONObject json) {

lib/android/app/src/main/java/com/reactnativenavigation/parse/TopBarOptions.java

@@ -16,7 +16,7 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-public class TopBarOptions implements DEFAULT_VALUES {
+public class TopBarOptions {
 
     public static TopBarOptions parse(TypefaceLoader typefaceManager, JSONObject json) {
         TopBarOptions options = new TopBarOptions();

lib/android/app/src/main/java/com/reactnativenavigation/parse/TopTabOptions.java

@@ -10,7 +10,7 @@ import com.reactnativenavigation.utils.TypefaceLoader;
 
 import org.json.JSONObject;
 
-public class TopTabOptions implements DEFAULT_VALUES {
+public class TopTabOptions {
     public Text title = new NullText();
     @Nullable public Typeface fontFamily;
     public int tabIndex;

lib/android/app/src/main/java/com/reactnativenavigation/parse/TopTabsOptions.java

@@ -15,7 +15,7 @@ import com.reactnativenavigation.parse.parsers.NumberParser;
 
 import org.json.JSONObject;
 
-public class TopTabsOptions implements DEFAULT_VALUES {
+public class TopTabsOptions {
 
     @NonNull public Color selectedTabColor = new NullColor();
     @NonNull public Color unselectedTabColor = new NullColor();

lib/android/app/src/main/java/com/reactnativenavigation/parse/ValueAnimationOptions.java

@@ -17,7 +17,7 @@ import com.reactnativenavigation.parse.parsers.NumberParser;
 
 import org.json.JSONObject;
 
-public class ValueAnimationOptions implements DEFAULT_VALUES {
+public class ValueAnimationOptions {
 
     public static ValueAnimationOptions parse(JSONObject json, Property<View, Float> property) {
         ValueAnimationOptions options = new ValueAnimationOptions();

lib/android/app/src/main/java/com/reactnativenavigation/parse/params/Button.java

@@ -1,9 +1,10 @@
 package com.reactnativenavigation.parse.params;
 
-import android.support.annotation.ColorInt;
 import android.view.MenuItem;
 
 import com.reactnativenavigation.parse.parsers.BoolParser;
+import com.reactnativenavigation.parse.parsers.ColorParser;
+import com.reactnativenavigation.parse.parsers.NumberParser;
 import com.reactnativenavigation.parse.parsers.TextParser;
 
 import org.json.JSONArray;
@@ -11,56 +12,54 @@ import org.json.JSONObject;
 
 import java.util.ArrayList;
 
-import static com.reactnativenavigation.parse.Options.NO_INT_VALUE;
-
 public class Button {
-	public String id;
-	public Text title = new NullText();
-	public Bool enabled = new NullBool();
-	public Bool disableIconTint = new NullBool();
-	public int showAsAction;
-	@ColorInt public int buttonColor;
-	public int buttonFontSize;
-	private Text buttonFontWeight = new NullText();
-	public Text icon = new NullText();
-	public Text testId = new NullText();
+    public String id;
+    public Text title = new NullText();
+    public Bool enabled = new NullBool();
+    public Bool disableIconTint = new NullBool();
+    public int showAsAction;
+    public Color buttonColor = new NullColor();
+    public Number buttonFontSize = new NullNumber();
+    private Text buttonFontWeight = new NullText();
+    public Text icon = new NullText();
+    public Text testId = new NullText();
     public Text component = new NullText();
 
-	private static Button parseJson(JSONObject json)  {
-		Button button = new Button();
-		button.id = json.optString("id");
-		button.title = TextParser.parse(json, "title");
-		button.enabled = BoolParser.parse(json,"enabled");
-		button.disableIconTint = BoolParser.parse(json,"disableIconTint");
-		button.showAsAction = parseShowAsAction(json);
-		button.buttonColor = json.optInt("buttonColor", NO_INT_VALUE);
-		button.buttonFontSize = json.optInt("buttonFontSize", NO_INT_VALUE);
-		button.buttonFontWeight = TextParser.parse(json, "buttonFontWeight");
+    private static Button parseJson(JSONObject json) {
+        Button button = new Button();
+        button.id = json.optString("id");
+        button.title = TextParser.parse(json, "title");
+        button.enabled = BoolParser.parse(json, "enabled");
+        button.disableIconTint = BoolParser.parse(json, "disableIconTint");
+        button.showAsAction = parseShowAsAction(json);
+        button.buttonColor = ColorParser.parse(json, "buttonColor");
+        button.buttonFontSize = NumberParser.parse(json, "buttonFontSize");
+        button.buttonFontWeight = TextParser.parse(json, "buttonFontWeight");
         button.testId = TextParser.parse(json, "testID");
         button.component = TextParser.parse(json, "component");
 
-		if (json.has("icon")) {
-			button.icon = TextParser.parse(json.optJSONObject("icon"), "uri");
-		}
+        if (json.has("icon")) {
+            button.icon = TextParser.parse(json.optJSONObject("icon"), "uri");
+        }
 
-		return button;
-	}
+        return button;
+    }
 
-	public static ArrayList<Button> parseJsonArray(JSONArray jsonArray) {
-		ArrayList<Button> buttons = new ArrayList<>();
+    public static ArrayList<Button> parseJsonArray(JSONArray jsonArray) {
+        ArrayList<Button> buttons = new ArrayList<>();
 
-		if (jsonArray == null) {
-			return null;
-		}
+        if (jsonArray == null) {
+            return null;
+        }
 
-		for (int i = 0; i < jsonArray.length(); i++) {
-			JSONObject json = jsonArray.optJSONObject(i);
-			Button button =	Button.parseJson(json);
-			buttons.add(button);
-		}
+        for (int i = 0; i < jsonArray.length(); i++) {
+            JSONObject json = jsonArray.optJSONObject(i);
+            Button button = Button.parseJson(json);
+            buttons.add(button);
+        }
 
-		return buttons;
-	}
+        return buttons;
+    }
 
     public boolean hasComponent() {
         return component.hasValue();
@@ -70,22 +69,22 @@ public class Button {
         return icon.hasValue();
     }
 
-	private static int parseShowAsAction(JSONObject json) {
-	    final Text showAsAction = TextParser.parse(json, "showAsAction");
-		if (!showAsAction.hasValue()) {
-			return MenuItem.SHOW_AS_ACTION_IF_ROOM;
-		}
-
-		switch (showAsAction.get()) {
-			case "always":
-				return MenuItem.SHOW_AS_ACTION_ALWAYS;
-			case "never":
-				return MenuItem.SHOW_AS_ACTION_NEVER;
-			case "withText":
-				return MenuItem.SHOW_AS_ACTION_WITH_TEXT;
-			case "ifRoom":
-			default:
-				return MenuItem.SHOW_AS_ACTION_IF_ROOM;
-		}
-	}
+    private static int parseShowAsAction(JSONObject json) {
+        final Text showAsAction = TextParser.parse(json, "showAsAction");
+        if (!showAsAction.hasValue()) {
+            return MenuItem.SHOW_AS_ACTION_IF_ROOM;
+        }
+
+        switch (showAsAction.get()) {
+            case "always":
+                return MenuItem.SHOW_AS_ACTION_ALWAYS;
+            case "never":
+                return MenuItem.SHOW_AS_ACTION_NEVER;
+            case "withText":
+                return MenuItem.SHOW_AS_ACTION_WITH_TEXT;
+            case "ifRoom":
+            default:
+                return MenuItem.SHOW_AS_ACTION_IF_ROOM;
+        }
+    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/TopBarButtonController.java

@@ -18,12 +18,12 @@ import android.widget.TextView;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Button;
 import com.reactnativenavigation.parse.params.Text;
-import com.reactnativenavigation.views.titlebar.TitleBarReactButtonView;
 import com.reactnativenavigation.utils.ArrayUtils;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.ImageLoadingListenerAdapter;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.utils.ViewUtils;
+import com.reactnativenavigation.views.titlebar.TitleBarReactButtonView;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -136,12 +136,12 @@ public class TopBarButtonController extends ViewController<TitleBarReactButtonVi
     }
 
     private void setIconColor(Drawable icon) {
-        if (button.enabled.isTrueOrUndefined()) {
-            UiUtils.tintDrawable(icon, button.buttonColor);
+        if (button.enabled.isTrueOrUndefined() && button.buttonColor.hasValue()) {
+            UiUtils.tintDrawable(icon, button.buttonColor.get());
             return;
         }
-        if (button.disableIconTint.isTrue()) {
-            UiUtils.tintDrawable(icon, button.buttonColor);
+        if (button.disableIconTint.isTrue() && button.buttonColor.hasValue()) {
+            UiUtils.tintDrawable(icon, button.buttonColor.get());
         } else {
             UiUtils.tintDrawable(icon, Color.LTGRAY);
         }
@@ -163,13 +163,16 @@ public class TopBarButtonController extends ViewController<TitleBarReactButtonVi
 
     private void setTextColorForFoundButtonViews(ArrayList<View> buttons) {
         for (View button : buttons) {
-            ((TextView) button).setTextColor(this.button.buttonColor);
+            if (this.button.buttonColor.hasValue())
+                ((TextView) button).setTextColor(this.button.buttonColor.get());
         }
     }
 
     private void setFontSize(MenuItem menuItem) {
         SpannableString spanString = new SpannableString(button.title.get());
-        spanString.setSpan(new AbsoluteSizeSpan(button.buttonFontSize, true), 0, button.title.get().length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+        if (this.button.buttonFontSize.hasValue())
+            spanString.setSpan(new AbsoluteSizeSpan(button.buttonFontSize.get(), true),
+                    0, button.title.get().length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
         menuItem.setTitleCondensed(spanString);
     }