Fixes bug with preview image arriving after full image.

Fixes bug when receiving changes from iCloud where there are deletions and changes for the same IndexPath
Use UIScheduler() instead of QueueScheduler.main.
Upgrade to ReactiveCocoa 6.0

Author: mluisbrown

Cartfile

@@ -1,4 +1,4 @@
 github "bizz84/SwiftyStoreKit"
 github "mluisbrown/DACircularProgress" "master"
 github "robb/Cartography"
-github "ReactiveCocoa/ReactiveCocoa" ~> 5.0
+github "ReactiveCocoa/ReactiveCocoa"

Cartfile.resolved

@@ -1,6 +1,6 @@
-github "ReactiveCocoa/ReactiveCocoa" "5.0.4"
-github "ReactiveCocoa/ReactiveSwift" "1.1.5"
+github "ReactiveCocoa/ReactiveCocoa" "6.0.0"
+github "ReactiveCocoa/ReactiveSwift" "2.0.0"
 github "antitypical/Result" "3.2.3"
-github "bizz84/SwiftyStoreKit" "0.10.4"
+github "bizz84/SwiftyStoreKit" "0.10.5"
 github "mluisbrown/DACircularProgress" "b00da38778a4e0f7962df88e1c5ad7dd41eef862"
 github "robb/Cartography" "1.1.0"

Memories/Date Picker/DatePickerViewController.swift

@@ -71,7 +71,7 @@ class DatePickerViewController: UIViewController, UIPickerViewDataSource, UIPick
             }
         }
 
-        datesWithCount <~ buildDatesWithCount().observe(on: QueueScheduler.main)
+        datesWithCount <~ buildDatesWithCount().observe(on: UIScheduler())
     }
 
 // MARK: - UIPickerViewDataSource

Memories/Grid View/GridViewController.swift

