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 b0a1d2246..ad0b5497e 100644 --- a/tns-core-modules/ui/activity-indicator/activity-indicator.android.ts +++ b/tns-core-modules/ui/activity-indicator/activity-indicator.android.ts @@ -16,29 +16,21 @@ export class ActivityIndicator extends ActivityIndicatorBase { } get [busyProperty.native](): boolean { - return this._progressBar.getVisibility() === android.view.View.VISIBLE; + return false; } set [busyProperty.native](value: boolean) { - this._progressBar.setVisibility(value ? android.view.View.VISIBLE : android.view.View.INVISIBLE); + if (this.visibility === Visibility.VISIBLE) { + this._progressBar.setVisibility(value ? android.view.View.VISIBLE : android.view.View.INVISIBLE); + } } get [visibilityProperty.native](): Visibility { - let nativeVisibility = this._progressBar.getVisibility(); - switch (nativeVisibility) { - case android.view.View.VISIBLE: - return Visibility.VISIBLE; - case android.view.View.INVISIBLE: - return Visibility.HIDDEN; - case android.view.View.GONE: - return Visibility.COLLAPSE; - default: - throw new Error(`Unsupported android.view.View visibility: ${nativeVisibility}. Currently supported values are android.view.View.VISIBLE, android.view.View.INVISIBLE, android.view.View.GONE.`); - } + return Visibility.HIDDEN; } set [visibilityProperty.native](value: Visibility) { switch (value) { case Visibility.VISIBLE: - this._progressBar.setVisibility(android.view.View.VISIBLE); + this._progressBar.setVisibility(this.busy ? android.view.View.VISIBLE : android.view.View.INVISIBLE); break; case Visibility.HIDDEN: this._progressBar.setVisibility(android.view.View.INVISIBLE); diff --git a/tns-core-modules/ui/activity-indicator/activity-indicator.ios.ts b/tns-core-modules/ui/activity-indicator/activity-indicator.ios.ts index 6198f6bb0..e1bd97fb5 100644 --- a/tns-core-modules/ui/activity-indicator/activity-indicator.ios.ts +++ b/tns-core-modules/ui/activity-indicator/activity-indicator.ios.ts @@ -33,13 +33,6 @@ export class ActivityIndicator extends ActivityIndicatorBase { } } - get [visibilityProperty.native](): Visibility { - return this.nativeView.hidden ? Visibility.COLLAPSE : Visibility.VISIBLE; - } - set [visibilityProperty.native](value: Visibility) { - this.nativeView.hidden = value !== Visibility.VISIBLE; - } - get [colorProperty.native](): UIColor { return this.nativeView.color; }