From b20fd7fd4c301facd16c9f583692a4a38b67c2f8 Mon Sep 17 00:00:00 2001 From: Hristo Hristov Date: Thu, 15 Dec 2016 10:46:20 +0200 Subject: [PATCH] Fix nativeView issues Fix Listeners base class --- .../activity-indicator.android.ts | 22 ++++----- tns-core-modules/ui/button/button.android.ts | 13 ++--- tns-core-modules/ui/core/properties.ts | 19 ++++++++ tns-core-modules/ui/core/view-common.ts | 10 ++-- tns-core-modules/ui/core/view.android.ts | 12 +++-- tns-core-modules/ui/core/view.d.ts | 8 ---- .../ui/date-picker/date-picker.android.ts | 35 +++++++------- .../editable-text-base.android.ts | 48 ++++++++++--------- tns-core-modules/ui/image/image.android.ts | 3 +- .../ui/list-picker/list-picker.android.ts | 6 ++- .../ui/list-view/list-view.android.ts | 3 +- .../ui/search-bar/search-bar.android.ts | 6 ++- .../ui/segmented-bar/segmented-bar.android.ts | 24 +++++----- tns-core-modules/ui/slider/slider.android.ts | 3 +- tns-core-modules/ui/switch/switch.android.ts | 3 +- .../ui/text-base/text-base.android.ts | 44 ++++++++--------- .../ui/time-picker/time-picker.android.ts | 15 +++--- 17 files changed, 151 insertions(+), 123 deletions(-) diff --git a/tns-core-modules/ui/activity-indicator/activity-indicator.android.ts b/tns-core-modules/ui/activity-indicator/activity-indicator.android.ts index 5c8b7b1b8..489607fd0 100644 --- a/tns-core-modules/ui/activity-indicator/activity-indicator.android.ts +++ b/tns-core-modules/ui/activity-indicator/activity-indicator.android.ts @@ -3,31 +3,31 @@ export * from "./activity-indicator-common"; export class ActivityIndicator extends ActivityIndicatorBase { - nativeView: android.widget.ProgressBar; + _progressBar: android.widget.ProgressBar; public _createUI() { - this.nativeView = new android.widget.ProgressBar(this._context); - this.nativeView.setVisibility(android.view.View.INVISIBLE); - this.nativeView.setIndeterminate(true); + this._progressBar = new android.widget.ProgressBar(this._context); + this._progressBar.setVisibility(android.view.View.INVISIBLE); + this._progressBar.setIndeterminate(true); } get android(): android.widget.ProgressBar { - return this.nativeView; + return this._progressBar; } get [busyProperty.native](): boolean { - return this.nativeView.getVisibility() === android.view.View.VISIBLE; + return this._progressBar.getVisibility() === android.view.View.VISIBLE; } set [busyProperty.native](value: boolean) { - this.nativeView.setVisibility(value ? android.view.View.VISIBLE : android.view.View.INVISIBLE); + this._progressBar.setVisibility(value ? android.view.View.VISIBLE : android.view.View.INVISIBLE); } get [visibilityProperty.native](): number { - return this.nativeView.getVisibility(); + return this._progressBar.getVisibility(); } set [visibilityProperty.native](value: number) { this.busy = value === android.view.View.VISIBLE; - this.nativeView.setVisibility(value); + this._progressBar.setVisibility(value); } get [colorProperty.native](): number { @@ -35,10 +35,10 @@ export class ActivityIndicator extends ActivityIndicatorBase { } set [colorProperty.native](value: number) { if (value < 0) { - this.nativeView.getIndeterminateDrawable().clearColorFilter(); + this._progressBar.getIndeterminateDrawable().clearColorFilter(); } else { - this.nativeView.getIndeterminateDrawable().setColorFilter(value, android.graphics.PorterDuff.Mode.SRC_IN); + this._progressBar.getIndeterminateDrawable().setColorFilter(value, android.graphics.PorterDuff.Mode.SRC_IN); } } } \ No newline at end of file diff --git a/tns-core-modules/ui/button/button.android.ts b/tns-core-modules/ui/button/button.android.ts index 0ef33f524..e530023d1 100644 --- a/tns-core-modules/ui/button/button.android.ts +++ b/tns-core-modules/ui/button/button.android.ts @@ -6,8 +6,9 @@ export * from "./button-common"; @Interfaces([android.view.View.OnClickListener]) -class ClickListener implements android.view.View.OnClickListener { +class ClickListener extends java.lang.Object implements android.view.View.OnClickListener { constructor(public owner: WeakRef