update from master

.gitignore

@@ -37,7 +37,9 @@ playground.xcworkspace
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
 # Package.pins
+Package.resolved
 .build/
+.swiftpm/
 
 # CocoaPods
 #

AssetsPickerViewController.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'AssetsPickerViewController'
-  s.version          = '2.9.6'
+  s.version          = '2.9.7'
   s.summary          = 'Picker controller that supports multiple photos and videos written in Swift.'
 
 # This description is used to generate tags and improve search results.
@@ -41,5 +41,4 @@ Fully customizable UI.
   # s.public_header_files = 'Pod/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
   s.dependency 'SnapKit'
-  s.dependency 'Device'
 end

AssetsPickerViewController/Classes/Album/Controller/AssetsAlbumViewController.swift

@@ -116,7 +116,15 @@ open class AssetsAlbumViewController: UIViewController {
             make.edges.equalToSuperview()
         }
 
-        loadingPlaceholderView.isHidden = true
+        let isFetchedAlbums = AssetsManager.shared.isFetchedAlbums
+        if isFetchedAlbums {
+            loadingActivityIndicatorView.stopAnimating()
+            loadingPlaceholderView.isHidden = true
+        } else {
+            loadingActivityIndicatorView.startAnimating()
+            loadingPlaceholderView.isHidden = false
+        }
+
         if #available(iOS 13.0, *) {
             loadingPlaceholderView.backgroundColor = .systemBackground
         } else {
@@ -333,6 +341,14 @@ extension AssetsAlbumViewController: AssetsManagerDelegate {
 
     public func assetsManagerFetched(manager: AssetsManager) {
         collectionView.reloadData()
+        let isFetchedAlbums = AssetsManager.shared.isFetchedAlbums
+        if isFetchedAlbums {
+            loadingActivityIndicatorView.stopAnimating()
+            loadingPlaceholderView.isHidden = true
+        } else {
+            loadingActivityIndicatorView.startAnimating()
+            loadingPlaceholderView.isHidden = false
+        }
     }
 
     public func assetsManager(manager: AssetsManager, authorizationStatusChanged oldStatus: PHAuthorizationStatus, newStatus: PHAuthorizationStatus) {}
@@ -366,4 +382,3 @@ extension AssetsAlbumViewController: AssetsManagerDelegate {
     public func assetsManager(manager: AssetsManager, removedAssets assets: [PHAsset], at indexPaths: [IndexPath]) {}
     public func assetsManager(manager: AssetsManager, updatedAssets assets: [PHAsset], at indexPaths: [IndexPath]) {}
 }
-

AssetsPickerViewController/Classes/Assets/AssetsManager+Sync.swift

@@ -98,9 +98,13 @@ extension AssetsManager: PHPhotoLibraryChangeObserver {
                 if let removedIndexesSet = assetsChangeDetails.removedIndexes {
                     let removedIndexes = removedIndexesSet.asArray().sorted(by: { $0.row < $1.row })
                     var removedAssets = [PHAsset]()
+                    let result = assetsChangeDetails.fetchResultAfterChanges
                     for removedIndex in removedIndexes.reversed() {
-                        removedAssets.insert(assetArray.remove(at: removedIndex.row), at: 0)
+                        let asset = fetchResult.object(at: removedIndex.row)
+                        removedAssets.insert(asset, at: 0)
                     }
+                    // update date source
+                    self.fetchResult = result
                     // stop caching for removed assets
                     stopCache(assets: removedAssets, size: pickerConfig.assetCacheSize)
                     notifySubscribers({ $0.assetsManager(manager: self, removedAssets: removedAssets, at: removedIndexes) }, condition: removedAssets.count > 0)
@@ -109,11 +113,13 @@ extension AssetsManager: PHPhotoLibraryChangeObserver {
                 if let insertedIndexesSet = assetsChangeDetails.insertedIndexes {
                     let insertedIndexes = insertedIndexesSet.asArray().sorted(by: { $0.row < $1.row })
                     var insertedAssets = [PHAsset]()
+                    let result = assetsChangeDetails.fetchResultAfterChanges
                     for insertedIndex in insertedIndexes {
-                        let insertedAsset = assetsChangeDetails.fetchResultAfterChanges.object(at: insertedIndex.row)
+                        let insertedAsset = result.object(at: insertedIndex.row)
                         insertedAssets.append(insertedAsset)
-                        assetArray.insert(insertedAsset, at: insertedIndex.row)
                     }
+                    // update date source
+                    self.fetchResult = result
                     // start caching for inserted assets
                     cache(assets: insertedAssets, size: pickerConfig.assetCacheSize)
                     notifySubscribers({ $0.assetsManager(manager: self, insertedAssets: insertedAssets, at: insertedIndexes) }, condition: insertedAssets.count > 0)