Merge pull request #196 from cityinspain/master

helperColor property on TextField and TextView

Author: farfromrefug

src/core/textbase/cssproperties.ts

@@ -12,6 +12,13 @@ export const helperProperty = new CssProperty<Style, string>({
     cssName: 'helper'
 });
 helperProperty.register(Style);
+export const helperColorProperty = new CssProperty<Style, Color>({
+    name: 'helperColor',
+    cssName: 'helper-color',
+    equalityComparer: Color.equals,
+    valueConverter: v => new Color(v),
+});
+helperColorProperty.register(Style);
 export const errorProperty = new CssProperty<Style, string>({
     name: 'error',
     cssName: 'error'

src/textfield/textfield.android.ts

@@ -6,6 +6,7 @@ import {
     floatingColorProperty,
     floatingInactiveColorProperty,
     floatingProperty,
+    helperColorProperty,
     helperProperty,
     maxLengthProperty,
     strokeColorProperty,
@@ -131,6 +132,10 @@ export class TextField extends TextFieldBase {
             this.floatingColor instanceof Color ? this.floatingColor.android : this.layoutView.getDefaultHintTextColor().getColorForState(stateSets.FOCUSED_STATE_SET, placeholderColor);
         this.layoutView.setDefaultHintTextColor(getColorStateList(floatingColor, placeholderColor));
     }
+    [helperColorProperty.setNative](value) {
+        const color = value instanceof Color ? value.android : value;
+        this.layoutView.setHelperTextColor(android.content.res.ColorStateList.valueOf(color));
+    }
 
     public requestFocus() {
         if (this.layoutView) {

src/textfield/textfield.common.ts

@@ -11,6 +11,7 @@ export abstract class TextFieldBase extends NTextField {
     closeOnReturn: boolean;
 
     @cssProperty helper: string;
+    @cssProperty helperColor: Color;
     @cssProperty maxLength: number;
     @cssProperty errorColor: Color;
     @cssProperty floating: boolean;

src/textfield/textfield.d.ts

@@ -12,6 +12,7 @@ export class TextField extends NTextField {
     nativeViewProtected: any;
 
     helper: string;
+    helperColor: Color;
     maxLength: number;
     errorColor: Color;
     floating: boolean;

src/textfield/textfield.ios.ts

@@ -7,6 +7,7 @@ import {
     floatingColorProperty,
     floatingInactiveColorProperty,
     floatingProperty,
+    helperColorProperty,
     helperProperty,
     maxLengthProperty,
     strokeColorProperty,
@@ -315,6 +316,11 @@ export class TextField extends TextFieldBase {
     [helperProperty.setNative](value: string) {
         this._controller.helperText = value;
     }
+    [helperColorProperty.setNative](value: string | Color) {
+        const temp = typeof value === 'string' ? new Color(value) : value;
+        const color: UIColor = temp.ios;
+        this._controller.leadingUnderlineLabelTextColor = color;
+    }
     [maxLengthProperty.setNative](value: number) {
         this._controller.characterCountMax = value;
     }

src/textview/textview.android.ts

@@ -4,6 +4,7 @@ import {
     floatingColorProperty,
     floatingInactiveColorProperty,
     floatingProperty,
+    helperColorProperty,
     helperProperty,
     maxLengthProperty,
     strokeColorProperty,
@@ -104,6 +105,10 @@ export class TextView extends TextViewBase {
         this.layoutView.setHint(text);
     }
 
+    [helperColorProperty.setNative](value) {
+        const color = value instanceof Color ? value.android : value;
+        this.layoutView.setHelperTextColor(android.content.res.ColorStateList.valueOf(color));
+    }
     [placeholderColorProperty.setNative](value: Color) {
         const placeholderColor = value instanceof Color ? value.android : value;
         const floatingColor = this.floatingColor instanceof Color ? this.floatingColor.android : placeholderColor;

src/textview/textview.common.ts

@@ -7,6 +7,7 @@ export abstract class TextViewBase extends NSTextView {
     abstract clearFocus();
 
     @cssProperty helper: string;
+    @cssProperty helperColor: Color;
     @cssProperty maxLength: number;
     @cssProperty errorColor: Color;
     @cssProperty floating: boolean;

src/textview/textview.d.ts

@@ -12,6 +12,7 @@ export class TextView extends EditableTextBase {
     nativeViewProtected: any;
 
     helper: string;
+    helperColor: Color;
     maxLength: number;
     errorColor: Color;
     floating: boolean;

src/textview/textview.ios.ts

@@ -6,6 +6,7 @@ import {
     floatingColorProperty,
     floatingInactiveColorProperty,
     floatingProperty,
+    helperColorProperty,
     helperProperty,
     maxLengthProperty,
     strokeColorProperty,
@@ -312,6 +313,11 @@ export class TextView extends TextViewBase {
     [helperProperty.setNative](value: string) {
         this._controller.helperText = value;
     }
+    [helperColorProperty.setNative](value: string | Color) {
+        const temp = typeof value === 'string' ? new Color(value) : value;
+        const color: UIColor = temp.ios;
+        this._controller.leadingUnderlineLabelTextColor = color;
+    }
     [maxLengthProperty.setNative](value: number) {
         this._controller.characterCountMax = value;
     }