fix(android): background image aspect ratio (NativeScript#10651)

CatchABus · web-flow · commit eb21056a64bc · 2025-01-12T18:00:23.000-08:00
diff --git a/packages/core/platforms/android/widgets-release.aar b/packages/core/platforms/android/widgets-release.aar
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java
@@ -273,11 +273,12 @@ public void refresh(int borderTopColor,
 			Fetcher fetcher = Fetcher.getInstance(context);
 			// TODO: Implement option to pass load-mode like in ImageView class.
 			boolean loadAsync = backgroundImageUri.startsWith("http");
-			fetcher.loadImage(backgroundImageUri, this, 0, 0, false, true, loadAsync, null);
+
+			// Maintain aspect ratio for background images by default and size will be handled by border drawable
+			fetcher.loadImage(backgroundImageUri, this, 0, 0, true, true, loadAsync, null);
 		}
 	}
 
-
 	RectF backgroundBoundsF = new RectF();
 	Path backgroundPath = new Path();
 	RectF backgroundRect = new RectF();
diff --git a/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/image/Fetcher.java b/packages/ui-mobile-base/android/widgets/src/main/java/org/nativescript/widgets/image/Fetcher.java
@@ -546,21 +546,32 @@ private static Bitmap scaleAndRotateBitmap(Bitmap bitmap, ExifInterface ei, int
 
 		int sourceWidth = bitmap.getWidth();
 		int sourceHeight = bitmap.getHeight();
+
 		reqWidth = reqWidth > 0 ? reqWidth : Math.min(sourceWidth, mDeviceWidthPixels);
 		reqHeight = reqHeight > 0 ? reqHeight : Math.min(sourceHeight, mDeviceHeightPixels);
 
 		// scale
 		if (reqWidth != sourceWidth || reqHeight != sourceHeight) {
+			boolean needsResize;
+
 			if (keepAspectRatio) {
 				double widthCoef = (double) sourceWidth / (double) reqWidth;
 				double heightCoef = (double) sourceHeight / (double) reqHeight;
 				double aspectCoef = Math.min(widthCoef, heightCoef);
 
 				reqWidth = (int) Math.floor(sourceWidth / aspectCoef);
 				reqHeight = (int) Math.floor(sourceHeight / aspectCoef);
+
+				// Update resize flag as values might revert back to original
+				needsResize = reqWidth != sourceWidth || reqHeight != sourceHeight;
+			} else {
+				needsResize = true;
 			}
 
-			bitmap = Bitmap.createScaledBitmap(bitmap, reqWidth, reqHeight, true);
+			// After preserving aspect ratio, check if bitmap still needs scaling
+			if (needsResize) {
+				bitmap = Bitmap.createScaledBitmap(bitmap, reqWidth, reqHeight, true);
+			}
 		}
 
 		// rotate

Original file line number	Diff line number	Diff line change
`@@ -273,11 +273,12 @@ public void refresh(int borderTopColor,`
`273`	`273`	`Fetcher fetcher = Fetcher.getInstance(context);`
`274`	`274`	`// TODO: Implement option to pass load-mode like in ImageView class.`
`275`	`275`	`boolean loadAsync = backgroundImageUri.startsWith("http");`
`276`		`- fetcher.loadImage(backgroundImageUri, this, 0, 0, false, true, loadAsync, null);`
	`276`	`+`
	`277`	`+ // Maintain aspect ratio for background images by default and size will be handled by border drawable`
	`278`	`+ fetcher.loadImage(backgroundImageUri, this, 0, 0, true, true, loadAsync, null);`
`277`	`279`	`}`
`278`	`280`	`}`
`279`	`281`
`280`		`-`
`281`	`282`	`RectF backgroundBoundsF = new RectF();`
`282`	`283`	`Path backgroundPath = new Path();`
`283`	`284`	`RectF backgroundRect = new RectF();`