Minor improvements

bandlab · Jun 30, 2023 · d21a06c · d21a06c
1 parent 4678e7b
commit d21a06c
Show file tree

Hide file tree

Showing 74 changed files with 176 additions and 147 deletions.
diff --git a/ChatLayout.podspec b/ChatLayout.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'ChatLayout'
-  s.version          = '1.3.0'
+  s.version          = '1.3.1'
   s.summary          = 'Chat UI Library. It uses custom UICollectionViewLayout to provide you full control over the presentation.'
   s.swift_version    = '5.8'
 

diff --git a/ChatLayout/Classes/Core/Extensions/RandomAccessCollection+Extension.swift b/ChatLayout/Classes/Core/Extensions/RandomAccessCollection+Extension.swift
@@ -20,9 +20,10 @@ extension RandomAccessCollection where Index == Int {
 
         while lowerBound < upperBound {
             let midIndex = lowerBound &+ (upperBound &- lowerBound) / 2
-            if predicate(self[midIndex]) == .orderedSame {
+            let result = predicate(self[midIndex])
+            if result == .orderedSame {
                 return midIndex
-            } else if predicate(self[midIndex]) == .orderedAscending {
+            } else if result == .orderedAscending {
                 lowerBound = midIndex &+ 1
             } else {
                 upperBound = midIndex

diff --git a/ChatLayout/Classes/Core/Model/StateController.swift b/ChatLayout/Classes/Core/Model/StateController.swift
@@ -152,9 +152,9 @@ final class StateController<Layout: ChatLayoutRepresentation> {
         let predicate: (ChatLayoutAttributes) -> ComparisonResult = { attributes in
             if attributes.frame.intersects(rect) {
                 return .orderedSame
-            } else if attributes.frame.minY > rect.maxY {
+            } else if attributes.frame.minY >= rect.maxY {
                 return .orderedDescending
-            } else if attributes.frame.maxY < rect.minY {
+            } else if attributes.frame.maxY <= rect.minY {
                 return .orderedAscending
             }
             return .orderedSame
@@ -835,9 +835,9 @@ final class StateController<Layout: ChatLayoutRepresentation> {
                         }
                         if itemFrame.intersects(visibleRect) {
                             return .orderedSame
-                        } else if itemFrame.minY > visibleRect.maxY {
+                        } else if itemFrame.minY >= visibleRect.maxY {
                             return .orderedDescending
-                        } else if itemFrame.maxX < visibleRect.minY {
+                        } else if itemFrame.maxX <= visibleRect.minY {
                             return .orderedAscending
                         }
                         return .orderedSame

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,10 +1,10 @@
 PODS:
-  - ChatLayout (1.3.0):
-    - ChatLayout/Ultimate (= 1.3.0)
-  - ChatLayout/Core (1.3.0)
-  - ChatLayout/Extras (1.3.0):
+  - ChatLayout (1.3.1):
+    - ChatLayout/Ultimate (= 1.3.1)
+  - ChatLayout/Core (1.3.1)
+  - ChatLayout/Extras (1.3.1):
     - ChatLayout/Core
-  - ChatLayout/Ultimate (1.3.0):
+  - ChatLayout/Ultimate (1.3.1):
     - ChatLayout/Core
     - ChatLayout/Extras
   - DifferenceKit (1.3.0):
@@ -35,7 +35,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  ChatLayout: 620aaa4cf30ce188cef80eb1dad391c9c250c5e2
+  ChatLayout: 7ce4d2a769cd48ce69481bf951fa3c73cec2063f
   DifferenceKit: ab185c4d7f9cef8af3fcf593e5b387fb81e999ca
   FPSCounter: 884afec377de66637808c4f52ecc3b85a404732b
   InputBarAccessoryView: 1d7b0a672b36e370f01f264b3907ef39d03328e3

diff --git a/Example/Tests/HelpersTests.swift b/Example/Tests/HelpersTests.swift
@@ -65,6 +65,34 @@ final class HelpersTests: XCTestCase {
         XCTAssertEqual((150...170).map { $0 }.binarySearch(predicate: predicate), nil)
     }
 
+    func testBinarySearchWithCGRect() {
+        let visibleRect = CGRect(origin: .init(x: 0, y: 100), size: .init(width: 100, height: 100))
+        let predicate: (CGRect) -> ComparisonResult = { frame in
+            if frame.intersects(visibleRect) {
+                return .orderedSame
+            } else if frame.minY >= visibleRect.maxY {
+                return .orderedDescending
+            } else if frame.maxX <= visibleRect.minY {
+                return .orderedAscending
+            }
+            XCTFail("Should not get here")
+            return .orderedSame
+        }
+        XCTAssertEqual([CGRect]().binarySearch(predicate: predicate), nil)
+        XCTAssertEqual((0...5).map { CGRect(origin: .init(x: 0, y: $0 * 50), size: .init(width: 100, height: 50)) }.binarySearch(predicate: predicate), 3)
+        XCTAssertEqual((-1...1).map { CGRect(origin: .init(x: 0, y: $0 * 50), size: .init(width: 100, height: 50)) }.binarySearch(predicate: predicate), nil)
+        XCTAssertEqual((1...1).map { CGRect(origin: .init(x: 0, y: $0 * 50), size: .init(width: 100, height: 50)) }.binarySearch(predicate: predicate), nil)
+        XCTAssertEqual((4...7).map { CGRect(origin: .init(x: 0, y: $0 * 50), size: .init(width: 100, height: 50)) }.binarySearch(predicate: predicate), nil)
+        XCTAssertEqual((4...4).map { CGRect(origin: .init(x: 0, y: $0 * 50), size: .init(width: 100, height: 50)) }.binarySearch(predicate: predicate), nil)
+
+        XCTAssertEqual([CGRect]().binarySearchRange(predicate: predicate), [])
+        XCTAssertEqual((0...5).map { CGRect(origin: .init(x: 0, y: $0 * 50), size: .init(width: 100, height: 50)) }.binarySearchRange(predicate: predicate).count, 2)
+        XCTAssertEqual((-1...1).map { CGRect(origin: .init(x: 0, y: $0 * 50), size: .init(width: 100, height: 50)) }.binarySearchRange(predicate: predicate).count, 0)
+        XCTAssertEqual((1...1).map { CGRect(origin: .init(x: 0, y: $0 * 50), size: .init(width: 100, height: 50)) }.binarySearchRange(predicate: predicate).count, 0)
+        XCTAssertEqual((4...7).map { CGRect(origin: .init(x: 0, y: $0 * 50), size: .init(width: 100, height: 50)) }.binarySearchRange(predicate: predicate).count, 0)
+        XCTAssertEqual((4...4).map { CGRect(origin: .init(x: 0, y: $0 * 50), size: .init(width: 100, height: 50)) }.binarySearchRange(predicate: predicate).count, 0)
+    }
+
     func testSearchInRange() {
         let predicate: (Int) -> ComparisonResult = { integer in
             if integer < 100 {

diff --git a/Example/Tests/PerformanceTests.swift b/Example/Tests/PerformanceTests.swift
@@ -70,7 +70,7 @@ final class PerformanceTests: XCTestCase {
 
         let rect = CGRect(origin: CGPoint(x: 0, y: 99999), size: CGSize(width: 300, height: 2))
         let attributes = layout.controller.layoutAttributesForElements(in: rect, state: .beforeUpdate, ignoreCache: true)
-        XCTAssertEqual(attributes.count, 4)
+        XCTAssertEqual(attributes.count, 2)
         measure {
             for _ in 0..<10 {
                 _ = layout.controller.layoutAttributesForElements(in: rect, state: .beforeUpdate, ignoreCache: true)

diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "slather", "2.6.1"
+gem "slather", "2.7.4"
 gem "cocoapods"
 gem "jazzy"
diff --git a/docs/Classes/CellLayoutContainerView.html b/docs/Classes/CellLayoutContainerView.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          ChatLayout 1.3.0 Docs
+          ChatLayout 1.3.1 Docs
         </a>
          (100% documented)
       </p>
@@ -464,7 +464,7 @@ <h4>Parameters</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-05-19)</p>
+      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-06-30)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
     </section>
   </body>

diff --git a/docs/Classes/ChatLayoutAttributes.html b/docs/Classes/ChatLayoutAttributes.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          ChatLayout 1.3.0 Docs
+          ChatLayout 1.3.1 Docs
         </a>
          (100% documented)
       </p>
@@ -423,7 +423,7 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-05-19)</p>
+      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-06-30)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
     </section>
   </body>

diff --git a/docs/Classes/ChatLayoutInvalidationContext.html b/docs/Classes/ChatLayoutInvalidationContext.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          ChatLayout 1.3.0 Docs
+          ChatLayout 1.3.1 Docs
         </a>
          (100% documented)
       </p>
@@ -208,7 +208,7 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-05-19)</p>
+      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-06-30)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
     </section>
   </body>

diff --git a/docs/Classes/CollectionViewChatLayout.html b/docs/Classes/CollectionViewChatLayout.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          ChatLayout 1.3.0 Docs
+          ChatLayout 1.3.1 Docs
         </a>
          (100% documented)
       </p>
@@ -1354,7 +1354,7 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-05-19)</p>
+      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-06-30)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
     </section>
   </body>

diff --git a/docs/Classes/ContainerCollectionReusableView.html b/docs/Classes/ContainerCollectionReusableView.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          ChatLayout 1.3.0 Docs
+          ChatLayout 1.3.1 Docs
         </a>
          (100% documented)
       </p>
@@ -384,7 +384,7 @@ <h4>Parameters</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-05-19)</p>
+      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-06-30)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
     </section>
   </body>

diff --git a/docs/Classes/ContainerCollectionViewCell.html b/docs/Classes/ContainerCollectionViewCell.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          ChatLayout 1.3.0 Docs
+          ChatLayout 1.3.1 Docs
         </a>
          (100% documented)
       </p>
@@ -384,7 +384,7 @@ <h4>Parameters</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-05-19)</p>
+      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-06-30)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
     </section>
   </body>