@@ -69,31 +69,31 @@ class GridViewController: UICollectionViewController
     let RELEASE_THRESHOLD : CGFloat = 100.0
 
     private func bindToModel() {
-        model.resultsDate.signal.observe(on: QueueScheduler.main)
+        model.resultsDate.signal.observe(on: UIScheduler())
             .skipRepeats(==)
             .observeValues { [weak self] date in
                 self?.refreshData(for: date)
         }
 
-        model.title.producer.observe(on: QueueScheduler.main)
+        model.title.producer.observe(on: UIScheduler())
             .startWithValues { [weak self] title in
                 self?.titleView.text = title
                 self?.titleView.sizeToFit()
         }
 
-        model.sectionChanged.observe(on: QueueScheduler.main)
+        model.sectionChanged.observe(on: UIScheduler())
             .observeValues { [weak self]  changes in
                 self?.updateSection(with: changes)
         }
 
-        model.statusText.producer.observe(on: QueueScheduler.main)
+        model.statusText.producer.observe(on: UIScheduler())
             .startWithValues { [weak self] status in
                 self?.showHideStatusLabel(status)
         }
     }
 
     private func loadPhotos() {
-        PhotoLibraryAuthorization.checkPhotosPermission().observe(on: QueueScheduler.main)
+        PhotoLibraryAuthorization.checkPhotosPermission().observe(on: UIScheduler())
             .startWithValues { [weak self] status in
                 switch status {
                 case .authorized:
@@ -181,7 +181,9 @@ class GridViewController: UICollectionViewController
 
     // MARK: - Observer handlers
     private func updateSection(with changes: SectionChanges) {
-        if changes.nonIncremental {
+        let changeRemoveConflicts = changes.changed.filter() { changes.removed.contains($0) }.count != 0
+        
+        if changes.nonIncremental || changeRemoveConflicts {
             collectionView?.reloadSections(IndexSet(integer: changes.section))
         }
         else {

Memories/Grid View/GridViewModel.swift

@@ -51,7 +51,7 @@ struct GridViewModel {
     }
 
     fileprivate let assetFetchResults = MutableProperty([PHFetchResult<PHAsset>]())
-    fileprivate let sectionChangesObserver: Observer<SectionChanges, NoError>
+    fileprivate let sectionChangesObserver: Signal<SectionChanges, NoError>.Observer
     let sectionChanged: Signal<SectionChanges, NoError>
 
     let libraryObserver: PhotoLibraryObserver?

Memories/Photos View/PhotoViewModel.swift

@@ -19,8 +19,8 @@ enum AssetResource {
 
 final class PhotoViewModel {
     let asset: MutableProperty<PHAsset>
-    let assetResource = MutableProperty<AssetResource?>(nil)
     let previewImage = MutableProperty<UIImage?>(nil)
+    let assetResource = MutableProperty<AssetResource?>(nil)
     let assetRequestId = MutableProperty<PHImageRequestID?>(nil)
 
     let fullImageUnavailable = MutableProperty(false)

Memories/Photos View/PhotosViewController.swift

@@ -68,7 +68,7 @@ class PhotosViewController: UIViewController,
             .filter { [weak self] in
                 self?.pageViews[$0] != nil
             }
-            .observe(on: QueueScheduler.main)
+            .observe(on: UIScheduler())
             .observeValues {
                 let pageView = self.pageViews[$0]!
                 let photoViewModel = self.model.photoViewModel(at: $0)
@@ -77,7 +77,7 @@ class PhotosViewController: UIViewController,
         }
 
         model.photoViewModels.signal
-            .observe(on: QueueScheduler.main)
+            .observe(on: UIScheduler())
             .observeValues { [weak self] in
                 if $0.count == 0 {
                     self?.presentingViewController?.dismiss(animated: true, completion: nil)
@@ -90,7 +90,7 @@ class PhotosViewController: UIViewController,
         }
 
         model.currentAssetChanged.signal
-            .observe(on: QueueScheduler.main)
+            .observe(on: UIScheduler())
             .observeValues { [weak self] in
                 self?.heartButton.setImage(self?.buttonImage(forFavorite: $0.isFavorite), for: .normal)
         }        

Memories/Photos View/PhotosViewModel.swift

@@ -21,10 +21,10 @@ struct PhotosViewModel {
     fileprivate let _photoViewModels = MutableProperty([PhotoViewModel]())
     let photoViewModels: Property<[PhotoViewModel]>
 
-    fileprivate let indexLoadedAndVisibleObserver: Observer<Int, NoError>
+    fileprivate let indexLoadedAndVisibleObserver: Signal<Int, NoError>.Observer
     let indexLoadedAndVisible: Signal<Int, NoError>
 
-    fileprivate let currentAssetChangedObserver: Observer<PHAsset, NoError>
+    fileprivate let currentAssetChangedObserver: Signal<PHAsset, NoError>.Observer
     let currentAssetChanged: Signal<PHAsset, NoError>
 
     private let libraryObserver: PhotoLibraryObserver
@@ -76,8 +76,11 @@ extension PhotosViewModel {
     func loadPreviewImageFor(index: Int) {
         let photoViewModel = photoViewModels.value[index]
 
-        self.imageManager.requestImage(for: photoViewModel.asset.value, targetSize: self.cacheSize,
-                                       contentMode: .aspectFill, options: nil, resultHandler: { result, userInfo in
+        self.imageManager.requestImage(for: photoViewModel.asset.value, 
+                                                                               targetSize: self.cacheSize,
+                                                                               contentMode: .aspectFill, 
+                                                                               options: nil, 
+                                                                               resultHandler: { result, userInfo in
             if let image = result {
                 photoViewModel.previewImage.value = image
 

Memories/Photos View/ZoomingPhotoView.swift

@@ -151,10 +151,10 @@ class ZoomingPhotoView: UIView, UIScrollViewDelegate {
         model.assetResource.signal
             .take(during: self.reactive.lifetime)
             .skipNil()
-            .on(value: { [weak self] _ in
+            .on() { [weak self] _ in
                 self?.model.imageIsPreview.value = false
-            })
-            .observe(on: QueueScheduler.main)
+            }
+            .observe(on: UIScheduler())
             .observeValues { [weak self] in
                 self?.progressView.isHidden = true
 
@@ -173,32 +173,32 @@ class ZoomingPhotoView: UIView, UIScrollViewDelegate {
         model.previewImage.signal
             .take(during: self.reactive.lifetime)
             .skipNil()
-            .on(value: { [weak self] _ in
-                self?.model.imageIsPreview.value = true
-            })
-            .observe(on: QueueScheduler.main)
+            .filter() { [weak self] _ in 
+                self?.model.imageIsPreview.value == true 
+            } 
+            .observe(on: UIScheduler())
             .observeValues { [weak self] in
                 self?.mediaView.photo = $0
                 self?.adjustZoomScale()
         }
 
         model.progress.signal
             .take(during: self.reactive.lifetime)
-            .observe(on: QueueScheduler.main)
+            .observe(on: UIScheduler())
             .observeValues { [weak self] in
             self?.updateProgress($0)
         }
 
         model.indeterminateProgress.signal
             .take(during: self.reactive.lifetime)
-            .observe(on: QueueScheduler.main)
+            .observe(on: UIScheduler())
             .observeValues { [weak self] in
             self?.updateProgress(indeterminate: $0)
         }
 
         model.fullImageUnavailable.signal
             .take(during: self.reactive.lifetime)
-            .observe(on: QueueScheduler.main)
+            .observe(on: UIScheduler())
             .filter { $0 }
             .observeValues { [weak self] _ in
                 self?.errorIndicator.isHidden = false

Memories/Supporting Files/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>27</string>
+	<string>28</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>