Merge pull request #234 from surfstudio/hotfix/replace_hardcoded_animation_parameter

Hotfix/replace hardcoded animation parameter

Author: NullIsOne

Example/targets/template.yml

@@ -36,7 +36,7 @@ targetTemplates:
       settings:
         base:
           PRODUCT_BUNDLE_IDENTIFIER: ${bundle_id}
-          MARKETING_VERSION: "7.3.5"
+          MARKETING_VERSION: "7.3.6"
           CURRENT_PROJECT_VERSION: 0
           VERSIONING_SYSTEM: "apple-generic"
           DEBUG_INFORMATION_FORMAT: dwarf-with-dsym

ReactiveDataDisplayManager.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = "ReactiveDataDisplayManager"
-  s.version = "7.3.5"
+  s.version = "7.3.6"
   s.summary = "Library with custom events and reusable adapter for scrollable UI Collections"
   s.homepage = "https://github.com/surfstudio/ReactiveDataDisplayManager"
   s.license = "MIT"

Source/Collection/Animator/CollectionSafeAnimator.swift

@@ -18,7 +18,7 @@ public final class CollectionSafeAnimator: Animator<UICollectionView> {
         self.generatorsProvider = generatorsProvider
     }
 
-    public override func performAnimated(in collection: UICollectionView, operation: Operation?) {
+    override func perform(in collection: UICollectionView, animated: Bool, operation: Animator<UICollectionView>.Operation?) {
         if operation == nil {
             let numberOfSectionsAreEqual = collection.numberOfSections == generatorsProvider?.sections.count
             guard numberOfSectionsAreEqual else {
@@ -32,7 +32,7 @@ public final class CollectionSafeAnimator: Animator<UICollectionView> {
                 return
             }
         }
-        baseAnimator.performAnimated(in: collection, operation: operation)
+        baseAnimator.perform(in: collection, animated: animated, operation: operation)
     }
 
 }

Source/Collection/DataSource/BaseCollectionDataSource.swift

@@ -146,11 +146,15 @@ private extension BaseCollectionDataSource {
         guard let expandable = cell as? ExpandableItem else {
             return
         }
-        expandable.onHeightChanged += { [weak self, weak collectionView] _ in
-            guard let collectionView = collectionView else {
+        expandable.onHeightChanged += { [weak self, weak expandable, weak collectionView] _ in
+            guard let collectionView = collectionView,
+                  let animated = expandable?.animatedExpandable else {
                 return
             }
-            self?.animator?.perform(in: collectionView, animated: true, operation: nil)
+
+            self?.animator?.perform(in: collectionView,
+                                    animated: animated,
+                                    operation: nil)
         }
     }
 

Source/Common/QueuedAnimator.swift

@@ -20,7 +20,7 @@ public final class QueuedAnimator<Collection: UIView>: Animator<Collection> {
         self.debouncer = .init(queue: .global(qos: .userInitiated), delay: debounceTime)
     }
 
-    override func performAnimated(in collection: Collection, operation: Animator<Collection>.Operation?) {
+    override func perform(in collection: Collection, animated: Bool, operation: Animator<Collection>.Operation?) {
         if operation == nil {
             // debounce
             debouncer.run { [weak baseAnimator, weak collection] in
@@ -29,11 +29,11 @@ public final class QueuedAnimator<Collection: UIView>: Animator<Collection> {
                 }
                 // waiting for main thread available
                 DispatchQueue.main.async {
-                    animator.performAnimated(in: collection, operation: operation)
+                    animator.perform(in: collection, animated: animated, operation: operation)
                 }
             }
         } else {
-            baseAnimator.performAnimated(in: collection, operation: operation)
+            baseAnimator.perform(in: collection, animated: animated, operation: operation)
         }
     }
 }

Source/Table/Animator/TableSafeAnimator.swift

@@ -18,7 +18,7 @@ public final class TableSafeAnimator: Animator<UITableView> {
         self.generatorsProvider = generatorsProvider
     }
 
-    public override func performAnimated(in collection: UITableView, operation: Operation?) {
+    override func perform(in collection: UITableView, animated: Bool, operation: Animator<UITableView>.Operation?) {
         if operation == nil {
             let numberOfSectionsAreEqual = collection.numberOfSections == generatorsProvider?.sections.count
             guard numberOfSectionsAreEqual else {
@@ -32,7 +32,7 @@ public final class TableSafeAnimator: Animator<UITableView> {
                 return
             }
         }
-        baseAnimator.performAnimated(in: collection, operation: operation)
+        baseAnimator.perform(in: collection, animated: animated, operation: operation)
     }
 
 }

Source/Table/DataSource/BaseTableDataSource.swift

@@ -125,11 +125,14 @@ private extension BaseTableDataSource {
         guard let expandable = cell as? ExpandableItem else {
             return
         }
-        expandable.onHeightChanged += { [weak self, weak tableView] _ in
-            guard let tableView = tableView else {
+        expandable.onHeightChanged += { [weak self, weak expandable, weak tableView] _ in
+            guard let tableView = tableView,
+                  let animated = expandable?.animatedExpandable else {
                 return
             }
-            self?.animator?.perform(in: tableView, animated: expandable.animatedExpandable, operation: nil)
+            self?.animator?.perform(in: tableView,
+                                    animated: animated,
+                                    operation: nil)
         }
     }
 

project.yml

@@ -36,7 +36,7 @@ targets:
       settings:
         base:
           PRODUCT_BUNDLE_IDENTIFIER: ru.surfstudio.rddm
-          MARKETING_VERSION: "7.3.5"
+          MARKETING_VERSION: "7.3.6"
           CURRENT_PROJECT_VERSION: 0
           VERSIONING_SYSTEM: "apple-generic"
           DEBUG_INFORMATION_FORMAT: dwarf-with-dsym