From 55e53f0b243717efcf2b060a04ea50f682ceb6bf Mon Sep 17 00:00:00 2001 From: Vasil Chimev Date: Sun, 15 Sep 2019 11:15:02 +0300 Subject: [PATCH] asdf --- tns-core-modules/ui/text-base/text-base.ios.ts | 1 + tns-core-modules/ui/text-view/text-view.ios.ts | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tns-core-modules/ui/text-base/text-base.ios.ts b/tns-core-modules/ui/text-base/text-base.ios.ts index 6560adbe9..32202babf 100644 --- 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 index 0b14b8c74..e7ed17ffe 100644 --- 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"; \ No newline at end of file +TextView.prototype.recycleNativeView = "auto";