diff --git a/docs/Classes/EdgeAligningView.html b/docs/Classes/EdgeAligningView.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          ChatLayout 1.3.0 Docs
+          ChatLayout 1.3.1 Docs
         </a>
          (100% documented)
       </p>
@@ -536,7 +536,7 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-05-19)</p>
+      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-06-30)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
     </section>
   </body>

diff --git a/docs/Classes/EdgeAligningView/Edge.html b/docs/Classes/EdgeAligningView/Edge.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../../index.html">
-          ChatLayout 1.3.0 Docs
+          ChatLayout 1.3.1 Docs
         </a>
          (100% documented)
       </p>
@@ -288,7 +288,7 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-05-19)</p>
+      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-06-30)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
     </section>
   </body>

diff --git a/docs/Classes/ImageMaskedView.html b/docs/Classes/ImageMaskedView.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          ChatLayout 1.3.0 Docs
+          ChatLayout 1.3.1 Docs
         </a>
          (100% documented)
       </p>
@@ -408,7 +408,7 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-05-19)</p>
+      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-06-30)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
     </section>
   </body>

diff --git a/docs/Classes/MessageContainerView.html b/docs/Classes/MessageContainerView.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          ChatLayout 1.3.0 Docs
+          ChatLayout 1.3.1 Docs
         </a>
          (100% documented)
       </p>
