fix(android): background color is not applied to certain views (NativeScript#10652)

CatchABus · web-flow · commit 4f367483ef9f · 2024-11-18T19:45:30.000-08:00
diff --git a/packages/core/ui/action-bar/index.android.ts b/packages/core/ui/action-bar/index.android.ts
@@ -189,6 +189,10 @@ export class ActionBar extends ActionBarBase {
 		this.update();
 	}
 
+	override get needsNativeDrawableFill(): boolean {
+		return true;
+	}
+
 	public update() {
 		if (!this.nativeViewProtected) {
 			return;
diff --git a/packages/core/ui/button/index.android.ts b/packages/core/ui/button/index.android.ts
@@ -106,6 +106,10 @@ export class Button extends ButtonBase {
 		}
 	}
 
+	override get needsNativeDrawableFill(): boolean {
+		return true;
+	}
+
 	[minWidthProperty.getDefault](): CoreTypes.LengthType {
 		const dips = org.nativescript.widgets.ViewHelper.getMinWidth(this.nativeViewProtected);
 
diff --git a/packages/core/ui/core/view/index.android.ts b/packages/core/ui/core/view/index.android.ts
@@ -1134,7 +1134,8 @@ export class View extends ViewCommon {
 				nativeView.setBackground(backgroundDrawable);
 			}
 
-			if (backgroundDrawable) {
+			// Apply color to drawables when there is the need to maintain visual things like button ripple effect
+			if (this.needsNativeDrawableFill && backgroundDrawable) {
 				backgroundDrawable.mutate();
 
 				AndroidHelper.setDrawableColor(backgroundColor, backgroundDrawable);
diff --git a/packages/core/ui/core/view/index.d.ts b/packages/core/ui/core/view/index.d.ts
@@ -781,6 +781,10 @@ export abstract class View extends ViewCommon {
 	 * @private
 	 */
 	isLayoutRequired: boolean;
+	/**
+	 * @private
+	 */
+	get needsNativeDrawableFill(): boolean;
 	/**
 	 * @private
 	 */
diff --git a/packages/core/ui/core/view/view-common.ts b/packages/core/ui/core/view/view-common.ts
@@ -984,6 +984,10 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {
 		return true;
 	}
 
+	get needsNativeDrawableFill(): boolean {
+		return false;
+	}
+
 	public measure(widthMeasureSpec: number, heightMeasureSpec: number): void {
 		this._setCurrentMeasureSpecs(widthMeasureSpec, heightMeasureSpec);
 	}

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,10 @@ export class Button extends ButtonBase {`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
	`109`	`+ override get needsNativeDrawableFill(): boolean {`
	`110`	`+ return true;`
	`111`	`+ }`
	`112`	`+`
`109`	`113`	`[minWidthProperty.getDefault](): CoreTypes.LengthType {`
`110`	`114`	`const dips = org.nativescript.widgets.ViewHelper.getMinWidth(this.nativeViewProtected);`
`111`	`115`
Original file line number	Diff line number	Diff line change
`@@ -1134,7 +1134,8 @@ export class View extends ViewCommon {`
`1134`	`1134`	`nativeView.setBackground(backgroundDrawable);`
`1135`	`1135`	`}`
`1136`	`1136`
`1137`		`- if (backgroundDrawable) {`
	`1137`	`+ // Apply color to drawables when there is the need to maintain visual things like button ripple effect`
	`1138`	`+ if (this.needsNativeDrawableFill && backgroundDrawable) {`
`1138`	`1139`	`backgroundDrawable.mutate();`
`1139`	`1140`
`1140`	`1141`	`AndroidHelper.setDrawableColor(backgroundColor, backgroundDrawable);`
Original file line number	Diff line number	Diff line change
`@@ -984,6 +984,10 @@ export abstract class ViewCommon extends ViewBase implements ViewDefinition {`
`984`	`984`	`return true;`
`985`	`985`	`}`
`986`	`986`
	`987`	`+ get needsNativeDrawableFill(): boolean {`
	`988`	`+ return false;`
	`989`	`+ }`
	`990`	`+`
`987`	`991`	`public measure(widthMeasureSpec: number, heightMeasureSpec: number): void {`
`988`	`992`	`this._setCurrentMeasureSpecs(widthMeasureSpec, heightMeasureSpec);`
`989`	`993`	`}`