From 1af7f8142f6734d13f7471144093e93715f042fd Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Thu, 22 Mar 2018 17:34:11 +0200
Subject: [PATCH 01/20] refactor: use viewModel and bindings in demo

---
 demo/app/main-page.ts       | 48 +++---------------------
 demo/app/main-page.xml      |  8 ++--
 demo/app/main-view-model.ts | 74 +++++++++++++++++++++++++++++++++++++
 demo/package.json           |  3 +-
 4 files changed, 85 insertions(+), 48 deletions(-)
 create mode 100644 demo/app/main-view-model.ts

diff --git a/demo/app/main-page.ts b/demo/app/main-page.ts
index 8199a20..f78cf95 100644
--- a/demo/app/main-page.ts
+++ b/demo/app/main-page.ts
@@ -1,50 +1,12 @@
 import { EventData } from 'tns-core-modules/data/observable';
 import { Page } from 'tns-core-modules/ui/page';
-import { isAndroid } from "tns-core-modules/platform";
-import * as imagepicker from "nativescript-imagepicker";
+import { MainViewModel } from './main-view-model';
 
-let list;
-let imageSrc;
+let viewModel;
 
 export function pageLoaded(args: EventData) {
-    let page = <Page>args.object;
-    list = page.getViewById("urls-list");
-    imageSrc = page.getViewById("imageSrc");
-}
-
-export function onSelectMultipleTap(args) {
-    let context = imagepicker.create({ mode: "multiple" });
-    startSelection(context, false);
-}
+    viewModel = viewModel || new MainViewModel();
 
-export function onSelectSingleTap(args) {
-    let context = imagepicker.create({ mode: "single" });
-    startSelection(context, true);
-}
-
-function startSelection(context, isSingle) {
-    context
-        .authorize()
-        .then(function() {
-            list.items = [];
-            return context.present();
-        })
-        .then(function(selection) {
-            console.log("Selection done:");
-            selection.forEach(function(selected) {
-                console.log("----------------");
-                console.log("uri: " + selected.uri);
-                if (isSingle) {
-                    selected.getImage({ maxWidth: 200, maxHeight: 200, aspectRatio: 'fill' })
-                    .then((imageSource) => {
-                        imageSrc.src = imageSource;
-                    });
-                } else {
-                    imageSrc.visibility = 'hidden';
-                }
-            });
-            list.items = selection;
-        }).catch(function (e) {
-            console.log(e);
-        });
+    let page = <Page>args.object;
+    page.bindingContext = viewModel;
 }
\ No newline at end of file
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
index 41d50bb..861f5b7 100644
--- a/demo/app/main-page.xml
+++ b/demo/app/main-page.xml
@@ -3,7 +3,7 @@
         <ActionBar title="Image Picker" />
     </Page.actionBar>
     <GridLayout rows="*, auto, auto">
-        <ListView id="urls-list">
+        <ListView items="{{ imageAssets }}">
             <ListView.itemTemplate>
                 <GridLayout columns="94, *" rows="*, *">
                     <Image rowSpan="2" width="80" height="80" src="{{ $value }}" />
@@ -13,8 +13,8 @@
             </ListView.itemTemplate>
         </ListView>
 
-        <Image id="imageSrc" width="200" height="200" />
-        <Button row="1" text="Pick Single" tap="onSelectSingleTap" horizontalAlignment="center" />
-        <Button row="2" text="Pick Multiple" tap="onSelectMultipleTap" horizontalAlignment="center" />
+        <Image src="{{ imageSrc }}" width="200" height="200" stretch="fill" />
+        <Button row="1" text="Pick Single" tap="{{ onSelectSingleTap }}" horizontalAlignment="center" />
+        <Button row="2" text="Pick Multiple" tap="{{ onSelectMultipleTap }}" horizontalAlignment="center" />
     </GridLayout>
 </Page>
diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
new file mode 100644
index 0000000..b09d9a1
--- /dev/null
+++ b/demo/app/main-view-model.ts
@@ -0,0 +1,74 @@
+import { Observable } from 'tns-core-modules/data/observable';
+import { isAndroid } from "tns-core-modules/platform";
+import * as imagepicker from "nativescript-imagepicker";
+import { ObservableArray } from 'tns-core-modules/data/observable-array/observable-array';
+
+export class MainViewModel extends Observable {
+    constructor() {
+        super();
+    }
+
+    private _imageSrc: any;
+    private _imageAssets: Array<any>;
+
+    get imageSrc(): any {
+        return this._imageSrc;
+    }
+
+    set imageSrc(value: any) {
+        if (this._imageSrc !== value) {
+            this._imageSrc = value;
+            this.notifyPropertyChange('imageSrc', value);
+        }
+    }
+
+    get imageAssets(): any {
+        return this._imageAssets;
+    }
+
+    set imageAssets(value: any) {
+        if (this._imageAssets !== value) {
+            this._imageAssets = value;
+            this.notifyPropertyChange('imageAssets', value);
+        }
+    }
+
+    public onSelectMultipleTap(args) {
+        let context = imagepicker.create({ mode: "multiple" });
+        this.startSelection(context, false);
+    }
+
+    public onSelectSingleTap(args) {
+        let context = imagepicker.create({ mode: "single" });
+        this.startSelection(context, true);
+    }
+
+    private startSelection(context, isSingle) {
+        context
+            .authorize()
+            .then(() => {
+                this.imageAssets = [];
+                return context.present();
+            })
+            .then((selection) => {
+                console.log("Selection done:");
+                selection.forEach((selected) => {
+                    console.log("----------------");
+                    console.log("uri: " + selected.uri);
+                    if (isSingle) {
+                        // selected.getImage({ maxWidth: 200, maxHeight: 200, aspectRatio: 'fill' })
+                        // .then((imageSource) => {
+                        //     imageSrc.src = imageSource;
+                        // });
+                        selected.options = { width: 200, height: 200 };
+                        this.imageSrc = selected;
+                    } else {
+                        this.imageSrc = null;
+                    }
+                });
+                this.imageAssets = selection;
+            }).catch(function (e) {
+                console.log(e);
+            });
+    }
+}
\ No newline at end of file
diff --git a/demo/package.json b/demo/package.json
index 6c0c408..24c3fc1 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -48,7 +48,8 @@
     "typescript": "~2.5.0",
     "webpack": "~3.8.1",
     "webpack-bundle-analyzer": "^2.8.2",