@@ -354,7 +354,7 @@ <h4>Parameters</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-05-19)</p>
+      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-06-30)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
     </section>
   </body>

diff --git a/docs/Classes/RoundedCornersContainerView.html b/docs/Classes/RoundedCornersContainerView.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          ChatLayout 1.3.0 Docs
+          ChatLayout 1.3.1 Docs
         </a>
          (100% documented)
       </p>
@@ -354,7 +354,7 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-05-19)</p>
+      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-06-30)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
     </section>
   </body>

diff --git a/docs/Classes/SwappingContainerView.html b/docs/Classes/SwappingContainerView.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../index.html">
-          ChatLayout 1.3.0 Docs
+          ChatLayout 1.3.1 Docs
         </a>
          (100% documented)
       </p>
@@ -599,7 +599,7 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-05-19)</p>
+      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-06-30)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
     </section>
   </body>

diff --git a/docs/Classes/SwappingContainerView/Axis.html b/docs/Classes/SwappingContainerView/Axis.html
@@ -21,7 +21,7 @@
     <header class="header">
       <p class="header-col header-col--primary">
         <a class="header-link" href="../../index.html">
-          ChatLayout 1.3.0 Docs
+          ChatLayout 1.3.1 Docs
         </a>
          (100% documented)
       </p>
@@ -234,7 +234,7 @@ <h4>Declaration</h4>
       </article>
     </div>
     <section class="footer">
-      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-05-19)</p>
+      <p>&copy; 2023 <a class="link" href="https://github.com/ekazaev" target="_blank" rel="external noopener">Evgeny Kazaev</a>. All rights reserved. (Last updated: 2023-06-30)</p>
       <p>Generated by <a class="link" href="https://github.com/realm/jazzy" target="_blank" rel="external noopener">jazzy ♪♫ v0.14.3</a>, a <a class="link" href="https://realm.io" target="_blank" rel="external noopener">Realm</a> project.</p>
     </section>
   </body>