fix(textfield): android fix stroke colors

Author: farfromrefug

packages/core/platforms/android/java/com/nativescript/material/core/Utils.java

@@ -45,15 +45,15 @@ public static void createStateListAnimator(Context context, View view, float ele
 
     public static ColorStateList getEnabledColorStateList(int color, int disabledColor) {
         int[][] states = new int[][] { new int[] { -android.R.attr.state_enabled }, // enabled
-                android.util.StateSet.NOTHING, // disabled
+                android.util.StateSet.WILD_CARD, // disabled
         };
         int[] colors = new int[] { disabledColor, color };
         return new android.content.res.ColorStateList(states, colors);
     }
 
     public static ColorStateList getFullColorStateList(int activeColor, int inactiveColor, int disabledColor) {
-        int[][] states = new int[][] { new int[] { android.R.attr.state_focused }, // focused
-                android.util.StateSet.NOTHING, // other
+        int[][] states = new int[][] { new int[] { android.R.attr.state_focused,  }, // focused
+                android.util.StateSet.WILD_CARD, // other
                 new int[] { -android.R.attr.state_enabled } // disabled
         };
         int[] colors = new int[] { activeColor, inactiveColor, disabledColor };

src/core/textbase/cssproperties.ts

@@ -63,6 +63,7 @@ export const strokeInactiveColorProperty = new CssProperty<Style, Color>({
     equalityComparer: Color.equals,
     valueConverter: v => new Color(v)
 });
+strokeInactiveColorProperty.register(Style);
 export const strokeDisabledColorProperty = new CssProperty<Style, Color>({
     name: 'strokeDisabledColor',
     cssName: 'stroke-disabled-color',

src/textfield/textfield.android.ts

@@ -127,20 +127,19 @@ export class TextField extends TextFieldBase {
     [placeholderColorProperty.setNative](value: Color) {
         const placeholderColor = value instanceof Color ? value.android : value;
         const floatingColor = this.floatingColor instanceof Color ? this.floatingColor.android : placeholderColor;
-
-        this.layoutView.setDefaultHintTextColor(getFullColorStateList(floatingColor, placeholderColor));
+        this.layoutView.setHintTextColor(getFullColorStateList(floatingColor, placeholderColor));
     }
 
     [floatingColorProperty.setNative](value: Color) {
         const floatingColor = value instanceof Color ? value.android : value;
-        const placeholderColor = this.placeholderColor instanceof Color ? this.placeholderColor.android : undefined;
+        const placeholderColor = this.floatingInactiveColor instanceof Color ? this.floatingInactiveColor.android : undefined;
         this.layoutView.setDefaultHintTextColor(getFullColorStateList(floatingColor, placeholderColor));
     }
 
     [floatingInactiveColorProperty.setNative](value: Color) {
-        const placeholderColor = value instanceof Color ? value.android : value;
+        const floatingInactiveColor = value instanceof Color ? value.android : value;
         const floatingColor = (this.floatingColor || (themer.getPrimaryColor() as Color)).android;
-        this.layoutView.setDefaultHintTextColor(getFullColorStateList(floatingColor, placeholderColor));
+        this.layoutView.setDefaultHintTextColor(getFullColorStateList(floatingColor, floatingInactiveColor));
     }
     [helperColorProperty.setNative](value) {
         const color = value instanceof Color ? value.android : value;
@@ -208,27 +207,30 @@ export class TextField extends TextFieldBase {
         const color = value instanceof Color ? value.android : value;
         if (this.layoutView.setBoxStrokeColorStateList) {
             const activeColor = this.strokeColor instanceof Color ? this.strokeColor.android : this.layoutView.getBoxStrokeColor();
-            const colorStateList = getFullColorStateList(activeColor, color);
+            const disabledColor = this.strokeDisabledColor instanceof Color ? this.strokeDisabledColor.android : undefined;
+            const colorStateList = getFullColorStateList(activeColor, color, disabledColor);
             this.layoutView.setBoxStrokeColorStateList(colorStateList);
         }
     }
-    [strokeDisabledColorProperty.setNative](value: Color) {
+
+    [strokeColorProperty.setNative](value: Color) {
         const color = value instanceof Color ? value.android : value;
         if (this.layoutView.setBoxStrokeColorStateList) {
-            const activeColor = this.strokeColor instanceof Color ? this.strokeColor.android : this.layoutView.getBoxStrokeColor();
-            const colorStateList = getFullColorStateList(activeColor, color);
+            const inactiveColor = this.strokeInactiveColor instanceof Color ? this.strokeInactiveColor.android : undefined;
+            const disabledColor = this.strokeDisabledColor instanceof Color ? this.strokeDisabledColor.android : undefined;
+            const colorStateList = getFullColorStateList(color, inactiveColor, disabledColor);
             this.layoutView.setBoxStrokeColorStateList(colorStateList);
+        } else {
+            this.layoutView.setBoxStrokeColor(color);
         }
     }
-
-    [strokeColorProperty.setNative](value: Color) {
+    [strokeDisabledColorProperty.setNative](value: Color) {
         const color = value instanceof Color ? value.android : value;
         if (this.layoutView.setBoxStrokeColorStateList) {
+            const activeColor = this.strokeColor instanceof Color ? this.strokeColor.android : this.layoutView.getBoxStrokeColor();
             const inactiveColor = this.strokeInactiveColor instanceof Color ? this.strokeInactiveColor.android : undefined;
-            const colorStateList = getFullColorStateList(color, inactiveColor);
+            const colorStateList = getFullColorStateList(activeColor, inactiveColor, color);
             this.layoutView.setBoxStrokeColorStateList(colorStateList);
-        } else {
-            this.layoutView.setBoxStrokeColor(color);
         }
     }