fix(SegmentSelector): Fix segment selection after theme changes (#131)

Telefonica · Sep 6, 2021 · 27afa2e · 27afa2e
1 parent 211eb4d
commit 27afa2e
Show file tree

Hide file tree

Showing 19 changed files with 53 additions and 2 deletions.
diff --git a/Mistica/Source/Components/Checkbox/Checkbox.swift b/Mistica/Source/Components/Checkbox/Checkbox.swift
@@ -184,7 +184,7 @@ private extension Checkbox {
             imageView.layer.opacity = 1
             imageView.layer.transform = CATransform3DIdentity
             borderView.layer.borderColor = UIColor.controlActivated.cgColor
-            borderView.layer.borderWidth = intrinsicContentSize.width / 2.0
+            borderView.layer.borderWidth = max(bounds.width, intrinsicContentSize.width) / 2.0
         } else {
             imageView.layer.opacity = 0
             imageView.layer.transform = CATransform3DScale(imageView.layer.transform, 0.01, 0.01, 0.01)

diff --git a/Mistica/Source/Components/SegmentSelector/SegmentSelector.swift b/Mistica/Source/Components/SegmentSelector/SegmentSelector.swift
@@ -117,6 +117,10 @@ public class SegmentSelector: UIView {
             themeDidChange()
         }
     }
+
+    override public var intrinsicContentSize: CGSize {
+        collectionView.intrinsicContentSize
+    }
 }
 
 // MARK: Public API
@@ -166,7 +170,7 @@ extension SegmentSelector: UICollectionViewDataSource {
 // MARK: UICollectionViewDelegate
 
 extension SegmentSelector: UICollectionViewDelegate {
-    public func collectionView(_: UICollectionView, shouldSelectItemAt indexPath: IndexPath) -> Bool {
+    public func collectionView(_ collectionView: UICollectionView, shouldSelectItemAt indexPath: IndexPath) -> Bool {
         // We allow selection only when the cell is not already selected.
         indexPath.item != selectedSegmentIndex
     }
@@ -326,7 +330,11 @@ private extension SegmentSelector {
     }
 
     func reloadContent() {
+        let selectedSegment = self.selectedSegment
         collectionView.reloadData()
+        if let selectedSegment = selectedSegment {
+            select(selectedSegment)
+        }
         scrollToFirstItemIfNeeded()
     }
 

diff --git a/Mistica/Tests/MisticaTests/UI/SegmentSelectorTests.swift b/Mistica/Tests/MisticaTests/UI/SegmentSelectorTests.swift
@@ -0,0 +1,43 @@
+//
+//  SegmentSelectorTests.swift
+//
+//  Made with ❤️ by Novum
+//
+//  Copyright © Telefonica. All rights reserved.
+//
+
+@testable import Mistica
+import SnapshotTesting
+import XCTest
+
+final class SegmentSelectorTests: XCTestCase {
+    override func setUp() {
+        super.setUp()
+        UIView.setAnimationsEnabled(false)
+
+        isRecording = false
+    }
+
+    func testSegmentsInSegmentSelector() {
+        assertSnapshotForAllBrandsAndStyles(
+            as: .image(size: CGSize(width: 320, height: 49)),
+            viewBuilder: makeSegmentSelector(segments: 5, hasSelectedItem: false)
+        )
+    }
+
+    func testSelectedSegmentsInSegmentSelector() {
+        assertSnapshotForAllBrandsAndStyles(
+            as: .image(size: CGSize(width: 320, height: 49)),
+            viewBuilder: makeSegmentSelector(segments: 5, hasSelectedItem: true)
+        )
+    }
+
+    func makeSegmentSelector(segments: Int, hasSelectedItem: Bool) -> SegmentSelector {
+        let segments = (0 ..< segments).map { Segment(id: "\($0)", title: "Segment") }
+        let segmentSelector = SegmentSelector(segments: segments)
+        if hasSelectedItem, let segment = segments.first {
+            segmentSelector.select(segment)
+        }
+        return segmentSelector
+    }
+}
diff --git a/...SegmentSelectorTests/testSegmentsInSegmentSelector.with-movistar-dark-style.png b/...SegmentSelectorTests/testSegmentsInSegmentSelector.with-movistar-dark-style.png
diff --git a/...ts__/SegmentSelectorTests/testSegmentsInSegmentSelector.with-movistar-style.png b/...ts__/SegmentSelectorTests/testSegmentsInSegmentSelector.with-movistar-style.png
diff --git a/...ots__/SegmentSelectorTests/testSegmentsInSegmentSelector.with-o2-dark-style.png b/...ots__/SegmentSelectorTests/testSegmentsInSegmentSelector.with-o2-dark-style.png
diff --git a/...napshots__/SegmentSelectorTests/testSegmentsInSegmentSelector.with-o2-style.png b/...napshots__/SegmentSelectorTests/testSegmentsInSegmentSelector.with-o2-style.png
diff --git a/...egmentSelectorTests/testSegmentsInSegmentSelector.with-o2Classic-dark-style.png b/...egmentSelectorTests/testSegmentsInSegmentSelector.with-o2Classic-dark-style.png
diff --git a/...s__/SegmentSelectorTests/testSegmentsInSegmentSelector.with-o2Classic-style.png b/...s__/SegmentSelectorTests/testSegmentsInSegmentSelector.with-o2Classic-style.png
diff --git a/...s__/SegmentSelectorTests/testSegmentsInSegmentSelector.with-vivo-dark-style.png b/...s__/SegmentSelectorTests/testSegmentsInSegmentSelector.with-vivo-dark-style.png
diff --git a/...pshots__/SegmentSelectorTests/testSegmentsInSegmentSelector.with-vivo-style.png b/...pshots__/SegmentSelectorTests/testSegmentsInSegmentSelector.with-vivo-style.png
diff --git a/...electorTests/testSelectedSegmentsInSegmentSelector.with-movistar-dark-style.png b/...electorTests/testSelectedSegmentsInSegmentSelector.with-movistar-dark-style.png
diff --git a/...mentSelectorTests/testSelectedSegmentsInSegmentSelector.with-movistar-style.png b/...mentSelectorTests/testSelectedSegmentsInSegmentSelector.with-movistar-style.png
diff --git a/...gmentSelectorTests/testSelectedSegmentsInSegmentSelector.with-o2-dark-style.png b/...gmentSelectorTests/testSelectedSegmentsInSegmentSelector.with-o2-dark-style.png
diff --git a/...__/SegmentSelectorTests/testSelectedSegmentsInSegmentSelector.with-o2-style.png b/...__/SegmentSelectorTests/testSelectedSegmentsInSegmentSelector.with-o2-style.png
diff --git a/...lectorTests/testSelectedSegmentsInSegmentSelector.with-o2Classic-dark-style.png b/...lectorTests/testSelectedSegmentsInSegmentSelector.with-o2Classic-dark-style.png
diff --git a/...entSelectorTests/testSelectedSegmentsInSegmentSelector.with-o2Classic-style.png b/...entSelectorTests/testSelectedSegmentsInSegmentSelector.with-o2Classic-style.png
diff --git a/...entSelectorTests/testSelectedSegmentsInSegmentSelector.with-vivo-dark-style.png b/...entSelectorTests/testSelectedSegmentsInSegmentSelector.with-vivo-dark-style.png
diff --git a/.../SegmentSelectorTests/testSelectedSegmentsInSegmentSelector.with-vivo-style.png b/.../SegmentSelectorTests/testSelectedSegmentsInSegmentSelector.with-vivo-style.png