Merge branch 'christmas-feature-branch' into fix/disable-qr-code-univ…

…ersal-links
wordpress-mobile · Jan 7, 2025 · 011b671 · 011b671
2 parents f9738ee + 530faff
commit 011b671
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -16,6 +16,7 @@
 * [*] Update site menu style on iPhone [#23944]
 * [*] Integrate zoom transitions in Themes, Reader [#23945, #23947]
 * [*] Fix an issue with site icons cropped in share extensions [#23950]
+* [*] Enable fast deceleration for filters on the Discover tab [#23954]
 * [*] Disable universal links support for QR code login. You can only scan the codes using the app now. [#23953]
 
 25.6

diff --git a/WordPress/Classes/ViewRelated/Reader/Headers/ReaderDiscoverHeaderView.swift b/WordPress/Classes/ViewRelated/Reader/Headers/ReaderDiscoverHeaderView.swift
@@ -22,6 +22,8 @@ final class ReaderDiscoverHeaderView: ReaderBaseHeaderView, UITextViewDelegate {
         scrollView.addSubview(channelsStackView)
         scrollView.showsHorizontalScrollIndicator = false
         scrollView.clipsToBounds = false
+        scrollView.decelerationRate = .fast
+
         channelsStackView.pinEdges()
         scrollView.heightAnchor.constraint(equalTo: channelsStackView.heightAnchor).isActive = true
 
@@ -65,7 +67,7 @@ final class ReaderDiscoverHeaderView: ReaderBaseHeaderView, UITextViewDelegate {
 
     private func updateScrollViewInsets() {
         scrollView.contentInset.left = contentView.frame.minX - (isCompact ? 0 : 10)
-        scrollView.contentInset.right = frame.maxX - contentView.frame.maxX
+        scrollView.contentInset.right = frame.maxX - contentView.frame.maxX + 10
         scrollView.contentOffset = CGPoint(x: -scrollView.contentInset.left, y: 0)
     }