fix: android ActivityIndicator custom color affecting other indicators on the page (#9026)

CatchABus · web-flow · commit e16bc606ef6e · 2020-12-28T13:48:14.000+01:00
* fix(core): Setting color of an Android ActivityIndicator changed the color of the rest of ActivityIndicators in the same page.

* test: Updated ActivityIndicator sample.

* perf: Call mutate() only if color is actually changed.
diff --git a/apps/ui/src/progress-bar/activity-indicator-page.xml b/apps/ui/src/progress-bar/activity-indicator-page.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Page>
-  <ActivityIndicator busy="true" verticalAlignment="center" horizontalAlignment="center"/>
+  <StackLayout>
+    <ActivityIndicator busy="true" color="red" verticalAlignment="center" horizontalAlignment="center"/>
+    <ActivityIndicator busy="true" color="green" verticalAlignment="center" horizontalAlignment="center"/>
+    <ActivityIndicator busy="true" color="blue" verticalAlignment="center" horizontalAlignment="center"/>
+    <ActivityIndicator busy="true" color="" verticalAlignment="center" horizontalAlignment="center"/>
+  </StackLayout>
 </Page>
diff --git a/packages/core/ui/activity-indicator/index.android.ts b/packages/core/ui/activity-indicator/index.android.ts
@@ -47,10 +47,12 @@ export class ActivityIndicator extends ActivityIndicatorBase {
 		return -1;
 	}
 	[colorProperty.setNative](value: number | Color) {
-		if (value instanceof Color) {
-			this.nativeViewProtected.getIndeterminateDrawable().setColorFilter(value.android, android.graphics.PorterDuff.Mode.SRC_IN);
+		const color = value instanceof Color ? value.android : value;
+		const drawable = this.nativeViewProtected.getIndeterminateDrawable().mutate();
+		if (color) {
+			drawable.setColorFilter(color, android.graphics.PorterDuff.Mode.SRC_IN);
 		} else {
-			this.nativeViewProtected.getIndeterminateDrawable().clearColorFilter();
+			drawable.clearColorFilter();
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,12 @@ export class ActivityIndicator extends ActivityIndicatorBase {`
`47`	`47`	`return -1;`
`48`	`48`	`}`
`49`	`49`	`[colorProperty.setNative](value: number \| Color) {`
`50`		`- if (value instanceof Color) {`
`51`		`- this.nativeViewProtected.getIndeterminateDrawable().setColorFilter(value.android, android.graphics.PorterDuff.Mode.SRC_IN);`
	`50`	`+ const color = value instanceof Color ? value.android : value;`
	`51`	`+ const drawable = this.nativeViewProtected.getIndeterminateDrawable().mutate();`
	`52`	`+ if (color) {`
	`53`	`+ drawable.setColorFilter(color, android.graphics.PorterDuff.Mode.SRC_IN);`
`52`	`54`	`} else {`
`53`		`- this.nativeViewProtected.getIndeterminateDrawable().clearColorFilter();`
	`55`	`+ drawable.clearColorFilter();`
`54`	`56`	`}`
`55`	`57`	`}`
`56`	`58`	`}`