Rename Color to Colour

As RNN's Color is used frequently with Android's Color class, we had to use fully qualified names, the rename avoids this.

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

@@ -3,7 +3,7 @@ package com.reactnativenavigation.parse;
 import android.graphics.Typeface;
 import android.support.annotation.Nullable;
 
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.NullColor;
 import com.reactnativenavigation.parse.params.NullNumber;
 import com.reactnativenavigation.parse.params.NullText;
@@ -38,14 +38,14 @@ public class BottomTabOptions {
     }
 
     public Text text = new NullText();
-    public Color textColor = new NullColor();
-    public Color selectedTextColor = new NullColor();
+    public Colour textColor = new NullColor();
+    public Colour selectedTextColor = new NullColor();
     public Text icon = new NullText();
-    public Color iconColor = new NullColor();
-    public Color selectedIconColor = new NullColor();
+    public Colour iconColor = new NullColor();
+    public Colour selectedIconColor = new NullColor();
     public Text testId = new NullText();
     public Text badge = new NullText();
-    public Color badgeColor = new NullColor();
+    public Colour badgeColor = new NullColor();
     public Number fontSize = new NullNumber();
     public Number selectedFontSize = new NullNumber();
     @Nullable public Typeface fontFamily;

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

@@ -1,7 +1,7 @@
 package com.reactnativenavigation.parse;
 
 import com.reactnativenavigation.parse.params.Bool;
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.NullBool;
 import com.reactnativenavigation.parse.params.NullColor;
 import com.reactnativenavigation.parse.params.NullNumber;
@@ -34,7 +34,7 @@ public class BottomTabsOptions {
 		return options;
 	}
 
-    public Color backgroundColor = new NullColor();
+    public Colour backgroundColor = new NullColor();
 	public Bool visible = new NullBool();
     public Bool drawBehind = new NullBool();
 	public Bool animate = new NullBool();

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

@@ -2,7 +2,7 @@ package com.reactnativenavigation.parse;
 
 
 import com.reactnativenavigation.parse.params.Bool;
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.NullBool;
 import com.reactnativenavigation.parse.params.NullColor;
 import com.reactnativenavigation.parse.params.NullText;
@@ -45,9 +45,9 @@ public class FabOptions {
     }
 
     public Text id = new NullText();
-    public Color backgroundColor = new NullColor();
-    public Color clickColor = new NullColor();
-    public Color rippleColor = new NullColor();
+    public Colour backgroundColor = new NullColor();
+    public Colour clickColor = new NullColor();
+    public Colour rippleColor = new NullColor();
     public Text icon = new NullText();
     public Bool visible = new NullBool();
     public ArrayList<FabOptions> actionsArray = new ArrayList<>();

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

@@ -1,6 +1,6 @@
 package com.reactnativenavigation.parse;
 
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.NullColor;
 import com.reactnativenavigation.parse.params.NullNumber;
 import com.reactnativenavigation.parse.params.Number;
@@ -21,7 +21,7 @@ public class LayoutOptions {
         return result;
     }
 
-    public Color backgroundColor = new NullColor();
+    public Colour backgroundColor = new NullColor();
     public Number topMargin = new NullNumber();
     public OrientationOptions orientation = new OrientationOptions();
 

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

@@ -3,7 +3,7 @@ package com.reactnativenavigation.parse;
 import android.support.annotation.Nullable;
 
 import com.reactnativenavigation.parse.params.Bool;
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.NullBool;
 import com.reactnativenavigation.parse.params.NullColor;
 import com.reactnativenavigation.parse.parsers.BoolParser;
@@ -50,7 +50,7 @@ public class StatusBarOptions {
         return result;
     }
 
-    public Color backgroundColor = new NullColor();
+    public Colour backgroundColor = new NullColor();
     public TextColorScheme textColorScheme = TextColorScheme.None;
     public Bool visible = new NullBool();
     public Bool drawBehind = new NullBool();

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

@@ -3,7 +3,7 @@ package com.reactnativenavigation.parse;
 import android.graphics.Typeface;
 import android.support.annotation.Nullable;
 
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.parse.params.NullColor;
 import com.reactnativenavigation.parse.params.NullFraction;