-    "webpack-sources": "~1.0.1"
+    "webpack-sources": "~1.0.1",
+    "uglifyjs-webpack-plugin": "~1.1.6"
   },
   "scripts": {
     "build.plugin": "cd ../src && npm run build",

From 329a459e2fc4e316e0f9a9f8bb4586ba4930099a Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Fri, 23 Mar 2018 11:23:55 +0200
Subject: [PATCH 02/20] chore: cleanup viewmodel

---
 demo/app/main-view-model.ts | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
index b09d9a1..c9a0b49 100644
--- a/demo/app/main-view-model.ts
+++ b/demo/app/main-view-model.ts
@@ -48,25 +48,18 @@ export class MainViewModel extends Observable {
             .authorize()
             .then(() => {
                 this.imageAssets = [];
+                this.imageSrc = null;
                 return context.present();
             })
-            .then((selection) => {
+            .then((selection) => { // returns SelectedAsset[]
+                this.imageSrc = isSingle && selection.length > 0 ? selection[0] : null;
+                this.imageAssets = selection;
+
                 console.log("Selection done:");
                 selection.forEach((selected) => {
                     console.log("----------------");
                     console.log("uri: " + selected.uri);
-                    if (isSingle) {
-                        // selected.getImage({ maxWidth: 200, maxHeight: 200, aspectRatio: 'fill' })
-                        // .then((imageSource) => {
-                        //     imageSrc.src = imageSource;
-                        // });
-                        selected.options = { width: 200, height: 200 };
-                        this.imageSrc = selected;
-                    } else {
-                        this.imageSrc = null;
-                    }
                 });
-                this.imageAssets = selection;
             }).catch(function (e) {
                 console.log(e);
             });

From 019618a800b2148e127e55ce1ca6cef30151b70b Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Fri, 30 Mar 2018 15:10:19 +0300
Subject: [PATCH 03/20] chore: test and compare QBImagePicker, BSImagePicker

---
 README.md                                     |  13 +
 demo/package.json                             |   2 +-
 src/albums.ios.ts                             |   2 +-
 src/imagepicker.ios.ts                        | 923 ++++++++++--------
 .../android/nativescript_imagepicker.aar      | Bin 0 -> 1454 bytes
 src/platforms/ios/Podfile                     |  12 +
 src/references.d.ts                           |   2 +
 src/typings/objc!BSImagePicker.d.ts           |  37 +
 src/typings/objc!QBImagePickerController.d.ts | 231 +++++
 9 files changed, 809 insertions(+), 413 deletions(-)
 create mode 100644 src/platforms/android/nativescript_imagepicker.aar
 create mode 100644 src/platforms/ios/Podfile
 create mode 100644 src/typings/objc!BSImagePicker.d.ts
 create mode 100644 src/typings/objc!QBImagePickerController.d.ts

diff --git a/README.md b/README.md
index 9c33a1c..a23bafc 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,16 @@
+SelectedAsset extends imageAssetModule.ImageAsset
+- getImage() -> remove, use ImageSource.fromAsset() instead
+- getImageData() : ArrayBuffer -> why do we have this?
+- data() : any -> iOS only -> why do we have this?
+
+
+candidates:
+
+- https://github.com/awkward/Tatsi (no cocoa pod)
+- https://github.com/mikaoj/BSImagePicker (not very similar to native picker)
+- https://github.com/questbeat/QBImagePicker 
+
+
 # NativeScript Image Picker ![apple](https://cdn3.iconfinder.com/data/icons/picons-social/57/16-apple-32.png) ![android](https://cdn4.iconfinder.com/data/icons/logos-3/228/android-32.png) 
 
 
diff --git a/demo/package.json b/demo/package.json
index 24c3fc1..d3ce849 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -5,7 +5,7 @@
       "version": "3.4.0"
     },
     "tns-ios": {
-      "version": "3.4.0"
+      "version": "3.4.1"
     }
   },
   "dependencies": {
diff --git a/src/albums.ios.ts b/src/albums.ios.ts
index e80f1be..f2a6825 100644
--- a/src/albums.ios.ts
+++ b/src/albums.ios.ts
@@ -8,7 +8,7 @@ import { ActionBar, NavigationButton, ActionItems, ActionItem } from "tns-core-m
 import { ListView } from "tns-core-modules/ui/list-view";
 import { Label } from "tns-core-modules/ui/label";
 
-import { ImagePicker } from "./imagepicker.ios";
+// import { ImagePicker } from "./imagepicker.ios";
 
 let imagesModule;
 
diff --git a/src/imagepicker.ios.ts b/src/imagepicker.ios.ts
index debd108..8ab1d8f 100644
--- a/src/imagepicker.ios.ts
+++ b/src/imagepicker.ios.ts
@@ -3,6 +3,7 @@ import * as data_observablearray from "tns-core-modules/data/observable-array";
 import * as frame from "tns-core-modules/ui/frame";
 import * as imageAssetModule from "tns-core-modules/image-asset";
 import * as image_source from "tns-core-modules/image-source";
+import * as ui_view_controller from "tns-core-modules/ui/page/page";
 
 let albumsModule;
 if (global.TNS_WEBPACK) {
@@ -22,224 +23,115 @@ interface ImageOptions {
     aspectRatio?: "fill" | "fit";
 }
 
-export function create(options?): ImagePicker {
-    return new ImagePickerPH(options);
+// export function create(options?): BSImagePicker {
+//     // return new ImagePickerPH(options);
+
+//     // return new ImagePicker1(options);
+//     return new BSImagePicker(options);
+// }
+
+
+
+// export class BSImagePicker extends data_observable.Observable {
+//     protected _page: ui_view_controller.Page;
+
+//     constructor(options) {
+//         super();
+//         let page = new ui_view_controller.Page();
+
+//         const pageUIViewController = page.ios;
+
+//         let imagePickerController = BSImagePickerViewController.alloc().init();
+//         imagePickerController.delegate = pageUIViewController;
+//         // imagePickerController.allowsMultipleSelection = options.mode === 'multiple';
+//         // imagePickerController.maximumNumberOfSelection = 10;
+//         // imagePickerController.showsNumberOfSelectedAssets = true;
+
+//         page.on(
+//             'navigatingTo', (data) => {
+//                 (<ui_view_controller.Page>data.object).ios.presentViewControllerAnimatedCompletion(imagePickerController, true, null);
+//             }
+//         );
+//         this._page = page;
+//     }
+
+//     authorize(): Promise<void> {
+//         console.log("authorizing...");
+
+//         return new Promise<void>((resolve, reject) => {
+//             let runloop = CFRunLoopGetCurrent();
+//             PHPhotoLibrary.requestAuthorization(function (result) {
+//                 if (result === PHAuthorizationStatus.Authorized) {
+//                     resolve();
+//                 } else {
+//                     reject(new Error("Authorization failed. Status: " + result));
+//                 }
+//             });
+//         });
+//     }
+
+//     present() {
+//         return new Promise<void>((resolve, reject) => {
+//             frame.topmost().navigate(() => {
+//                 return this._page;
+//             });
+//             resolve();
+//         });
+//     }
+// }
+
+export function create(options?): QBImagePicker {
+    // return new ImagePickerPH(options);
+
+    // return new ImagePicker1(options);
+    return new QBImagePicker(options);
 }
 
-export class ImagePicker extends data_observable.Observable {
-    private _selection: data_observablearray.ObservableArray<Asset>;
-    private _albums: data_observablearray.ObservableArray<Album>;
-
-    private _resolve;
-    private _reject;
-
-    protected _options;
-
-    constructor(options) {
-        super();
-        this._selection = new data_observablearray.ObservableArray<Asset>();
-        this._albums = new data_observablearray.ObservableArray<Album>();
-        this._options = options;
-    }
-
-    authorize(): Promise<void> {
-        return Promise.reject(new Error("Not implemented"));
-    }
-
-    present(): Promise<SelectedAsset[]> {
-        if (this._resolve || this._reject) {
-            return Promise.reject(new Error("Selection is already in progress..."));
-        } else {
-            return new Promise<SelectedAsset[]>((resolve, reject) => {
-                this._resolve = resolve;
-                this._reject = reject;
-                frame.topmost().navigate({
-                    create: albumsModule.albumsPageFactory,
-                    context: this
-                });
-            });
-        }
-    }
-
-    get albums(): data_observablearray.ObservableArray<Album> {
-        return this._albums;
-    }
-
-    get selection(): data_observablearray.ObservableArray<Asset> {
-        return this._selection;
-    }
-
-    get doneText(): string {
-        return this._options && this._options.doneText ? this._options.doneText : "Done";
-    }
-
-    get cancelText(): string {
-        return this._options && this._options.cancelText ? this._options.cancelText : "Cancel";
-    }
-
-    get albumsText(): string {
-        return this._options && this._options.albumsText ? this._options.albumsText : "Albums";
-    }
-
-    get mode(): string {
-        return this._options && this._options.mode && this._options.mode.toLowerCase() === 'single' ? 'single' : 'multiple';
-    }
-
-    get newestFirst(): boolean {
-        return this._options && !!this._options.newestFirst;
-    }
-
-    cancel(): void {
-        this.notifyCanceled();
-    }
-
-    done(): void {
-        this.notifySelection([]);
-    }
-
-    protected notifyCanceled(): void {
-        if (this._reject) {
-            this._reject(new Error("Selection canceled."));
-        }
+export class ImagePickerControllerDelegate extends NSObject implements QBImagePickerControllerDelegate {
+    qb_imagePickerControllerDidCancel?(imagePickerController: QBImagePickerController): void {
+        imagePickerController.dismissViewControllerAnimatedCompletion(true, null);
     }
-
-    protected notifySelection(results: SelectedAsset[]): void {
-        if (this._resolve) {
-            this._resolve(results);
-        }
-    }
-}
-
-export class Album extends data_observable.Observable {
-
-    private _imagePicker: ImagePicker;
-    private _assets: data_observablearray.ObservableArray<Asset>;
-    private _title: string;
-    private _thumbAsset: imageAssetModule.ImageAsset;
-
-    constructor(imagePicker: ImagePicker, title: string) {
-        super();
-        this._imagePicker = imagePicker;
-        this._title = title;
-        this._assets = new data_observablearray.ObservableArray<Asset>();
+    qb_imagePickerControllerDidDeselectAsset?(imagePickerController: QBImagePickerController, asset: PHAsset): void {
+        console.log("qb_imagePickerControllerDidDeselectAsset");
     }
-
-    get imagePicker(): ImagePicker {
-        return this._imagePicker;
+    qb_imagePickerControllerDidFinishPickingAssets?(imagePickerController: QBImagePickerController, assets: NSArray<any>): void {
+        console.log("qb_imagePickerControllerDidFinishPickingAssets");
+        imagePickerController.dismissViewControllerAnimatedCompletion(true, null);
     }
-
-    get title(): string {
-        return this._title;
+    qb_imagePickerControllerDidSelectAsset?(imagePickerController: QBImagePickerController, asset: PHAsset): void {
+        console.log("qb_imagePickerControllerDidSelectAsset " + asset);
     }
-
-    get assets(): data_observablearray.ObservableArray<Asset> {
-        return this._assets;
+    qb_imagePickerControllerShouldSelectAsset?(imagePickerController: QBImagePickerController, asset: PHAsset): boolean {
+        console.log("qb_imagePickerControllerShouldSelectAsset " + asset);
+        return true;
     }
 
-    get thumbAsset(): imageAssetModule.ImageAsset {
-        return this._thumbAsset;
-    }
+    public static ObjCProtocols = [QBImagePickerControllerDelegate];
 
-    protected setThumbAsset(value: imageAssetModule.ImageAsset): void {
-        this._thumbAsset = value;
-        this.notifyPropertyChange("thumbAsset", value);
+    static new(): ImagePickerControllerDelegate {
+        console.log('static new DelegateImpl');
+        return <ImagePickerControllerDelegate>super.new(); // calls new() on the NSObject
     }
 }
 
-export class SelectedAsset extends imageAssetModule.ImageAsset {
-    get uri(): string {
-        return null;
-    }
-
-    get fileUri(): string {
-        return null;
-    }
-
-    getImage(options?: ImageOptions): Promise<image_source.ImageSource> {
-        return Promise.reject(new Error("getImage() is not implemented in SelectedAsset. Derived classes should implement it to be fully functional."));
-    }
-
-    getImageData(): Promise<ArrayBuffer> {
-        return Promise.reject(new Error("getImageData() is not implemented in SelectedAsset. Derived classes should implement it to be fully functional."));
-    }
-}
-
-export class Asset extends SelectedAsset {
-    private _selected: boolean;
-    private _album: Album;
-
-    private _image: image_source.ImageSource;
-
-    constructor(album: Album, asset: PHAsset | UIImage) {
-        super(asset);
-        this._album = album;
-        this._image = null;
-    }
-
-    get album(): Album {
-        return this._album;
-    }
-
-    get selected(): boolean {
-        return !!this._selected;
-    }
-
-    set selected(value: boolean) {
-        if (!!value === this.selected) return;
-        let index = this.album.imagePicker.selection.indexOf(this);
-        if (value) {
-            this._selected = true;
-            if (this.album.imagePicker.mode === "single") {
-                if (this.album.imagePicker.selection.length > 0) {
-                    this.album.imagePicker.selection.getItem(0).selected = false;
-                }
-            }
-            if (index < 0) {
-                this.album.imagePicker.selection.push(this);
-            }
-        } else {
-            delete this._selected;
-            if (index >= 0) {
-                this.album.imagePicker.selection.splice(index, 1);
-            }
-        }
-
-        this.notifyPropertyChange("selected", this.selected);
-    }
-
-    toggleSelection(args): void {
-        this.selected = !this.selected;
-    }
-
-    data(): Promise<any> {
-        return Promise.reject(new Error("Not implemented."));
-    }
-}
-
-// iOS8+ Photo framework based view model implementation...
-class ImagePickerPH extends ImagePicker {
-
-    private _thumbRequestOptions: PHImageRequestOptions;
-    private _thumbRequestSize: CGSize;
-    private _initialized: boolean;
+export class QBImagePicker extends data_observable.Observable {
+    _imagePC: QBImagePickerController;
 
     constructor(options) {
-        super(options);
-
-        this._thumbRequestOptions = PHImageRequestOptions.alloc().init();
-        this._thumbRequestOptions.resizeMode = PHImageRequestOptionsResizeMode.Exact;
-        this._thumbRequestOptions.synchronous = false;
-        this._thumbRequestOptions.deliveryMode = PHImageRequestOptionsDeliveryMode.Opportunistic;
-        this._thumbRequestOptions.networkAccessAllowed = true; // needed for retrieving iCloud images
-        this._thumbRequestOptions.normalizedCropRect = CGRectMake(0, 0, 1, 1);
+        super();
 
-        this._thumbRequestSize = CGSizeMake(80, 80);
-        this._options = options;
+        let imagePickerController = QBImagePickerController.alloc().init();
+        imagePickerController.delegate = new ImagePickerControllerDelegate();
+        imagePickerController.allowsMultipleSelection = options.mode === 'multiple';
+        imagePickerController.maximumNumberOfSelection = 4;
+        imagePickerController.showsNumberOfSelectedAssets = true;
 
-        this._initialized = false;
+        this._imagePC = imagePickerController;
     }
 
     authorize(): Promise<void> {
+        console.log("authorizing...");
+
         return new Promise<void>((resolve, reject) => {
             let runloop = CFRunLoopGetCurrent();
             PHPhotoLibrary.requestAuthorization(function (result) {
@@ -252,219 +144,428 @@ class ImagePickerPH extends ImagePicker {
         });
     }
 
-    present(): Promise<SelectedAsset[]> {
-        this.initialize();
-        return super.present();
-    }
-
-    addAlbumsForFetchResult(result: PHFetchResult<any>): void {
-        for (let i = 0; i < result.count; i++) {
-            let item = result.objectAtIndex(i);
-            if (item.isKindOfClass(PHAssetCollection)) {
-                this.addAlbumForAssetCollection(<PHAssetCollection>item);
-            } else {
-                console.log("Ignored result: " + item);
-            }
-        }
-    }
-
-    addAlbumForAssetCollection(assetCollection: PHAssetCollection): void {
-        let album = new AlbumPH(this, assetCollection.localizedTitle);
-        let pfAssets = PHAsset.fetchAssetsInAssetCollectionOptions(assetCollection, null);
-        album.addAssetsForFetchResult(pfAssets);
-        if (album.assets.length > 0) {
-            this.albums.push(album);
-        }
-    }
-
-    createPHImageThumbAsset(target, asset: PHAsset): void {
-        PHImageManager.defaultManager().requestImageForAssetTargetSizeContentModeOptionsResultHandler(asset, this._thumbRequestSize, PHImageContentMode.AspectFill,
-            this._thumbRequestOptions, function (target, uiImage, info) {
-                let imageAsset = new imageAssetModule.ImageAsset(uiImage);
-                imageAsset.options = {
-                    width: this._options.maxWidth && this._options.maxWidth < IMAGE_WIDTH ? this._options.maxWidth : IMAGE_WIDTH,
-                    height: this._options.maxHeight && this._options.IMAGE_HEIGHT < 80 ? this._options.IMAGE_HEIGHT : IMAGE_HEIGHT,
-                    keepAspectRatio: true
-                };
-                target.setThumbAsset(imageAsset);
-            }.bind(this, target));
-    }
-
-    /**
-     * Creates a new ImageSource from the given image, using the given sizing options.
-     * @param image   The image asset that should be put into an ImageSource.
-     * @param options The options that should be used to create the ImageSource.
-     */
-    createPHImage(image: PHAsset, options?: ImageOptions): Promise<image_source.ImageSource> {
-        return new Promise<image_source.ImageSource>((resolve, reject) => {
-            let size: CGSize = options ? CGSizeMake(options.maxWidth, options.maxHeight) : PHImageManagerMaximumSize;
-            let resizeMode = PHImageRequestOptions.alloc().init();
-            let aspectRatio = (options && options.aspectRatio && options.aspectRatio === 'fill') ? PHImageContentMode.AspectFill : PHImageContentMode.AspectFit;
-
-            // TODO: Decide whether it is benefical to use PHImageRequestOptionsResizeModeFast
-            //       Accuracy vs Performance. It is probably best to expose these as iOS specific options.
-            resizeMode.resizeMode = PHImageRequestOptionsResizeMode.Exact;
-            resizeMode.synchronous = false;
-
-            // TODO: provide the ability to change this setting.
-            //       Right now, it is needed to make sure that resolve is not called twice.
-            resizeMode.deliveryMode = PHImageRequestOptionsDeliveryMode.HighQualityFormat;
-            resizeMode.normalizedCropRect = CGRectMake(0, 0, 1, 1);
-            PHImageManager.defaultManager().requestImageForAssetTargetSizeContentModeOptionsResultHandler(
-                image,
-                size,
-                aspectRatio,
-                resizeMode,
-                (createdImage, data) => {
-                    if (createdImage) {
-                        let imageSource = new image_source.ImageSource();
-                        imageSource.setNativeSource(createdImage);
-
-                        // TODO: Determine whether runOnRunLoop is needed
-                        //       for callback or not. (See the data() implementation in AssetPH below)
-                        resolve(imageSource);
-                    } else {
-                        reject(new Error("The image could not be created."));
-                    }
-                }
-            );
+    present() {
+        return new Promise<void>((resolve, reject) => {
+            frame.topmost().ios.controller.presentViewControllerAnimatedCompletion(this._imagePC, true, null);
+            // resolve();
         });
     }
-
-    done(): void {
-        let result = [];
-        for (let i = 0; i < this.selection.length; ++i) {
-            result.push(this.selection.getItem(i));
-        }
-        this.notifySelection(result);
-    }
-
-    private initialize(): void {
-        if (this._initialized) {
-            return;
-        }
-
-        this._initialized = true;
-
-        let smart = PHAssetCollection.fetchAssetCollectionsWithTypeSubtypeOptions(PHAssetCollectionType.SmartAlbum, PHAssetCollectionSubtype.AlbumRegular, null);
-        this.addAlbumsForFetchResult(smart);
-
-        let user = PHCollection.fetchTopLevelUserCollectionsWithOptions(null);
-        this.addAlbumsForFetchResult(user);
-    }
 }
 
-class AlbumPH extends Album {
-    private _setThumb: boolean;
-    private _options: ImageOptions;
-
-    constructor(imagePicker: ImagePicker, title: string, options?: ImageOptions) {
-        super(imagePicker, title);
-        this._setThumb = false;
-        this._options = options;
-    }
-
-    addAssetsForFetchResult(result: PHFetchResult<any>): void {
-        for (let i = 0; i < result.count; i++) {
-            let asset = result.objectAtIndex(i);
-            if (asset.isKindOfClass(PHAsset)) {
-                this.addAsset(<PHAsset>asset);
-            } else {
-                console.log("Ignored asset: " + asset);
-            }
-        }
-    }
-
-    addAsset(asset: PHAsset): void {
-        let imagePicker = <ImagePickerPH>this.imagePicker;
-        let item = new AssetPH(this, asset, this._options);
-
-        if (!this._setThumb && imagePicker) {
-            this._setThumb = true;
-            imagePicker.createPHImageThumbAsset(this, asset);
-
-        }
-        if (this.imagePicker.newestFirst) {
-            this.assets.unshift(item);
-        } else {
-            this.assets.push(item);
-        }
-    }
-}
-
-class AssetPH extends Asset {
-    private _phAsset: PHAsset;
-    private static _uriRequestOptions: PHImageRequestOptions;
-
-    constructor(album: AlbumPH, phAsset: PHAsset, options?: ImageOptions) {
-        super(album, phAsset);
-        this._phAsset = phAsset;
-        this._initializeOptions(options);
-    }
-
-    /**
-     * Gets the underlying iOS PHAsset instance.
-     */
-    public get ios(): any {
-        return this._phAsset;
-    }
-
-    get uri(): string {
-        return this._phAsset.localIdentifier.toString();
-    }
-
-    private _initializeOptions(options: ImageOptions): void {
-        if (options) {
-            this.options = {
-                width: options.maxWidth && options.maxWidth < IMAGE_WIDTH ? options.maxWidth : IMAGE_WIDTH,
-                height: options.maxHeight && options.maxHeight < IMAGE_HEIGHT ? options.maxHeight : IMAGE_HEIGHT,
-                keepAspectRatio: true
-            };
-        } else {
-            this.options = {
-                width: IMAGE_WIDTH,
-                height: IMAGE_HEIGHT,
-                keepAspectRatio: true
-            };
-        }
-    }
-
-    getImage(options?: ImageOptions): Promise<image_source.ImageSource> {
-        return (<ImagePickerPH>(<AlbumPH>this.album).imagePicker).createPHImage(this._phAsset, options);
-    }
-
-    getImageData(): Promise<ArrayBuffer> {
-        return this.data().then((data: NSData) => {
-            return (<any>interop).bufferFromData(data);
-        });
-    }
-
-    get fileUri(): string {
-        if (!AssetPH._uriRequestOptions) {
-            AssetPH._uriRequestOptions = PHImageRequestOptions.alloc().init();
-            AssetPH._uriRequestOptions.synchronous = true;
-        }
-
-        let uri;
-        PHImageManager.defaultManager().requestImageDataForAssetOptionsResultHandler(this._phAsset, AssetPH._uriRequestOptions, (data, uti, orientation, info) => {
-            uri = info.objectForKey("PHImageFileURLKey");
-        });
-        if (uri) {
-            return uri.toString();
-        }
-        return undefined;
-    }
-
-    data(): Promise<any> {
-        return new Promise((resolve, reject) => {
-            let runloop = CFRunLoopGetCurrent();
-            PHImageManager.defaultManager().requestImageDataForAssetOptionsResultHandler(this._phAsset, null, (data, dataUTI, orientation, info) => {
-                if (data) {
-                    resolve(data);
-                } else {
-                    reject(new Error("Failed to get image data."));
-                }
-            });
-        });
-    }
-}
+// export class ImagePicker1 extends data_observable.Observable {
+//     protected _page: ui_view_controller.Page;
+
+//     constructor(options) {
+//         debugger;
+//         console.log("options...: " + JSON.stringify(options));
+
+//         super();
+//         let page = new ui_view_controller.Page();
+
+//         const pageUIViewController = page.ios;
+//         let imagePickerController = UIImagePickerController.alloc().init();
+//         imagePickerController.delegate = pageUIViewController;
+//         imagePickerController.sourceType = UIImagePickerControllerSourceType.PhotoLibrary;
+//         page.on(
+//             'navigatingTo', (data) => {
+//                 (<ui_view_controller.Page>data.object).ios.presentViewControllerAnimatedCompletion(imagePickerController, true, null);
+//             }
+//         );
+//         this._page = page;
+//     }
+
+//     authorize(): Promise<void> {
+//         console.log("authorizing...");
+
+//         return new Promise<void>((resolve, reject) => {
+//             let runloop = CFRunLoopGetCurrent();
+//             PHPhotoLibrary.requestAuthorization(function (result) {
+//                 if (result === PHAuthorizationStatus.Authorized) {
+//                     resolve();
+//                 } else {
+//                     reject(new Error("Authorization failed. Status: " + result));
+//                 }
+//             });
+//         });
+//     }
+
+//     present() {
+//         return new Promise<void>((resolve, reject) => {
+//             frame.topmost().navigate(() => {
+//                 return this._page;
+//             });
+//             resolve();
+//         });
+//     }
+// }
+
+
+// export class ImagePicker extends data_observable.Observable {
+//     private _selection: data_observablearray.ObservableArray<Asset>;
+//     private _albums: data_observablearray.ObservableArray<Album>;
+//     private _resolve;
+//     private _reject;
+//     protected _options;
+//     constructor(options) {
+//         super();
+//         this._selection = new data_observablearray.ObservableArray<Asset>();
+//         this._albums = new data_observablearray.ObservableArray<Album>();
+//         this._options = options;
+//     }
+//     authorize(): Promise<void> {
+//         return Promise.reject(new Error("Not implemented"));
+//     }
+//     present(): Promise<SelectedAsset[]> {
+//         if (this._resolve || this._reject) {
+//             return Promise.reject(new Error("Selection is already in progress..."));
+//         } else {
+//             return new Promise<SelectedAsset[]>((resolve, reject) => {
+//                 this._resolve = resolve;
+//                 this._reject = reject;
+//                 frame.topmost().navigate({
+//                     create: albumsModule.albumsPageFactory,
+//                     context: this
+//                 });
+//             });
+//         }
+//     }
+//     get albums(): data_observablearray.ObservableArray<Album> {
+//         return this._albums;
+//     }
+//     get selection(): data_observablearray.ObservableArray<Asset> {
+//         return this._selection;
+//     }
+//     get doneText(): string {
+//         return this._options && this._options.doneText ? this._options.doneText : "Done";
+//     }
+//     get cancelText(): string {
+//         return this._options && this._options.cancelText ? this._options.cancelText : "Cancel";
+//     }
+//     get albumsText(): string {
+//         return this._options && this._options.albumsText ? this._options.albumsText : "Albums";
+//     }
+//     get mode(): string {
+//         return this._options && this._options.mode && this._options.mode.toLowerCase() === 'single' ? 'single' : 'multiple';
+//     }
+//     get newestFirst(): boolean {
+//         return this._options && !!this._options.newestFirst;
+//     }
+//     cancel(): void {
+//         this.notifyCanceled();
+//     }
+//     done(): void {
+//         this.notifySelection([]);
+//     }
+//     protected notifyCanceled(): void {
+//         if (this._reject) {
+//             this._reject(new Error("Selection canceled."));
+//         }
+//     }
+//     protected notifySelection(results: SelectedAsset[]): void {
+//         if (this._resolve) {
+//             this._resolve(results);
+//         }
+//     }
+// }
+// export class Album extends data_observable.Observable {
+//     private _imagePicker: ImagePicker;
+//     private _assets: data_observablearray.ObservableArray<Asset>;
+//     private _title: string;
+//     private _thumbAsset: imageAssetModule.ImageAsset;
+//     constructor(imagePicker: ImagePicker, title: string) {
+//         super();
+//         this._imagePicker = imagePicker;
+//         this._title = title;
+//         this._assets = new data_observablearray.ObservableArray<Asset>();
+//     }
+//     get imagePicker(): ImagePicker {
+//         return this._imagePicker;
+//     }
+//     get title(): string {
+//         return this._title;
+//     }
+//     get assets(): data_observablearray.ObservableArray<Asset> {
+//         return this._assets;
+//     }
+//     get thumbAsset(): imageAssetModule.ImageAsset {
+//         return this._thumbAsset;
+//     }
+//     protected setThumbAsset(value: imageAssetModule.ImageAsset): void {
+//         this._thumbAsset = value;
+//         this.notifyPropertyChange("thumbAsset", value);
+//     }
+// }
+// export class SelectedAsset extends imageAssetModule.ImageAsset {
+//     get uri(): string {
+//         return null;
+//     }
+//     get fileUri(): string {
+//         return null;
+//     }
+//     getImage(options?: ImageOptions): Promise<image_source.ImageSource> {
+//         return Promise.reject(new Error("getImage() is not implemented in SelectedAsset. Derived classes should implement it to be fully functional."));
+//     }
+//     getImageData(): Promise<ArrayBuffer> {
+//         return Promise.reject(new Error("getImageData() is not implemented in SelectedAsset. Derived classes should implement it to be fully functional."));
+//     }
+// }
+// export class Asset extends SelectedAsset {
+//     private _selected: boolean;
+//     private _album: Album;
+//     private _image: image_source.ImageSource;
+//     constructor(album: Album, asset: PHAsset | UIImage) {
+//         super(asset);
+//         this._album = album;
+//         this._image = null;
+//     }
+//     get album(): Album {
+//         return this._album;
+//     }
+//     get selected(): boolean {
+//         return !!this._selected;
+//     }
+//     set selected(value: boolean) {
+//         if (!!value === this.selected) return;
+//         let index = this.album.imagePicker.selection.indexOf(this);
+//         if (value) {
+//             this._selected = true;
+//             if (this.album.imagePicker.mode === "single") {
+//                 if (this.album.imagePicker.selection.length > 0) {
+//                     this.album.imagePicker.selection.getItem(0).selected = false;
+//                 }
+//             }
+//             if (index < 0) {
+//                 this.album.imagePicker.selection.push(this);
+//             }
+//         } else {
+//             delete this._selected;
+//             if (index >= 0) {
+//                 this.album.imagePicker.selection.splice(index, 1);
+//             }
+//         }
+//         this.notifyPropertyChange("selected", this.selected);
+//     }
+//     toggleSelection(args): void {
+//         this.selected = !this.selected;
+//     }
+//     data(): Promise<any> {
+//         return Promise.reject(new Error("Not implemented."));
+//     }
+// }
+// // iOS8+ Photo framework based view model implementation...
+// class ImagePickerPH extends ImagePicker {
+//     private _thumbRequestOptions: PHImageRequestOptions;
+//     private _thumbRequestSize: CGSize;
+//     private _initialized: boolean;
+//     constructor(options) {
+//         super(options);
+//         this._thumbRequestOptions = PHImageRequestOptions.alloc().init();
+//         this._thumbRequestOptions.resizeMode = PHImageRequestOptionsResizeMode.Exact;
+//         this._thumbRequestOptions.synchronous = false;
+//         this._thumbRequestOptions.deliveryMode = PHImageRequestOptionsDeliveryMode.Opportunistic;
+//         this._thumbRequestOptions.networkAccessAllowed = true; // needed for retrieving iCloud images
+//         this._thumbRequestOptions.normalizedCropRect = CGRectMake(0, 0, 1, 1);
+//         this._thumbRequestSize = CGSizeMake(80, 80);
+//         this._options = options;
+//         this._initialized = false;
+//     }
+//     authorize(): Promise<void> {
+//         return new Promise<void>((resolve, reject) => {
+//             let runloop = CFRunLoopGetCurrent();
+//             PHPhotoLibrary.requestAuthorization(function (result) {
+//                 if (result === PHAuthorizationStatus.Authorized) {
+//                     resolve();
+//                 } else {
+//                     reject(new Error("Authorization failed. Status: " + result));
+//                 }
+//             });
+//         });
+//     }
+//     present(): Promise<SelectedAsset[]> {
+//         this.initialize();
+//         return super.present();
+//     }
+//     addAlbumsForFetchResult(result: PHFetchResult<any>): void {
+//         for (let i = 0; i < result.count; i++) {
+//             let item = result.objectAtIndex(i);
+//             if (item.isKindOfClass(PHAssetCollection)) {
+//                 this.addAlbumForAssetCollection(<PHAssetCollection>item);
+//             } else {
+//                 console.log("Ignored result: " + item);
+//             }
+//         }
+//     }
+//     addAlbumForAssetCollection(assetCollection: PHAssetCollection): void {
+//         let album = new AlbumPH(this, assetCollection.localizedTitle);
+//         let pfAssets = PHAsset.fetchAssetsInAssetCollectionOptions(assetCollection, null);
+//         album.addAssetsForFetchResult(pfAssets);
+//         if (album.assets.length > 0) {
+//             this.albums.push(album);
+//         }
+//     }
+//     createPHImageThumbAsset(target, asset: PHAsset): void {
+//         PHImageManager.defaultManager().requestImageForAssetTargetSizeContentModeOptionsResultHandler(asset, this._thumbRequestSize, PHImageContentMode.AspectFill,
+//             this._thumbRequestOptions, function (target, uiImage, info) {
+//                 let imageAsset = new imageAssetModule.ImageAsset(uiImage);
+//                 imageAsset.options = {
+//                     width: this._options.maxWidth && this._options.maxWidth < IMAGE_WIDTH ? this._options.maxWidth : IMAGE_WIDTH,
+//                     height: this._options.maxHeight && this._options.IMAGE_HEIGHT < 80 ? this._options.IMAGE_HEIGHT : IMAGE_HEIGHT,
+//                     keepAspectRatio: true
+//                 };
+//                 target.setThumbAsset(imageAsset);
+//             }.bind(this, target));
+//     }
+//     /**
+//      * Creates a new ImageSource from the given image, using the given sizing options.
+//      * @param image   The image asset that should be put into an ImageSource.
+//      * @param options The options that should be used to create the ImageSource.
+//      */
+//     createPHImage(image: PHAsset, options?: ImageOptions): Promise<image_source.ImageSource> {
+//         return new Promise<image_source.ImageSource>((resolve, reject) => {
+//             let size: CGSize = options ? CGSizeMake(options.maxWidth, options.maxHeight) : PHImageManagerMaximumSize;
+//             let resizeMode = PHImageRequestOptions.alloc().init();
+//             let aspectRatio = (options && options.aspectRatio && options.aspectRatio === 'fill') ? PHImageContentMode.AspectFill : PHImageContentMode.AspectFit;
+//             // TODO: Decide whether it is benefical to use PHImageRequestOptionsResizeModeFast
+//             //       Accuracy vs Performance. It is probably best to expose these as iOS specific options.
+//             resizeMode.resizeMode = PHImageRequestOptionsResizeMode.Exact;
+//             resizeMode.synchronous = false;
+//             // TODO: provide the ability to change this setting.
+//             //       Right now, it is needed to make sure that resolve is not called twice.
+//             resizeMode.deliveryMode = PHImageRequestOptionsDeliveryMode.HighQualityFormat;
+//             resizeMode.normalizedCropRect = CGRectMake(0, 0, 1, 1);
+//             PHImageManager.defaultManager().requestImageForAssetTargetSizeContentModeOptionsResultHandler(
+//                 image,
+//                 size,
+//                 aspectRatio,
+//                 resizeMode,
+//                 (createdImage, data) => {
+//                     if (createdImage) {
+//                         let imageSource = new image_source.ImageSource();
+//                         imageSource.setNativeSource(createdImage);
+//                         // TODO: Determine whether runOnRunLoop is needed
+//                         //       for callback or not. (See the data() implementation in AssetPH below)
+//                         resolve(imageSource);
+//                     } else {
+//                         reject(new Error("The image could not be created."));
+//                     }
+//                 }
+//             );
+//         });
+//     }
+//     done(): void {
+//         let result = [];
+//         for (let i = 0; i < this.selection.length; ++i) {
+//             result.push(this.selection.getItem(i));
+//         }
+//         this.notifySelection(result);
+//     }
+//     private initialize(): void {
+//         if (this._initialized) {
+//             return;
+//         }
+//         this._initialized = true;
+//         let smart = PHAssetCollection.fetchAssetCollectionsWithTypeSubtypeOptions(PHAssetCollectionType.SmartAlbum, PHAssetCollectionSubtype.AlbumRegular, null);
+//         this.addAlbumsForFetchResult(smart);
+//         let user = PHCollection.fetchTopLevelUserCollectionsWithOptions(null);
+//         this.addAlbumsForFetchResult(user);
+//     }
+// }
+// class AlbumPH extends Album {
+//     private _setThumb: boolean;
+//     private _options: ImageOptions;
+//     constructor(imagePicker: ImagePicker, title: string, options?: ImageOptions) {
+//         super(imagePicker, title);
+//         this._setThumb = false;
+//         this._options = options;
+//     }
+//     addAssetsForFetchResult(result: PHFetchResult<any>): void {
+//         for (let i = 0; i < result.count; i++) {
+//             let asset = result.objectAtIndex(i);
+//             if (asset.isKindOfClass(PHAsset)) {
+//                 this.addAsset(<PHAsset>asset);
+//             } else {
+//                 console.log("Ignored asset: " + asset);
+//             }
+//         }
+//     }
+//     addAsset(asset: PHAsset): void {
+//         let imagePicker = <ImagePickerPH>this.imagePicker;
+//         let item = new AssetPH(this, asset, this._options);
+//         if (!this._setThumb && imagePicker) {
+//             this._setThumb = true;
+//             imagePicker.createPHImageThumbAsset(this, asset);
+//         }
+//         if (this.imagePicker.newestFirst) {
+//             this.assets.unshift(item);
+//         } else {
+//             this.assets.push(item);
+//         }
+//     }
+// }
+// class AssetPH extends Asset {
+//     private _phAsset: PHAsset;
+//     private static _uriRequestOptions: PHImageRequestOptions;
+//     constructor(album: AlbumPH, phAsset: PHAsset, options?: ImageOptions) {
+//         super(album, phAsset);
+//         this._phAsset = phAsset;
+//         this._initializeOptions(options);
+//     }
+//     /**
+//      * Gets the underlying iOS PHAsset instance.
+//      */
+//     public get ios(): any {
+//         return this._phAsset;
+//     }
+//     get uri(): string {
+//         return this._phAsset.localIdentifier.toString();
+//     }
+//     private _initializeOptions(options: ImageOptions): void {
+//         if (options) {
+//             this.options = {
+//                 width: options.maxWidth && options.maxWidth < IMAGE_WIDTH ? options.maxWidth : IMAGE_WIDTH,
+//                 height: options.maxHeight && options.maxHeight < IMAGE_HEIGHT ? options.maxHeight : IMAGE_HEIGHT,
+//                 keepAspectRatio: true
+//             };
+//         } else {
+//             this.options = {
+//                 width: IMAGE_WIDTH,
+//                 height: IMAGE_HEIGHT,
+//                 keepAspectRatio: true
+//             };
+//         }
+//     }
+//     getImage(options?: ImageOptions): Promise<image_source.ImageSource> {
+//         return (<ImagePickerPH>(<AlbumPH>this.album).imagePicker).createPHImage(this._phAsset, options);
+//     }
+//     getImageData(): Promise<ArrayBuffer> {
+//         return this.data().then((data: NSData) => {
+//             return (<any>interop).bufferFromData(data);
+//         });
+//     }
+//     get fileUri(): string {
+//         if (!AssetPH._uriRequestOptions) {
+//             AssetPH._uriRequestOptions = PHImageRequestOptions.alloc().init();
+//             AssetPH._uriRequestOptions.synchronous = true;
+//         }
+//         let uri;
+//         PHImageManager.defaultManager().requestImageDataForAssetOptionsResultHandler(this._phAsset, AssetPH._uriRequestOptions, (data, uti, orientation, info) => {
+//             uri = info.objectForKey("PHImageFileURLKey");
+//         });
+//         if (uri) {
+//             return uri.toString();
+//         }
+//         return undefined;
+//     }
+//     data(): Promise<any> {
+//         return new Promise((resolve, reject) => {
+//             let runloop = CFRunLoopGetCurrent();
+//             PHImageManager.defaultManager().requestImageDataForAssetOptionsResultHandler(this._phAsset, null, (data, dataUTI, orientation, info) => {
+//                 if (data) {
+//                     resolve(data);
+//                 } else {
+//                     reject(new Error("Failed to get image data."));
+//                 }
+//             });
+//         });
+//     }
+// }
\ No newline at end of file
diff --git a/src/platforms/android/nativescript_imagepicker.aar b/src/platforms/android/nativescript_imagepicker.aar
new file mode 100644
index 0000000000000000000000000000000000000000..6d54ca01154c17659c8635aab0293886360d853a
GIT binary patch
literal 1454
zcmWIWW@h1HVBp|jke*!b!*MeE#eD__hFnGl24NuWn3qzNpPAyDn3tKBT3n)6k(-k{
z!9V-30ngF*KShpxzxA3gxkW{_Wa0FSj#0<*4&KPhiur%A=(OFxP1jy(_?W-^`{hFL
z)?eGyiyAv_?VhD~Q&{!ElJHx-rnbuuKbpF3)}l>^UNR>r3BTJQ;^(?P)VE)=byD#Z
z_YF*u^Ne5WiXZ&IapH52SjsAeC4$OVt{k6eIq?f?fSc?kXX6ZOM@MhwkK3mEo~n6y
zYxT+GpX;}YiWN;-wu9-aB%}C>GqS!)eG|$~)toyyKVIV@e@#P%>AzLqP0P2=bN<J;
z=KZbh3xD4#|GTYLzU+7ZzPlynhr7=2&#q$#Knaftg)blIGBGgB0Ag-ncqHc}78j=$
z>t!Vtaeqil6HI*Y;6Xw{LO_ZG+clm=JU?Au{;KR$ote7w=t<X^tg0Gwew?{;<ja+&
zGf&=JQL0^j>C7CF=YRHWIa9Lt$($pP9$gTKV=GJf{BLej!VK$^*8ev(ANcrx`u87a
zHf5K5n)W|v$ANDhr@P!4b%Xmp<W?;bv#`v%_@(D~)%zQL-%sl7zc0Jy)c5HN-5#Il
zoiKG8tA6nIH|zfd&kGCt|2<yyKl8JF!RkWOx8D){b?ji3h59nTk4+hmygav^7SxfR
z`u~hgaK^F1U)lG*=5F5iZuhK{>o4z7T>t;XE$*#NqM^TP75Sf~g;iwFc>VI;v>%)H
zpPBx>-22kY(rd*#D{n^cn)G-dhv_m|^B<W@ba(7YuV3@`bLhF(b-IZ{Ys0IH{IBg=
zdaUC77O{&N*L=5K`m-|p$lS+QlcKNHP7sZ`sbv5BIlp<l-_PxA^Y>ZEREj<;zkc|8
zVC|u%<aRY~`?a&}KHlRw`+xJi|IyoySKM>@SnT!iwv$-y?5mPimCMRpAAgy4`jxi%
z{py<YuRa`^^u)RC-on}I<Nm(ad|~?W^d(8xll5E5+-kR;?JBrY;&d`+QT5~4>#1vk
z(`MW{qc<-yvm)Zl%^<nj$6q;@KHqeH&%B?DZ|Ge(@yqP}cJWzf)=pll|7Erf@7|-^
zzRZ64Hu!twk-W;Q@pEz~{he)pVD{YPO<OCx<dvD7wS}3T8_bm_b1*BJDx8iq{$R9#
zsp}G(wn}cpC6@+sZRw7)94)C1v)Vb2Fr%d^U_xR5CMYmq1(J!GDLMN16tRO80TW(H
zF<xaXKxJ8ZnFQ4orQ$aS<ffd=B#0tLCJ|=b1q4tf7%XW7QCNzL0B=+S&~p?-I|IX#
zMgd@%gOtC}HG&i(2O3190K;3yG-hZJ;?n{OLWGuXkQPXQ;?o2QP=uyUKuw_FC0@rh
kpbk)A<I@2OY=j-ZfI7fIAK=Z(1`=im!b)Js$b;Pi0Kc;lG5`Po

literal 0
HcmV?d00001

diff --git a/src/platforms/ios/Podfile b/src/platforms/ios/Podfile
new file mode 100644
index 0000000..fda2376
--- /dev/null
+++ b/src/platforms/ios/Podfile
@@ -0,0 +1,12 @@
+platform :ios, '8.0'
+
+pod 'QBImagePickerController', '~> 3.4.0'
+pod "BSImagePicker", "~> 2.4"
+
+post_install do |installer|
+    installer.pods_project.targets.each do |target|
+        target.build_configurations.each do |config|
+            config.build_settings['SWIFT_VERSION'] = '3.0'
+        end
+    end
+  end    
\ No newline at end of file
diff --git a/src/references.d.ts b/src/references.d.ts
index 1e5e961..f2bfebf 100644
--- a/src/references.d.ts
+++ b/src/references.d.ts
@@ -1,2 +1,4 @@
 /// <reference path="./node_modules/tns-platform-declarations/ios.d.ts" />
 /// <reference path="./node_modules/tns-platform-declarations/android.d.ts" />
+/// <reference path="./typings/objc!QBImagePickerController.d.ts" />
+/// <reference path="./typings/objc!BSImagePicker.d.ts" />
diff --git a/src/typings/objc!BSImagePicker.d.ts b/src/typings/objc!BSImagePicker.d.ts
new file mode 100644
index 0000000..eec3430
--- /dev/null
+++ b/src/typings/objc!BSImagePicker.d.ts
@@ -0,0 +1,37 @@
+
+declare var BSImagePickerVersionNumber: number;
+
+declare var BSImagePickerVersionString: interop.Reference<number>;
+
+declare class BSImagePickerViewController extends UINavigationController {
+
+	static alloc(): BSImagePickerViewController; // inherited from NSObject
+
+	static new(): BSImagePickerViewController; // inherited from NSObject
+
+	albumButton: UIButton;
+
+	cancelButton: UIBarButtonItem;
+
+	cellsPerRow: (p1: UIUserInterfaceSizeClass, p2: UIUserInterfaceSizeClass) => number;
+
+	defaultSelections: PHFetchResult<PHAsset>;
+
+	doneButton: UIBarButtonItem;
+
+	fetchResults: NSArray<PHFetchResult<PHAssetCollection>>;
+
+	maxNumberOfSelections: number;
+
+	selectionFillColor: UIColor;
+
+	selectionShadowColor: UIColor;
+
+	selectionStrokeColor: UIColor;
+
+	selectionTextAttributes: NSDictionary<string, any>;
+
+	takePhotoIcon: UIImage;
+
+	takePhotos: boolean;
+}
diff --git a/src/typings/objc!QBImagePickerController.d.ts b/src/typings/objc!QBImagePickerController.d.ts
new file mode 100644
index 0000000..e79143d
--- /dev/null
+++ b/src/typings/objc!QBImagePickerController.d.ts
@@ -0,0 +1,231 @@
+
+declare class QBAlbumCell extends UITableViewCell {
+
+	static alloc(): QBAlbumCell; // inherited from NSObject
+
+	static appearance(): QBAlbumCell; // inherited from UIAppearance
+
+	static appearanceForTraitCollection(trait: UITraitCollection): QBAlbumCell; // inherited from UIAppearance
+
+	static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBAlbumCell; // inherited from UIAppearance
+
+	static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBAlbumCell; // inherited from UIAppearance
+
+	static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBAlbumCell; // inherited from UIAppearance
+
+	static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBAlbumCell; // inherited from UIAppearance
+
+	static new(): QBAlbumCell; // inherited from NSObject
+
+	borderWidth: number;
+
+	countLabel: UILabel;
+
+	imageView1: UIImageView;
+
+	imageView2: UIImageView;
+
+	imageView3: UIImageView;
+
+	titleLabel: UILabel;
+}
+
+declare class QBAlbumsViewController extends UITableViewController {
+
+	static alloc(): QBAlbumsViewController; // inherited from NSObject
+
+	static new(): QBAlbumsViewController; // inherited from NSObject
+
+	imagePickerController: QBImagePickerController;
+}
+
+declare class QBAssetCell extends UICollectionViewCell {
+
+	static alloc(): QBAssetCell; // inherited from NSObject
+
+	static appearance(): QBAssetCell; // inherited from UIAppearance
+
+	static appearanceForTraitCollection(trait: UITraitCollection): QBAssetCell; // inherited from UIAppearance
+
+	static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBAssetCell; // inherited from UIAppearance
+
+	static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBAssetCell; // inherited from UIAppearance
+
+	static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBAssetCell; // inherited from UIAppearance
+
+	static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBAssetCell; // inherited from UIAppearance
+
+	static new(): QBAssetCell; // inherited from NSObject
+
+	imageView: UIImageView;
+
+	showsOverlayViewWhenSelected: boolean;
+
+	videoIndicatorView: QBVideoIndicatorView;
+}
+
+declare class QBAssetsViewController extends UICollectionViewController {
+
+	static alloc(): QBAssetsViewController; // inherited from NSObject
+
+	static new(): QBAssetsViewController; // inherited from NSObject
+
+	assetCollection: PHAssetCollection;
+
+	imagePickerController: QBImagePickerController;
+}
+
+declare class QBCheckmarkView extends UIView {
+
+	static alloc(): QBCheckmarkView; // inherited from NSObject
+
+	static appearance(): QBCheckmarkView; // inherited from UIAppearance
+
+	static appearanceForTraitCollection(trait: UITraitCollection): QBCheckmarkView; // inherited from UIAppearance
+
+	static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBCheckmarkView; // inherited from UIAppearance
+
+	static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBCheckmarkView; // inherited from UIAppearance
+
+	static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBCheckmarkView; // inherited from UIAppearance
+
+	static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBCheckmarkView; // inherited from UIAppearance
+
+	static new(): QBCheckmarkView; // inherited from NSObject
+
+	bodyColor: UIColor;
+
+	borderColor: UIColor;
+
+	borderWidth: number;
+
+	checkmarkColor: UIColor;
+
+	checkmarkLineWidth: number;
+}
+
+declare class QBImagePickerController extends UIViewController {
+
+	static alloc(): QBImagePickerController; // inherited from NSObject
+
+	static new(): QBImagePickerController; // inherited from NSObject
+
+	allowsMultipleSelection: boolean;
+
+	assetCollectionSubtypes: NSArray<any>;
+
+	delegate: QBImagePickerControllerDelegate;
+
+	maximumNumberOfSelection: number;
+
+	mediaType: QBImagePickerMediaType;
+
+	minimumNumberOfSelection: number;
+
+	numberOfColumnsInLandscape: number;
+
+	numberOfColumnsInPortrait: number;
+
+	prompt: string;
+
+	readonly selectedAssets: NSMutableOrderedSet<any>;
+
+	showsNumberOfSelectedAssets: boolean;
+}
+
+interface QBImagePickerControllerDelegate extends NSObjectProtocol {
+
+	qb_imagePickerControllerDidCancel?(imagePickerController: QBImagePickerController): void;
+
+	qb_imagePickerControllerDidDeselectAsset?(imagePickerController: QBImagePickerController, asset: PHAsset): void;
+
+	qb_imagePickerControllerDidFinishPickingAssets?(imagePickerController: QBImagePickerController, assets: NSArray<any>): void;
+
+	qb_imagePickerControllerDidSelectAsset?(imagePickerController: QBImagePickerController, asset: PHAsset): void;
+
+	qb_imagePickerControllerShouldSelectAsset?(imagePickerController: QBImagePickerController, asset: PHAsset): boolean;
+}
+declare var QBImagePickerControllerDelegate: {
+
+	prototype: QBImagePickerControllerDelegate;
+};
+
+declare var QBImagePickerControllerVersionNumber: number;
+
+declare var QBImagePickerControllerVersionString: interop.Reference<number>;
+
+declare const enum QBImagePickerMediaType {
+
+	Any = 0,
+
+	Image = 1,
+
+	Video = 2
+}
+
+declare class QBSlomoIconView extends UIView {
+
+	static alloc(): QBSlomoIconView; // inherited from NSObject
+
+	static appearance(): QBSlomoIconView; // inherited from UIAppearance
+
+	static appearanceForTraitCollection(trait: UITraitCollection): QBSlomoIconView; // inherited from UIAppearance
+
+	static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBSlomoIconView; // inherited from UIAppearance
+
+	static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBSlomoIconView; // inherited from UIAppearance
+
+	static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBSlomoIconView; // inherited from UIAppearance
+
+	static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBSlomoIconView; // inherited from UIAppearance
+
+	static new(): QBSlomoIconView; // inherited from NSObject
+
+	iconColor: UIColor;
+}
+
+declare class QBVideoIconView extends UIView {
+
+	static alloc(): QBVideoIconView; // inherited from NSObject
+
+	static appearance(): QBVideoIconView; // inherited from UIAppearance
+
+	static appearanceForTraitCollection(trait: UITraitCollection): QBVideoIconView; // inherited from UIAppearance
+
+	static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBVideoIconView; // inherited from UIAppearance
+
+	static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBVideoIconView; // inherited from UIAppearance
+
+	static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBVideoIconView; // inherited from UIAppearance
+
+	static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBVideoIconView; // inherited from UIAppearance
+
+	static new(): QBVideoIconView; // inherited from NSObject
+
+	iconColor: UIColor;
+}
+
+declare class QBVideoIndicatorView extends UIView {
+
+	static alloc(): QBVideoIndicatorView; // inherited from NSObject
+
+	static appearance(): QBVideoIndicatorView; // inherited from UIAppearance
+
+	static appearanceForTraitCollection(trait: UITraitCollection): QBVideoIndicatorView; // inherited from UIAppearance
+
+	static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBVideoIndicatorView; // inherited from UIAppearance
+
+	static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBVideoIndicatorView; // inherited from UIAppearance
+
+	static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBVideoIndicatorView; // inherited from UIAppearance
+
+	static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBVideoIndicatorView; // inherited from UIAppearance
+
+	static new(): QBVideoIndicatorView; // inherited from NSObject
+
+	slomoIcon: QBSlomoIconView;
+
+	timeLabel: UILabel;
+
+	videoIcon: QBVideoIconView;
+}

From a5d6466cecd6411f04c74e153704c58fd229b2e4 Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Mon, 2 Apr 2018 18:23:05 +0300
Subject: [PATCH 04/20] chore: clean-up image picker implementation in ios,
 make the demo fully work as previous implementation

---
 demo/app/main-page.xml      |   4 +-
 demo/app/main-view-model.ts |   6 ++
 demo/package.json           |   4 +-
 src/imagepicker.ios.ts      | 178 ++++++++++++------------------------
 4 files changed, 66 insertions(+), 126 deletions(-)

diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
index 861f5b7..24e9432 100644
--- a/demo/app/main-page.xml
+++ b/demo/app/main-page.xml
@@ -6,14 +6,14 @@
         <ListView items="{{ imageAssets }}">
             <ListView.itemTemplate>
                 <GridLayout columns="94, *" rows="*, *">
-                    <Image rowSpan="2" width="80" height="80" src="{{ $value }}" />
+                    <Image rowSpan="2" width="80" height="80" src="{{ $value }}" stretch="fill" />
                     <Label col="1" text="{{ uri }}" />
                     <Label col="1" row="1" text="{{ fileUri }}" />
                 </GridLayout>
             </ListView.itemTemplate>
         </ListView>
 
-        <Image src="{{ imageSrc }}" width="200" height="200" stretch="fill" />
+        <Image src="{{ imageSrc }}" width="300" height="300" stretch="aspectFit" />
         <Button row="1" text="Pick Single" tap="{{ onSelectSingleTap }}" horizontalAlignment="center" />
         <Button row="2" text="Pick Multiple" tap="{{ onSelectMultipleTap }}" horizontalAlignment="center" />
     </GridLayout>
diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
index c9a0b49..d9eab07 100644
--- a/demo/app/main-view-model.ts
+++ b/demo/app/main-view-model.ts
@@ -52,7 +52,13 @@ export class MainViewModel extends Observable {
                 return context.present();
             })
             .then((selection) => { // returns SelectedAsset[]
+                console.log("Selection done: " + JSON.stringify(selection));
+                // selection[0].options = {};
+                // selection[0].options.width = 10;
+                // selection[0].options.height = 10;
+                // selection[0].options.keepAspectRatio = true;
                 this.imageSrc = isSingle && selection.length > 0 ? selection[0] : null;
+
                 this.imageAssets = selection;
 
                 console.log("Selection done:");
diff --git a/demo/package.json b/demo/package.json
index d3ce849..942ca6a 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -2,7 +2,7 @@
   "nativescript": {
     "id": "org.nativescript.imagepickerdemo",
     "tns-android": {
-      "version": "3.4.0"
+      "version": "3.4.2"
     },
     "tns-ios": {
       "version": "3.4.1"
@@ -12,7 +12,7 @@
     "nativescript-imagepicker": "../src",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "^0.3.4",
-    "tns-core-modules": "^3.4.0"
+    "tns-core-modules": "^4.0.0-2018-03-27-02"
   },
   "devDependencies": {
     "@types/chai": "^4.0.2",
diff --git a/src/imagepicker.ios.ts b/src/imagepicker.ios.ts
index 8ab1d8f..b35f96e 100644
--- a/src/imagepicker.ios.ts
+++ b/src/imagepicker.ios.ts
@@ -17,116 +17,64 @@ if (global.TNS_WEBPACK) {
 const IMAGE_WIDTH = 80;
 const IMAGE_HEIGHT = 80;
 
-interface ImageOptions {
-    maxWidth?: number;
-    maxHeight?: number;
-    aspectRatio?: "fill" | "fit";
-}
-
-// export function create(options?): BSImagePicker {
-//     // return new ImagePickerPH(options);
-
-//     // return new ImagePicker1(options);
-//     return new BSImagePicker(options);
-// }
-
-
-
-// export class BSImagePicker extends data_observable.Observable {
-//     protected _page: ui_view_controller.Page;
-
-//     constructor(options) {
-//         super();
-//         let page = new ui_view_controller.Page();
-
-//         const pageUIViewController = page.ios;
-
-//         let imagePickerController = BSImagePickerViewController.alloc().init();
-//         imagePickerController.delegate = pageUIViewController;
-//         // imagePickerController.allowsMultipleSelection = options.mode === 'multiple';
-//         // imagePickerController.maximumNumberOfSelection = 10;
-//         // imagePickerController.showsNumberOfSelectedAssets = true;
-
-//         page.on(
-//             'navigatingTo', (data) => {
-//                 (<ui_view_controller.Page>data.object).ios.presentViewControllerAnimatedCompletion(imagePickerController, true, null);
-//             }
-//         );
-//         this._page = page;
-//     }
-
-//     authorize(): Promise<void> {
-//         console.log("authorizing...");
-
-//         return new Promise<void>((resolve, reject) => {
-//             let runloop = CFRunLoopGetCurrent();
-//             PHPhotoLibrary.requestAuthorization(function (result) {
-//                 if (result === PHAuthorizationStatus.Authorized) {
-//                     resolve();
-//                 } else {
-//                     reject(new Error("Authorization failed. Status: " + result));
-//                 }
-//             });
-//         });
-//     }
-
-//     present() {
-//         return new Promise<void>((resolve, reject) => {
-//             frame.topmost().navigate(() => {
-//                 return this._page;
-//             });
-//             resolve();
-//         });
-//     }
+// interface ImageOptions {
+//     maxWidth?: number;
+//     maxHeight?: number;
+//     aspectRatio?: "fill" | "fit";
 // }
 
 export function create(options?): QBImagePicker {
-    // return new ImagePickerPH(options);
-
-    // return new ImagePicker1(options);
     return new QBImagePicker(options);
 }
 
 export class ImagePickerControllerDelegate extends NSObject implements QBImagePickerControllerDelegate {
+    _resolve: any;
     qb_imagePickerControllerDidCancel?(imagePickerController: QBImagePickerController): void {
-        imagePickerController.dismissViewControllerAnimatedCompletion(true, null);
-    }
-    qb_imagePickerControllerDidDeselectAsset?(imagePickerController: QBImagePickerController, asset: PHAsset): void {
-        console.log("qb_imagePickerControllerDidDeselectAsset");
+        imagePickerController.dismissViewControllerAnimatedCompletion(true, () => {
+            console.log("qb_imagePickerControllerDidCancel completion");
+        });
     }
     qb_imagePickerControllerDidFinishPickingAssets?(imagePickerController: QBImagePickerController, assets: NSArray<any>): void {
         console.log("qb_imagePickerControllerDidFinishPickingAssets");
-        imagePickerController.dismissViewControllerAnimatedCompletion(true, null);
-    }
-    qb_imagePickerControllerDidSelectAsset?(imagePickerController: QBImagePickerController, asset: PHAsset): void {
-        console.log("qb_imagePickerControllerDidSelectAsset " + asset);
-    }
-    qb_imagePickerControllerShouldSelectAsset?(imagePickerController: QBImagePickerController, asset: PHAsset): boolean {
-        console.log("qb_imagePickerControllerShouldSelectAsset " + asset);
-        return true;
+        let assetPHs = [];
+        // foreach of selected items
+        for (let i = 0; i < assets.count; i++) {
+            let asset = assets[i];
+            let assetPH = new AssetPH(asset);
+            assetPHs.push(assetPH);
+            // assetPHs.push(assets);
+        }
+        this._resolve(assetPHs);
+
+        imagePickerController.dismissViewControllerAnimatedCompletion(true, () => {
+            console.log("qb_imagePickerControllerDidFinishPickingAssets completion");
+        });
     }
 
     public static ObjCProtocols = [QBImagePickerControllerDelegate];
 
     static new(): ImagePickerControllerDelegate {
-        console.log('static new DelegateImpl');
         return <ImagePickerControllerDelegate>super.new(); // calls new() on the NSObject
     }
 }
 
 export class QBImagePicker extends data_observable.Observable {
-    _imagePC: QBImagePickerController;
+    _imagePickerController: QBImagePickerController;
+    _imagePickerControllerDelegate: ImagePickerControllerDelegate;
 
     constructor(options) {
         super();
 
+        this._imagePickerControllerDelegate = new ImagePickerControllerDelegate();
+        // imagePickerControllerDelegate
+
         let imagePickerController = QBImagePickerController.alloc().init();
-        imagePickerController.delegate = new ImagePickerControllerDelegate();
+        imagePickerController.delegate = this._imagePickerControllerDelegate; // new ImagePickerControllerDelegate();
         imagePickerController.allowsMultipleSelection = options.mode === 'multiple';
         imagePickerController.maximumNumberOfSelection = 4;
         imagePickerController.showsNumberOfSelectedAssets = true;
 
-        this._imagePC = imagePickerController;
+        this._imagePickerController = imagePickerController;
     }
 
     authorize(): Promise<void> {
@@ -146,59 +94,45 @@ export class QBImagePicker extends data_observable.Observable {
 
     present() {
         return new Promise<void>((resolve, reject) => {
-            frame.topmost().ios.controller.presentViewControllerAnimatedCompletion(this._imagePC, true, null);
+            this._imagePickerControllerDelegate._resolve = resolve;
+
+
+            frame.topmost().ios.controller.presentViewControllerAnimatedCompletion(this._imagePickerController, true, null);
             // resolve();
         });
     }
 }
 
-// export class ImagePicker1 extends data_observable.Observable {
-//     protected _page: ui_view_controller.Page;
-
-//     constructor(options) {
-//         debugger;
-//         console.log("options...: " + JSON.stringify(options));
+export class AssetPH extends imageAssetModule.ImageAsset {
+    private static _uriRequestOptions: PHImageRequestOptions;
 
-//         super();
-//         let page = new ui_view_controller.Page();
+    constructor(phAsset: PHAsset, options?) {
+        super(phAsset);
+        this.options = {};
+    }
 
-//         const pageUIViewController = page.ios;
-//         let imagePickerController = UIImagePickerController.alloc().init();
-//         imagePickerController.delegate = pageUIViewController;
-//         imagePickerController.sourceType = UIImagePickerControllerSourceType.PhotoLibrary;
-//         page.on(
-//             'navigatingTo', (data) => {
-//                 (<ui_view_controller.Page>data.object).ios.presentViewControllerAnimatedCompletion(imagePickerController, true, null);
-//             }
-//         );
-//         this._page = page;
-//     }
+    get uri(): string {
+        return this.ios.localIdentifier.toString();
+    }
 
-//     authorize(): Promise<void> {
-//         console.log("authorizing...");
+    get fileUri(): string {
+        if (!AssetPH._uriRequestOptions) {
+            AssetPH._uriRequestOptions = PHImageRequestOptions.alloc().init();
+            AssetPH._uriRequestOptions.synchronous = true;
+        }
 
-//         return new Promise<void>((resolve, reject) => {
-//             let runloop = CFRunLoopGetCurrent();
-//             PHPhotoLibrary.requestAuthorization(function (result) {
-//                 if (result === PHAuthorizationStatus.Authorized) {
-//                     resolve();
-//                 } else {
-//                     reject(new Error("Authorization failed. Status: " + result));
-//                 }
-//             });
-//         });
-//     }
+        let uri;
+        PHImageManager.defaultManager().requestImageDataForAssetOptionsResultHandler(this.ios, AssetPH._uriRequestOptions, (data, uti, orientation, info) => {
+            uri = info.objectForKey("PHImageFileURLKey");
+        });
 
-//     present() {
-//         return new Promise<void>((resolve, reject) => {
-//             frame.topmost().navigate(() => {
-//                 return this._page;
-//             });
-//             resolve();
-//         });
-//     }
-// }
+        if (uri) {
+            return uri.toString();
+        }
 
+        return undefined;
+    }
+}
 
 // export class ImagePicker extends data_observable.Observable {
 //     private _selection: data_observablearray.ObservableArray<Asset>;

From 8eb01ae944ba39930ae030fdd8233a79bcc79356 Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Tue, 3 Apr 2018 18:13:21 +0300
Subject: [PATCH 05/20] refactor: delete unused/unneeded code from ios and
 android implementations, equalize class names, fix ios aspect ratio in core
 modules versions smaller than 4

---
 demo/app/main-view-model.ts |   4 -
 src/imagepicker.android.ts  | 167 -------------
 src/imagepicker.ios.ts      | 481 +++---------------------------------
 src/platforms/ios/Podfile   |  11 +-
 4 files changed, 36 insertions(+), 627 deletions(-)

diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
index d9eab07..a316e60 100644
--- a/demo/app/main-view-model.ts
+++ b/demo/app/main-view-model.ts
@@ -53,10 +53,6 @@ export class MainViewModel extends Observable {
             })
             .then((selection) => { // returns SelectedAsset[]
                 console.log("Selection done: " + JSON.stringify(selection));
-                // selection[0].options = {};
-                // selection[0].options.width = 10;
-                // selection[0].options.height = 10;
-                // selection[0].options.keepAspectRatio = true;
                 this.imageSrc = isSingle && selection.length > 0 ? selection[0] : null;
 
                 this.imageAssets = selection;
diff --git a/src/imagepicker.android.ts b/src/imagepicker.android.ts
index 4c57629..985bb97 100644
--- a/src/imagepicker.android.ts
+++ b/src/imagepicker.android.ts
@@ -1,71 +1,10 @@
-import * as observable from "tns-core-modules/data/observable";
-import * as imagesource from "tns-core-modules/image-source";
 import * as application from "tns-core-modules/application";
-import * as platform from "tns-core-modules/platform";
 import * as imageAssetModule from "tns-core-modules/image-asset";
 import * as permissions from "nativescript-permissions";
 
-interface ArrayBufferStatic extends ArrayBufferConstructor {
-    from(buffer: java.nio.ByteBuffer): ArrayBuffer;
-}
-
 export class SelectedAsset extends imageAssetModule.ImageAsset {
-    private _uri: android.net.Uri;
-    private _thumbAsset: imageAssetModule.ImageAsset;
-    private _fileUri: string;
-    private _data: ArrayBuffer;
-
     constructor(uri: android.net.Uri) {
         super(SelectedAsset._calculateFileUri(uri));
-        this._uri = uri;
-    }
-
-    data(): Promise<any> {
-        return Promise.reject(new Error("Not implemented."));
-    }
-
-    getImage(options?: { maxWidth: number, maxHeight: number }): Promise<imagesource.ImageSource> {
-        return new Promise<imagesource.ImageSource>((resolve, reject) => {
-            try {
-                resolve(this.decodeUri(this._uri, options));
-            } catch (ex) {
-                reject(ex);
-            }
-        });
-    }
-
-    getImageData(): Promise<ArrayBuffer> {
-        return new Promise<ArrayBuffer>((resolve, reject) => {
-            try {
-                if (!this._data) {
-                    let bb = this.getByteBuffer(this._uri);
-                    this._data = (<ArrayBufferStatic>ArrayBuffer).from(bb);
-                }
-                resolve(this._data);
-            } catch (ex) {
-                reject(ex);
-            }
-        });
-    }
-
-    get thumbAsset(): imageAssetModule.ImageAsset {
-        return this._thumbAsset;
-    }
-
-    protected setThumbAsset(value: imageAssetModule.ImageAsset): void {
-        this._thumbAsset = value;
-        this.notifyPropertyChange("thumbAsset", value);
-    }
-
-    get uri(): string {
-        return this._uri.toString();
-    }
-
-    get fileUri(): string {
-        if (!this._fileUri) {
-            this._fileUri = SelectedAsset._calculateFileUri(this._uri);
-        }
-        return this._fileUri;
     }
 
     private static _calculateFileUri(uri: android.net.Uri) {
@@ -132,7 +71,6 @@ export class SelectedAsset extends imageAssetModule.ImageAsset {
     }
 
     private static getDataColumn(uri: android.net.Uri, selection, selectionArgs) {
-
         let cursor = null;
         let columns = [android.provider.MediaStore.MediaColumns.DATA];
         let filePath;
@@ -171,111 +109,6 @@ export class SelectedAsset extends imageAssetModule.ImageAsset {
         return "com.android.providers.media.documents" === uri.getAuthority();
     }
 
-    private decodeThumbAssetUri(): void {
-        // Decode image size
-        let REQUIRED_SIZE = {
-            maxWidth: 100,
-            maxHeight: 100
-        };
-
-        // Decode with scale
-        this._thumbAsset = this.decodeUriForImageAsset(this._uri, REQUIRED_SIZE);
-        this.notifyPropertyChange("thumbAsset", this._thumbAsset);
-    }
-
-    /**
-     * Discovers the sample size that a BitmapFactory.Options object should have
-     * to scale the retrieved image to the given max size.
-     * @param uri The URI of the image that should be scaled.
-     * @param options The options that should be used to produce the correct image scale.
-     */
-    private getSampleSize(uri: android.net.Uri, options?: { maxWidth: number, maxHeight: number }): number {
-        let boundsOptions = new android.graphics.BitmapFactory.Options();
-        boundsOptions.inJustDecodeBounds = true;
-        android.graphics.BitmapFactory.decodeStream(this.openInputStream(uri), null, boundsOptions);
-
-        // Find the correct scale value. It should be the power of 2.
-        let outWidth = boundsOptions.outWidth;
-        let outHeight = boundsOptions.outHeight;
-        let scale = 1;
-        if (options) {
-            // TODO: Refactor to accomodate different scaling options
-            //       Right now, it just selects the smallest of the two sizes
-            //       and scales the image proportionally to that.
-            let targetSize = !options.maxWidth && options.maxHeight ? options.maxHeight :
-                (!options.maxHeight && options.maxWidth ? options.maxWidth :
-                    (options.maxWidth < options.maxHeight ? options.maxWidth : options.maxHeight));
-            if (targetSize) {
-                while (!(this.matchesSize(targetSize, outWidth) ||
-                    this.matchesSize(targetSize, outHeight))) {
-                    outWidth /= 2;
-                    outHeight /= 2;
-                    scale *= 2;
-                }
-            }
-        }
-        return scale;
-    }
-
-    private matchesSize(targetSize: number, actualSize: number): boolean {
-        return targetSize && actualSize / 2 < targetSize;
-    }
-
-    /**
-     * Decodes the given URI using the given options.
-     * @param uri The URI that should be decoded into an ImageSource.
-     * @param options The options that should be used to decode the image.
-     */
-    private decodeUri(uri: android.net.Uri, options?: { maxWidth: number, maxHeight: number }): imagesource.ImageSource {
-        let downsampleOptions = new android.graphics.BitmapFactory.Options();
-        downsampleOptions.inSampleSize = this.getSampleSize(uri, options);
-        let bitmap = android.graphics.BitmapFactory.decodeStream(this.openInputStream(uri), null, downsampleOptions);
-        let image = new imagesource.ImageSource();
-        image.setNativeSource(bitmap);
-        return image;
-    }
-
-    /**
-     * Decodes the given URI using the given options.
-     * @param uri The URI that should be decoded into an ImageAsset.
-     * @param options The options that should be used to decode the image.
-     */
-    private decodeUriForImageAsset(uri: android.net.Uri, options?: { maxWidth: number, maxHeight: number }): imageAssetModule.ImageAsset {
-        let downsampleOptions = new android.graphics.BitmapFactory.Options();
-        downsampleOptions.inSampleSize = this.getSampleSize(uri, options);
-        let bitmap = android.graphics.BitmapFactory.decodeStream(this.openInputStream(uri), null, downsampleOptions);
-        return new imageAssetModule.ImageAsset(bitmap);
-    }
-
-    /**
-     * Retrieves the raw data of the given file and exposes it as a byte buffer.
-     */
-    private getByteBuffer(uri: android.net.Uri): java.nio.ByteBuffer {
-        let file: android.content.res.AssetFileDescriptor = null;
-        try {
-            file = SelectedAsset.getContentResolver().openAssetFileDescriptor(uri, "r");
-
-            // Determine how many bytes to allocate in memory based on the file length
-            let length: number = file.getLength();
-            let buffer: java.nio.ByteBuffer = java.nio.ByteBuffer.allocateDirect(length);
-            let bytes = buffer.array();
-            let stream = file.createInputStream();
-
-            // Buffer the data in 4KiB amounts
-            let reader = new java.io.BufferedInputStream(stream, 4096);
-            reader.read(bytes, 0, bytes.length);
-            return buffer;
-        } finally {
-            if (file) {
-                file.close();
-            }
-        }
-    }
-
-    private openInputStream(uri: android.net.Uri): java.io.InputStream {
-        return SelectedAsset.getContentResolver().openInputStream(uri);
-    }
-
     private static getContentResolver(): android.content.ContentResolver {
         return application.android.nativeApp.getContentResolver();
     }
diff --git a/src/imagepicker.ios.ts b/src/imagepicker.ios.ts
index b35f96e..d878b41 100644
--- a/src/imagepicker.ios.ts
+++ b/src/imagepicker.ios.ts
@@ -1,78 +1,38 @@
 import * as data_observable from "tns-core-modules/data/observable";
-import * as data_observablearray from "tns-core-modules/data/observable-array";
 import * as frame from "tns-core-modules/ui/frame";
 import * as imageAssetModule from "tns-core-modules/image-asset";
-import * as image_source from "tns-core-modules/image-source";
-import * as ui_view_controller from "tns-core-modules/ui/page/page";
 
-let albumsModule;
-if (global.TNS_WEBPACK) {
-    albumsModule = require("./albums.ios");
-
-    require("bundle-entry-points");
-} else {
-    albumsModule = require("./albums");
+interface ImagePickerOptions {
+    mode?: string;
+    maxImagesToPick?: number;
+    showSelectedImagesCount?: boolean;
 }
 
-const IMAGE_WIDTH = 80;
-const IMAGE_HEIGHT = 80;
-
-// interface ImageOptions {
-//     maxWidth?: number;
-//     maxHeight?: number;
-//     aspectRatio?: "fill" | "fit";
-// }
-
-export function create(options?): QBImagePicker {
-    return new QBImagePicker(options);
-}
+export class SelectedAsset extends imageAssetModule.ImageAsset {
+    constructor(phAsset: PHAsset, options?) {
+        super(phAsset);
 
-export class ImagePickerControllerDelegate extends NSObject implements QBImagePickerControllerDelegate {
-    _resolve: any;
-    qb_imagePickerControllerDidCancel?(imagePickerController: QBImagePickerController): void {
-        imagePickerController.dismissViewControllerAnimatedCompletion(true, () => {
-            console.log("qb_imagePickerControllerDidCancel completion");
-        });
-    }
-    qb_imagePickerControllerDidFinishPickingAssets?(imagePickerController: QBImagePickerController, assets: NSArray<any>): void {
-        console.log("qb_imagePickerControllerDidFinishPickingAssets");
-        let assetPHs = [];
-        // foreach of selected items
-        for (let i = 0; i < assets.count; i++) {
-            let asset = assets[i];
-            let assetPH = new AssetPH(asset);
-            assetPHs.push(assetPH);
-            // assetPHs.push(assets);
+        // this fixes the image aspect ratio in tns-core-modules version < 4.0
+        if (!this.options) {
+            this.options = { keepAspectRatio: true };
         }
-        this._resolve(assetPHs);
-
-        imagePickerController.dismissViewControllerAnimatedCompletion(true, () => {
-            console.log("qb_imagePickerControllerDidFinishPickingAssets completion");
-        });
-    }
-
-    public static ObjCProtocols = [QBImagePickerControllerDelegate];
-
-    static new(): ImagePickerControllerDelegate {
-        return <ImagePickerControllerDelegate>super.new(); // calls new() on the NSObject
     }
 }
 
-export class QBImagePicker extends data_observable.Observable {
+export class ImagePicker extends data_observable.Observable {
     _imagePickerController: QBImagePickerController;
     _imagePickerControllerDelegate: ImagePickerControllerDelegate;
 
-    constructor(options) {
+    constructor(options: ImagePickerOptions) {
         super();
 
         this._imagePickerControllerDelegate = new ImagePickerControllerDelegate();
-        // imagePickerControllerDelegate
 
         let imagePickerController = QBImagePickerController.alloc().init();
-        imagePickerController.delegate = this._imagePickerControllerDelegate; // new ImagePickerControllerDelegate();
+        imagePickerController.delegate = this._imagePickerControllerDelegate;
         imagePickerController.allowsMultipleSelection = options.mode === 'multiple';
-        imagePickerController.maximumNumberOfSelection = 4;
-        imagePickerController.showsNumberOfSelectedAssets = true;
+        imagePickerController.maximumNumberOfSelection = options.maxImagesToPick || 0;
+        imagePickerController.showsNumberOfSelectedAssets = options.showSelectedImagesCount || true;
 
         this._imagePickerController = imagePickerController;
     }
@@ -96,410 +56,39 @@ export class QBImagePicker extends data_observable.Observable {
         return new Promise<void>((resolve, reject) => {
             this._imagePickerControllerDelegate._resolve = resolve;
 
-
             frame.topmost().ios.controller.presentViewControllerAnimatedCompletion(this._imagePickerController, true, null);
-            // resolve();
         });
     }
 }
 
-export class AssetPH extends imageAssetModule.ImageAsset {
-    private static _uriRequestOptions: PHImageRequestOptions;
+export class ImagePickerControllerDelegate extends NSObject implements QBImagePickerControllerDelegate {
+    _resolve: any;
 
-    constructor(phAsset: PHAsset, options?) {
-        super(phAsset);
-        this.options = {};
+    qb_imagePickerControllerDidCancel?(imagePickerController: QBImagePickerController): void {
+        imagePickerController.dismissViewControllerAnimatedCompletion(true, null);
     }
 
-    get uri(): string {
-        return this.ios.localIdentifier.toString();
-    }
+    qb_imagePickerControllerDidFinishPickingAssets?(imagePickerController: QBImagePickerController, iosAssets: NSArray<any>): void {
+        let assets = [];
 
-    get fileUri(): string {
-        if (!AssetPH._uriRequestOptions) {
-            AssetPH._uriRequestOptions = PHImageRequestOptions.alloc().init();
-            AssetPH._uriRequestOptions.synchronous = true;
+        for (let i = 0; i < iosAssets.count; i++) {
+            let asset = new SelectedAsset(iosAssets[i]);
+            assets.push(asset);
         }
 
-        let uri;
-        PHImageManager.defaultManager().requestImageDataForAssetOptionsResultHandler(this.ios, AssetPH._uriRequestOptions, (data, uti, orientation, info) => {
-            uri = info.objectForKey("PHImageFileURLKey");
-        });
+        this._resolve(assets);
 
-        if (uri) {
-            return uri.toString();
-        }
+        imagePickerController.dismissViewControllerAnimatedCompletion(true, null);
+    }
+
+    public static ObjCProtocols = [QBImagePickerControllerDelegate];
 
-        return undefined;
+    static new(): ImagePickerControllerDelegate {
+        return <ImagePickerControllerDelegate>super.new(); // calls new() on the NSObject
     }
 }
 
-// export class ImagePicker extends data_observable.Observable {
-//     private _selection: data_observablearray.ObservableArray<Asset>;
-//     private _albums: data_observablearray.ObservableArray<Album>;
-//     private _resolve;
-//     private _reject;
-//     protected _options;
-//     constructor(options) {
-//         super();
-//         this._selection = new data_observablearray.ObservableArray<Asset>();
-//         this._albums = new data_observablearray.ObservableArray<Album>();
-//         this._options = options;
-//     }
-//     authorize(): Promise<void> {
-//         return Promise.reject(new Error("Not implemented"));
-//     }
-//     present(): Promise<SelectedAsset[]> {
-//         if (this._resolve || this._reject) {
-//             return Promise.reject(new Error("Selection is already in progress..."));
-//         } else {
-//             return new Promise<SelectedAsset[]>((resolve, reject) => {
-//                 this._resolve = resolve;
-//                 this._reject = reject;
-//                 frame.topmost().navigate({
-//                     create: albumsModule.albumsPageFactory,
-//                     context: this
-//                 });
-//             });
-//         }
-//     }
-//     get albums(): data_observablearray.ObservableArray<Album> {
-//         return this._albums;
-//     }
-//     get selection(): data_observablearray.ObservableArray<Asset> {
-//         return this._selection;
-//     }
-//     get doneText(): string {
-//         return this._options && this._options.doneText ? this._options.doneText : "Done";
-//     }
-//     get cancelText(): string {
-//         return this._options && this._options.cancelText ? this._options.cancelText : "Cancel";
-//     }
-//     get albumsText(): string {
-//         return this._options && this._options.albumsText ? this._options.albumsText : "Albums";
-//     }
-//     get mode(): string {
-//         return this._options && this._options.mode && this._options.mode.toLowerCase() === 'single' ? 'single' : 'multiple';
-//     }
-//     get newestFirst(): boolean {
-//         return this._options && !!this._options.newestFirst;
-//     }
-//     cancel(): void {
-//         this.notifyCanceled();
-//     }
-//     done(): void {
-//         this.notifySelection([]);
-//     }
-//     protected notifyCanceled(): void {
-//         if (this._reject) {
-//             this._reject(new Error("Selection canceled."));
-//         }
-//     }
-//     protected notifySelection(results: SelectedAsset[]): void {
-//         if (this._resolve) {
-//             this._resolve(results);
-//         }
-//     }
-// }
-// export class Album extends data_observable.Observable {
-//     private _imagePicker: ImagePicker;
-//     private _assets: data_observablearray.ObservableArray<Asset>;
-//     private _title: string;
-//     private _thumbAsset: imageAssetModule.ImageAsset;
-//     constructor(imagePicker: ImagePicker, title: string) {
-//         super();
-//         this._imagePicker = imagePicker;
-//         this._title = title;
-//         this._assets = new data_observablearray.ObservableArray<Asset>();
-//     }
-//     get imagePicker(): ImagePicker {
-//         return this._imagePicker;
-//     }
-//     get title(): string {
-//         return this._title;
-//     }
-//     get assets(): data_observablearray.ObservableArray<Asset> {
-//         return this._assets;
-//     }
-//     get thumbAsset(): imageAssetModule.ImageAsset {
-//         return this._thumbAsset;
-//     }
-//     protected setThumbAsset(value: imageAssetModule.ImageAsset): void {
-//         this._thumbAsset = value;
-//         this.notifyPropertyChange("thumbAsset", value);
-//     }
-// }
-// export class SelectedAsset extends imageAssetModule.ImageAsset {
-//     get uri(): string {
-//         return null;
-//     }
-//     get fileUri(): string {
-//         return null;
-//     }
-//     getImage(options?: ImageOptions): Promise<image_source.ImageSource> {
-//         return Promise.reject(new Error("getImage() is not implemented in SelectedAsset. Derived classes should implement it to be fully functional."));
-//     }
-//     getImageData(): Promise<ArrayBuffer> {
-//         return Promise.reject(new Error("getImageData() is not implemented in SelectedAsset. Derived classes should implement it to be fully functional."));
-//     }
-// }
-// export class Asset extends SelectedAsset {
-//     private _selected: boolean;
-//     private _album: Album;
-//     private _image: image_source.ImageSource;
-//     constructor(album: Album, asset: PHAsset | UIImage) {
-//         super(asset);
-//         this._album = album;
-//         this._image = null;
-//     }
-//     get album(): Album {
-//         return this._album;
-//     }
-//     get selected(): boolean {
-//         return !!this._selected;
-//     }
-//     set selected(value: boolean) {
-//         if (!!value === this.selected) return;
-//         let index = this.album.imagePicker.selection.indexOf(this);
-//         if (value) {
-//             this._selected = true;
-//             if (this.album.imagePicker.mode === "single") {
-//                 if (this.album.imagePicker.selection.length > 0) {
-//                     this.album.imagePicker.selection.getItem(0).selected = false;
-//                 }
-//             }
-//             if (index < 0) {
-//                 this.album.imagePicker.selection.push(this);
-//             }
-//         } else {
-//             delete this._selected;
-//             if (index >= 0) {
-//                 this.album.imagePicker.selection.splice(index, 1);
-//             }
-//         }
-//         this.notifyPropertyChange("selected", this.selected);
-//     }
-//     toggleSelection(args): void {
-//         this.selected = !this.selected;
-//     }
-//     data(): Promise<any> {
-//         return Promise.reject(new Error("Not implemented."));
-//     }
-// }
-// // iOS8+ Photo framework based view model implementation...
-// class ImagePickerPH extends ImagePicker {
-//     private _thumbRequestOptions: PHImageRequestOptions;
-//     private _thumbRequestSize: CGSize;
-//     private _initialized: boolean;
-//     constructor(options) {
-//         super(options);
-//         this._thumbRequestOptions = PHImageRequestOptions.alloc().init();
-//         this._thumbRequestOptions.resizeMode = PHImageRequestOptionsResizeMode.Exact;
-//         this._thumbRequestOptions.synchronous = false;
-//         this._thumbRequestOptions.deliveryMode = PHImageRequestOptionsDeliveryMode.Opportunistic;
-//         this._thumbRequestOptions.networkAccessAllowed = true; // needed for retrieving iCloud images
-//         this._thumbRequestOptions.normalizedCropRect = CGRectMake(0, 0, 1, 1);
-//         this._thumbRequestSize = CGSizeMake(80, 80);
-//         this._options = options;
-//         this._initialized = false;
-//     }
-//     authorize(): Promise<void> {
-//         return new Promise<void>((resolve, reject) => {
-//             let runloop = CFRunLoopGetCurrent();
-//             PHPhotoLibrary.requestAuthorization(function (result) {
-//                 if (result === PHAuthorizationStatus.Authorized) {
-//                     resolve();
-//                 } else {
-//                     reject(new Error("Authorization failed. Status: " + result));
-//                 }
-//             });
-//         });
-//     }
-//     present(): Promise<SelectedAsset[]> {
-//         this.initialize();
-//         return super.present();
-//     }
-//     addAlbumsForFetchResult(result: PHFetchResult<any>): void {
-//         for (let i = 0; i < result.count; i++) {
-//             let item = result.objectAtIndex(i);
-//             if (item.isKindOfClass(PHAssetCollection)) {
-//                 this.addAlbumForAssetCollection(<PHAssetCollection>item);
-//             } else {
-//                 console.log("Ignored result: " + item);
-//             }
-//         }
-//     }
-//     addAlbumForAssetCollection(assetCollection: PHAssetCollection): void {
-//         let album = new AlbumPH(this, assetCollection.localizedTitle);
-//         let pfAssets = PHAsset.fetchAssetsInAssetCollectionOptions(assetCollection, null);
-//         album.addAssetsForFetchResult(pfAssets);
-//         if (album.assets.length > 0) {
-//             this.albums.push(album);
-//         }
-//     }
-//     createPHImageThumbAsset(target, asset: PHAsset): void {
-//         PHImageManager.defaultManager().requestImageForAssetTargetSizeContentModeOptionsResultHandler(asset, this._thumbRequestSize, PHImageContentMode.AspectFill,
-//             this._thumbRequestOptions, function (target, uiImage, info) {
-//                 let imageAsset = new imageAssetModule.ImageAsset(uiImage);
-//                 imageAsset.options = {
-//                     width: this._options.maxWidth && this._options.maxWidth < IMAGE_WIDTH ? this._options.maxWidth : IMAGE_WIDTH,
-//                     height: this._options.maxHeight && this._options.IMAGE_HEIGHT < 80 ? this._options.IMAGE_HEIGHT : IMAGE_HEIGHT,
-//                     keepAspectRatio: true
-//                 };
-//                 target.setThumbAsset(imageAsset);
-//             }.bind(this, target));
-//     }
-//     /**
-//      * Creates a new ImageSource from the given image, using the given sizing options.
-//      * @param image   The image asset that should be put into an ImageSource.
-//      * @param options The options that should be used to create the ImageSource.
-//      */
-//     createPHImage(image: PHAsset, options?: ImageOptions): Promise<image_source.ImageSource> {
-//         return new Promise<image_source.ImageSource>((resolve, reject) => {
-//             let size: CGSize = options ? CGSizeMake(options.maxWidth, options.maxHeight) : PHImageManagerMaximumSize;
-//             let resizeMode = PHImageRequestOptions.alloc().init();
-//             let aspectRatio = (options && options.aspectRatio && options.aspectRatio === 'fill') ? PHImageContentMode.AspectFill : PHImageContentMode.AspectFit;
-//             // TODO: Decide whether it is benefical to use PHImageRequestOptionsResizeModeFast
-//             //       Accuracy vs Performance. It is probably best to expose these as iOS specific options.
-//             resizeMode.resizeMode = PHImageRequestOptionsResizeMode.Exact;
-//             resizeMode.synchronous = false;
-//             // TODO: provide the ability to change this setting.
-//             //       Right now, it is needed to make sure that resolve is not called twice.
-//             resizeMode.deliveryMode = PHImageRequestOptionsDeliveryMode.HighQualityFormat;
-//             resizeMode.normalizedCropRect = CGRectMake(0, 0, 1, 1);
-//             PHImageManager.defaultManager().requestImageForAssetTargetSizeContentModeOptionsResultHandler(
-//                 image,
-//                 size,
-//                 aspectRatio,
-//                 resizeMode,
-//                 (createdImage, data) => {
-//                     if (createdImage) {
-//                         let imageSource = new image_source.ImageSource();
-//                         imageSource.setNativeSource(createdImage);
-//                         // TODO: Determine whether runOnRunLoop is needed
-//                         //       for callback or not. (See the data() implementation in AssetPH below)
-//                         resolve(imageSource);
-//                     } else {
-//                         reject(new Error("The image could not be created."));
-//                     }
-//                 }
-//             );
-//         });
-//     }
-//     done(): void {
-//         let result = [];
-//         for (let i = 0; i < this.selection.length; ++i) {
-//             result.push(this.selection.getItem(i));
-//         }
-//         this.notifySelection(result);
-//     }
-//     private initialize(): void {
-//         if (this._initialized) {
-//             return;
-//         }
-//         this._initialized = true;
-//         let smart = PHAssetCollection.fetchAssetCollectionsWithTypeSubtypeOptions(PHAssetCollectionType.SmartAlbum, PHAssetCollectionSubtype.AlbumRegular, null);
-//         this.addAlbumsForFetchResult(smart);
-//         let user = PHCollection.fetchTopLevelUserCollectionsWithOptions(null);
-//         this.addAlbumsForFetchResult(user);
-//     }
-// }
-// class AlbumPH extends Album {
-//     private _setThumb: boolean;
-//     private _options: ImageOptions;
-//     constructor(imagePicker: ImagePicker, title: string, options?: ImageOptions) {
-//         super(imagePicker, title);
-//         this._setThumb = false;
-//         this._options = options;
-//     }
-//     addAssetsForFetchResult(result: PHFetchResult<any>): void {
-//         for (let i = 0; i < result.count; i++) {
-//             let asset = result.objectAtIndex(i);
-//             if (asset.isKindOfClass(PHAsset)) {
-//                 this.addAsset(<PHAsset>asset);
-//             } else {
-//                 console.log("Ignored asset: " + asset);
-//             }
-//         }
-//     }
-//     addAsset(asset: PHAsset): void {
-//         let imagePicker = <ImagePickerPH>this.imagePicker;
-//         let item = new AssetPH(this, asset, this._options);
-//         if (!this._setThumb && imagePicker) {
-//             this._setThumb = true;
-//             imagePicker.createPHImageThumbAsset(this, asset);
-//         }
-//         if (this.imagePicker.newestFirst) {
-//             this.assets.unshift(item);
-//         } else {
-//             this.assets.push(item);
-//         }
-//     }
-// }
-// class AssetPH extends Asset {
-//     private _phAsset: PHAsset;
-//     private static _uriRequestOptions: PHImageRequestOptions;
-//     constructor(album: AlbumPH, phAsset: PHAsset, options?: ImageOptions) {
-//         super(album, phAsset);
-//         this._phAsset = phAsset;
-//         this._initializeOptions(options);
-//     }
-//     /**
-//      * Gets the underlying iOS PHAsset instance.
-//      */
-//     public get ios(): any {
-//         return this._phAsset;
-//     }
-//     get uri(): string {
-//         return this._phAsset.localIdentifier.toString();
-//     }
-//     private _initializeOptions(options: ImageOptions): void {
-//         if (options) {
-//             this.options = {
-//                 width: options.maxWidth && options.maxWidth < IMAGE_WIDTH ? options.maxWidth : IMAGE_WIDTH,
-//                 height: options.maxHeight && options.maxHeight < IMAGE_HEIGHT ? options.maxHeight : IMAGE_HEIGHT,
-//                 keepAspectRatio: true
-//             };
-//         } else {
-//             this.options = {
-//                 width: IMAGE_WIDTH,
-//                 height: IMAGE_HEIGHT,
-//                 keepAspectRatio: true
-//             };
-//         }
-//     }
-//     getImage(options?: ImageOptions): Promise<image_source.ImageSource> {
-//         return (<ImagePickerPH>(<AlbumPH>this.album).imagePicker).createPHImage(this._phAsset, options);
-//     }
-//     getImageData(): Promise<ArrayBuffer> {
-//         return this.data().then((data: NSData) => {
-//             return (<any>interop).bufferFromData(data);
-//         });
-//     }
-//     get fileUri(): string {
-//         if (!AssetPH._uriRequestOptions) {
-//             AssetPH._uriRequestOptions = PHImageRequestOptions.alloc().init();
-//             AssetPH._uriRequestOptions.synchronous = true;
-//         }
-//         let uri;
-//         PHImageManager.defaultManager().requestImageDataForAssetOptionsResultHandler(this._phAsset, AssetPH._uriRequestOptions, (data, uti, orientation, info) => {
-//             uri = info.objectForKey("PHImageFileURLKey");
-//         });
-//         if (uri) {
-//             return uri.toString();
-//         }
-//         return undefined;
-//     }
-//     data(): Promise<any> {
-//         return new Promise((resolve, reject) => {
-//             let runloop = CFRunLoopGetCurrent();
-//             PHImageManager.defaultManager().requestImageDataForAssetOptionsResultHandler(this._phAsset, null, (data, dataUTI, orientation, info) => {
-//                 if (data) {
-//                     resolve(data);
-//                 } else {
-//                     reject(new Error("Failed to get image data."));
-//                 }
-//             });
-//         });
-//     }
-// }
\ No newline at end of file
+export function create(options?: ImagePickerOptions): ImagePicker {
+    return new ImagePicker(options);
+}
+
diff --git a/src/platforms/ios/Podfile b/src/platforms/ios/Podfile
index fda2376..e0d5c2c 100644
--- a/src/platforms/ios/Podfile
+++ b/src/platforms/ios/Podfile
@@ -1,12 +1,3 @@
 platform :ios, '8.0'
 
-pod 'QBImagePickerController', '~> 3.4.0'
-pod "BSImagePicker", "~> 2.4"
-
-post_install do |installer|
-    installer.pods_project.targets.each do |target|
-        target.build_configurations.each do |config|
-            config.build_settings['SWIFT_VERSION'] = '3.0'
-        end
-    end
-  end    
\ No newline at end of file
+pod 'QBImagePickerController', '~> 3.4.0'
\ No newline at end of file

From 40a549a320b26b951d73beb2198195de0f0b63a1 Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Wed, 4 Apr 2018 11:45:29 +0300
Subject: [PATCH 06/20] refactor: clean-up unneeded code

---
 demo/app/main-view-model.ts |  7 ---
 src/imagepicker.android.ts  | 28 ++++++------
 src/imagepicker.ios.ts      | 19 +++------
 src/images.ios.ts           | 85 -------------------------------------
 src/images.xml              | 27 ------------
 src/package.json            |  2 -
 6 files changed, 20 insertions(+), 148 deletions(-)
 delete mode 100644 src/images.ios.ts
 delete mode 100644 src/images.xml

diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
index a316e60..4935896 100644
--- a/demo/app/main-view-model.ts
+++ b/demo/app/main-view-model.ts
@@ -54,14 +54,7 @@ export class MainViewModel extends Observable {
             .then((selection) => { // returns SelectedAsset[]
                 console.log("Selection done: " + JSON.stringify(selection));
                 this.imageSrc = isSingle && selection.length > 0 ? selection[0] : null;
-
                 this.imageAssets = selection;
-
-                console.log("Selection done:");
-                selection.forEach((selected) => {
-                    console.log("----------------");
-                    console.log("uri: " + selected.uri);
-                });
             }).catch(function (e) {
                 console.log(e);
             });
diff --git a/src/imagepicker.android.ts b/src/imagepicker.android.ts
index 985bb97..1c1ab94 100644
--- a/src/imagepicker.android.ts
+++ b/src/imagepicker.android.ts
@@ -2,12 +2,8 @@ import * as application from "tns-core-modules/application";
 import * as imageAssetModule from "tns-core-modules/image-asset";
 import * as permissions from "nativescript-permissions";
 
-export class SelectedAsset extends imageAssetModule.ImageAsset {
-    constructor(uri: android.net.Uri) {
-        super(SelectedAsset._calculateFileUri(uri));
-    }
-
-    private static _calculateFileUri(uri: android.net.Uri) {
+class UriHelper {
+    public static _calculateFileUri(uri: android.net.Uri) {
         let DocumentsContract = (<any>android.provider).DocumentsContract;
         let isKitKat = android.os.Build.VERSION.SDK_INT >= 19; // android.os.Build.VERSION_CODES.KITKAT
 
@@ -16,7 +12,7 @@ export class SelectedAsset extends imageAssetModule.ImageAsset {
             let contentUri: android.net.Uri = null;
 
             // ExternalStorageProvider
-            if (SelectedAsset.isExternalStorageDocument(uri)) {
+            if (UriHelper.isExternalStorageDocument(uri)) {
                 docId = DocumentsContract.getDocumentId(uri);
                 id = docId.split(":")[1];
                 type = docId.split(":")[0];
@@ -28,15 +24,15 @@ export class SelectedAsset extends imageAssetModule.ImageAsset {
                 // TODO handle non-primary volumes
             }
             // DownloadsProvider
-            else if (SelectedAsset.isDownloadsDocument(uri)) {
+            else if (UriHelper.isDownloadsDocument(uri)) {
                 id = DocumentsContract.getDocumentId(uri);
                 contentUri = android.content.ContentUris.withAppendedId(
                     android.net.Uri.parse("content://downloads/public_downloads"), long(id));
 
-                return SelectedAsset.getDataColumn(contentUri, null, null);
+                return UriHelper.getDataColumn(contentUri, null, null);
             }
             // MediaProvider
-            else if (SelectedAsset.isMediaDocument(uri)) {
+            else if (UriHelper.isMediaDocument(uri)) {
                 docId = DocumentsContract.getDocumentId(uri);
                 let split = docId.split(":");
                 type = split[0];
@@ -53,13 +49,13 @@ export class SelectedAsset extends imageAssetModule.ImageAsset {
                 let selection = "_id=?";
                 let selectionArgs = [id];
 
-                return SelectedAsset.getDataColumn(contentUri, selection, selectionArgs);
+                return UriHelper.getDataColumn(contentUri, selection, selectionArgs);
             }
         }
         else {
             // MediaStore (and general)
             if ("content" === uri.getScheme()) {
-                return SelectedAsset.getDataColumn(uri, null, null);
+                return UriHelper.getDataColumn(uri, null, null);
             }
             // FILE
             else if ("file" === uri.getScheme()) {
@@ -133,7 +129,7 @@ export class ImagePicker {
         }
     }
 
-    present(): Promise<SelectedAsset[]> {
+    present(): Promise<imageAssetModule.ImageAsset[]> {
         return new Promise((resolve, reject) => {
 
             // WARNING: If we want to support multiple pickers we will need to have a range of IDs here:
@@ -162,13 +158,15 @@ export class ImagePicker {
                                     if (clipItem) {
                                         let uri = clipItem.getUri();
                                         if (uri) {
-                                            results.push(new SelectedAsset(uri));
+                                            let selectedAsset = new imageAssetModule.ImageAsset(UriHelper._calculateFileUri(uri));
+                                            results.push(selectedAsset);
                                         }
                                     }
                                 }
                             } else {
                                 let uri = data.getData();
-                                results.push(new SelectedAsset(uri));
+                                let selectedAsset = new imageAssetModule.ImageAsset(UriHelper._calculateFileUri(uri));
+                                results.push(selectedAsset);
                             }
 
                             application.android.off(application.AndroidApplication.activityResultEvent, onResult);
diff --git a/src/imagepicker.ios.ts b/src/imagepicker.ios.ts
index d878b41..8f647fd 100644
--- a/src/imagepicker.ios.ts
+++ b/src/imagepicker.ios.ts
@@ -8,17 +8,6 @@ interface ImagePickerOptions {
     showSelectedImagesCount?: boolean;
 }
 
-export class SelectedAsset extends imageAssetModule.ImageAsset {
-    constructor(phAsset: PHAsset, options?) {
-        super(phAsset);
-
-        // this fixes the image aspect ratio in tns-core-modules version < 4.0
-        if (!this.options) {
-            this.options = { keepAspectRatio: true };
-        }
-    }
-}
-
 export class ImagePicker extends data_observable.Observable {
     _imagePickerController: QBImagePickerController;
     _imagePickerControllerDelegate: ImagePickerControllerDelegate;
@@ -72,7 +61,13 @@ export class ImagePickerControllerDelegate extends NSObject implements QBImagePi
         let assets = [];
 
         for (let i = 0; i < iosAssets.count; i++) {
-            let asset = new SelectedAsset(iosAssets[i]);
+            let asset = new imageAssetModule.ImageAsset(iosAssets[i]);
+
+            // this fixes the image aspect ratio in tns-core-modules version < 4.0
+            if (!asset.options) {
+                asset.options = { keepAspectRatio: true };
+            }
+
             assets.push(asset);
         }
 
diff --git a/src/images.ios.ts b/src/images.ios.ts
deleted file mode 100644
index 1fd5850..0000000
--- a/src/images.ios.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import application = require("tns-core-modules/application");
-import platform = require("tns-core-modules/platform");
-
-import ui_frame = require("tns-core-modules/ui/frame");
-import { Page } from "tns-core-modules/ui/page";
-import { ActionBar, NavigationButton, ActionItems, ActionItem } from "tns-core-modules/ui/action-bar";
-import { RadListView, ListViewGridLayout } from "nativescript-ui-listview";
-
-let page;
-let list;
-let album;
-
-export function pageLoaded(args) {
-    page = args.object;
-    page.bindingContext = page.navigationContext;
-    list = page.getViewById("images-list");
-
-    // Get the current Size, and then adjust the number of columns based on it...
-    list.listViewLayout.spanCount = Math.floor(platform.screen.mainScreen.widthDIPs / 80);
-
-    application.on("orientationChanged", function (e: application.OrientationChangedEventData) {
-        let currentPageWidth = platform.screen.mainScreen.heightDIPs;
-        list.listViewLayout.spanCount = Math.floor(currentPageWidth / 80);
-    });
-}
-
-export function done(args) {
-    let topmost = ui_frame.topmost();
-    topmost.goBack();
-    topmost.goBack();
-
-    page.bindingContext.imagePicker.done();
-}
-
-export function imagesPageFactory(): Page {
-    // <Page xmlns="http://www.nativescript.org/tns.xsd" loaded="pageLoaded" xmlns:lv="nativescript-ui-listview">
-    let page = new Page();
-    page.on(Page.loadedEvent, pageLoaded);
-
-    // <ActionBar title="{{ title }}">
-    let actionBar = new ActionBar();
-    actionBar.bind({ targetProperty: "title", sourceProperty: "title", twoWay: false });
-    // <ActionBar.navigationButton>
-    //    <NavigationButton text="Albums"/>
-    // </ActionBar.navigationButton>
-    let navigationButton = new NavigationButton();
-    navigationButton.text = "Albums";
-    actionBar.navigationButton = navigationButton;
-    // <ActionBar.actionItems>
-    //    <ActionItem
-    //        text="{{ imagePicker.selection.length, imagePicker.doneText + (imagePicker.mode === 'single' ? '' : ' (' + imagePicker.selection.length + ')') }}"
-    //        ios.position="right" tap="done"/>
-    // </ActionBar.actionItems>
-    let actionItems = new ActionItems();
-    let item = new ActionItem();
-    item.bind({
-        targetProperty: "text", sourceProperty: "imagePicker.selection.length", twoWay: false,
-        expression: "imagePicker.doneText + (imagePicker.mode === 'single' ? '' : ' (' + imagePicker.selection.length + ')')"
-    });
-    item.ios.position = "right";
-    item.on("tap", done);
-    actionBar.actionItems.addItem(item);
-    page.actionBar = actionBar;
-
-    // <lv:RadListView id="images-list" items="{{ assets }}" >
-    let listView = new RadListView();
-    listView.id = "images-list";
-    listView.bind({ targetProperty: "items", sourceProperty: "assets", twoWay: false });
-    // <lv:RadListView.listViewLayout>
-    //    <lv:ListViewGridLayout scrollDirection="Vertical" spanCount="4" itemHeight="80"/>
-    // </lv:RadListView.listViewLayout>
-    let listViewGridLayout = new ListViewGridLayout();
-    listViewGridLayout.scrollDirection = "Vertical";
-    listViewGridLayout.spanCount = 4;
-    listViewGridLayout.itemHeight = 80;
-    listView.listViewLayout = listViewGridLayout;
-    listView.itemTemplate =
-        "<GridLayout margin=\"1\" rows=\"auto\" tap=\"{{ toggleSelection }}\"> \
-        <Image height=\"78\" width=\"78\" opacity=\"{{ selected ? 0.7 : 1 }}\" src=\"{{ $value }}\"/> \
-        </GridLayout>";
-
-    page.content = listView;
-
-    return page;
-}
diff --git a/src/images.xml b/src/images.xml
deleted file mode 100644
index 9402872..0000000
--- a/src/images.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Page xmlns="http://www.nativescript.org/tns.xsd" loaded="pageLoaded"
-      xmlns:lv="nativescript-ui-listview">
-
-    <Page.actionBar>
-        <ActionBar title="{{ title }}">
-            <ActionBar.navigationButton>
-                <NavigationButton text="Albums"/>
-            </ActionBar.navigationButton>
-            <ActionBar.actionItems>
-                <ActionItem
-                        text="{{ imagePicker.selection.length, imagePicker.doneText + (imagePicker.mode === 'single' ? '' : ' (' + imagePicker.selection.length + ')') }}"
-                        ios.position="right" tap="done"/>
-            </ActionBar.actionItems>
-        </ActionBar>
-    </Page.actionBar>
-
-    <lv:RadListView id="images-list" items="{{ assets }}" >
-        <lv:RadListView.listViewLayout>
-            <lv:ListViewGridLayout scrollDirection="Vertical" spanCount="4" itemHeight="80"/>
-        </lv:RadListView.listViewLayout>
-        <lv:RadListView.itemTemplate>
-            <GridLayout margin="1" tap="{{ toggleSelection }}">
-                <Image height="78" width="78" opacity="{{ selected ? 0.7 : 1 }}" src="{{ $value }}" />
-            </GridLayout>
-        </lv:RadListView.itemTemplate>
-    </lv:RadListView>
-</Page>
diff --git a/src/package.json b/src/package.json
index f8dbe77..8013812 100644
--- a/src/package.json
+++ b/src/package.json
@@ -52,8 +52,6 @@
         "tslint": "~5.4.3"
     },
     "dependencies": {
-        "nativescript-ui-core": "^1.0.0",
-        "nativescript-ui-listview": "^3.5.0",
         "nativescript-permissions": "~1.2.3"
     },
     "bootstrapper": "nativescript-plugin-seed"

From db4f6d582cdb15a3416598bbeb82b246b0eebda8 Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Wed, 4 Apr 2018 11:49:26 +0300
Subject: [PATCH 07/20] refactor: cleanup unneeded files

---
 src/albums.ios.d.ts |   6 ---
 src/albums.ios.ts   | 106 --------------------------------------------
 src/albums.xml      |  24 ----------
 3 files changed, 136 deletions(-)
 delete mode 100644 src/albums.ios.d.ts
 delete mode 100644 src/albums.ios.ts
 delete mode 100644 src/albums.xml

diff --git a/src/albums.ios.d.ts b/src/albums.ios.d.ts
deleted file mode 100644
index 5846044..0000000
--- a/src/albums.ios.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Page } from "tns-core-modules/ui/page";
-export declare function onAlbumsItemTap(args: any): void;
-export declare function pageLoaded(args: any): void;
-export declare function navigatedFrom(args: any): void;
-export declare function done(args: any): void;
-export declare function albumsPageFactory(): Page;
diff --git a/src/albums.ios.ts b/src/albums.ios.ts
deleted file mode 100644
index f2a6825..0000000
--- a/src/albums.ios.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-// Apple example: https://developer.apple.com/library/ios/samplecode/UsingPhotosFramework/Listings/SamplePhotosApp_AAPLRootListViewController_m.html
-import data_observable = require("tns-core-modules/data/observable");
-import data_observablearray = require("tns-core-modules/data/observable-array");
-
-import ui_frame = require("tns-core-modules/ui/frame");
-import { Page } from "tns-core-modules/ui/page";
-import { ActionBar, NavigationButton, ActionItems, ActionItem } from "tns-core-modules/ui/action-bar";
-import { ListView } from "tns-core-modules/ui/list-view";
-import { Label } from "tns-core-modules/ui/label";
-
-// import { ImagePicker } from "./imagepicker.ios";
-
-let imagesModule;
-
-if (global.TNS_WEBPACK) {
-    imagesModule = require("./images.ios");
-
-    require("bundle-entry-points");
-} else {
-    imagesModule = require("./images");
-}
-
-let page;
-let goingToAlbum: boolean = false;
-
-export function onAlbumsItemTap(args) {
-    let list = args.object;
-    let topmost = ui_frame.topmost();
-    goingToAlbum = true;
-    topmost.navigate({
-        create: imagesModule.imagesPageFactory,
-        context: list.items.getItem(args.index)
-    });
-}
-
-export function pageLoaded(args) {
-    page = args.object;
-    let list = page.getViewById("albums-list");
-
-    list.on(ListView.itemLoadingEvent, function(args) {
-        if (args.ios) {
-            args.ios.accessoryType = UITableViewCellAccessoryType.DisclosureIndicator;
-        }
-    });
-
-    if (page.navigationContext) {
-        page.bindingContext = page.navigationContext;
-    }
-}
-
-export function navigatedFrom(args) {
-    if (!goingToAlbum) {
-        page.bindingContext.cancel();
-    }
-    goingToAlbum = false;
-}
-
-export function done(args) {
-    let topmost = ui_frame.topmost();
-    topmost.goBack();
-    page.bindingContext.done();
-}
-
-export function albumsPageFactory(): Page {
-    // <Page xmlns="http://www.nativescript.org/tns.xsd" loaded="pageLoaded" navigatedFrom="navigatedFrom">
-    let page = new Page();
-    page.on(Page.loadedEvent, pageLoaded);
-    page.on(Page.navigatedFromEvent, navigatedFrom);
-
-    // <ActionBar title="{{ albumsText }}">
-    let actionBar = new ActionBar();
-    actionBar.bind({ targetProperty: "title", sourceProperty: "albumsText", twoWay: false });
-    // <ActionBar.navigationButton>
-    //    <NavigationButton text="{{ cancelText }}" />
-    // </ActionBar.navigationButton>
-    let navigationButton = new NavigationButton();
-    navigationButton.bind({ targetProperty: "text", sourceProperty: "cancelText", twoWay: false });
-    actionBar.navigationButton = navigationButton;
-    // <ActionBar.actionItems>
-    //    <!-- enabled="{{ selection.length > 0 }}" -->
-    //    <ActionItem text="{{ selection.length, doneText + (mode === 'single' ? '' : ' (' + selection.length + ')') }}" ios.position="right" tap="done" />
-    // </ActionBar.actionItems>
-    let actionItems = new ActionItems();
-    let item = new ActionItem();
-    item.bind({ targetProperty: "text", sourceProperty: "selection.length", twoWay: false,
-        expression: "doneText + (mode === 'single' ? '' : ' (' + selection.length + ')')" });
-    item.ios.position = "right";
-    item.on("tap", done);
-    actionBar.actionItems.addItem(item);
-    page.actionBar = actionBar;
-
-    // <ListView id="albums-list" items="{{ albums }}" itemTap="onAlbumsItemTap">
-    let listView = new ListView();
-    listView.id = "albums-list";
-    listView.bind({ targetProperty: "items", sourceProperty: "albums", twoWay: false });
-    listView.on(ListView.itemTapEvent, onAlbumsItemTap);
-    listView.itemTemplate = "<GridLayout rows=\"*, *\" columns=\"auto, *\" backgroundCount=\"red\"> \
-			<Image rowSpan=\"2\" src=\"{{ thumbAsset }}\" width=\"80\" height=\"80\" margin=\"2\" /> \
-			<Label row=\"0\" col=\"1\" text=\"{{ title}}\" verticalAlignment=\"bottom\" fontSize=\"16\" margin=\"0 12\" /> \
-			<Label row=\"1\" col=\"1\" text=\"{{ assets.length }}\" verticalAlignment=\"top\" fontSize=\"13\" margin=\"0 12\" /> \
-		</GridLayout>";
-
-    page.content = listView;
-
-    return page;
-}
diff --git a/src/albums.xml b/src/albums.xml
deleted file mode 100644
index ff6c8b4..0000000
--- a/src/albums.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<Page xmlns="http://www.nativescript.org/tns.xsd" loaded="pageLoaded" navigatedFrom="navigatedFrom">
-	<Page.actionBar>
-		<ActionBar title="{{ albumsText }}">
-			<ActionBar.navigationButton>
-				<NavigationButton text="{{ cancelText }}" />
-			</ActionBar.navigationButton>
-			<ActionBar.actionItems>
-				<!-- enabled="{{ selection.length > 0 }}" -->
-				<ActionItem text="{{ selection.length, doneText + (mode === 'single' ? '' : ' (' + selection.length + ')') }}" ios.position="right" tap="done" />
-			</ActionBar.actionItems>
-		</ActionBar>
-	</Page.actionBar>
-
-	<ListView id="albums-list" items="{{ albums }}" itemTap="onAlbumsItemTap">
-		<ListView.itemTemplate>
-			<GridLayout rows="*, *" columns="auto, *" backgroundCount="red">
-				<Image rowSpan="2" src="{{ thumbAsset }}" width="80" height="80" margin="2" />
-				<Label row="0" col="1" text="{{ title }}" verticalAlignment="bottom" fontSize="16" margin="0 12" />
-				<Label row="1" col="1" text="{{ assets.length }}" verticalAlignment="top" fontSize="13" margin="0 12" />
-			</GridLayout>
-		</ListView.itemTemplate>
-	</ListView>
-
-</Page>
\ No newline at end of file

From 82edc3fcd52a70ec54f9fdccb3d30c8e6413c812 Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Thu, 5 Apr 2018 15:53:49 +0300
Subject: [PATCH 08/20] fix: update README, polish demo, bump version

---
 README.md                   | 39 +++++----------
 demo/app/main-page.xml      |  5 +-
 demo/app/main-view-model.ts | 35 +++++++++++---
 src/imagepicker.ios.ts      | 34 +++++++++----
 src/index.d.ts              | 96 ++++++++++---------------------------
 src/package.json            |  4 +-
 6 files changed, 92 insertions(+), 121 deletions(-)

diff --git a/README.md b/README.md
index a23bafc..57410f8 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,3 @@
-SelectedAsset extends imageAssetModule.ImageAsset
-- getImage() -> remove, use ImageSource.fromAsset() instead
-- getImageData() : ArrayBuffer -> why do we have this?
-- data() : any -> iOS only -> why do we have this?
-
-
-candidates:
-
-- https://github.com/awkward/Tatsi (no cocoa pod)
-- https://github.com/mikaoj/BSImagePicker (not very similar to native picker)
-- https://github.com/questbeat/QBImagePicker 
-
-
 # NativeScript Image Picker ![apple](https://cdn3.iconfinder.com/data/icons/picons-social/57/16-apple-32.png) ![android](https://cdn4.iconfinder.com/data/icons/logos-3/228/android-32.png) 
 
 
@@ -19,13 +6,14 @@ candidates:
 [![Build Status](https://travis-ci.org/NativeScript/nativescript-imagepicker.svg?branch=master)](https://travis-ci.org/NativeScript/nativescript-imagepicker)
 
 Imagepicker plugin supporting both single and multiple selection.
-<br />Plugin supports **iOS8+** and uses [Photos Framework](https://developer.apple.com/library/prerelease/ios//documentation/Photos/Reference/Photos_Framework/index.html).
+<br />Plugin supports **iOS8+** and uses [QBImagePicker](https://github.com/questbeat/QBImagePicker) cocoa pod.
 <br />For **Android** it uses Intents to open the stock images or file pickers. For Android 6 (API 23) and above the permissions to read file storage should be explicitly required. See demo for implementation details.
 
 <!-- TOC depthFrom:2 -->
 
 - [Installation](#installation)
 - [Configuration](#configuration)
+- [Migrating from 5.x.x to 6.x.x](#migrating-from-5xx-to-6xx)
 - [Migrating from 4.x.x to 5.x.x](#migrating-from-4xx-to-5xx)
 - [Migrating from 3.x.x to 4.x.x](#migrating-from-3xx-to-4xx)
 - [Usage](#usage)
@@ -54,6 +42,9 @@ tns run
 ## Configuration
 No additional configuration required!
 
+## Migrating from 5.x.x to 6.x.x
+With version **6.x.x** the dependency to the `nativescript-ui-listview` plugin is removed and for iOS the [QBImagePicker](https://github.com/questbeat/QBImagePicker) cocoa pod is used. Now the plugin supports some new features, fixes some bugs and looks super native for iOS. You can remove any dependencies to `nativescript-pro-ui`, `nativescript-ui-listview`, etc. in case you've added them in your app specifically for this plugin. Also the options **doneText**, **cancelText**, **albumsText**, **newestFirst** and the methods **cancel()** and **done()** are no longer applicable. The image picker now returns the basic [{N} ImageAsset class](https://github.com/NativeScript/NativeScript/tree/master/tns-core-modules/image-asset) (and not custom asset as before).
+
 ## Migrating from 4.x.x to 5.x.x
 With version **5.x.x** major update to the plugin there is a related dependency which needs to be updated inside your project. The plugin uses internally the `nativescript-ui-listview` plugin (part of the NativeScript Pro UI components). Recently the monolithic [NativeScript Pro UI plugin was split in multiple plugins](https://www.nativescript.org/blog/professional-components-from-nativescript-ui-the-big-breakup), each of them representing a single component. Now, instead of the monolithic package, nativescript-imagepicker uses only the component it needs. To use version 5.x.x of the plugin, you need to update any dependencies to `nativescript-pro-ui` in your project with the single component alternatives as described in the [migration guide](http://docs.telerik.com/devtools/nativescript-ui/migration).
 
@@ -129,23 +120,15 @@ context
 | Option | Platform | Default | Description |
 | --- |  --- | --- | --- |
 | mode | both | multiple | The mode if the imagepicker. Possible values are `single` for single selection and `multiple` for multiple selection. |
-| doneText | iOS | Done | The text of the "Done" button on top right. |
-| cancelText |  iOS | Cancel | The text of the "Cancel" button on top left. |
-| albumsText | iOS | Albums | The title of the "Albums" screen from where the selection of album and images can be done. |
-| newestFirst | iOS | false | Set to `true` to sort the images in an album by newest first. |
+| minimumNumberOfSelection | iOS | 0 | The minumum number of selected assets. |
+| maximumNumberOfSelection | iOS | 0 | The maximum number of selected assets. |
+| showsNumberOfSelectedAssets |  iOS | True | Display the number of selected assets. |
+| prompt | iOS | undefined | Display prompt text when selecting assets. |
+| numberOfColumnsInPortrait | iOS | 4 | Set the number of columns in Portrait orientation. |
+| numberOfColumnsInLandscape | iOS | 7 | Set the number of columns in Landscape orientation. |
 
 * authorize() - request the required permissions.
 * present() - show the albums to present the user the ability to select images. Returns an array of the selected images.
-* cancel() - cancel selection. iOS only.
-* done() - confirm the selection is ready. iOS only.
-
-
-### Properties
-| Property | Default | Description |
-| --- | --- | --- |
-| selection | null | An array of selected image assets. |
-| albums | null | Albums from where the images are picked. |
-
 
 ### Image properties
 
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
index 24e9432..5808d90 100644
--- a/demo/app/main-page.xml
+++ b/demo/app/main-page.xml
@@ -7,13 +7,12 @@
             <ListView.itemTemplate>
                 <GridLayout columns="94, *" rows="*, *">
                     <Image rowSpan="2" width="80" height="80" src="{{ $value }}" stretch="fill" />
-                    <Label col="1" text="{{ uri }}" />
-                    <Label col="1" row="1" text="{{ fileUri }}" />
+                    <Label col="1" text="Some text" />
                 </GridLayout>
             </ListView.itemTemplate>
         </ListView>
 
-        <Image src="{{ imageSrc }}" width="300" height="300" stretch="aspectFit" />
+        <Image src="{{ imageSrc }}" visibility="{{ isSingleMode ? 'visible' : 'collapsed' }}" width="300" height="300" stretch="aspectFit" />
         <Button row="1" text="Pick Single" tap="{{ onSelectSingleTap }}" horizontalAlignment="center" />
         <Button row="2" text="Pick Multiple" tap="{{ onSelectMultipleTap }}" horizontalAlignment="center" />
     </GridLayout>
diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
index 4935896..44acec0 100644
--- a/demo/app/main-view-model.ts
+++ b/demo/app/main-view-model.ts
@@ -10,6 +10,7 @@ export class MainViewModel extends Observable {
 
     private _imageSrc: any;
     private _imageAssets: Array<any>;
+    private _isSingleMode: boolean;
 
     get imageSrc(): any {
         return this._imageSrc;
@@ -33,17 +34,32 @@ export class MainViewModel extends Observable {
         }
     }
 
+    get isSingleMode(): any {
+        return this._isSingleMode;
+    }
+
+    set isSingleMode(value: any) {
+        if (this._isSingleMode !== value) {
+            this._isSingleMode = value;
+            this.notifyPropertyChange('isSingleMode', value);
+        }
+    }
+
     public onSelectMultipleTap(args) {
-        let context = imagepicker.create({ mode: "multiple" });
-        this.startSelection(context, false);
+        this.isSingleMode = false;
+        let context = imagepicker.create({
+            mode: "multiple"
+        });
+        this.startSelection(context);
     }
 
     public onSelectSingleTap(args) {
+        this.isSingleMode = true;
         let context = imagepicker.create({ mode: "single" });
-        this.startSelection(context, true);
+        this.startSelection(context);
     }
 
-    private startSelection(context, isSingle) {
+    private startSelection(context) {
         context
             .authorize()
             .then(() => {
@@ -51,9 +67,16 @@ export class MainViewModel extends Observable {
                 this.imageSrc = null;
                 return context.present();
             })
-            .then((selection) => { // returns SelectedAsset[]
+            .then((selection) => {
                 console.log("Selection done: " + JSON.stringify(selection));
-                this.imageSrc = isSingle && selection.length > 0 ? selection[0] : null;
+                this.imageSrc = this.isSingleMode && selection.length > 0 ? selection[0] : null;
+
+                // set the images to be loaded from the assets with optimal sizes (optimize memory usage)
+                selection.forEach(element => {
+                    element.options.width = this.isSingleMode ? 300 : 80;
+                    element.options.height = this.isSingleMode ? 300 : 80;
+                });
+
                 this.imageAssets = selection;
             }).catch(function (e) {
                 console.log(e);
diff --git a/src/imagepicker.ios.ts b/src/imagepicker.ios.ts
index 8f647fd..dc49a84 100644
--- a/src/imagepicker.ios.ts
+++ b/src/imagepicker.ios.ts
@@ -1,27 +1,41 @@
 import * as data_observable from "tns-core-modules/data/observable";
 import * as frame from "tns-core-modules/ui/frame";
 import * as imageAssetModule from "tns-core-modules/image-asset";
-
-interface ImagePickerOptions {
-    mode?: string;
-    maxImagesToPick?: number;
-    showSelectedImagesCount?: boolean;
-}
+import { Options } from ".";
+
+const defaultAssetCollectionSubtypes: NSArray<any> = NSArray.arrayWithArray(<any>[
+    PHAssetCollectionSubtype.SmartAlbumRecentlyAdded,
+    PHAssetCollectionSubtype.SmartAlbumUserLibrary,
+    PHAssetCollectionSubtype.AlbumMyPhotoStream,
+    PHAssetCollectionSubtype.SmartAlbumFavorites,
+    PHAssetCollectionSubtype.SmartAlbumPanoramas,
+    PHAssetCollectionSubtype.SmartAlbumBursts,
+    PHAssetCollectionSubtype.AlbumCloudShared,
+    PHAssetCollectionSubtype.SmartAlbumSelfPortraits,
+    PHAssetCollectionSubtype.SmartAlbumScreenshots,
+    PHAssetCollectionSubtype.SmartAlbumLivePhotos
+]);
 
 export class ImagePicker extends data_observable.Observable {
     _imagePickerController: QBImagePickerController;
     _imagePickerControllerDelegate: ImagePickerControllerDelegate;
 
-    constructor(options: ImagePickerOptions) {
+    constructor(options: Options) {
         super();
 
         this._imagePickerControllerDelegate = new ImagePickerControllerDelegate();
 
         let imagePickerController = QBImagePickerController.alloc().init();
+        imagePickerController.assetCollectionSubtypes = defaultAssetCollectionSubtypes;
+        imagePickerController.mediaType = QBImagePickerMediaType.Image;
         imagePickerController.delegate = this._imagePickerControllerDelegate;
         imagePickerController.allowsMultipleSelection = options.mode === 'multiple';
-        imagePickerController.maximumNumberOfSelection = options.maxImagesToPick || 0;
-        imagePickerController.showsNumberOfSelectedAssets = options.showSelectedImagesCount || true;
+        imagePickerController.minimumNumberOfSelection = options.minimumNumberOfSelection || 0;
+        imagePickerController.maximumNumberOfSelection = options.maximumNumberOfSelection || 0;
+        imagePickerController.showsNumberOfSelectedAssets = options.showsNumberOfSelectedAssets || true;
+        imagePickerController.numberOfColumnsInPortrait = options.numberOfColumnsInPortrait || imagePickerController.numberOfColumnsInPortrait;
+        imagePickerController.numberOfColumnsInLandscape = options.numberOfColumnsInLandscape || imagePickerController.numberOfColumnsInLandscape;
+        imagePickerController.prompt = options.prompt || imagePickerController.prompt;
 
         this._imagePickerController = imagePickerController;
     }
@@ -83,7 +97,7 @@ export class ImagePickerControllerDelegate extends NSObject implements QBImagePi
     }
 }
 
-export function create(options?: ImagePickerOptions): ImagePicker {
+export function create(options?: Options): ImagePicker {
     return new ImagePicker(options);
 }
 
diff --git a/src/index.d.ts b/src/index.d.ts
index b355fc8..d7c5cb4 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -2,64 +2,6 @@ import { Observable } from "tns-core-modules/data/observable";
 import { ImageSource } from "tns-core-modules/image-source";
 import { ImageAsset } from "tns-core-modules/image-asset";
 
-export interface ImageOptions {
-    /**
-     * The maximum width that the image is allowed to be.
-     */
-    maxWidth?: number;
-
-    /**
-     * The maximum height that the image is allowed to be.
-     */
-    maxHeight?: number;
-
-    /**
-     * iOS only. The image aspect ratio. Default value: fit.
-     */
-    aspectRatio?: "fill" | "fit";
-}
-
-export class SelectedAsset extends ImageAsset {
-    /**
-     * A 100x100 pixels thumb of the selected image.
-     * This property will be initialized on demand. The first access will return undefined or null.
-     * It will trigger an async load and when the thumb is obtained, a property changed notification will occur.
-     */
-    thumb: ImageSource;
-
-    /**
-     * URI that identifies the image asset.
-     * Chances are you do not have permissions to read this uri.
-     * The image data should be obtained using the other instance members.
-     */
-    uri: string;
-
-    /**
-     * An URI that identifies the local asset file.
-     * Chances are you do not have permissions to read this file.
-     * The image data should be obtained using the other instance members.
-     */
-    fileUri: string;
-
-    /**
-     * Asynchronously retrieves an ImageSource object that represents this selected image.
-     * Scaled to the given size. (Aspect-ratio is preserved by default)
-     */
-    getImage(options?: ImageOptions): Promise<ImageSource>;
-
-    /**
-     * Asynchronously retrieves an ArrayBuffer that represents the raw byte data from this selected image.
-     */
-    getImageData(): Promise<ArrayBuffer>;
-
-    /**
-     * For iOS Returns a promise with NSData representation of the asset.
-     * On Android, Returns a promise with a java.io.InputStream.
-     * Note that in future versions it should return ArrayBuffer.
-     */
-    data(): Promise<any>;
-}
-
 export class ImagePicker {
     /**
      * Call this before 'present' to request any additional permissions that may be necessary.
@@ -71,7 +13,7 @@ export class ImagePicker {
      * Present the image picker UI.
      * The result will be an array of SelectedAsset instances provided when the promise is fulfilled.
      */
-    present(): Promise<SelectedAsset[]>;
+    present(): Promise<ImageAsset[]>;
 }
 
 /**
@@ -84,19 +26,34 @@ interface Options {
     mode?: string;
 
     /**
-    * Set the text for the done button in iOS
+    * Set the minumum number of selected assets in iOS
     */
-    doneText?: string;
+    minimumNumberOfSelection?: number;
 
     /**
-    * Set the text for the cancel button in iOS
-    */
-    cancelText?: string;
+     * Set the maximum number of selected assets in iOS
+     */
+    maximumNumberOfSelection?: number;
 
     /**
-    * Set the text for the albums button in iOS
-    */
-    albumsText?: string;
+     * Display the number of selected assets in iOS
+     */
+    showsNumberOfSelectedAssets?: boolean;
+
+    /**
+     * Display prompt text when selecting assets in iOS
+     */
+    prompt?: string;
+
+    /**
+     * Set the number of columns in Portrait in iOS
+     */
+    numberOfColumnsInPortrait?: number;
+    
+    /**
+     * Set the number of columns in Landscape in iOS
+     */
+    numberOfColumnsInLandscape?: number;
 
     android?: {
         /**
@@ -104,11 +61,6 @@ interface Options {
          */
         read_external_storage?: string;
     };
-
-    /**
-     * Indicates images should be sorted newest-first (iOS only, default false).
-     */
-    newestFirst?: boolean;
 }
 
 export function create(options?: Options): ImagePicker;
diff --git a/src/package.json b/src/package.json
index 8013812..75bd280 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,6 +1,6 @@
 {
     "name": "nativescript-imagepicker",
-    "version": "5.0.2",
+    "version": "6.0.0",
     "description": "A plugin for the NativeScript framework implementing multiple image picker",
     "repository": {
         "type": "git",
@@ -55,4 +55,4 @@
         "nativescript-permissions": "~1.2.3"
     },
     "bootstrapper": "nativescript-plugin-seed"
-}
\ No newline at end of file
+}

From 9cf41b8c814abc6d41a6efc47e40ef8f1ac80eef Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Thu, 5 Apr 2018 16:42:27 +0300
Subject: [PATCH 09/20] feature: add mediaType to options in iOS

---
 src/imagepicker.ios.ts |  4 ++--
 src/index.d.ts         | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/imagepicker.ios.ts b/src/imagepicker.ios.ts
index dc49a84..99bbe63 100644
--- a/src/imagepicker.ios.ts
+++ b/src/imagepicker.ios.ts
@@ -1,7 +1,7 @@
 import * as data_observable from "tns-core-modules/data/observable";
 import * as frame from "tns-core-modules/ui/frame";
 import * as imageAssetModule from "tns-core-modules/image-asset";
-import { Options } from ".";
+import { Options, ImagePickerMediaType } from ".";
 
 const defaultAssetCollectionSubtypes: NSArray<any> = NSArray.arrayWithArray(<any>[
     PHAssetCollectionSubtype.SmartAlbumRecentlyAdded,
@@ -27,7 +27,7 @@ export class ImagePicker extends data_observable.Observable {
 
         let imagePickerController = QBImagePickerController.alloc().init();
         imagePickerController.assetCollectionSubtypes = defaultAssetCollectionSubtypes;
-        imagePickerController.mediaType = QBImagePickerMediaType.Image;
+        imagePickerController.mediaType = options.mediaType ? <QBImagePickerMediaType>options.mediaType.valueOf() : QBImagePickerMediaType.Any;
         imagePickerController.delegate = this._imagePickerControllerDelegate;
         imagePickerController.allowsMultipleSelection = options.mode === 'multiple';
         imagePickerController.minimumNumberOfSelection = options.minimumNumberOfSelection || 0;
diff --git a/src/index.d.ts b/src/index.d.ts
index d7c5cb4..3b3e04c 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -16,6 +16,12 @@ export class ImagePicker {
     present(): Promise<ImageAsset[]>;
 }
 
+export declare const enum ImagePickerMediaType {
+    Any = 0,
+    Image = 1,
+    Video = 2
+}
+
 /**
  * Provide options for the image picker.
  */
@@ -49,12 +55,17 @@ interface Options {
      * Set the number of columns in Portrait in iOS
      */
     numberOfColumnsInPortrait?: number;
-    
+
     /**
      * Set the number of columns in Landscape in iOS
      */
     numberOfColumnsInLandscape?: number;
 
+    /**
+     * Set the media type (image/video/both) to pick in iOS
+     */
+    mediaType?: ImagePickerMediaType;
+
     android?: {
         /**
          * Provide a reason for permission request to access external storage on api levels above 23.

From 2d507b3e3f8eb073d583e01e44a9d3149190e445 Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Thu, 5 Apr 2018 16:45:11 +0300
Subject: [PATCH 10/20] chore: update README

---
 README.md | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 57410f8..279b122 100644
--- a/README.md
+++ b/README.md
@@ -126,20 +126,11 @@ context
 | prompt | iOS | undefined | Display prompt text when selecting assets. |
 | numberOfColumnsInPortrait | iOS | 4 | Set the number of columns in Portrait orientation. |
 | numberOfColumnsInLandscape | iOS | 7 | Set the number of columns in Landscape orientation. |
+| mediaType | iOS | Any | Choose whether to pick Image/Video/Any type of assets. |
 
 * authorize() - request the required permissions.
 * present() - show the albums to present the user the ability to select images. Returns an array of the selected images.
 
-### Image properties
-
-Once image is picked some options can be applied to it  before it is used:
-
-| Option | Default | Description |
-| --- | --- | --- |
-| maxWidth | null | Image max width |
-| maxHeight | null | Image max height |
-| aspectRatio | fit | iOS only. Possible values are `fit` and `fill`. [Read more](https://developer.apple.com/documentation/photos/phimagecontentmode) |
-
 ## Contribute
 We love PRs! Check out the [contributing guidelines](CONTRIBUTING.md). If you want to contribute, but you are not sure where to start - look for [issues labeled `help wanted`](https://github.com/NativeScript/nativescript-imagepicker/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22).
 

From d109a8985ef80616d00102aec5966bea7dd9db0a Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Thu, 5 Apr 2018 16:48:09 +0300
Subject: [PATCH 11/20] chore: remove unneeded typings file

---
 src/typings/objc!BSImagePicker.d.ts | 37 -----------------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 src/typings/objc!BSImagePicker.d.ts

diff --git a/src/typings/objc!BSImagePicker.d.ts b/src/typings/objc!BSImagePicker.d.ts
deleted file mode 100644
index eec3430..0000000
--- a/src/typings/objc!BSImagePicker.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-
-declare var BSImagePickerVersionNumber: number;
-
-declare var BSImagePickerVersionString: interop.Reference<number>;
-
-declare class BSImagePickerViewController extends UINavigationController {
-
-	static alloc(): BSImagePickerViewController; // inherited from NSObject
-
-	static new(): BSImagePickerViewController; // inherited from NSObject
-
-	albumButton: UIButton;
-
-	cancelButton: UIBarButtonItem;
-
-	cellsPerRow: (p1: UIUserInterfaceSizeClass, p2: UIUserInterfaceSizeClass) => number;
-
-	defaultSelections: PHFetchResult<PHAsset>;
-
-	doneButton: UIBarButtonItem;
-
-	fetchResults: NSArray<PHFetchResult<PHAssetCollection>>;
-
-	maxNumberOfSelections: number;
-
-	selectionFillColor: UIColor;
-
-	selectionShadowColor: UIColor;
-
-	selectionStrokeColor: UIColor;
-
-	selectionTextAttributes: NSDictionary<string, any>;
-
-	takePhotoIcon: UIImage;
-
-	takePhotos: boolean;
-}

From 7e1e53c954fe9dbdab5a10572e2c768e03d350ff Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Tue, 10 Apr 2018 15:51:04 +0300
Subject: [PATCH 12/20] fix: use official NS 4.0.0 version in demo, use common
 thumbnail and preview sizes with binding in the UI

---
 demo/app/main-page.ts       |  8 +++-----
 demo/app/main-page.xml      | 10 +++++-----
 demo/app/main-view-model.ts | 13 ++++++++++---
 demo/package.json           |  2 +-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/demo/app/main-page.ts b/demo/app/main-page.ts
index f78cf95..2f755ff 100644
--- a/demo/app/main-page.ts
+++ b/demo/app/main-page.ts
@@ -2,11 +2,9 @@ import { EventData } from 'tns-core-modules/data/observable';
 import { Page } from 'tns-core-modules/ui/page';
 import { MainViewModel } from './main-view-model';
 
-let viewModel;
-
-export function pageLoaded(args: EventData) {
-    viewModel = viewModel || new MainViewModel();
-
+export function onNavigatingTo(args: EventData) {
+    let viewModel = new MainViewModel();
     let page = <Page>args.object;
+
     page.bindingContext = viewModel;
 }
\ No newline at end of file
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
index 5808d90..ad76e5f 100644
--- a/demo/app/main-page.xml
+++ b/demo/app/main-page.xml
@@ -1,18 +1,18 @@
-<Page xmlns="http://www.nativescript.org/tns.xsd" loaded="pageLoaded">
+<Page xmlns="http://www.nativescript.org/tns.xsd" navigatingTo="onNavigatingTo">
     <Page.actionBar>
         <ActionBar title="Image Picker" />
     </Page.actionBar>
     <GridLayout rows="*, auto, auto">
         <ListView items="{{ imageAssets }}">
             <ListView.itemTemplate>
-                <GridLayout columns="94, *" rows="*, *">
-                    <Image rowSpan="2" width="80" height="80" src="{{ $value }}" stretch="fill" />
-                    <Label col="1" text="Some text" />
+                <GridLayout columns="auto, *" rows="*, *">
+                    <Image rowSpan="2" width="{{ $parents['ListView'].thumbSize }}" height="{{ $parents['ListView'].thumbSize }}" src="{{ $value }}" stretch="fill" />
+                    <Label col="1" text="some text" />
                 </GridLayout>
             </ListView.itemTemplate>
         </ListView>
 
-        <Image src="{{ imageSrc }}" visibility="{{ isSingleMode ? 'visible' : 'collapsed' }}" width="300" height="300" stretch="aspectFit" />
+        <Image src="{{ imageSrc }}" visibility="{{ isSingleMode ? 'visible' : 'collapsed' }}" width="{{ previewSize }}" height="{{ previewSize }}" stretch="aspectFit" />
         <Button row="1" text="Pick Single" tap="{{ onSelectSingleTap }}" horizontalAlignment="center" />
         <Button row="2" text="Pick Multiple" tap="{{ onSelectMultipleTap }}" horizontalAlignment="center" />
     </GridLayout>
diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
index 44acec0..7f62734 100644
--- a/demo/app/main-view-model.ts
+++ b/demo/app/main-view-model.ts
@@ -1,7 +1,6 @@
 import { Observable } from 'tns-core-modules/data/observable';
 import { isAndroid } from "tns-core-modules/platform";
 import * as imagepicker from "nativescript-imagepicker";
-import { ObservableArray } from 'tns-core-modules/data/observable-array/observable-array';
 
 export class MainViewModel extends Observable {
     constructor() {
@@ -12,6 +11,14 @@ export class MainViewModel extends Observable {
     private _imageAssets: Array<any>;
     private _isSingleMode: boolean;
 
+    get thumbSize(): any {
+        return 80;
+    }
+
+    get previewSize(): any {
+        return 300;
+    }
+
     get imageSrc(): any {
         return this._imageSrc;
     }
@@ -73,8 +80,8 @@ export class MainViewModel extends Observable {
 
                 // set the images to be loaded from the assets with optimal sizes (optimize memory usage)
                 selection.forEach(element => {
-                    element.options.width = this.isSingleMode ? 300 : 80;
-                    element.options.height = this.isSingleMode ? 300 : 80;
+                    element.options.width = this.isSingleMode ? this.previewSize : this.thumbSize;
+                    element.options.height = this.isSingleMode ? this.previewSize : this.thumbSize;
                 });
 
                 this.imageAssets = selection;
diff --git a/demo/package.json b/demo/package.json
index 942ca6a..9a52929 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -12,7 +12,7 @@
     "nativescript-imagepicker": "../src",
     "nativescript-theme-core": "^1.0.4",
     "nativescript-unit-test-runner": "^0.3.4",
-    "tns-core-modules": "^4.0.0-2018-03-27-02"
+    "tns-core-modules": "^4.0.0"
   },
   "devDependencies": {
     "@types/chai": "^4.0.2",

From 90d583eeec5f4b1533fb1dcb9f451f811a58c14b Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Tue, 10 Apr 2018 17:33:56 +0300
Subject: [PATCH 13/20] fix: make angular demo work, cleanup

---
 demo-angular/app/app.component.html           |  20 +-
 demo-angular/app/app.component.ts             |  38 ++--
 demo-angular/package.json                     |   3 +-
 demo/app/main-page.xml                        |   4 +-
 demo/app/main-view-model.ts                   |   1 -
 src/typings/objc!QBImagePickerController.d.ts | 194 +++++++++---------
 6 files changed, 136 insertions(+), 124 deletions(-)

diff --git a/demo-angular/app/app.component.html b/demo-angular/app/app.component.html
index 7efff0d..f011b22 100644
--- a/demo-angular/app/app.component.html
+++ b/demo-angular/app/app.component.html
@@ -3,15 +3,19 @@
 </ActionBar>
 
 <GridLayout rows="*, auto, auto">
-    <ScrollView>
-        <StackLayout>
-            <GridLayout height="94" columns="94, *" rows="*, *" *ngFor="let item of items">
-                <Image rowSpan="2" width="94" height="94" [src]="item"></Image>
-                <Label col="1" [text]="item.uri"></Label>
-                <Label col="1" row="1" [text]="item.fileUri"></Label>
+    <ListView [items]="imageAssets">
+        <ng-template let-image="item">
+            <GridLayout columns="auto, *">
+                <Image
+                    [width]="thumbSize" 
+                    [height]="thumbSize" 
+                    [src]="image" stretch="fill"></Image>
+                <Label col="1" text="some text"></Label>
             </GridLayout>
-        </StackLayout>
-    </ScrollView>
+        </ng-template>
+    </ListView>
+    
+    <Image [src]="imageSrc" *ngIf="isSingleMode" [width]="previewSize" [height]="previewSize" stretch="aspectFit"></Image>
     <Button row="1" text="Pick Single" (tap)="onSelectSingleTap()" horizontalAlignment="center"></Button>
     <Button row="2" text="Pick Multiple" (tap)="onSelectMultipleTap()" horizontalAlignment="center"></Button>
 </GridLayout>
\ No newline at end of file
diff --git a/demo-angular/app/app.component.ts b/demo-angular/app/app.component.ts
index b35dd6f..9f9676e 100644
--- a/demo-angular/app/app.component.ts
+++ b/demo-angular/app/app.component.ts
@@ -8,44 +8,54 @@ import * as imagepicker from "nativescript-imagepicker";
     templateUrl: "app.component.html",
 })
 export class AppComponent {
-
-    items = [];
+    imageAssets = [];
+    imageSrc: any;
+    isSingleMode: boolean = true;
+    thumbSize: number = 80;
+    previewSize: number = 300;
 
     constructor(private _changeDetectionRef: ChangeDetectorRef) {
     }
 
-    onSelectMultipleTap() {
+    public onSelectMultipleTap() {
+        this.isSingleMode = false;
+
         let context = imagepicker.create({
             mode: "multiple"
         });
         this.startSelection(context);
     }
 
-    onSelectSingleTap() {
+    public onSelectSingleTap() {
+        this.isSingleMode = true;
+
         let context = imagepicker.create({
             mode: "single"
         });
         this.startSelection(context);
     }
 
-    startSelection(context) {
-        let _that = this;
+    private startSelection(context) {
+        let that = this;
 
         context
         .authorize()
         .then(() => {
-            _that.items = [];
+            that.imageAssets = [];
+            that.imageSrc = null;
             return context.present();
         })
         .then((selection) => {
-            console.log("Selection done:");
-            selection.forEach(function (selected) {
-                console.log("----------------");
-                console.log("uri: " + selected.uri);
-                console.log("fileUri: " + selected.fileUri);
+            console.log("Selection done: " + JSON.stringify(selection));
+            that.imageSrc = that.isSingleMode && selection.length > 0 ? selection[0] : null;
+
+            // set the images to be loaded from the assets with optimal sizes (optimize memory usage)
+            selection.forEach(function (element) {
+                element.options.width = that.isSingleMode ? that.previewSize : that.thumbSize;
+                element.options.height = that.isSingleMode ? that.previewSize : that.thumbSize;
             });
-            _that.items = selection;
-            _that._changeDetectionRef.detectChanges();
+
+            that.imageAssets = selection;
         }).catch(function (e) {
             console.log(e);
         });
diff --git a/demo-angular/package.json b/demo-angular/package.json
index 1eb9e13..c60dc67 100644
--- a/demo-angular/package.json
+++ b/demo-angular/package.json
@@ -52,7 +52,8 @@
     "webpack": "~3.8.1",
     "webpack-bundle-analyzer": "^2.8.2",
     "webpack-sources": "~1.0.1",
-    "zone.js": "^0.8.4"
+    "zone.js": "^0.8.4",
+    "uglifyjs-webpack-plugin": "~1.1.6"
   },
   "scripts": {
     "build.plugin": "cd ../src && npm run build",
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
index ad76e5f..106882a 100644
--- a/demo/app/main-page.xml
+++ b/demo/app/main-page.xml
@@ -5,8 +5,8 @@
     <GridLayout rows="*, auto, auto">
         <ListView items="{{ imageAssets }}">
             <ListView.itemTemplate>
-                <GridLayout columns="auto, *" rows="*, *">
-                    <Image rowSpan="2" width="{{ $parents['ListView'].thumbSize }}" height="{{ $parents['ListView'].thumbSize }}" src="{{ $value }}" stretch="fill" />
+                <GridLayout columns="auto, *">
+                    <Image width="{{ $parents['ListView'].thumbSize }}" height="{{ $parents['ListView'].thumbSize }}" src="{{ $value }}" stretch="fill" />
                     <Label col="1" text="some text" />
                 </GridLayout>
             </ListView.itemTemplate>
diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
index 7f62734..42d5b36 100644
--- a/demo/app/main-view-model.ts
+++ b/demo/app/main-view-model.ts
@@ -1,5 +1,4 @@
 import { Observable } from 'tns-core-modules/data/observable';
-import { isAndroid } from "tns-core-modules/platform";
 import * as imagepicker from "nativescript-imagepicker";
 
 export class MainViewModel extends Observable {
diff --git a/src/typings/objc!QBImagePickerController.d.ts b/src/typings/objc!QBImagePickerController.d.ts
index e79143d..c51fc83 100644
--- a/src/typings/objc!QBImagePickerController.d.ts
+++ b/src/typings/objc!QBImagePickerController.d.ts
@@ -1,153 +1,151 @@
-
 declare class QBAlbumCell extends UITableViewCell {
+    static alloc(): QBAlbumCell; // inherited from NSObject
 
-	static alloc(): QBAlbumCell; // inherited from NSObject
-
-	static appearance(): QBAlbumCell; // inherited from UIAppearance
+    static appearance(): QBAlbumCell; // inherited from UIAppearance
 
-	static appearanceForTraitCollection(trait: UITraitCollection): QBAlbumCell; // inherited from UIAppearance
+    static appearanceForTraitCollection(trait: UITraitCollection): QBAlbumCell; // inherited from UIAppearance
 
-	static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBAlbumCell; // inherited from UIAppearance
+    static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBAlbumCell; // inherited from UIAppearance
 
-	static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBAlbumCell; // inherited from UIAppearance
+    static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBAlbumCell; // inherited from UIAppearance
 
-	static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBAlbumCell; // inherited from UIAppearance
+    static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBAlbumCell; // inherited from UIAppearance
 
-	static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBAlbumCell; // inherited from UIAppearance
+    static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBAlbumCell; // inherited from UIAppearance
 
-	static new(): QBAlbumCell; // inherited from NSObject
+    static new(): QBAlbumCell; // inherited from NSObject
 
-	borderWidth: number;
+    borderWidth: number;
 
-	countLabel: UILabel;
+    countLabel: UILabel;
 
-	imageView1: UIImageView;
+    imageView1: UIImageView;
 
-	imageView2: UIImageView;
+    imageView2: UIImageView;
 
-	imageView3: UIImageView;
+    imageView3: UIImageView;
 
-	titleLabel: UILabel;
+    titleLabel: UILabel;
 }
 
 declare class QBAlbumsViewController extends UITableViewController {
 
-	static alloc(): QBAlbumsViewController; // inherited from NSObject
+    static alloc(): QBAlbumsViewController; // inherited from NSObject
 
-	static new(): QBAlbumsViewController; // inherited from NSObject
+    static new(): QBAlbumsViewController; // inherited from NSObject
 
-	imagePickerController: QBImagePickerController;
+    imagePickerController: QBImagePickerController;
 }
 
 declare class QBAssetCell extends UICollectionViewCell {
 
-	static alloc(): QBAssetCell; // inherited from NSObject
+    static alloc(): QBAssetCell; // inherited from NSObject
 
-	static appearance(): QBAssetCell; // inherited from UIAppearance
+    static appearance(): QBAssetCell; // inherited from UIAppearance
 
-	static appearanceForTraitCollection(trait: UITraitCollection): QBAssetCell; // inherited from UIAppearance
+    static appearanceForTraitCollection(trait: UITraitCollection): QBAssetCell; // inherited from UIAppearance
 
-	static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBAssetCell; // inherited from UIAppearance
+    static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBAssetCell; // inherited from UIAppearance
 
-	static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBAssetCell; // inherited from UIAppearance
+    static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBAssetCell; // inherited from UIAppearance
 
-	static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBAssetCell; // inherited from UIAppearance
+    static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBAssetCell; // inherited from UIAppearance
 
-	static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBAssetCell; // inherited from UIAppearance
+    static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBAssetCell; // inherited from UIAppearance
 
-	static new(): QBAssetCell; // inherited from NSObject
+    static new(): QBAssetCell; // inherited from NSObject
 
-	imageView: UIImageView;
+    imageView: UIImageView;
 
-	showsOverlayViewWhenSelected: boolean;
+    showsOverlayViewWhenSelected: boolean;
 
-	videoIndicatorView: QBVideoIndicatorView;
+    videoIndicatorView: QBVideoIndicatorView;
 }
 
 declare class QBAssetsViewController extends UICollectionViewController {
 
-	static alloc(): QBAssetsViewController; // inherited from NSObject
+    static alloc(): QBAssetsViewController; // inherited from NSObject
 
-	static new(): QBAssetsViewController; // inherited from NSObject
+    static new(): QBAssetsViewController; // inherited from NSObject
 
-	assetCollection: PHAssetCollection;
+    assetCollection: PHAssetCollection;
 
-	imagePickerController: QBImagePickerController;
+    imagePickerController: QBImagePickerController;
 }
 
 declare class QBCheckmarkView extends UIView {
 
-	static alloc(): QBCheckmarkView; // inherited from NSObject
+    static alloc(): QBCheckmarkView; // inherited from NSObject
 
-	static appearance(): QBCheckmarkView; // inherited from UIAppearance
+    static appearance(): QBCheckmarkView; // inherited from UIAppearance
 
-	static appearanceForTraitCollection(trait: UITraitCollection): QBCheckmarkView; // inherited from UIAppearance
+    static appearanceForTraitCollection(trait: UITraitCollection): QBCheckmarkView; // inherited from UIAppearance
 
-	static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBCheckmarkView; // inherited from UIAppearance
+    static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBCheckmarkView; // inherited from UIAppearance
 
-	static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBCheckmarkView; // inherited from UIAppearance
+    static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBCheckmarkView; // inherited from UIAppearance
 
-	static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBCheckmarkView; // inherited from UIAppearance
+    static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBCheckmarkView; // inherited from UIAppearance
 
-	static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBCheckmarkView; // inherited from UIAppearance
+    static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBCheckmarkView; // inherited from UIAppearance
 
-	static new(): QBCheckmarkView; // inherited from NSObject
+    static new(): QBCheckmarkView; // inherited from NSObject
 
-	bodyColor: UIColor;
+    bodyColor: UIColor;
 
-	borderColor: UIColor;
+    borderColor: UIColor;
 
-	borderWidth: number;
+    borderWidth: number;
 
-	checkmarkColor: UIColor;
+    checkmarkColor: UIColor;
 
-	checkmarkLineWidth: number;
+    checkmarkLineWidth: number;
 }
 
 declare class QBImagePickerController extends UIViewController {
 
-	static alloc(): QBImagePickerController; // inherited from NSObject
+    static alloc(): QBImagePickerController; // inherited from NSObject
 
-	static new(): QBImagePickerController; // inherited from NSObject
+    static new(): QBImagePickerController; // inherited from NSObject
 
-	allowsMultipleSelection: boolean;
+    allowsMultipleSelection: boolean;
 
-	assetCollectionSubtypes: NSArray<any>;
+    assetCollectionSubtypes: NSArray<any>;
 
-	delegate: QBImagePickerControllerDelegate;
+    delegate: QBImagePickerControllerDelegate;
 
-	maximumNumberOfSelection: number;
+    maximumNumberOfSelection: number;
 
-	mediaType: QBImagePickerMediaType;
+    mediaType: QBImagePickerMediaType;
 
-	minimumNumberOfSelection: number;
+    minimumNumberOfSelection: number;
 
-	numberOfColumnsInLandscape: number;
+    numberOfColumnsInLandscape: number;
 
-	numberOfColumnsInPortrait: number;
+    numberOfColumnsInPortrait: number;
 
-	prompt: string;
+    prompt: string;
 
-	readonly selectedAssets: NSMutableOrderedSet<any>;
+    readonly selectedAssets: NSMutableOrderedSet<any>;
 
-	showsNumberOfSelectedAssets: boolean;
+    showsNumberOfSelectedAssets: boolean;
 }
 
 interface QBImagePickerControllerDelegate extends NSObjectProtocol {
 
-	qb_imagePickerControllerDidCancel?(imagePickerController: QBImagePickerController): void;
+    qb_imagePickerControllerDidCancel?(imagePickerController: QBImagePickerController): void;
 
-	qb_imagePickerControllerDidDeselectAsset?(imagePickerController: QBImagePickerController, asset: PHAsset): void;
+    qb_imagePickerControllerDidDeselectAsset?(imagePickerController: QBImagePickerController, asset: PHAsset): void;
 
-	qb_imagePickerControllerDidFinishPickingAssets?(imagePickerController: QBImagePickerController, assets: NSArray<any>): void;
+    qb_imagePickerControllerDidFinishPickingAssets?(imagePickerController: QBImagePickerController, assets: NSArray<any>): void;
 
-	qb_imagePickerControllerDidSelectAsset?(imagePickerController: QBImagePickerController, asset: PHAsset): void;
+    qb_imagePickerControllerDidSelectAsset?(imagePickerController: QBImagePickerController, asset: PHAsset): void;
 
-	qb_imagePickerControllerShouldSelectAsset?(imagePickerController: QBImagePickerController, asset: PHAsset): boolean;
+    qb_imagePickerControllerShouldSelectAsset?(imagePickerController: QBImagePickerController, asset: PHAsset): boolean;
 }
 declare var QBImagePickerControllerDelegate: {
 
-	prototype: QBImagePickerControllerDelegate;
+    prototype: QBImagePickerControllerDelegate;
 };
 
 declare var QBImagePickerControllerVersionNumber: number;
@@ -156,76 +154,76 @@ declare var QBImagePickerControllerVersionString: interop.Reference<number>;
 
 declare const enum QBImagePickerMediaType {
 
-	Any = 0,
+    Any = 0,
 
-	Image = 1,
+    Image = 1,
 
-	Video = 2
+    Video = 2
 }
 
 declare class QBSlomoIconView extends UIView {
 
-	static alloc(): QBSlomoIconView; // inherited from NSObject
+    static alloc(): QBSlomoIconView; // inherited from NSObject
 
-	static appearance(): QBSlomoIconView; // inherited from UIAppearance
+    static appearance(): QBSlomoIconView; // inherited from UIAppearance
 
-	static appearanceForTraitCollection(trait: UITraitCollection): QBSlomoIconView; // inherited from UIAppearance
+    static appearanceForTraitCollection(trait: UITraitCollection): QBSlomoIconView; // inherited from UIAppearance
 
-	static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBSlomoIconView; // inherited from UIAppearance
+    static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBSlomoIconView; // inherited from UIAppearance
 
-	static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBSlomoIconView; // inherited from UIAppearance
+    static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBSlomoIconView; // inherited from UIAppearance
 
-	static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBSlomoIconView; // inherited from UIAppearance
+    static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBSlomoIconView; // inherited from UIAppearance
 
-	static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBSlomoIconView; // inherited from UIAppearance
+    static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBSlomoIconView; // inherited from UIAppearance
 
-	static new(): QBSlomoIconView; // inherited from NSObject
+    static new(): QBSlomoIconView; // inherited from NSObject
 
-	iconColor: UIColor;
+    iconColor: UIColor;
 }
 
 declare class QBVideoIconView extends UIView {
 
-	static alloc(): QBVideoIconView; // inherited from NSObject
+    static alloc(): QBVideoIconView; // inherited from NSObject
 
-	static appearance(): QBVideoIconView; // inherited from UIAppearance
+    static appearance(): QBVideoIconView; // inherited from UIAppearance
 
-	static appearanceForTraitCollection(trait: UITraitCollection): QBVideoIconView; // inherited from UIAppearance
+    static appearanceForTraitCollection(trait: UITraitCollection): QBVideoIconView; // inherited from UIAppearance
 
-	static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBVideoIconView; // inherited from UIAppearance
+    static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBVideoIconView; // inherited from UIAppearance
 
-	static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBVideoIconView; // inherited from UIAppearance
+    static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBVideoIconView; // inherited from UIAppearance
 
-	static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBVideoIconView; // inherited from UIAppearance
+    static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBVideoIconView; // inherited from UIAppearance
 
-	static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBVideoIconView; // inherited from UIAppearance
+    static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBVideoIconView; // inherited from UIAppearance
 
-	static new(): QBVideoIconView; // inherited from NSObject
+    static new(): QBVideoIconView; // inherited from NSObject
 
-	iconColor: UIColor;
+    iconColor: UIColor;
 }
 
 declare class QBVideoIndicatorView extends UIView {
 
-	static alloc(): QBVideoIndicatorView; // inherited from NSObject
+    static alloc(): QBVideoIndicatorView; // inherited from NSObject
 
-	static appearance(): QBVideoIndicatorView; // inherited from UIAppearance
+    static appearance(): QBVideoIndicatorView; // inherited from UIAppearance
 
-	static appearanceForTraitCollection(trait: UITraitCollection): QBVideoIndicatorView; // inherited from UIAppearance
+    static appearanceForTraitCollection(trait: UITraitCollection): QBVideoIndicatorView; // inherited from UIAppearance
 
-	static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBVideoIndicatorView; // inherited from UIAppearance
+    static appearanceForTraitCollectionWhenContainedIn(trait: UITraitCollection, ContainerClass: typeof NSObject): QBVideoIndicatorView; // inherited from UIAppearance
 
-	static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBVideoIndicatorView; // inherited from UIAppearance
+    static appearanceForTraitCollectionWhenContainedInInstancesOfClasses(trait: UITraitCollection, containerTypes: NSArray<typeof NSObject>): QBVideoIndicatorView; // inherited from UIAppearance
 
-	static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBVideoIndicatorView; // inherited from UIAppearance
+    static appearanceWhenContainedIn(ContainerClass: typeof NSObject): QBVideoIndicatorView; // inherited from UIAppearance
 
-	static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBVideoIndicatorView; // inherited from UIAppearance
+    static appearanceWhenContainedInInstancesOfClasses(containerTypes: NSArray<typeof NSObject>): QBVideoIndicatorView; // inherited from UIAppearance
 
-	static new(): QBVideoIndicatorView; // inherited from NSObject
+    static new(): QBVideoIndicatorView; // inherited from NSObject
 
-	slomoIcon: QBSlomoIconView;
+    slomoIcon: QBSlomoIconView;
 
-	timeLabel: UILabel;
+    timeLabel: UILabel;
 
-	videoIcon: QBVideoIconView;
+    videoIcon: QBVideoIconView;
 }

From 86e7ac8259ba6a899c9866917a0af7f65a112ef2 Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Tue, 10 Apr 2018 17:57:26 +0300
Subject: [PATCH 14/20] fix: remove BSImagePicker reference

---
 src/references.d.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/references.d.ts b/src/references.d.ts
index f2bfebf..0d40032 100644
--- a/src/references.d.ts
+++ b/src/references.d.ts
@@ -1,4 +1,3 @@
 /// <reference path="./node_modules/tns-platform-declarations/ios.d.ts" />
 /// <reference path="./node_modules/tns-platform-declarations/android.d.ts" />
-/// <reference path="./typings/objc!QBImagePickerController.d.ts" />
-/// <reference path="./typings/objc!BSImagePicker.d.ts" />
+/// <reference path="./typings/objc!QBImagePickerController.d.ts" />
\ No newline at end of file

From 4992d660bcfb3d33ad0f96d4e45170d79bea1fc0 Mon Sep 17 00:00:00 2001
From: Zdravko Branzov <Zdravko.Branzov@progress.com>
Date: Wed, 11 Apr 2018 17:40:59 +0300
Subject: [PATCH 15/20] fix: UI tests and bump modules and runtime version.

---
 demo-angular/app/app.component.html |  4 ++--
 demo-angular/app/app.component.ts   |  7 +------
 demo-angular/app/main.ts            |  2 +-
 demo-angular/package.json           |  6 +++---
 demo/app/main-page.xml              |  5 ++---
 demo/app/main-view-model.ts         |  7 +++++++
 demo/e2e/test.e2e.ts                | 31 +++--------------------------
 7 files changed, 19 insertions(+), 43 deletions(-)

diff --git a/demo-angular/app/app.component.html b/demo-angular/app/app.component.html
index f011b22..82bbd9a 100644
--- a/demo-angular/app/app.component.html
+++ b/demo-angular/app/app.component.html
@@ -4,13 +4,13 @@
 
 <GridLayout rows="*, auto, auto">
     <ListView [items]="imageAssets">
-        <ng-template let-image="item">
+        <ng-template let-image="item" let-i="index">
             <GridLayout columns="auto, *">
                 <Image
                     [width]="thumbSize" 
                     [height]="thumbSize" 
                     [src]="image" stretch="fill"></Image>
-                <Label col="1" text="some text"></Label>
+                <Label col="1" [text]="'image ' + i"></Label>
             </GridLayout>
         </ng-template>
     </ListView>
diff --git a/demo-angular/app/app.component.ts b/demo-angular/app/app.component.ts
index 9f9676e..bc2a1c6 100644
--- a/demo-angular/app/app.component.ts
+++ b/demo-angular/app/app.component.ts
@@ -1,6 +1,4 @@
-import { Component, ChangeDetectorRef } from "@angular/core";
-import { ListView } from "tns-core-modules/ui/list-view";
-import { isAndroid } from "tns-core-modules/platform";
+import { Component } from "@angular/core";
 import * as imagepicker from "nativescript-imagepicker";
 
 @Component({
@@ -14,9 +12,6 @@ export class AppComponent {
     thumbSize: number = 80;
     previewSize: number = 300;
 
-    constructor(private _changeDetectionRef: ChangeDetectorRef) {
-    }
-
     public onSelectMultipleTap() {
         this.isSingleMode = false;
 
diff --git a/demo-angular/app/main.ts b/demo-angular/app/main.ts
index 639bfd5..5cf76e1 100644
--- a/demo-angular/app/main.ts
+++ b/demo-angular/app/main.ts
@@ -1,4 +1,4 @@
 import { platformNativeScriptDynamic } from "nativescript-angular/platform";
 import { AppModule } from "./app.module";
 
-platformNativeScriptDynamic().bootstrapModule(AppModule);
+platformNativeScriptDynamic({ createFrameOnBootstrap: true }).bootstrapModule(AppModule);
\ No newline at end of file
diff --git a/demo-angular/package.json b/demo-angular/package.json
index c60dc67..539d695 100644
--- a/demo-angular/package.json
+++ b/demo-angular/package.json
@@ -2,10 +2,10 @@
   "nativescript": {
     "id": "org.nativescript.imagepickerdemoangular",
     "tns-ios": {
-      "version": "3.4.0"
+      "version": "4.0.1"
     },
     "tns-android": {
-      "version": "3.4.0"
+      "version": "4.0.0"
     }
   },
   "dependencies": {
@@ -23,7 +23,7 @@
     "nativescript-unit-test-runner": "^0.3.4",
     "reflect-metadata": "~0.1.8",
     "rxjs": "^5.5.0",
-    "tns-core-modules": "^3.4.0"
+    "tns-core-modules": "^4.0.0"
   },
   "devDependencies": {
     "@angular/compiler-cli": "~5.0.0",
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
index 106882a..b237af5 100644
--- a/demo/app/main-page.xml
+++ b/demo/app/main-page.xml
@@ -3,15 +3,14 @@
         <ActionBar title="Image Picker" />
     </Page.actionBar>
     <GridLayout rows="*, auto, auto">
-        <ListView items="{{ imageAssets }}">
+        <ListView itemLoading="{{ onItemLoading }}" items="{{ imageAssets }}">
             <ListView.itemTemplate>
                 <GridLayout columns="auto, *">
                     <Image width="{{ $parents['ListView'].thumbSize }}" height="{{ $parents['ListView'].thumbSize }}" src="{{ $value }}" stretch="fill" />
-                    <Label col="1" text="some text" />
+                    <Label class="m-10" id="imageLabel" col="1" />
                 </GridLayout>
             </ListView.itemTemplate>
         </ListView>
-
         <Image src="{{ imageSrc }}" visibility="{{ isSingleMode ? 'visible' : 'collapsed' }}" width="{{ previewSize }}" height="{{ previewSize }}" stretch="aspectFit" />
         <Button row="1" text="Pick Single" tap="{{ onSelectSingleTap }}" horizontalAlignment="center" />
         <Button row="2" text="Pick Multiple" tap="{{ onSelectMultipleTap }}" horizontalAlignment="center" />
diff --git a/demo/app/main-view-model.ts b/demo/app/main-view-model.ts
index 42d5b36..1a76bc6 100644
--- a/demo/app/main-view-model.ts
+++ b/demo/app/main-view-model.ts
@@ -1,5 +1,7 @@
 import { Observable } from 'tns-core-modules/data/observable';
 import * as imagepicker from "nativescript-imagepicker";
+import { ItemEventData } from "tns-core-modules/ui/list-view";
+import { Label } from "tns-core-modules/ui/label";
 
 export class MainViewModel extends Observable {
     constructor() {
@@ -51,6 +53,11 @@ export class MainViewModel extends Observable {
         }
     }
 
+    public onItemLoading(args: ItemEventData) {
+        let label = args.view.getViewById<Label>("imageLabel");
+        label.text = "image " + args.index;
+    }
+
     public onSelectMultipleTap(args) {
         this.isSingleMode = false;
         let context = imagepicker.create({
diff --git a/demo/e2e/test.e2e.ts b/demo/e2e/test.e2e.ts
index 4d4f592..7f46dca 100644
--- a/demo/e2e/test.e2e.ts
+++ b/demo/e2e/test.e2e.ts
@@ -9,7 +9,6 @@ describe("Imagepicker", async function () {
     const imagesFolderName = "Images";
     const imagesFolderNameIos = "Camera Roll";
     const doneButtonText = "Done";
-    let isOlderEmulator;
     let driver: AppiumDriver;
 
     before(async () => {
@@ -31,12 +30,7 @@ describe("Imagepicker", async function () {
         //await driver.driver.resetApp();
         const pickSingleButtonText = "Pick Single";
         let confirmButtonText = isAndroid ? "Allow" : "OK";
-        let uploadPicVerification;
-        if (isAndroid) {
-            uploadPicVerification = isSauceRun ? "sauce_logo.png" : "pic1.jpeg";
-        } else {
-            uploadPicVerification = "IMG_0001.JPG";
-        }
+        let uploadPicVerification = "image 0";
 
         const pickSingleButton = await driver.findElementByText(pickSingleButtonText, SearchOptions.contains);
         await pickSingleButton.click();
@@ -49,7 +43,6 @@ describe("Imagepicker", async function () {
             const imagesFolder = await driver.driver.elementByXPathIfExists(imagesFolderXpath, 10000);
 
             if (isSauceRun && imagesFolder) {
-                isOlderEmulator = true;
                 await imagesFolder.click();
                 const downloadFolder = await driver.findElementByClassName(driver.locators.image);
                 await downloadFolder.click();
@@ -62,27 +55,14 @@ describe("Imagepicker", async function () {
         const pickedImage = await driver.findElementByClassName(driver.locators.image);
         await pickedImage.click();
 
-        if (!isAndroid) {
-            const doneButton = await driver.findElementByText(doneButtonText);
-            await doneButton.click();
-        }
-
         const result = await driver.findElementByText(uploadPicVerification, SearchOptions.contains);
         expect(result).to.exist;
     });
 
     it("should pick multiple images", async function () {
         let openImagesButtonText = isAndroid ? "Open" : doneButtonText;
-        let uploadPicVerification;
-        let uploadPicVerification2;
-
-        if (isAndroid) {
-            uploadPicVerification = isSauceRun ? "sauce_logo_red.png" : "pic2.jpeg";
-            uploadPicVerification2 = isSauceRun ? "sauce_logo.png" : "pic3.jpeg";
-        } else {
-            uploadPicVerification = "IMG_0001.JPG";
-            uploadPicVerification2 = "IMG_0002.JPG";
-        }
+        let uploadPicVerification = "image 0";
+        let uploadPicVerification2 = "image 1";
 
         const pickMultipleButtonText = "Pick Multiple";
         const pickMultipleButton = await driver.findElementByText(pickMultipleButtonText, SearchOptions.contains);
@@ -107,11 +87,6 @@ describe("Imagepicker", async function () {
         await openImagesButton.click();
         const img = await driver.findElementByText(uploadPicVerification, SearchOptions.contains);
         expect(img).to.exist;
-
-        if(isOlderEmulator){
-            uploadPicVerification2 = "saucelabs_sauce.png";
-        }
-
         const img1 = await driver.findElementByText(uploadPicVerification2, SearchOptions.contains);
         expect(img1).to.exist;
     });

From b53c1a93114a037cb5ea42fba8a6b5d4303c12b3 Mon Sep 17 00:00:00 2001
From: Zdravko Branzov <Zdravko.Branzov@progress.com>
Date: Wed, 11 Apr 2018 18:17:25 +0300
Subject: [PATCH 16/20] fix: travis build

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d6e5ed1..8734fc7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 env:
   global:
-    - ANDROID_PACKAGE='imagepickerdemo-debug.apk'
-    - ANDROID_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/platforms/android/app/build/outputs/apk
+    - ANDROID_PACKAGE='app-debug.apk'
+    - ANDROID_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/platforms/android/app/build/outputs/apk/debug
     - ANDROID_SAUCE_STORAGE="https://saucelabs.com/rest/v1/storage/$SAUCE_USER/$ANDROID_PACKAGE?overwrite=true"
     - IOS_PACKAGE='imagepickerdemo.zip'
     - IOS_PACKAGE_FOLDER=$TRAVIS_BUILD_DIR/demo/platforms/ios/build/emulator
@@ -78,7 +78,7 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-26.0.1
+    - build-tools-26.0.2
     - android-26
     - android-23
     - extra-android-m2repository

From 559ec60d8d6187d90a53a2798a8d38cd72c3fe82 Mon Sep 17 00:00:00 2001
From: Zdravko Branzov <Zdravko.Branzov@progress.com>
Date: Thu, 12 Apr 2018 09:47:34 +0300
Subject: [PATCH 17/20] chore: bump demo app runtime version

---
 demo/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo/package.json b/demo/package.json
index 9a52929..7a25c7d 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -2,10 +2,10 @@
   "nativescript": {
     "id": "org.nativescript.imagepickerdemo",
     "tns-android": {
-      "version": "3.4.2"
+      "version": "4.0.0"
     },
     "tns-ios": {
-      "version": "3.4.1"
+      "version": "4.0.1"
     }
   },
   "dependencies": {

From 31617655175fe6d9b1e360e49eabc47a9b084402 Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Thu, 12 Apr 2018 16:18:54 +0300
Subject: [PATCH 18/20] feature: support opening the picker from modal pages

---
 src/imagepicker.ios.ts | 16 ++++++++++++----
 src/index.d.ts         |  7 ++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/imagepicker.ios.ts b/src/imagepicker.ios.ts
index 99bbe63..d23ccd8 100644
--- a/src/imagepicker.ios.ts
+++ b/src/imagepicker.ios.ts
@@ -2,6 +2,7 @@ import * as data_observable from "tns-core-modules/data/observable";
 import * as frame from "tns-core-modules/ui/frame";
 import * as imageAssetModule from "tns-core-modules/image-asset";
 import { Options, ImagePickerMediaType } from ".";
+import { View } from "tns-core-modules/ui/core/view/view";
 
 const defaultAssetCollectionSubtypes: NSArray<any> = NSArray.arrayWithArray(<any>[
     PHAssetCollectionSubtype.SmartAlbumRecentlyAdded,
@@ -19,10 +20,17 @@ const defaultAssetCollectionSubtypes: NSArray<any> = NSArray.arrayWithArray(<any
 export class ImagePicker extends data_observable.Observable {
     _imagePickerController: QBImagePickerController;
     _imagePickerControllerDelegate: ImagePickerControllerDelegate;
+    _hostView: View;
 
-    constructor(options: Options) {
+    // lazy-load latest frame.topmost() if _hostName is not used
+    get hostView() {
+        return this._hostView || frame.topmost();
+    }
+
+    constructor(options: Options = {}, hostView: View) {
         super();
 
+        this._hostView = hostView;
         this._imagePickerControllerDelegate = new ImagePickerControllerDelegate();
 
         let imagePickerController = QBImagePickerController.alloc().init();
@@ -59,7 +67,7 @@ export class ImagePicker extends data_observable.Observable {
         return new Promise<void>((resolve, reject) => {
             this._imagePickerControllerDelegate._resolve = resolve;
 
-            frame.topmost().ios.controller.presentViewControllerAnimatedCompletion(this._imagePickerController, true, null);
+            (<any>this.hostView).viewController.presentViewControllerAnimatedCompletion(this._imagePickerController, true, null);
         });
     }
 }
@@ -97,7 +105,7 @@ export class ImagePickerControllerDelegate extends NSObject implements QBImagePi
     }
 }
 
-export function create(options?: Options): ImagePicker {
-    return new ImagePicker(options);
+export function create(options?: Options, hostView?: View): ImagePicker {
+    return new ImagePicker(options, hostView);
 }
 
diff --git a/src/index.d.ts b/src/index.d.ts
index 3b3e04c..50cf59b 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -1,6 +1,7 @@
 import { Observable } from "tns-core-modules/data/observable";
 import { ImageSource } from "tns-core-modules/image-source";
 import { ImageAsset } from "tns-core-modules/image-asset";
+import { View } from "tns-core-modules/ui/core/view/view";
 
 export class ImagePicker {
     /**
@@ -74,4 +75,8 @@ interface Options {
     };
 }
 
-export function create(options?: Options): ImagePicker;
+/**
+ * @param {Options} [options] - options for the image picker.
+ * @param {View} [hostView] - [use in iOS] the view that hosts the image picker (e.g. to use when open from a modal page).
+ */
+export function create(options?: Options, hostView?: View): ImagePicker;

From f63acd9615bd441a419b0412bba801ae3bc7cd55 Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Thu, 12 Apr 2018 17:38:59 +0300
Subject: [PATCH 19/20] chore: update README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 279b122..e54d06c 100644
--- a/README.md
+++ b/README.md
@@ -128,6 +128,8 @@ context
 | numberOfColumnsInLandscape | iOS | 7 | Set the number of columns in Landscape orientation. |
 | mediaType | iOS | Any | Choose whether to pick Image/Video/Any type of assets. |
 
+The **hostView** parameter can be set to the view that hosts the image picker. Applicable in iOS only, intended to be used when open picker from a modal page.
+
 * authorize() - request the required permissions.
 * present() - show the albums to present the user the ability to select images. Returns an array of the selected images.
 

From 4a1287020fa941e0b759b5c6fc2b1f83b4d8e8d3 Mon Sep 17 00:00:00 2001
From: Teodor Bozhikov <Teodor.Bozhikov@progress.com>
Date: Thu, 12 Apr 2018 18:11:51 +0300
Subject: [PATCH 20/20] chore: update nativescript-dev-webpack version in demos

---
 demo-angular/package.json | 2 +-
 demo/package.json         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demo-angular/package.json b/demo-angular/package.json
index 539d695..548bd5e 100644
--- a/demo-angular/package.json
+++ b/demo-angular/package.json
@@ -42,7 +42,7 @@
     "lazy": "1.0.11",
     "nativescript-css-loader": "~0.26.0",
     "nativescript-dev-typescript": "^0.6.0",
-    "nativescript-dev-webpack": "^0.9.0",
+    "nativescript-dev-webpack": "^0.10.1",
     "nativescript-worker-loader": "~0.8.1",
     "raw-loader": "~0.5.1",
     "resolve-url-loader": "~2.1.0",
diff --git a/demo/package.json b/demo/package.json
index 7a25c7d..328d4fb 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -39,7 +39,7 @@
     "nativescript-css-loader": "~0.26.0",
     "nativescript-dev-appium": "3.1.0",
     "nativescript-dev-typescript": "^0.6.0",
-    "nativescript-dev-webpack": "^0.9.0",
+    "nativescript-dev-webpack": "^0.10.1",
     "nativescript-worker-loader": "~0.8.1",
     "raw-loader": "~0.5.1",
     "resolve-url-loader": "~2.1.0",