Send a bool to the banner view for visibility. Extend scroll delegate with visibility logic.

Author: twstokes

WordPress/Classes/ViewRelated/Activity/JetpackActivityLogViewController.swift

@@ -3,7 +3,7 @@ import Combine
 
 class JetpackActivityLogViewController: BaseActivityListViewController {
     private let jetpackBannerView = JetpackBannerView()
-    let scrollViewTranslationPublisher = PassthroughSubject<CGFloat, Never>()
+    let scrollViewTranslationPublisher = PassthroughSubject<Bool, Never>()
 
     override init(site: JetpackSiteRef, store: ActivityStore, isFreeWPCom: Bool = false) {
         let activityListConfiguration = ActivityListConfiguration(
@@ -53,6 +53,6 @@ class JetpackActivityLogViewController: BaseActivityListViewController {
 extension JetpackActivityLogViewController: JPScrollViewDelegate {
     override func scrollViewDidScroll(_ scrollView: UIScrollView) {
         super.scrollViewDidScroll(scrollView)
-        scrollViewTranslationPublisher.send(scrollView.panGestureRecognizer.translation(in: scrollView.superview).y)
+        processJetpackBannerVisibility(scrollView)
     }
 }

WordPress/Classes/ViewRelated/Jetpack/Branding/Banner/JPScrollViewDelegate.swift

@@ -1,10 +1,11 @@
 import Combine
 import CoreGraphics
+import UIKit
 
 /// Conform to this protocol to send scrollview translations to a `JetpackBannerView` instance
 protocol JPScrollViewDelegate: UIScrollViewDelegate {
 
-    var scrollViewTranslationPublisher: PassthroughSubject<CGFloat, Never> { get }
+    var scrollViewTranslationPublisher: PassthroughSubject<Bool, Never> { get }
     func addTranslationObserver(_ receiver: JetpackBannerView)
 }
 
@@ -13,4 +14,30 @@ extension JPScrollViewDelegate {
     func addTranslationObserver(_ receiver: JetpackBannerView) {
         scrollViewTranslationPublisher.subscribe(receiver)
     }
+
+    func processJetpackBannerVisibility(_ scrollView: UIScrollView) {
+        let shouldHideJetpackBanner = Self.shouldHideJetpackBanner(
+            contentHeight: scrollView.contentSize.height,
+            frameHeight: scrollView.frame.height,
+            verticalContentOffset: scrollView.contentOffset.y + scrollView.adjustedContentInset.top
+        )
+
+        scrollViewTranslationPublisher.send(shouldHideJetpackBanner)
+    }
+
+    static func shouldHideJetpackBanner(
+        contentHeight: CGFloat,
+        frameHeight: CGFloat,
+        verticalContentOffset: CGFloat
+    ) -> Bool {
+        /// The scrollable content isn't any larger than its frame, so don't hide the banner if the view is bounced.
+        if contentHeight <= frameHeight {
+            return false
+        /// Don't hide the banner until the view has scrolled down some. Currently the height of the banner itself.
+        } else if verticalContentOffset <= JetpackBannerView.minimumHeight {
+            return false
+        }
+
+        return true
+    }
 }

WordPress/Classes/ViewRelated/Jetpack/Branding/Banner/JetpackBannerView.swift

@@ -47,16 +47,15 @@ class JetpackBannerView: UIView {
 // MARK: Responding to scroll events
 extension JetpackBannerView: Subscriber {
 
-    typealias Input = CGFloat
+    typealias Input = Bool
     typealias Failure = Never
 
     func receive(subscription: Subscription) {
         subscription.request(.unlimited)
     }
 
-    func receive(_ input: CGFloat) -> Subscribers.Demand {
-
-        let isHidden: Bool = input < 0
+    func receive(_ input: Bool) -> Subscribers.Demand {
+        let isHidden = input
 
         guard self.isHidden != isHidden else {
             return .unlimited

WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationsViewController.swift

@@ -135,7 +135,7 @@ class NotificationsViewController: UIViewController, UIViewControllerRestoration
     }()
 
     /// Used by JPScrollViewDelegate to send scroll position
-    internal let scrollViewTranslationPublisher = PassthroughSubject<CGFloat, Never>()
+    internal let scrollViewTranslationPublisher = PassthroughSubject<Bool, Never>()
 
     // MARK: - View Lifecycle
 
@@ -2075,6 +2075,6 @@ extension NotificationsViewController: WPScrollableViewController {
 //
 extension NotificationsViewController: JPScrollViewDelegate {
     public func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        scrollViewTranslationPublisher.send(scrollView.panGestureRecognizer.translation(in: scrollView.superview).y)
+        processJetpackBannerVisibility(scrollView)
     }
 }

WordPress/Classes/ViewRelated/Reader/ReaderSiteSearchViewController.swift

@@ -54,7 +54,7 @@ class ReaderSiteSearchViewController: UITableViewController, UIViewControllerRes
 
     // MARK: - JPScrollViewDelegate
 
-    let scrollViewTranslationPublisher = PassthroughSubject<CGFloat, Never>()
+    let scrollViewTranslationPublisher = PassthroughSubject<Bool, Never>()
 
     // MARK: - View lifecycle
 
@@ -411,6 +411,6 @@ class ReaderSiteSearchFooterView: UIView {
 
 extension ReaderSiteSearchViewController: JPScrollViewDelegate {
     override func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        scrollViewTranslationPublisher.send(scrollView.panGestureRecognizer.translation(in: scrollView.superview).y)
+        processJetpackBannerVisibility(scrollView)
     }
 }

WordPress/Classes/ViewRelated/Reader/ReaderStreamViewController.swift

@@ -101,7 +101,7 @@ import Combine
     private var didSetupView = false
     private var listentingForBlockedSiteNotification = false
     private var didBumpStats = false
-    internal let scrollViewTranslationPublisher = PassthroughSubject<CGFloat, Never>()
+    internal let scrollViewTranslationPublisher = PassthroughSubject<Bool, Never>()
 
     /// Content management
     let content = ReaderTableContent()
@@ -2006,6 +2006,6 @@ extension ReaderStreamViewController: ReaderTopicsChipsDelegate {
 
 extension ReaderStreamViewController: UITableViewDelegate, JPScrollViewDelegate {
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        scrollViewTranslationPublisher.send(scrollView.panGestureRecognizer.translation(in: scrollView.superview).y)
+        processJetpackBannerVisibility(scrollView)
     }
 }

WordPress/Classes/ViewRelated/Stats/Helpers/BottomScrollAnalyticsTracker.swift

@@ -5,7 +5,7 @@ import Foundation
 
 final class BottomScrollAnalyticsTracker: NSObject {
 
-    let scrollViewTranslationPublisher = PassthroughSubject<CGFloat, Never>()
+    let scrollViewTranslationPublisher = PassthroughSubject<Bool, Never>()
 
     private func captureAnalyticsEvent(_ event: WPAnalyticsStat) {
         if let blogIdentifier = SiteStatsInformation.sharedInstance.siteID {
@@ -39,6 +39,6 @@ extension BottomScrollAnalyticsTracker: JPScrollViewDelegate {
         }
     }
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        scrollViewTranslationPublisher.send(scrollView.panGestureRecognizer.translation(in: scrollView.superview).y)
+        processJetpackBannerVisibility(scrollView)
     }
 }