Process manifest from App_Resources directory

Author: Fatme Havaluova

lib/definitions/project.d.ts

@@ -10,6 +10,8 @@ interface IProjectData {
 	projectFilePath: string;
 	projectId?: string;
 	dependencies: any;
+	appDirectoryPath: string;
+	appResourcesDirectoryPath: string;
 }
 
 interface IProjectDataService {

lib/project-data.ts

@@ -1,6 +1,7 @@
 ///<reference path=".d.ts"/>
 "use strict";
 
+import constants = require("./constants");
 import * as path from "path";
 import * as os from "os";
 
@@ -12,6 +13,8 @@ export class ProjectData implements IProjectData {
 	public projectFilePath: string;
 	public projectId: string;
 	public projectName: string;
+	public appDirectoryPath: string;
+	public appResourcesDirectoryPath: string;
 	public dependencies: any;
 
 	constructor(private $fs: IFileSystem,
@@ -101,6 +104,8 @@ export class ProjectData implements IProjectData {
 		this.projectName = this.$projectHelper.sanitizeName(path.basename(projectDir));
 		this.platformsDir = path.join(projectDir, "platforms");
 		this.projectFilePath = path.join(projectDir, this.$staticConfig.PROJECT_FILE_NAME);
+		this.appDirectoryPath = path.join(projectDir, constants.APP_FOLDER_NAME);
+		this.appResourcesDirectoryPath = path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME);
 	}
 }
 $injector.register("projectData", ProjectData);

lib/services/android-project-service.ts

@@ -12,7 +12,6 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 	private static VALUES_DIRNAME = "values";
 	private static VALUES_VERSION_DIRNAME_PREFIX = AndroidProjectService.VALUES_DIRNAME + "-v";
 	private static ANDROID_PLATFORM_NAME = "android";
-	private static LIBS_FOLDER_NAME = "libs";
 	private static MIN_RUNTIME_VERSION_WITH_GRADLE = "1.3.0";
 
 	private _androidProjectPropertiesManagers: IDictionary<IAndroidProjectPropertiesManager>;
@@ -278,21 +277,32 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		return (() => {
 			let pluginPlatformsFolderPath = this.getPluginPlatformsFolderPath(pluginData, AndroidProjectService.ANDROID_PLATFORM_NAME);
 
+			this.processResourcesFromPlugin(pluginData.name, pluginPlatformsFolderPath).wait();
+
+			// Process androidManifest.xml from App_Resources
+			let manifestFilePath = path.join(this.$projectData.appResourcesDirectoryPath, this.platformData.configurationFileName);
+			if (this.$fs.exists(manifestFilePath).wait()) {
+				this.processResourcesFromPlugin("NativescriptAppResources", this.$projectData.appResourcesDirectoryPath).wait();
+			}
+		}).future<void>()();
+	}
+
+	private processResourcesFromPlugin(pluginName: string, pluginPlatformsFolderPath: string): IFuture<void> {
+		return (() => {
 			let configurationsDirectoryPath = path.join(this.platformData.projectRoot, "configurations");
 			this.$fs.ensureDirectoryExists(configurationsDirectoryPath).wait();
 
-			let pluginConfigurationDirectoryPath = path.join(configurationsDirectoryPath, pluginData.name);
+			let pluginConfigurationDirectoryPath = path.join(configurationsDirectoryPath, pluginName);
 			this.$fs.ensureDirectoryExists(pluginConfigurationDirectoryPath).wait();
 
-			// Copy include include.gradle file
+			// Copy include.gradle file
 			let includeGradleFilePath = path.join(pluginPlatformsFolderPath, "include.gradle");
 			if(this.$fs.exists(includeGradleFilePath).wait()) {
-				// TODO: Validate the existing include.gradle
 				shell.cp("-f", includeGradleFilePath, pluginConfigurationDirectoryPath);
-			} // TODO: SHOULD generate default include.gradle
+			}
 
 			// Copy all resources from plugin
-			let resourcesDestinationDirectoryPath = path.join(this.platformData.projectRoot, "src", pluginData.name);
+			let resourcesDestinationDirectoryPath = path.join(this.platformData.projectRoot, "src", pluginName);
 			this.$fs.ensureDirectoryExists(resourcesDestinationDirectoryPath).wait();
 			shell.cp("-Rf", path.join(pluginPlatformsFolderPath, "*"), resourcesDestinationDirectoryPath);
 		}).future<void>()();

test/stubs.ts

@@ -249,6 +249,8 @@ export class ProjectDataStub implements IProjectData {
 	projectFilePath: string;
 	projectId: string;
 	dependencies: any;
+	appDirectoryPath: string;
+	appResourcesDirectoryPath: string;
 }
 
 export class PlatformsDataStub implements IPlatformsData {