@@ -33,7 +33,7 @@ public class SubtitleOptions {
     }
 
     public Text text = new NullText();
-    public Color color = new NullColor();
+    public Colour color = new NullColor();
     public Fraction fontSize = new NullFraction();
     @Nullable public Typeface fontFamily;
     public Alignment alignment = Alignment.Default;

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

@@ -3,7 +3,7 @@ package com.reactnativenavigation.parse;
 import android.graphics.Typeface;
 import android.support.annotation.Nullable;
 
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.parse.params.NullColor;
 import com.reactnativenavigation.parse.params.NullFraction;
@@ -35,7 +35,7 @@ public class TitleOptions {
     }
 
     public Text text = new NullText();
-    public Color color = new NullColor();
+    public Colour color = new NullColor();
     public Fraction fontSize = new NullFraction();
     public Alignment alignment = Alignment.Default;
     @Nullable public Typeface fontFamily;

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

@@ -1,6 +1,6 @@
 package com.reactnativenavigation.parse;
 
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.NullColor;
 import com.reactnativenavigation.parse.parsers.ColorParser;
 
@@ -15,13 +15,13 @@ public class TopBarBackgroundOptions {
         options.component = Component.parse(json.optJSONObject("component"));
 
         if (options.component.hasValue()) {
-            options.color = new Color(android.graphics.Color.TRANSPARENT);
+            options.color = new Colour(android.graphics.Color.TRANSPARENT);
         }
 
         return options;
     }
 
