From 84e726e6b9c80aa126aa79c7398d9e66abb7cefe Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Tue, 28 Mar 2017 14:20:45 +0300 Subject: [PATCH] Resolving comments --- .../ui/core/view-base/view-base.ts | 3 --- .../ui/date-picker/date-picker.android.ts | 10 ++++---- .../editable-text-base.android.ts | 17 ------------- .../ui/html-view/html-view.ios.ts | 25 ++++++++----------- .../ui/time-picker/time-picker.android.ts | 2 -- 5 files changed, 16 insertions(+), 41 deletions(-) diff --git a/tns-core-modules/ui/core/view-base/view-base.ts b/tns-core-modules/ui/core/view-base/view-base.ts index fce712a8f..d32b7afc4 100644 --- a/tns-core-modules/ui/core/view-base/view-base.ts +++ b/tns-core-modules/ui/core/view-base/view-base.ts @@ -660,9 +660,6 @@ export abstract class ViewBase extends Observable implements ViewBaseDefinition } else { // TODO: Implement _createNativeView for iOS this.createNativeView(); - if (!currentNativeView) { - console.log(`${this.typeName} doesnt have NativeView !!!!! =================`); - } // this.nativeView = this._iosView = (this)._nativeView; } diff --git a/tns-core-modules/ui/date-picker/date-picker.android.ts b/tns-core-modules/ui/date-picker/date-picker.android.ts index 4b29cd8e6..14fc80fbf 100644 --- a/tns-core-modules/ui/date-picker/date-picker.android.ts +++ b/tns-core-modules/ui/date-picker/date-picker.android.ts @@ -119,19 +119,19 @@ export class DatePicker extends DatePickerBase { } } - [maxDateProperty.getDefault](): Date { + [maxDateProperty.getDefault](): number { return this.nativeView.getMaxDate(); } - [maxDateProperty.setNative](value: Date) { + [maxDateProperty.setNative](value: Date | number) { const newValue = value instanceof Date ? value.getTime() : value; this.nativeView.setMaxDate(newValue); } - [minDateProperty.getDefault](): Date { + [minDateProperty.getDefault](): number { return this.nativeView.getMinDate(); } - [minDateProperty.setNative](value: Date) { + [minDateProperty.setNative](value: Date | number) { const newValue = value instanceof Date ? value.getTime() : value; this.nativeView.setMinDate(newValue); } -} +} \ No newline at end of file diff --git a/tns-core-modules/ui/editable-text-base/editable-text-base.android.ts b/tns-core-modules/ui/editable-text-base/editable-text-base.android.ts index 8d7e6d546..2e31dd01d 100644 --- a/tns-core-modules/ui/editable-text-base/editable-text-base.android.ts +++ b/tns-core-modules/ui/editable-text-base/editable-text-base.android.ts @@ -159,23 +159,6 @@ export abstract class EditableTextBase extends EditableTextBaseCommon { (this.nativeView).listener.owner = null; } - // public _resetNativeView(force?: boolean) { - // if (this._android) { - // this._android.setOnFocusChangeListener(null); - // this._android.setOnEditorActionListener(null); - - // if (this._editTextListeners) { - // this._android.removeTextChangedListener(this._editTextListeners); - // } - // } - // super.resetNativeView(); - // } - - // public _disposeNativeView(force?: boolean) { - // this._android = undefined; - // super.disposeNativeView(); - // } - public dismissSoftInput() { ad.dismissSoftInput(this.nativeView); } diff --git a/tns-core-modules/ui/html-view/html-view.ios.ts b/tns-core-modules/ui/html-view/html-view.ios.ts index 2439a2309..416e08de3 100644 --- a/tns-core-modules/ui/html-view/html-view.ios.ts +++ b/tns-core-modules/ui/html-view/html-view.ios.ts @@ -5,29 +5,26 @@ export * from "./html-view-common"; export class HtmlView extends HtmlViewBase { - private _ios: UITextView; + nativeView: UITextView; constructor() { super(); - this.nativeView = this._ios = UITextView.new(); + const nativeView = UITextView.new() + nativeView.scrollEnabled = false; + nativeView.editable = false; + nativeView.selectable = true; + nativeView.userInteractionEnabled = true; + nativeView.dataDetectorTypes = UIDataDetectorTypes.All; - this._ios.scrollEnabled = false; - this._ios.editable = false; - this._ios.selectable = true; - this._ios.userInteractionEnabled = true; - this._ios.dataDetectorTypes = UIDataDetectorTypes.All; + this.nativeView = nativeView; } get ios(): UITextView { - return this._ios; + return this.nativeView; } - // get nativeView(): UITextView { - // return this._ios; - // } - public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void { - var nativeView = this._ios; + const nativeView = this.nativeView; if (nativeView) { const width = layout.getMeasureSpecSize(widthMeasureSpec); const widthMode = layout.getMeasureSpecMode(widthMeasureSpec); @@ -54,6 +51,6 @@ export class HtmlView extends HtmlViewBase { [htmlProperty.setNative](value: string) { const htmlString = NSString.stringWithString(value + ""); const nsData = htmlString.dataUsingEncoding(NSUnicodeStringEncoding); - this._ios.attributedText = NSAttributedString.alloc().initWithDataOptionsDocumentAttributesError(nsData, { [NSDocumentTypeDocumentAttribute]: NSHTMLTextDocumentType }, null); + this.nativeView.attributedText = NSAttributedString.alloc().initWithDataOptionsDocumentAttributesError(nsData, { [NSDocumentTypeDocumentAttribute]: NSHTMLTextDocumentType }, null); } } diff --git a/tns-core-modules/ui/time-picker/time-picker.android.ts b/tns-core-modules/ui/time-picker/time-picker.android.ts index 680cc8e86..a6c92a6ea 100644 --- a/tns-core-modules/ui/time-picker/time-picker.android.ts +++ b/tns-core-modules/ui/time-picker/time-picker.android.ts @@ -29,8 +29,6 @@ function initializeTimeChangedListener(): void { } const validTime = getValidTime(timePicker, hour, minute); - hourProperty.nativeValueChange(timePicker, validTime.hour); - minuteProperty.nativeValueChange(timePicker, validTime.minute); timeProperty.nativeValueChange(timePicker, new Date(0, 0, 0, validTime.hour, validTime.minute)); } }