Merge pull request #3485 from NativeScript/vladimirov/fix-assets

fix(assets): Fix asset genration

Author: rosen-vladimirov

lib/common

@@ -163,4 +163,7 @@ export class AssetConstants {
 	public static assets = "assets";
 
 	public static sizeDelimiter = "x";
+
+	public static defaultScale = 1;
+	public static defaultOverlayImageScale = 0.8;
 }

lib/constants.ts

@@ -157,9 +157,10 @@ interface IAssetItem {
 	height: number;
 	filename: string;
 	directory: string;
-	scale: number;
+	scale: string;
 	idiom: string;
 	resizeOperation?: string;
+	overlayImageScale?: number;
 }
 
 interface IAssetSubGroup {

lib/definitions/project.d.ts

@@ -1,6 +1,7 @@
 import * as Jimp from "jimp";
 import * as Color from "color";
 import { exported } from "../../common/decorators";
+import { AssetConstants } from '../../constants';
 
 export const enum Operations {
 	OverlayWith = "overlayWith",
@@ -39,12 +40,12 @@ export class AssetsGenerationService implements IAssetsGenerationService {
 		const assetsStructure = await this.$projectDataService.getAssetsStructure(generationData);
 
 		const assetItems = _(assetsStructure)
-			.filter((assetGroup: IAssetGroup, platform: string) => {
-				return !generationData.platform || platform.toLowerCase() === generationData.platform.toLowerCase();
-			})
+			.filter((assetGroup: IAssetGroup, platform: string) =>
+				!generationData.platform || platform.toLowerCase() === generationData.platform.toLowerCase()
+			)
 			.map((assetGroup: IAssetGroup) =>
 				_.filter(assetGroup, (assetSubGroup: IAssetSubGroup, imageTypeKey: string) =>
-					propertiesToEnumerate.indexOf(imageTypeKey) !== -1 && !assetSubGroup[imageTypeKey]
+					assetSubGroup && propertiesToEnumerate.indexOf(imageTypeKey) !== -1
 				)
 			)
 			.flatten<IAssetSubGroup>()
@@ -55,20 +56,34 @@ export class AssetsGenerationService implements IAssetsGenerationService {
 
 		for (const assetItem of assetItems) {
 			const operation = assetItem.resizeOperation || Operations.Resize;
-			const scale = assetItem.scale || 0.8;
+			let tempScale: number = null;
+			if (assetItem.scale) {
+				if (_.isNumber(assetItem.scale)) {
+					tempScale = assetItem.scale;
+				} else {
+					const splittedElements = `${assetItem.scale}`.split(AssetConstants.sizeDelimiter);
+					tempScale = splittedElements && splittedElements.length && splittedElements[0] && +splittedElements[0];
+				}
+			}
+
+			const scale = tempScale || AssetConstants.defaultScale;
+
 			const outputPath = assetItem.path;
+			const width = assetItem.width * scale;
+			const height = assetItem.height * scale;
 
 			switch (operation) {
 				case Operations.OverlayWith:
-					const imageResize = Math.round(Math.min(assetItem.width, assetItem.height) * scale);
+					const overlayImageScale = assetItem.overlayImageScale || AssetConstants.defaultOverlayImageScale;
+					const imageResize = Math.round(Math.min(width, height) * overlayImageScale);
 					const image = await this.resize(generationData.imagePath, imageResize, imageResize);
-					await this.generateImage(generationData.background, assetItem.width, assetItem.height, outputPath, image);
+					await this.generateImage(generationData.background, width, height, outputPath, image);
 					break;
 				case Operations.Blank:
-					await this.generateImage(generationData.background, assetItem.width, assetItem.height, outputPath);
+					await this.generateImage(generationData.background, width, height, outputPath);
 					break;
 				case Operations.Resize:
-					const resizedImage = await this.resize(generationData.imagePath, assetItem.width, assetItem.height);
+					const resizedImage = await this.resize(generationData.imagePath, width, height);
 					resizedImage.write(outputPath);
 					break;
 				default:

lib/services/assets-generation/assets-generation-service.ts

@@ -137,25 +137,35 @@ export class ProjectDataService implements IProjectDataService {
 				image.path = path.join(dirPath, image.filename);
 			}
 
-			if (image.size) {
-				// size is basically <width>x<height>
-				const [width, height] = image.size.toString().split(AssetConstants.sizeDelimiter);
-				if (width && height) {
-					image.width = +width;
-					image.height = +height;
-				}
-			} else {
-				// Find the image size based on the hardcoded values in the image-definitions.json
-				_.each(imageDefinitions, (assetSubGroup: IAssetItem[]) => {
-					_.each(assetSubGroup, assetItem => {
-						if (assetItem.filename === image.filename && path.basename(assetItem.directory) === path.basename(dirPath)) {
-							image.width = assetItem.width;
-							image.height = assetItem.height;
-							image.size = `${assetItem.width}${AssetConstants.sizeDelimiter}${assetItem.height}`;
+			// Find the image size based on the hardcoded values in the image-definitions.json
+			_.each(imageDefinitions, (assetSubGroup: IAssetItem[]) => {
+				const assetItem = _.find(assetSubGroup, assetElement =>
+					assetElement.filename === image.filename && path.basename(assetElement.directory) === path.basename(dirPath)
+				);
+
+				if (assetItem) {
+					if (image.size) {
+						// size is basically <width>x<height>
+						const [width, height] = image.size.toString().split(AssetConstants.sizeDelimiter);
+						if (width && height) {
+							image.width = +width;
+							image.height = +height;
 						}
-					});
-				});
-			}
+					}
+
+					if (!image.width || !image.height) {
+						image.width = assetItem.width;
+						image.height = assetItem.height;
+						image.size = image.size || `${assetItem.width}${AssetConstants.sizeDelimiter}${assetItem.height}`;
+					}
+
+					image.resizeOperation = image.resizeOperation || assetItem.resizeOperation;
+					image.overlayImageScale = image.overlayImageScale || assetItem.overlayImageScale;
+					image.scale = image.scale || assetItem.scale;
+					// break each
+					return false;
+				}
+			});
 		});
 
 		return content;