Merge pull request #597 from NativeScript/fatme/fix-broken-android-prepare

Fix broken android prepare

Author: Fatme

lib/definitions/project.d.ts

@@ -28,6 +28,7 @@ interface IPlatformProjectService {
 	afterCreateProject(projectRoot: string): IFuture<void>;
 	buildProject(projectRoot: string): IFuture<void>;
 	prepareProject(): IFuture<void>;
+	prepareAppResources(appResourcesDirectoryPath: string): IFuture<void>;
 	isPlatformPrepared(projectRoot: string): IFuture<boolean>;
 	addLibrary(platformData: IPlatformData, libraryPath: string): IFuture<void>;
 	canUpdatePlatform(currentVersion: string, newVersion: string): IFuture<boolean>;

lib/services/android-project-service.ts

@@ -181,6 +181,16 @@ class AndroidProjectService implements IPlatformProjectService {
 	public isPlatformPrepared(projectRoot: string): IFuture<boolean> {
 		return this.$fs.exists(path.join(projectRoot, "assets", constants.APP_FOLDER_NAME));
 	}
+	
+	public prepareAppResources(appResourcesDirectoryPath: string): IFuture<void> {
+		return (() => {
+			let resourcesDirPath = path.join(appResourcesDirectoryPath, this.platformData.normalizedPlatformName);
+			let resourcesDirs = this.$fs.readDirectory(resourcesDirPath).wait();
+			_.each(resourcesDirs, resourceDir => {
+				this.$fs.deleteDirectory(path.join(this.platformData.appResourcesDestinationDirectoryPath, resourceDir)).wait();				
+			});	
+		}).future<void>()();
+	}
 
 	private parseProjectProperties(projDir: string, destDir: string): void {
 		let projProp = path.join(projDir, "project.properties");

lib/services/ios-project-service.ts

@@ -254,6 +254,10 @@ class IOSProjectService implements  IPlatformProjectService {
 		}).future<void>()();
 	}
 
+	public prepareAppResources(appResourcesDirectoryPath: string): IFuture<void> {
+		return this.$fs.deleteDirectory(this.platformData.appResourcesDestinationDirectoryPath);
+	}
+	
 	private replace(name: string): string {
 		if(_.startsWith(name, '"')) {
 			name = name.substr(1, name.length-2);

lib/services/platform-service.ts

@@ -158,10 +158,10 @@ export class PlatformService implements IPlatformService {
 			shell.cp("-R", appSourceDirectoryPath, platformData.appDestinationDirectoryPath);
 
 			// Copy App_Resources to project root folder
-			this.$fs.ensureDirectoryExists(platformData.appResourcesDestinationDirectoryPath).wait(); // Should be deleted
 			var appResourcesDirectoryPath = path.join(platformData.appDestinationDirectoryPath, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME);
+			this.$fs.ensureDirectoryExists(platformData.appResourcesDestinationDirectoryPath).wait();
 			if (this.$fs.exists(appResourcesDirectoryPath).wait()) {
-				this.$fs.deleteDirectory(platformData.appResourcesDestinationDirectoryPath).wait(); // Respect removed files
+				platformData.platformProjectService.prepareAppResources(appResourcesDirectoryPath).wait();
 				shell.cp("-R", path.join(appResourcesDirectoryPath, platformData.normalizedPlatformName, "*"), platformData.appResourcesDestinationDirectoryPath);
 				this.$fs.deleteDirectory(appResourcesDirectoryPath).wait();
 			}

test/npm-support.ts

@@ -123,7 +123,8 @@ describe("Npm support tests", () => {
 				frameworkPackageName: "tns-android",
 				normalizedPlatformName: "Android",
 				platformProjectService: {
-					prepareProject: () => Future.fromResult()
+					prepareProject: () => Future.fromResult(),
+					prepareAppResources: () => Future.fromResult()
 				}
 			}	
 		};

test/stubs.ts

@@ -297,6 +297,9 @@ export class PlatformProjectServiceStub implements IPlatformProjectService {
 	updatePlatform(currentVersion: string, newVersion: string): IFuture<void> {
 		return Future.fromResult();
 	}
+	prepareAppResources(appResourcesDirectoryPath: string): IFuture<void> {
+		return Future.fromResult();
+	}
 }
 
 export class ProjectDataService implements IProjectDataService {