wymsee · Sep 12, 2015 · Sep 12, 2015 · Sep 12, 2015 · Sep 12, 2015 · Sep 12, 2015
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.idea
 .DS_Store
 /build
 # XCode (and ancestors) per-user config (very noisy, and not relevant)
@@ -12,3 +13,4 @@
 xcuserdata/
 project.xcworkspace/
 tags
+test
diff --git a/.gitignore.swp b/.gitignore.swp
diff --git a/README.md b/README.md
@@ -1,16 +1,18 @@
-cordova-imagePicker
+cordova-obimagepicker
 ===================
 
 Cordova Plugin For Multiple Image Selection - implemented for iOS and Android 4.0 and above.
+It can be used as a replacement for http://ngcordova.com/docs/plugins/imagePicker/
+
+* exports images in Base64 format
 
 ## Installing the plugin
 
 The plugin conforms to the Cordova plugin specification, it can be installed
 using the Cordova / Phonegap command line interface.
 
-    phonegap plugin add https://github.com/wymsee/cordova-imagePicker.git
-
-    cordova plugin add https://github.com/wymsee/cordova-imagePicker.git
+    phonegap plugin add cordova-obimagepicker
+    cordova plugin add cordova-obimagepicker
 
 
 ## Using the plugin
@@ -41,28 +43,18 @@ window.imagePicker.getPictures(
 		console.log('Error: ' + error);
 	}, {
 		maximumImagesCount: 10,
-		width: 800
+		width: 100 // Set with for image - will keep the aspect ratio
 	}
 );
 ```
 
 ### Options
 
     options = {
-        // max images to be selected, defaults to 15. If this is set to 1, upon
-    	// selection of a single image, the plugin will return it.
+        // max images to be selected, defaults to 0 (infinity)
     	maximumImagesCount: int,
-    	
-    	// max width and height to allow the images to be.  Will keep aspect
-    	// ratio no matter what.  So if both are 800, the returned image
-    	// will be at most 800 pixels wide and 800 pixels tall.  If the width is
-    	// 800 and height 0 the image will be 800 pixels wide if the source
-    	// is at least that wide.
-    	width: int,
-    	height: int,
-    	
-    	// quality of resized image, defaults to 100
-    	quality: int (0-100)
+    	// set with of the new returned image - will keep the aspect ratio
+    	width: int
     };
 
 ### Note for Android Use
@@ -71,11 +63,17 @@ The plugin returns images that are stored in a temporary directory.  These image
 
 ## Libraries used
 
-#### ELCImagePicker
+#### QBImagePicker
+
+For iOS this plugin uses the QBImagePicker, with slight modifications for the iOS image picker.
+QBImagePicker uses the MIT License which can be found in the file LICENSE.
+
+### The following libraries are required:
+- QuartzCore.framework
+- Photos.framework
 
-For iOS this plugin uses the ELCImagePickerController, with slight modifications for the iOS image picker.  ELCImagePicker uses the MIT License which can be found in the file LICENSE.
 
-https://github.com/B-Sides/ELCImagePickerController
+https://github.com/questbeat/QBImagePicker
 
 #### MultiImageChooser
 

diff --git a/package.json b/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "cordova-obimagepicker",
+  "version": "2.0.13",
+  "description": "Cordova file picker",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://ovidiubularda@github.com/ovidiubularda/cordova-imagePicker.git"
+  },
+  "author": "Ovidiu Bularda",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/ovidiubularda/cordova-imagePicker/issues"
+  },
+  "homepage": "https://github.com/ovidiubularda/cordova-imagePicker#readme"
+}
diff --git a/plugin.xml b/plugin.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
-  id="com.synconset.imagepicker"
-  version="1.0.6">
+  id="ro.qualitance.obimagepicker"
+  version="2.0.13">
 
-	<name>ImagePicker</name>
+	<name>ObImagePicker</name>
 
 	<description>
 		This plugin allows selection of multiple images from the camera roll / gallery in a phonegap app
@@ -31,36 +31,46 @@
 		<header-file src="src/ios/SOSPicker.h" />
 		<source-file src="src/ios/SOSPicker.m" />
 
-		<header-file src="src/ios/ELCImagePicker/ELCAlbumPickerController.h" />
-		<source-file src="src/ios/ELCImagePicker/ELCAlbumPickerController.m" />
+		<header-file src="src/ios/QBImagePicker/QBAlbumCell.h" />
+		<source-file src="src/ios/QBImagePicker/QBAlbumCell.m" />
 
-		<header-file src="src/ios/ELCImagePicker/ELCAsset.h" />
-		<source-file src="src/ios/ELCImagePicker/ELCAsset.m" />
+		<header-file src="src/ios/QBImagePicker/QBAlbumsViewController.h" />
+		<source-file src="src/ios/QBImagePicker/QBAlbumsViewController.m" />
 
-		<header-file src="src/ios/ELCImagePicker/ELCAssetCell.h" />
-		<source-file src="src/ios/ELCImagePicker/ELCAssetCell.m" />
+		<header-file src="src/ios/QBImagePicker/QBAssetCell.h" />
+		<source-file src="src/ios/QBImagePicker/QBAssetCell.m" />
 
-		<header-file src="src/ios/ELCImagePicker/ELCAssetPickerFilterDelegate.h" />
-		<header-file src="src/ios/ELCImagePicker/ELCAssetSelectionDelegate.h" />
+		<header-file src="src/ios/QBImagePicker/QBAssetsViewController.h" />
+		<source-file src="src/ios/QBImagePicker/QBAssetsViewController.m" />
 
-		<header-file src="src/ios/ELCImagePicker/ELCAssetTablePicker.h" />
-		<source-file src="src/ios/ELCImagePicker/ELCAssetTablePicker.m" />
+		<header-file src="src/ios/QBImagePicker/QBCheckmarkView.h" />
+		<source-file src="src/ios/QBImagePicker/QBCheckmarkView.m" />
 
-		<header-file src="src/ios/ELCImagePicker/ELCImagePickerController.h" />
-		<source-file src="src/ios/ELCImagePicker/ELCImagePickerController.m" />
+		<header-file src="src/ios/QBImagePicker/QBImagePicker.h" />
+
+		<header-file src="src/ios/QBImagePicker/QBImagePickerController.h" />
+		<source-file src="src/ios/QBImagePicker/QBImagePickerController.m" />
+
+		<header-file src="src/ios/QBImagePicker/QBSlomoIconView.h" />
+		<source-file src="src/ios/QBImagePicker/QBSlomoIconView.m" />
+
+		<header-file src="src/ios/QBImagePicker/QBVideoIconView.h" />
+		<source-file src="src/ios/QBImagePicker/QBVideoIconView.m" />
+
+		<header-file src="src/ios/QBImagePicker/QBVideoIndicatorView.h" />
+		<source-file src="src/ios/QBImagePicker/QBVideoIndicatorView.m" />
+
+
+		<resource-file src="src/ios/QBImagePicker/QBImagePicker.storyboard" />
+		<resource-file src="src/ios/QBImagePicker/en.lproj/QBImagePicker.strings" />
 
-		<resource-file src="src/ios/ELCImagePicker/Resources/ELCAlbumPickerController.xib" />
-		<resource-file src="src/ios/ELCImagePicker/Resources/ELCAssetPicker.xib" />
-		<resource-file src="src/ios/ELCImagePicker/Resources/ELCAssetTablePicker.xib" />
-		<resource-file src="src/ios/ELCImagePicker/Resources/Overlay.png" />
-		<resource-file src="src/ios/ELCImagePicker/Resources/Overlay@2x.png" />
 	</platform>
 
 	<!-- android -->
 	<platform name="android">
 		<config-file target="res/xml/config.xml" parent="/*">
 			<feature name="ImagePicker">
-				<param name="android-package" value="com.synconset.ImagePicker"/>
+				<param name="android-package" value="ro.qualitance.obimagepicker"/>
 			</feature>
 		</config-file>
 

diff --git a/src/ios/ELCImagePicker/ELCAlbumPickerController.h b/src/ios/ELCImagePicker/ELCAlbumPickerController.h
diff --git a/src/ios/ELCImagePicker/ELCAlbumPickerController.m b/src/ios/ELCImagePicker/ELCAlbumPickerController.m