fix(android): box shadow and border radius white border resolution (#…

…10125)
NativeScript · Mar 17, 2023 · ea45758 · ea45758
1 parent 7eaafa5
commit ea45758
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/packages/core/platforms/android/widgets-release.aar b/packages/core/platforms/android/widgets-release.aar
diff --git a/...mobile-base/android/widgets/src/main/java/org/nativescript/widgets/BoxShadowDrawable.java b/...mobile-base/android/widgets/src/main/java/org/nativescript/widgets/BoxShadowDrawable.java
@@ -43,12 +43,19 @@ public BoxShadowDrawable(Drawable wrappedDrawable, String value) {
 		Log.d(TAG, "Constructing BoxShadowDrawable!");
 
 		this.shadowLayer = new ShapeDrawable(new RectShape());
-		this.overlayLayer = this.createOverlayLayer();
 		this.wrappedLayer = wrappedDrawable;
 
+		if(shouldHideOverlayLayer()) {
+			this.overlayLayer = null;
+		} else {
+			this.overlayLayer = this.createOverlayLayer();
+		}
+
 		// add our layers
 		this.addLayer(shadowLayer);
-		this.addLayer(overlayLayer);
+		if(this.overlayLayer != null) {
+			this.addLayer(overlayLayer);
+		}
 		this.addLayer(wrappedLayer);
 
 		this.setValue(value);
@@ -100,7 +107,9 @@ public void setValue(String value) {
 			if (!Arrays.equals(outerRadius, currentCornerRadii)) {
 				Log.d(TAG, "Update layer shape");
 				shadowLayer.setShape(new RoundRectShape(outerRadius, null, null));
-				overlayLayer.setShape(new RoundRectShape(outerRadius, null, null));
+				if(overlayLayer != null) {
+					overlayLayer.setShape(new RoundRectShape(outerRadius, null, null));
+				}
 
 				// update current
 				currentCornerRadii = outerRadius;
@@ -148,6 +157,17 @@ private ShapeDrawable createOverlayLayer() {
 		return shapeDrawable;
 	}
 
+	private boolean shouldHideOverlayLayer() {
+		if (wrappedLayer instanceof BorderDrawable) {
+			BorderDrawable bd = (BorderDrawable) this.wrappedLayer;
+			if (bd.getBackgroundColor() != 0 || bd.getBackgroundBitmap() != null || bd.getBackgroundGradient() != null) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	@Override
 	public String toString() {
 		return "BoxShadowDrawable { oX:" + offsetX + " oY:" + offsetY + " br:" + blurRadius + " sr:" + spreadRadius + " c:" + shadowColor + " }";