Merge pull request #583 from NativeScript/fatme/android-native-libs

Support for android native libraries in plugin

Author: Fatme

lib/common

@@ -2,4 +2,5 @@ interface ILibRef {
     idx: number;
     path: string;
     adjustedPath?: string;
+    key?: string;
 }

lib/definitions/libref.ts

@@ -7,7 +7,8 @@ interface IPluginsService {
 }
 
 interface IPluginData extends INodeModuleData {
-	platformsData: IPluginPlatformsData; 
+	platformsData: IPluginPlatformsData;
+	pluginPlatformsFolderPath(platform: string): string; 
 }
 
 interface INodeModuleData {

lib/definitions/plugins.d.ts

@@ -33,4 +33,12 @@ interface IPlatformProjectService {
 	addLibrary(platformData: IPlatformData, libraryPath: string): IFuture<void>;
 	canUpdatePlatform(currentVersion: string, newVersion: string): IFuture<boolean>;
 	updatePlatform(currentVersion: string, newVersion: string): IFuture<void>;
+	preparePluginNativeCode(pluginData: IPluginData): IFuture<void>;
+	removePluginNativeCode(pluginData: IPluginData): IFuture<void>;
+}
+
+interface IAndroidProjectPropertiesManager {
+	getProjectReferences(): IFuture<ILibRef[]>;
+	addProjectReference(referencePath: string): IFuture<void>;
+	removeProjectReference(referencePath: string): IFuture<void>;	
 }

lib/definitions/project.d.ts

@@ -0,0 +1,118 @@
+///<reference path="../.d.ts"/>
+"use strict";
+
+import path = require("path");
+
+export class AndroidProjectPropertiesManager implements IAndroidProjectPropertiesManager {
+	private static LIBRARY_REFERENCE_KEY_PREFIX = "android.library.reference.";
+	
+	private _editor: IPropertiesParserEditor = null;
+	private filePath: string = null;
+	private projectReferences: ILibRef[];
+	private dirty = false;
+	
+	constructor(private $propertiesParser: IPropertiesParser,
+		private $fs: IFileSystem,
+		private $logger: ILogger,
+		directoryPath: string) {
+			this.filePath = path.join(directoryPath, "project.properties");
+	}
+	
+	
+	
+	public getProjectReferences(): IFuture<ILibRef[]> {
+		return (() => {
+			if(!this.projectReferences || this.dirty) {
+				let allProjectProperties = this.getAllProjectProperties().wait();
+				let allProjectPropertiesKeys = _.keys(allProjectProperties);
+				this.projectReferences = _(allProjectPropertiesKeys)
+					.filter(key => _.startsWith(key, "android.library.reference."))
+					.map(key => this.createLibraryReference(key, allProjectProperties[key]))
+					.value();
+			}
+			
+			return this.projectReferences;
+		}).future<ILibRef[]>()();
+	}
+	
+	public addProjectReference(referencePath: string): IFuture<void> {
+		return (() => {
+			let references = this.getProjectReferences().wait();
+			let libRefExists = _.any(references, r => path.normalize(r.path) === path.normalize(referencePath));
+			if(!libRefExists) {
+				this.addToPropertyList("android.library.reference", referencePath).wait();
+			}
+		}).future<void>()();
+	}
+	
+	public removeProjectReference(referencePath: string): IFuture<void> {
+		return (() => {
+			let references = this.getProjectReferences().wait();
+			let libRefExists = _.any(references, r => path.normalize(r.path) === path.normalize(referencePath));
+			if(libRefExists) {
+				this.removeFromPropertyList("android.library.reference", referencePath).wait();
+			} else {
+				this.$logger.error(`Could not find ${referencePath}.`);
+			}
+		}).future<void>()();
+	}
+	
+	private createEditor(): IFuture<any> {
+		return (() => {
+			return this._editor || this.$propertiesParser.createEditor(this.filePath).wait();
+		}).future<any>()();
+	}
+	
+	private buildKeyName(key: string, index: number): string {
+		return `${key}.${index}`;
+	}
+	
+	private getAllProjectProperties(): IFuture<IStringDictionary> {
+		return this.$propertiesParser.read(this.filePath);
+	}
+	
+	private createLibraryReference(referenceName: string, referencePath: string): ILibRef {
+		return {
+			idx: parseInt(referenceName.split("android.library.reference.")[1]),
+			key: referenceName,
+			path: referencePath,
+			adjustedPath: path.join(path.dirname(this.filePath), referencePath)
+		}
+	}
+	
+	private addToPropertyList(key: string, value: string): IFuture<void> {
+		return (() => {
+			let editor = this.createEditor().wait();
+			let i = 1;
+    		while (editor.get(this.buildKeyName(key, i))) {
+        		i++;
+			}
+			
+			editor.set(this.buildKeyName(key, i), value);
+			this.$propertiesParser.saveEditor().wait();
+			this.dirty = true;
+		}).future<void>()();
+	}
+	
+	private removeFromPropertyList(key: string, value: string): IFuture<void> {
+		return (() => {
+			let editor = this.createEditor().wait();
+			let valueLowerCase = value.toLowerCase();
+			let i = 1;
+			let currentValue: any;
+		 	while (currentValue = editor.get(this.buildKeyName(key, i))) {
+		    	if (currentValue.toLowerCase() === valueLowerCase) {
+		            while (currentValue = editor.get(this.buildKeyName(key, i+1))) {
+		                editor.set(this.buildKeyName(key, i), currentValue); 
+		                i++;
+		            }
+		            editor.set(this.buildKeyName(key, i));
+		            break;
+		        }
+		        i++;
+		    }
+			this.$propertiesParser.saveEditor().wait();
+			this.dirty = true;
+		}).future<void>()();		
+	}
+}