fix: CC-344 highlighting images when switching albums

rewardStyle · Oct 20, 2023 · 8098ca1 · 8098ca1
1 parent 955f3fe
commit 8098ca1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/Source/Pages/Gallery/YPLibraryVC+CollectionView.swift b/Source/Pages/Gallery/YPLibraryVC+CollectionView.swift
@@ -145,7 +145,7 @@ extension YPLibraryVC: UICollectionViewDelegate {
         cell.durationLabel.isHidden = !isVideo
         cell.durationLabel.text = isVideo ? YPHelper.formattedStrigFrom(asset.duration) : ""
         cell.multipleSelectionIndicator.isHidden = !isMultipleSelectionEnabled || (isMultipleSelectionEnabled && isVideo)
-        cell.isSelected = currentlySelectedIndex == indexPath.row
+        cell.isSelected = !disableAutomaticCellSelection && currentlySelectedIndex == indexPath.row && selectedItems.contains(where: { $0.assetIdentifier == asset.localIdentifier })
         cell.isUserInteractionEnabled = !(isMultipleSelectionEnabled && isVideo)
 
         // Set correct selection number
@@ -187,14 +187,14 @@ extension YPLibraryVC: UICollectionViewDelegate {
             let cellIsInTheSelectionPool = isInSelectionPool(indexPath: indexPath)
             let cellIsCurrentlySelected = previouslySelectedIndexPath.row == currentlySelectedIndex
             if cellIsInTheSelectionPool {
-                if cellIsCurrentlySelected {
+                if cellIsCurrentlySelected && !disableAutomaticCellSelection {
                     deselect(indexPath: indexPath)
                 }
             } else if isLimitExceeded == false {
                 addToSelection(indexPath: indexPath)
             }
-
-            if (cellIsCurrentlySelected && !cellIsInTheSelectionPool) || !cellIsCurrentlySelected {
+            if (cellIsCurrentlySelected && !cellIsInTheSelectionPool) || !cellIsCurrentlySelected || disableAutomaticCellSelection {
+                disableAutomaticCellSelection = false
                 collectionView.cellForItem(at: indexPath)?.isSelected = true
             }
 
@@ -212,6 +212,7 @@ extension YPLibraryVC: UICollectionViewDelegate {
             }
             collectionView.reloadItems(at: [indexPath, previouslySelectedIndexPath])
         }
+        disableAutomaticCellSelection = false
     }
 
     public func collectionView(_ collectionView: UICollectionView, shouldSelectItemAt indexPath: IndexPath) -> Bool {

diff --git a/Source/Pages/Gallery/YPLibraryVC.swift b/Source/Pages/Gallery/YPLibraryVC.swift
@@ -20,6 +20,7 @@ public final class YPLibraryVC: UIViewController, YPPermissionCheckable {
     public var currentlySelectedIndex: Int = 0
     internal let panGestureHelper = PanGestureHelper()
     internal var isInitialized = false
+    var disableAutomaticCellSelection = false
 
     // MARK: - Init
 
@@ -91,6 +92,7 @@ public final class YPLibraryVC: UIViewController, YPPermissionCheckable {
     }
 
     func setAlbum(_ album: YPAlbum) {
+        disableAutomaticCellSelection = isMultipleSelectionEnabled
         if YPConfig.showsLibraryButtonInTitle {
             title = album.title
         } else {
@@ -252,12 +254,10 @@ public final class YPLibraryVC: UIViewController, YPPermissionCheckable {
         }
 
         if mediaManager.hasResultItems,
-        let firstAsset = mediaManager.getAsset(at: 0) {
+        let firstAsset = mediaManager.getAsset(with: selectedItems.last?.assetIdentifier) ?? mediaManager.getAsset(at: 0) {
             changeAsset(firstAsset)
             v.collectionView.reloadData()
-            v.collectionView.selectItem(at: IndexPath(row: 0, section: 0),
-                                        animated: false,
-                                        scrollPosition: UICollectionView.ScrollPosition())
+
             if !isMultipleSelectionEnabled && YPConfig.library.preSelectItemOnMultipleSelection {
                 addToSelection(indexPath: IndexPath(row: 0, section: 0))
             }