asdf

vchimev · vchimev · commit 55e53f0b2437 · 2019-09-15T11:15:35.000+03:00
diff --git a/tns-core-modules/ui/text-base/text-base.ios.ts b/tns-core-modules/ui/text-base/text-base.ios.ts
@@ -205,6 +205,7 @@ export class TextBase extends TextBaseCommon {
             if (isTextView) {
                 // UITextView's font seems to change inside.
                 dict.set(NSFontAttributeName, this.nativeTextViewProtected.font);
+                dict.set(NSForegroundColorAttributeName, this.nativeTextViewProtected.textColor);
             }
 
             const result = NSMutableAttributedString.alloc().initWithString(source);
diff --git a/tns-core-modules/ui/text-view/text-view.ios.ts b/tns-core-modules/ui/text-view/text-view.ios.ts
@@ -114,6 +114,7 @@ export class TextView extends EditableTextBase implements TextViewDefinition {
     public _isEditing: boolean;
 
     createNativeView() {
+        debugger;
         const textView = NoScrollAnimationUITextView.new();
         if (!textView.font) {
             textView.font = UIFont.systemFontOfSize(12);
@@ -163,6 +164,7 @@ export class TextView extends EditableTextBase implements TextViewDefinition {
     }
 
     private _refreshColor() {
+        debugger;
         if (this._isShowingHint) {
             const placeholderColor = this.style.placeholderColor;
             const color = this.style.color;
@@ -173,7 +175,7 @@ export class TextView extends EditableTextBase implements TextViewDefinition {
                 // Use semi-transparent version of color for back-compatibility
                 this.nativeTextViewProtected.textColor = color.ios.colorWithAlphaComponent(0.22);
             } else {
-                this.nativeTextViewProtected.textColor = UIColor.blackColor.colorWithAlphaComponent(0.22);
+                this.nativeTextViewProtected.textColor = UIColor.labelColor;
             }
         } else {
             const color = this.style.color;
@@ -182,8 +184,8 @@ export class TextView extends EditableTextBase implements TextViewDefinition {
                 this.nativeTextViewProtected.textColor = color.ios;
                 this.nativeTextViewProtected.tintColor = color.ios;
             } else {
-                this.nativeTextViewProtected.textColor = null;
-                this.nativeTextViewProtected.tintColor = null;
+                this.nativeTextViewProtected.textColor = UIColor.labelColor;
+                this.nativeTextViewProtected.tintColor = UIColor.tintColor;
             }
         }
     }
@@ -329,4 +331,4 @@ export class TextView extends EditableTextBase implements TextViewDefinition {
     }
 }
 
-TextView.prototype.recycleNativeView = "auto";
+TextView.prototype.recycleNativeView = "auto";

Original file line number	Diff line number	Diff line change
`@@ -205,6 +205,7 @@ export class TextBase extends TextBaseCommon {`
`205`	`205`	`if (isTextView) {`
`206`	`206`	`// UITextView's font seems to change inside.`
`207`	`207`	`dict.set(NSFontAttributeName, this.nativeTextViewProtected.font);`
	`208`	`+ dict.set(NSForegroundColorAttributeName, this.nativeTextViewProtected.textColor);`
`208`	`209`	`}`
`209`	`210`
`210`	`211`	`const result = NSMutableAttributedString.alloc().initWithString(source);`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,7 @@ export class TextView extends EditableTextBase implements TextViewDefinition {`
`114`	`114`	`public _isEditing: boolean;`
`115`	`115`
`116`	`116`	`createNativeView() {`
	`117`	`+ debugger;`
`117`	`118`	`const textView = NoScrollAnimationUITextView.new();`
`118`	`119`	`if (!textView.font) {`
`119`	`120`	`textView.font = UIFont.systemFontOfSize(12);`
`@@ -163,6 +164,7 @@ export class TextView extends EditableTextBase implements TextViewDefinition {`
`163`	`164`	`}`
`164`	`165`
`165`	`166`	`private _refreshColor() {`
	`167`	`+ debugger;`
`166`	`168`	`if (this._isShowingHint) {`
`167`	`169`	`const placeholderColor = this.style.placeholderColor;`
`168`	`170`	`const color = this.style.color;`
`@@ -173,7 +175,7 @@ export class TextView extends EditableTextBase implements TextViewDefinition {`
`173`	`175`	`// Use semi-transparent version of color for back-compatibility`
`174`	`176`	`this.nativeTextViewProtected.textColor = color.ios.colorWithAlphaComponent(0.22);`
`175`	`177`	`} else {`
`176`		`- this.nativeTextViewProtected.textColor = UIColor.blackColor.colorWithAlphaComponent(0.22);`
	`178`	`+ this.nativeTextViewProtected.textColor = UIColor.labelColor;`
`177`	`179`	`}`
`178`	`180`	`} else {`
`179`	`181`	`const color = this.style.color;`
`@@ -182,8 +184,8 @@ export class TextView extends EditableTextBase implements TextViewDefinition {`
`182`	`184`	`this.nativeTextViewProtected.textColor = color.ios;`
`183`	`185`	`this.nativeTextViewProtected.tintColor = color.ios;`
`184`	`186`	`} else {`
`185`		`- this.nativeTextViewProtected.textColor = null;`
`186`		`- this.nativeTextViewProtected.tintColor = null;`
	`187`	`+ this.nativeTextViewProtected.textColor = UIColor.labelColor;`
	`188`	`+ this.nativeTextViewProtected.tintColor = UIColor.tintColor;`
`187`	`189`	`}`
`188`	`190`	`}`
`189`	`191`	`}`
`@@ -329,4 +331,4 @@ export class TextView extends EditableTextBase implements TextViewDefinition {`
`329`	`331`	`}`
`330`	`332`	`}`
`331`	`333`
`332`		`-TextView.prototype.recycleNativeView = "auto";`
	`334`	`+TextView.prototype.recycleNativeView = "auto";`