javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): type collisions with namespace (#8809)

Browse Source
This commit is contained in:
Nathan Walker
2021-02-25 21:03:07 -08:00
parent 784e9c93cd
commit ab11dc9c9f
110 changed files with 1882 additions and 1827 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/core/ui/activity-indicator/index.android.ts
View File

@@ -1,6 +1,7 @@
import { ActivityIndicatorBase, busyProperty } from './activity-indicator-common';
import { colorProperty, visibilityProperty, Visibility } from '../styling/style-properties';
import { colorProperty, visibilityProperty } from '../styling/style-properties';
import { Color } from '../../color';
import { Enums } from '../enums';
export * from './activity-indicator-common';
@@ -19,27 +20,27 @@ export class ActivityIndicator extends ActivityIndicatorBase {
return false;
}
[busyProperty.setNative](value: boolean) {
if (this.visibility === Visibility.VISIBLE) {
if (this.visibility === Enums.Visibility.visible) {
this.nativeViewProtected.setVisibility(value ? android.view.View.VISIBLE : android.view.View.INVISIBLE);
}
}
[visibilityProperty.getDefault](): Visibility {
return Visibility.HIDDEN;
[visibilityProperty.getDefault](): Enums.VisibilityType {
return Enums.Visibility.hidden;
}
[visibilityProperty.setNative](value: Visibility) {
[visibilityProperty.setNative](value: Enums.VisibilityType) {
switch (value) {
case Visibility.VISIBLE:
case Enums.Visibility.visible:
this.nativeViewProtected.setVisibility(this.busy ? android.view.View.VISIBLE : android.view.View.INVISIBLE);
break;
case Visibility.HIDDEN:
case Enums.Visibility.hidden:
this.nativeViewProtected.setVisibility(android.view.View.INVISIBLE);
break;
case Visibility.COLLAPSE:
case Enums.Visibility.collapse:
this.nativeViewProtected.setVisibility(android.view.View.GONE);
break;
default:
throw new Error(`Invalid visibility value: ${value}. Valid values are: "${Visibility.VISIBLE}", "${Visibility.HIDDEN}", "${Visibility.COLLAPSE}".`);
throw new Error(`Invalid visibility value: ${value}. Valid values are: "${Enums.Visibility.visible}", "${Enums.Visibility.hidden}", "${Enums.Visibility.collapse}".`);
}
}