javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 21:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the ActivityIndicator busy/visibility problems.

Browse Source
This commit is contained in:
Rossen Hristov
2016-12-19 14:57:53 +02:00
parent 9be5d4301a
commit 35c06ba855
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tns-core-modules/ui/activity-indicator/activity-indicator.android.ts
View File

@ -16,29 +16,21 @@ export class ActivityIndicator extends ActivityIndicatorBase {
} }
get [busyProperty.native](): boolean { get [busyProperty.native](): boolean {
return this._progressBar.getVisibility() === android.view.View.VISIBLE; return false;
} }
set [busyProperty.native](value: boolean) { set [busyProperty.native](value: boolean) {
if (this.visibility === Visibility.VISIBLE) {
this._progressBar.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](): Visibility { 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; 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.`);
}
} }
set [visibilityProperty.native](value: Visibility) { set [visibilityProperty.native](value: Visibility) {
switch (value) { switch (value) {
case Visibility.VISIBLE: case Visibility.VISIBLE:
this._progressBar.setVisibility(android.view.View.VISIBLE); this._progressBar.setVisibility(this.busy ? android.view.View.VISIBLE : android.view.View.INVISIBLE);
break; break;
case Visibility.HIDDEN: case Visibility.HIDDEN:
this._progressBar.setVisibility(android.view.View.INVISIBLE); this._progressBar.setVisibility(android.view.View.INVISIBLE);

7
tns-core-modules/ui/activity-indicator/activity-indicator.ios.ts
View File

@ -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 { get [colorProperty.native](): UIColor {
return this.nativeView.color; return this.nativeView.color;
} }