diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/PickerProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/PickerProxy.java index 3069b63fa07..0317a9ae213 100644 --- a/android/modules/ui/src/java/ti/modules/titanium/ui/PickerProxy.java +++ b/android/modules/ui/src/java/ti/modules/titanium/ui/PickerProxy.java @@ -226,7 +226,7 @@ public boolean forwardDelete(View view, Editable content, int keyCode, KeyEvent TextInputLayout.LayoutParams.MATCH_PARENT, TextInputLayout.LayoutParams.MATCH_PARENT)); if (hasPropertyAndNotNull(TiC.PROPERTY_COLOR)) { - editText.setTextColor(TiConvert.toColor(getProperty(TiC.PROPERTY_COLOR).toString())); + editText.setTextColor(TiConvert.toColor(getProperty(TiC.PROPERTY_COLOR).toString(), activity)); } return textInputLayout; diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/android/AndroidModule.java b/android/modules/ui/src/java/ti/modules/titanium/ui/android/AndroidModule.java index e2384b96cde..65befefb9d1 100644 --- a/android/modules/ui/src/java/ti/modules/titanium/ui/android/AndroidModule.java +++ b/android/modules/ui/src/java/ti/modules/titanium/ui/android/AndroidModule.java @@ -303,7 +303,7 @@ public ColorProxy getColorResource(Object idOrName) @Kroll.method public String harmonizedColor(String value) { - int color = TiConvert.toColor(value); + int color = TiConvert.toColor(value, TiApplication.getAppCurrentActivity()); return String.format("#%06X", (0xFFFFFF & MaterialColors.harmonizeWithPrimary(TiApplication.getAppCurrentActivity(), color))); } diff --git a/android/titanium/src/java/org/appcelerator/titanium/util/TiAnimationBuilder.java b/android/titanium/src/java/org/appcelerator/titanium/util/TiAnimationBuilder.java index 76fb99f5827..4bd6414f97b 100644 --- a/android/titanium/src/java/org/appcelerator/titanium/util/TiAnimationBuilder.java +++ b/android/titanium/src/java/org/appcelerator/titanium/util/TiAnimationBuilder.java @@ -14,6 +14,7 @@ import org.appcelerator.kroll.KrollDict; import org.appcelerator.kroll.KrollFunction; import org.appcelerator.kroll.common.Log; +import org.appcelerator.titanium.TiApplication; import org.appcelerator.titanium.TiC; import org.appcelerator.titanium.TiDimension; import org.appcelerator.titanium.proxy.TiViewProxy; @@ -229,11 +230,12 @@ public void applyOptions(HashMap options) } if (options.containsKey(TiC.PROPERTY_BACKGROUND_COLOR)) { - backgroundColor = TiConvert.toColor(options, TiC.PROPERTY_BACKGROUND_COLOR); + backgroundColor = TiConvert.toColor(options, TiC.PROPERTY_BACKGROUND_COLOR, + TiApplication.getAppCurrentActivity()); } if (options.containsKey(TiC.PROPERTY_COLOR)) { - color = TiConvert.toColor(options, TiC.PROPERTY_COLOR); + color = TiConvert.toColor(options, TiC.PROPERTY_COLOR, TiApplication.getAppCurrentActivity()); } if (options.containsKey(TiC.PROPERTY_ELEVATION)) { diff --git a/android/titanium/src/java/org/appcelerator/titanium/view/TiGradientDrawable.java b/android/titanium/src/java/org/appcelerator/titanium/view/TiGradientDrawable.java index dda7526206e..dccba21b5f7 100644 --- a/android/titanium/src/java/org/appcelerator/titanium/view/TiGradientDrawable.java +++ b/android/titanium/src/java/org/appcelerator/titanium/view/TiGradientDrawable.java @@ -10,6 +10,7 @@ import org.appcelerator.kroll.KrollDict; import org.appcelerator.kroll.common.Log; +import org.appcelerator.titanium.TiApplication; import org.appcelerator.titanium.TiDimension; import org.appcelerator.titanium.TiPoint; import org.appcelerator.titanium.util.TiConvert; @@ -299,7 +300,7 @@ private void loadColors(Object[] colors) // We were given a Titanium "GradientColorRef" dictionary. Fetch its color. @SuppressWarnings({ "rawtypes", "unchecked" }) HashMap colorRefObject = (HashMap) color; - this.colors[i] = TiConvert.toColor(colorRefObject, "color"); + this.colors[i] = TiConvert.toColor(colorRefObject, "color", TiApplication.getAppCurrentActivity()); // Fetch the offset from the "GradientColorRef" dictionary. // Note: Make sure value does not exceed the 0.0 - 1.0 normalized range. @@ -319,7 +320,7 @@ private void loadColors(Object[] colors) } } else { // Fetch the color value from the array. - this.colors[i] = TiConvert.toColor(color.toString()); + this.colors[i] = TiConvert.toColor(color.toString(), TiApplication.getAppCurrentActivity()); } }