-    public Color color = new NullColor();
+    public Colour color = new NullColor();
     public Component component = new Component();
 
     void mergeWith(final TopBarBackgroundOptions other) {

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

@@ -5,7 +5,7 @@ import android.util.Log;
 
 import com.reactnativenavigation.BuildConfig;
 import com.reactnativenavigation.parse.params.Bool;
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.parse.params.NullBool;
 import com.reactnativenavigation.parse.params.NullColor;
@@ -62,13 +62,13 @@ public class TopBarOptions {
     public Number height = new NullNumber();
     public Fraction elevation = new NullFraction();
     public Fraction borderHeight = new NullFraction();
-    public Color borderColor = new NullColor();
+    public Colour borderColor = new NullColor();
 
     // Deprecated
-    public Color rightButtonColor = new NullColor();
-    public Color leftButtonColor = new NullColor();
-    public Color rightButtonDisabledColor = new NullColor();
-    public Color leftButtonDisabledColor = new NullColor();
+    public Colour rightButtonColor = new NullColor();
+    public Colour leftButtonColor = new NullColor();
+    public Colour rightButtonDisabledColor = new NullColor();
+    public Colour leftButtonDisabledColor = new NullColor();
 
     public TopBarOptions copy() {
         TopBarOptions result = new TopBarOptions();

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

@@ -4,7 +4,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import com.reactnativenavigation.parse.params.Bool;
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.NullBool;
 import com.reactnativenavigation.parse.params.NullColor;
 import com.reactnativenavigation.parse.params.NullNumber;
@@ -17,8 +17,8 @@ import org.json.JSONObject;
 
 public class TopTabsOptions {
 
-    @NonNull public Color selectedTabColor = new NullColor();
-    @NonNull public Color unselectedTabColor = new NullColor();
+    @NonNull public Colour selectedTabColor = new NullColor();
+    @NonNull public Colour unselectedTabColor = new NullColor();
     @NonNull public Number fontSize = new NullNumber();
     @NonNull public Bool visible = new NullBool();
     @NonNull public Number height = new NullNumber();

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

@@ -22,8 +22,8 @@ public class Button {
     public Bool enabled = new NullBool();
     public Bool disableIconTint = new NullBool();
     public Number showAsAction = new NullNumber();
-    public Color color = new NullColor();
-    public Color disabledColor = new NullColor();
+    public Colour color = new NullColor();
+    public Colour disabledColor = new NullColor();
     public Number fontSize = new NullNumber();
     private Text fontWeight = new NullText();
     @Nullable public Typeface fontFamily;

lib/android/app/src/main/java/com/reactnativenavigation/parse/params/Color.java → lib/android/app/src/main/java/com/reactnativenavigation/parse/params/Colour.java

@@ -2,9 +2,9 @@ package com.reactnativenavigation.parse.params;
 
 import android.support.annotation.ColorInt;
 
-public class Color extends Param<Integer>{
+public class Colour extends Param<Integer>{
 
-    public Color(@ColorInt int color) {
+    public Colour(@ColorInt int color) {
         super(color);
     }
 

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

@@ -1,6 +1,6 @@
 package com.reactnativenavigation.parse.params;
 
-public class NullColor extends Color {
+public class NullColor extends Colour {
 
     public NullColor() {
         super(0);

lib/android/app/src/main/java/com/reactnativenavigation/parse/parsers/ColorParser.java

@@ -1,12 +1,12 @@
 package com.reactnativenavigation.parse.parsers;
 
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.NullColor;
 
 import org.json.JSONObject;
 
 public class ColorParser {
-    public static Color parse(JSONObject json, String color) {
-        return json.has(color) ? new Color(json.optInt(color)) : new NullColor();
+    public static Colour parse(JSONObject json, String color) {
+        return json.has(color) ? new Colour(json.optInt(color)) : new NullColor();
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/presentation/StackOptionsPresenter.java

@@ -18,6 +18,7 @@ import com.reactnativenavigation.parse.TopBarOptions;
 import com.reactnativenavigation.parse.TopTabOptions;
 import com.reactnativenavigation.parse.TopTabsOptions;
 import com.reactnativenavigation.parse.params.Button;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.viewcontrollers.IReactView;
 import com.reactnativenavigation.viewcontrollers.TitleBarReactViewController;
@@ -165,7 +166,7 @@ public class StackOptionsPresenter {
         }
     }
 
-    private void applyButtons(TopBarOptions options, com.reactnativenavigation.parse.params.Color rightButtonColor, com.reactnativenavigation.parse.params.Color leftButtonColor, com.reactnativenavigation.parse.params.Color rightButtonDisabledColor, com.reactnativenavigation.parse.params.Color leftButtonDisabledColor) {
+    private void applyButtons(TopBarOptions options, Colour rightButtonColor, Colour leftButtonColor, Colour rightButtonDisabledColor, Colour leftButtonDisabledColor) {
         List<Button> rightButtons = mergeButtonsWithColor(options.buttons.right, rightButtonColor, rightButtonDisabledColor);
         List<Button> leftButtons = mergeButtonsWithColor(options.buttons.left, leftButtonColor, leftButtonDisabledColor);
         topBar.setRightButtons(rightButtons);
@@ -212,7 +213,7 @@ public class StackOptionsPresenter {
         if (orientationOptions.hasValue()) applyOrientation(orientationOptions);
     }
 
-    private void mergeButtons(TopBarButtons buttons, com.reactnativenavigation.parse.params.Color rightButtonColor, com.reactnativenavigation.parse.params.Color leftButtonColor, com.reactnativenavigation.parse.params.Color rightButtonDisabledColor, com.reactnativenavigation.parse.params.Color leftButtonDisabledColor) {
+    private void mergeButtons(TopBarButtons buttons, Colour rightButtonColor, Colour leftButtonColor, Colour rightButtonDisabledColor, Colour leftButtonDisabledColor) {
         List<Button> rightButtons = mergeButtonsWithColor(buttons.right, rightButtonColor, rightButtonDisabledColor);
         List<Button> leftButtons = mergeButtonsWithColor(buttons.left, leftButtonColor, leftButtonDisabledColor);
         if (buttons.right != null) topBar.setRightButtons(rightButtons);
@@ -221,7 +222,7 @@ public class StackOptionsPresenter {
     }
 
     @Nullable
-    private List<Button> mergeButtonsWithColor(List<Button> buttons, com.reactnativenavigation.parse.params.Color buttonColor, com.reactnativenavigation.parse.params.Color disabledColor) {
+    private List<Button> mergeButtonsWithColor(List<Button> buttons, Colour buttonColor, Colour disabledColor) {
         List<Button> result = null;
         if (buttons != null) {
             result = new ArrayList<>();

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

@@ -13,7 +13,7 @@ import android.widget.TextView;
 import com.reactnativenavigation.parse.Alignment;
 import com.reactnativenavigation.parse.BackButton;
 import com.reactnativenavigation.parse.params.Button;
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.utils.ButtonOptionsPresenter;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.UiUtils;
@@ -57,7 +57,7 @@ public class TitleBar extends Toolbar {
         return super.getTitle() == null ? "" : (String) super.getTitle();
     }
 
-    public void setTitleTextColor(Color color) {
+    public void setTitleTextColor(Colour color) {
         if (color.hasValue()) setTitleTextColor(color.get());
     }
 
@@ -68,7 +68,7 @@ public class TitleBar extends Toolbar {
         addView(component);
     }
 
-    public void setBackgroundColor(Color color) {
+    public void setBackgroundColor(Colour color) {
         if (color.hasValue()) setBackgroundColor(color.get());
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/views/topbar/TopBar.java

@@ -29,7 +29,7 @@ import com.reactnativenavigation.parse.AnimationOptions;
 import com.reactnativenavigation.parse.BackButton;
 import com.reactnativenavigation.parse.Component;
 import com.reactnativenavigation.parse.params.Button;
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.utils.ImageLoader;
@@ -191,7 +191,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         topTabs.setFontFamily(tabIndex, fontFamily);
     }
 
-    public void applyTopTabsColors(Color selectedTabColor, Color unselectedTabColor) {
+    public void applyTopTabsColors(Colour selectedTabColor, Colour unselectedTabColor) {
         topTabs.applyTopTabsColors(selectedTabColor, unselectedTabColor);
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/views/toptabs/TopTabs.java

@@ -6,7 +6,7 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 import android.view.ViewManager;
 
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.views.topbar.TopBar;
 
@@ -30,7 +30,7 @@ public class TopTabs extends TabLayout {
         return EMPTY_STATE_SET;
     }
 
-    public void applyTopTabsColors(Color selectedTabColor, Color unselectedTabColor) {
+    public void applyTopTabsColors(Colour selectedTabColor, Colour unselectedTabColor) {
         styleHelper.applyTopTabsColors(selectedTabColor, unselectedTabColor);
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/views/toptabs/TopTabsStyleHelper.java

@@ -5,7 +5,7 @@ import android.graphics.Typeface;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.utils.Task;
 import com.reactnativenavigation.utils.ViewUtils;
@@ -24,7 +24,7 @@ class TopTabsStyleHelper {
         }
     }
 
-    void applyTopTabsColors(Color selected, Color unselected) {
+    void applyTopTabsColors(Colour selected, Colour unselected) {
         ColorStateList originalColors = topTabs.getTabTextColors();
         int selectedTabColor = originalColors != null ? originalColors.getColorForState(topTabs.getSelectedTabColors(), -1) : -1;
         int tabTextColor = originalColors != null ? originalColors.getColorForState(topTabs.getDefaultTabColors(), -1) : -1;

lib/android/app/src/test/java/com/reactnativenavigation/parse/OptionsTest.java

@@ -1,11 +1,13 @@
 package com.reactnativenavigation.parse;
 
+import android.graphics.Color;
 import android.graphics.Typeface;
 import android.support.annotation.NonNull;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.TypefaceLoaderMock;
 import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.NullText;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
@@ -269,7 +271,7 @@ public class OptionsTest extends BaseTest {
     @Test
     public void clear_bottomTabsOptions() {
         Options uut = new Options();
-        uut.bottomTabsOptions.backgroundColor = new com.reactnativenavigation.parse.params.Color(android.graphics.Color.RED);
+        uut.bottomTabsOptions.backgroundColor = new Colour(Color.RED);
         uut.clearBottomTabsOptions();
         assertThat(uut.bottomTabsOptions.backgroundColor.hasValue()).isFalse();
     }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/BottomTabOptionsPresenterTest.java

@@ -1,11 +1,12 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
+import android.graphics.Color;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.presentation.BottomTabOptionsPresenter;
 import com.reactnativenavigation.views.BottomTabs;
@@ -81,16 +82,16 @@ public class BottomTabOptionsPresenterTest extends BaseTest {
     private Options createTab1Options() {
         Options options = new Options();
         options.bottomTabOptions.badge = new Text("tab1badge");
-        options.bottomTabOptions.iconColor = new Color(android.graphics.Color.RED);
-        options.bottomTabOptions.selectedIconColor = new Color(android.graphics.Color.RED);
+        options.bottomTabOptions.iconColor = new Colour(Color.RED);
+        options.bottomTabOptions.selectedIconColor = new Colour(Color.RED);
         return options;
     }
 
     private Options createTab2Options() {
         Options options = new Options();
         options.bottomTabOptions.badge = new Text("tab2badge");
-        options.bottomTabOptions.iconColor = new Color(android.graphics.Color.RED);
-        options.bottomTabOptions.selectedIconColor = new Color(android.graphics.Color.RED);
+        options.bottomTabOptions.iconColor = new Colour(Color.RED);
+        options.bottomTabOptions.selectedIconColor = new Colour(Color.RED);
         return options;
     }
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/BottomTabsControllerTest.java

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
+import android.graphics.Color;
 import android.support.annotation.NonNull;
 import android.view.View;
 import android.view.ViewGroup;
@@ -13,7 +14,7 @@ import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.mocks.TitleBarReactViewCreatorMock;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.presentation.BottomTabOptionsPresenter;
@@ -157,7 +158,7 @@ public class BottomTabsControllerTest extends BaseTest {
     @Test
     public void applyOptions_bottomTabsOptionsAreClearedAfterApply() {
         Options options = new Options();
-        options.bottomTabsOptions.backgroundColor = new Color(android.graphics.Color.RED);
+        options.bottomTabsOptions.backgroundColor = new Colour(Color.RED);
         child1.mergeOptions(options);
         uut.ensureViewIsCreated();
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/BottomTabsOptionsPresenterTest.java

@@ -6,7 +6,7 @@ import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.presentation.BottomTabsOptionsPresenter;
 import com.reactnativenavigation.viewcontrollers.bottomtabs.TabSelector;
 import com.reactnativenavigation.views.BottomTabs;
@@ -46,7 +46,7 @@ public class BottomTabsOptionsPresenterTest extends BaseTest {
         uut.setDefaultOptions(defaultOptions);
 
         Options options = new Options();
-        options.bottomTabsOptions.backgroundColor = new Color(10);
+        options.bottomTabsOptions.backgroundColor = new Colour(10);
         uut.mergeChildOptions(options, (Component) tabs.get(0).getView());
         verify(bottomTabs).setBackgroundColor(options.bottomTabsOptions.backgroundColor.get());
         verifyNoMoreInteractions(bottomTabs);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/OptionsApplyingTest.java

@@ -19,6 +19,7 @@ import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.SubtitleOptions;
 import com.reactnativenavigation.parse.TopBarBackgroundOptions;
 import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.presentation.OptionsPresenter;
@@ -142,7 +143,7 @@ public class OptionsApplyingTest extends BaseTest {
         uut.onViewAppeared();
 
         Options opts = new Options();
-        opts.topBar.background.color = new com.reactnativenavigation.parse.params.Color(Color.RED);
+        opts.topBar.background.color = new Colour(Color.RED);
         uut.mergeOptions(opts);
 
         assertThat(((ColorDrawable) stackController.getTopBar().getBackground()).getColor()).isEqualTo(Color.RED);
@@ -156,7 +157,7 @@ public class OptionsApplyingTest extends BaseTest {
             public void onSuccess(String childId) {
                 Options opts = new Options();
                 opts.topBar.title.text = new Text("the title");
-                opts.topBar.title.color = new com.reactnativenavigation.parse.params.Color(Color.RED);
+                opts.topBar.title.color = new Colour(Color.RED);
                 uut.mergeOptions(opts);
 
                 assertThat(stackController.getTopBar().getTitleTextView()).isNotEqualTo(null);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/StackOptionsPresenterTest.java

@@ -18,7 +18,7 @@ import com.reactnativenavigation.parse.SubtitleOptions;
 import com.reactnativenavigation.parse.TitleOptions;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Button;
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Fraction;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
@@ -154,15 +154,15 @@ public class StackOptionsPresenterTest extends BaseTest {
         title.text = new Text("abc");
         title.component.name = new Text("someComponent");
         title.component.componentId = new Text("compId");
-        title.color = new Color(0);
+        title.color = new Colour(0);
         title.fontSize = new Fraction(1.0f);
         title.fontFamily = Typeface.DEFAULT_BOLD;
         options.topBar.title = title;
         SubtitleOptions subtitleOptions = new SubtitleOptions();
         subtitleOptions.text = new Text("Sub");
-        subtitleOptions.color = new Color(1);
+        subtitleOptions.color = new Colour(1);
         options.topBar.subtitle = subtitleOptions;
-        options.topBar.background.color = new Color(0);
+        options.topBar.background.color = new Colour(0);
         options.topBar.testId = new Text("test123");
         options.topBar.animate = new Bool(false);
         options.topBar.visible = new Bool(false);
@@ -187,8 +187,8 @@ public class StackOptionsPresenterTest extends BaseTest {
         verify(topBar, times(0)).applyTopTabsFontSize(any());
         verify(topBar, times(0)).setTopTabsVisible(anyBoolean());
 
-        options.topTabs.selectedTabColor = new Color(1);
-        options.topTabs.unselectedTabColor = new Color(1);
+        options.topTabs.selectedTabColor = new Colour(1);
+        options.topTabs.unselectedTabColor = new Colour(1);
         options.topTabs.fontSize = new Number(1);
         options.topTabs.visible = new Bool(true);
         uut.mergeChildOptions(options, EMPTY_OPTIONS, child);
@@ -225,7 +225,7 @@ public class StackOptionsPresenterTest extends BaseTest {
     @Test
     public void mergeOptions_defaultOptionsAreNotApplied() {
         Options defaultOptions = new Options();
-        defaultOptions.topBar.background.color = new Color(10);
+        defaultOptions.topBar.background.color = new Colour(10);
         uut.setDefaultOptions(defaultOptions);
 
         Options childOptions = new Options();
@@ -242,8 +242,8 @@ public class StackOptionsPresenterTest extends BaseTest {
         Button rightButton2 = new Button();
         Button leftButton = new Button();
 
-        options.topBar.rightButtonColor = new Color(10);
-        options.topBar.leftButtonColor = new Color(100);
+        options.topBar.rightButtonColor = new Colour(10);
+        options.topBar.leftButtonColor = new Colour(100);
 
         options.topBar.buttons.right = new ArrayList<>();
         options.topBar.buttons.right.add(rightButton1);
@@ -269,8 +269,8 @@ public class StackOptionsPresenterTest extends BaseTest {
     @Test
     public void mergeChildOptions_buttonColorIsResolvedFromAppliedOptions() {
         Options appliedOptions = new Options();
-        appliedOptions.topBar.rightButtonColor = new Color(10);
-        appliedOptions.topBar.leftButtonColor = new Color(100);
+        appliedOptions.topBar.rightButtonColor = new Colour(10);
+        appliedOptions.topBar.leftButtonColor = new Colour(100);
 
         Options options2 = new Options();
         Button rightButton1 = new Button();
@@ -301,8 +301,8 @@ public class StackOptionsPresenterTest extends BaseTest {
     @Test
     public void mergeChildOptions_buttonColorIsResolvedFromMergedOptions() {
         Options resolvedOptions = new Options();
-        resolvedOptions.topBar.rightButtonColor = new Color(10);
-        resolvedOptions.topBar.leftButtonColor = new Color(100);
+        resolvedOptions.topBar.rightButtonColor = new Colour(10);
+        resolvedOptions.topBar.leftButtonColor = new Colour(100);
 
         Options options2 = new Options();
         Button rightButton1 = new Button();

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/TopBarButtonControllerTest.java

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
+import android.graphics.Color;
 import android.graphics.Typeface;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
@@ -11,7 +12,7 @@ import com.reactnativenavigation.mocks.ImageLoaderMock;
 import com.reactnativenavigation.mocks.TopBarButtonCreatorMock;
 import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.parse.params.Button;
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.NullText;
 import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
@@ -71,7 +72,7 @@ public class TopBarButtonControllerTest extends BaseTest {
         uut.addToMenu(getTitleBar(), 0);
 
         assertThat(getTitleBar().getMenu().size()).isOne();
-        verify(optionsPresenter, times(1)).tint(any(), eq(android.graphics.Color.RED));
+        verify(optionsPresenter, times(1)).tint(any(), eq(Color.RED));
     }
 
     @Test
@@ -79,16 +80,16 @@ public class TopBarButtonControllerTest extends BaseTest {
         setIconButton(false);
         uut.addToMenu(getTitleBar(), 0);
 
-        verify(optionsPresenter, times(1)).tint(any(), eq(android.graphics.Color.LTGRAY));
+        verify(optionsPresenter, times(1)).tint(any(), eq(Color.LTGRAY));
     }
 
     @Test
     public void setIconColor_disabledColor() {
         setIconButton(false);
-        button.disabledColor = new Color(android.graphics.Color.BLACK);
+        button.disabledColor = new Colour(Color.BLACK);
         uut.addToMenu(getTitleBar(), 0);
 
-        verify(optionsPresenter, times(1)).tint(any(), eq(android.graphics.Color.BLACK));
+        verify(optionsPresenter, times(1)).tint(any(), eq(Color.BLACK));
     }
 
     @Test
@@ -128,7 +129,7 @@ public class TopBarButtonControllerTest extends BaseTest {
 
         clearMenu();
         button.enabled = new Bool(true);
-        button.color = new Color(android.graphics.Color.RED);
+        button.color = new Colour(android.graphics.Color.RED);
         uut.addToMenu(getTitleBar(), 0);
         dispatchPreDraw(getTitleBar());
         verify(optionsPresenter, times(1)).setEnabledColor(any());
@@ -144,13 +145,13 @@ public class TopBarButtonControllerTest extends BaseTest {
         button.enabled = new Bool(false);
         uut.addToMenu(getTitleBar(), 0);
         dispatchPreDraw(getTitleBar());
-        verify(optionsPresenter, times(1)).setDisabledColor(any(), eq(android.graphics.Color.LTGRAY));
+        verify(optionsPresenter, times(1)).setDisabledColor(any(), eq(Color.LTGRAY));
 
         clearMenu();
-        button.disabledColor = new Color(android.graphics.Color.BLACK);
+        button.disabledColor = new Colour(android.graphics.Color.BLACK);
         uut.addToMenu(getTitleBar(), 0);
         dispatchPreDraw(getTitleBar());
-        verify(optionsPresenter, times(1)).setDisabledColor(any(), eq(android.graphics.Color.BLACK));
+        verify(optionsPresenter, times(1)).setDisabledColor(any(), eq(Color.BLACK));
     }
 
     private Toolbar getTitleBar() {
@@ -167,7 +168,7 @@ public class TopBarButtonControllerTest extends BaseTest {
     private void setIconButton(boolean enabled) {
         button.id = "btn1";
         button.icon = new Text("someIcon");
-        button.color = new Color(android.graphics.Color.RED);
+        button.color = new Colour(Color.RED);
         button.component.name = new NullText();
         button.component.componentId = new NullText();
         button.enabled = new Bool(enabled);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/button/NavigationIconResolverTest.java

@@ -1,12 +1,13 @@
 package com.reactnativenavigation.viewcontrollers.button;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.ImageLoaderMock;
 import com.reactnativenavigation.parse.params.Button;
-import com.reactnativenavigation.parse.params.Color;
+import com.reactnativenavigation.parse.params.Colour;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.react.Constants;
 import com.reactnativenavigation.utils.ImageLoader;
@@ -63,7 +64,7 @@ public class NavigationIconResolverTest extends BaseTest {
         Button button = new Button();
         button.id = "iconBtnId";
         button.icon = new Text(ICON_URI);
-        button.color = new Color(android.graphics.Color.RED);
+        button.color = new Colour(Color.RED);
         return button;
     }