Fixes for prepare command

Author: Fatme

lib/common

@@ -1,7 +1,7 @@
 interface IProjectService {
 	createProject(projectName: string, projectId: string): IFuture<void>;
 	createPlatformSpecificProject(platform: string): IFuture<void>;
-	prepareProject(platform: string, platforms: string[]): IFuture<void>;
+	prepareProject(normalizedPlatformName: string, platforms: string[]): IFuture<void>;
 	buildProject(platform: string): IFuture<void>;
 	ensureProject(): void;
 	projectData: IProjectData;

lib/definitions/project.d.ts

@@ -90,14 +90,17 @@ export class PlatformService implements IPlatformService {
 
 	public preparePlatform(platform: string): IFuture<void> {
 		return (() => {
+			platform = platform.toLowerCase();
 			this.validatePlatform(platform);
+			var normalizedPlatformName = this.normalizePlatformName(platform);
 
-			this.$projectService.prepareProject(platform, this.platformNames).wait();
+			this.$projectService.prepareProject(normalizedPlatformName, this.platformNames).wait();
 		}).future<void>()();
 	}
 
 	public buildPlatform(platform: string): IFuture<void> {
 		return (() => {
+			platform = platform.toLocaleLowerCase();
 			this.validatePlatform(platform);
 
 			this.$projectService.buildProject(platform).wait();
@@ -128,5 +131,16 @@ export class PlatformService implements IPlatformService {
 
 		return false;
 	}
+
+	private normalizePlatformName(platform: string): string {
+		switch(platform) {
+			case "android":
+				return "Android";
+			case "ios":
+				return "iOS";
+		}
+
+		return undefined;
+	}
 }
 $injector.register("platformService", PlatformService);

lib/services/platform-service.ts

@@ -11,6 +11,7 @@ export class ProjectService implements IProjectService {
 	private static DEFAULT_PROJECT_ID = "com.telerik.tns.HelloWorld";
 	private static DEFAULT_PROJECT_NAME = "HelloNativescript";
 	public static APP_FOLDER_NAME = "app";
+	private static APP_RESOURCES_FOLDER_NAME = "App_Resources";
 	public static PROJECT_FRAMEWORK_DIR = "framework";
 
 	public projectData: IProjectData = null;
@@ -130,32 +131,41 @@ export class ProjectService implements IProjectService {
 		}).future<void>()();
 	}
 
-	public prepareProject(platform: string, platforms: string[]): IFuture<void> {
+	public prepareProject(normalizedPlatformName: string, platforms: string[]): IFuture<void> {
 		return (() => {
+			var platform = normalizedPlatformName.toLowerCase();
 			var assetsDirectoryPath = path.join(this.projectData.platformsDir, platform, "assets");
-			shell.cp("-r",path.join(this.projectData.projectDir, ProjectService.APP_FOLDER_NAME), assetsDirectoryPath);
+			var appResourcesDirectoryPath = path.join(assetsDirectoryPath, ProjectService.APP_FOLDER_NAME, ProjectService.APP_RESOURCES_FOLDER_NAME);
+			shell.cp("-r", path.join(this.projectData.projectDir, ProjectService.APP_FOLDER_NAME), assetsDirectoryPath);
+
+			if(this.$fs.exists(appResourcesDirectoryPath).wait()) {
+				shell.cp("-r", path.join(appResourcesDirectoryPath, normalizedPlatformName, "*"), path.join(this.projectData.platformsDir, platform, "res"));
+				this.$fs.deleteDirectory(appResourcesDirectoryPath).wait();
+			}
 
 			var files = helpers.enumerateFilesInDirectorySync(path.join(assetsDirectoryPath, ProjectService.APP_FOLDER_NAME));
-			var pattern = util.format("%s%s%s", path.sep, ProjectService.APP_FOLDER_NAME, path.sep);
+			var platformsAsString = platforms.join("|");
+
 			_.each(files, fileName => {
-				if(ProjectService.shouldExcludeFile(platform, platforms, fileName.split(pattern)[1])) {
+				var platformInfo = ProjectService.parsePlatformSpecificFileName(path.basename(fileName), platformsAsString);
+				var shouldExcludeFile = platformInfo && platformInfo.platform !== platform;
+				if(shouldExcludeFile) {
 					this.$fs.deleteFile(fileName).wait();
+				} else if(platformInfo && platformInfo.onDeviceName) {
+					this.$fs.rename(fileName, path.join(path.dirname(fileName), platformInfo.onDeviceName)).wait();
 				}
 			});
-		}).future<void>()();
-	}
 
-	private static shouldExcludeFile(platform: string, platforms: string[], fileName: string): boolean {
-		var platformInfo = ProjectService.parsePlatformSpecificFileName(fileName, platforms);
-		return platformInfo && platformInfo.platform !== platform;
+		}).future<void>()();
 	}
 
-	private static parsePlatformSpecificFileName(fileName: string, platforms: string[]): any {
-		var regex = util.format("^(.+?)\.(%s)(\..+?)$", platforms.join("|"));
+	private static parsePlatformSpecificFileName(fileName: string, platforms: string): any {
+		var regex = util.format("^(.+?)\.(%s)(\..+?)$", platforms);
 		var parsed = fileName.toLowerCase().match(new RegExp(regex, "i"));
 		if (parsed) {
 			return {
-				platform: parsed[2]
+				platform: parsed[2],
+				onDeviceName: parsed[1] + parsed[3]
 			};
 		}
 		return undefined;