TouchInstinct
/
RxSwift
311
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #402 from sergdort/image_picker_example_bug 

Fixes for bug with UIImagePickerController example.
This commit is contained in:
Krunoslav Zaher 2016-01-17 16:15:13 +01:00
parent 4e4d9dd794 5e619180ee
commit a50c6e59e9
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
RxExample/RxExample/Examples/ImagePicker/UIImagePickerController+RxCreate.swift
View File

@ -31,6 +31,12 @@ extension UIImagePickerController {
static func rx_createWithParent(parent: UIViewController?, animated: Bool = true, configureImagePicker: (UIImagePickerController) throws -> () = { x in }) -> Observable<UIImagePickerController> {
return Observable.create { [weak parent] observer in
let imagePicker = UIImagePickerController()
let dismissDisposable = imagePicker
.rx_didCancel
.subscribeNext({ [unowned imagePicker] in
dismissViewController(imagePicker, animated: true)
})
do {
try configureImagePicker(imagePicker)
}
@ -46,10 +52,10 @@ extension UIImagePickerController {
parent.presentViewController(imagePicker, animated: animated, completion: nil)
observer.on(.Next(imagePicker))
return AnonymousDisposable {
dismissViewController(imagePicker, animated: animated)
}
return CompositeDisposable(dismissDisposable, AnonymousDisposable {
dismissViewController(imagePicker, animated: animated)
})
}
}
}