javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3770 from NativeScript/activity-indicator-crash

Browse Source 
FIX: Crash setting color to activity-indicator
This commit is contained in:
Alexander Vakrilov
2017-03-12 01:27:28 +02:00
committed by GitHub
parent 9786a87509 d7ad9108eb
commit 6a0f12b677
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import { ActivityIndicatorBase, busyProperty, colorProperty, visibilityProperty, Visibility } from "./activity-indicator-common";
import { ActivityIndicatorBase, busyProperty, colorProperty, visibilityProperty, Visibility, Color } from "./activity-indicator-common";
export * from "./activity-indicator-common";
@ -47,12 +47,12 @@ export class ActivityIndicator extends ActivityIndicatorBase {
get [colorProperty.native](): number {
return -1;
}
set [colorProperty.native](value: number) {
if (value < 0) {
this._progressBar.getIndeterminateDrawable().clearColorFilter();
set [colorProperty.native](value: number | Color) {
if (value instanceof Color) {
this._progressBar.getIndeterminateDrawable().setColorFilter(value.android, android.graphics.PorterDuff.Mode.SRC_IN);
}
else {
this._progressBar.getIndeterminateDrawable().setColorFilter(value, android.graphics.PorterDuff.Mode.SRC_IN);
this._progressBar.getIndeterminateDrawable().clearColorFilter();
}
}
}