Merge pull request #5739 from wikimedia/T416194

T416194: Fix compactness

Author: tonisevener

WMFComponents/Sources/WMFComponents/Extensions/Navigation Bar/WMFNavigationBarHiding.swift

@@ -71,6 +71,21 @@ public extension WMFNavigationBarHiding where Self:UIViewController {
             swapLogoToFull()
         }
     }
+    
+    func resetLogoToFull() {
+        WMFNavigationBarHidingLogoState.isCompact = false
+        swapLogoToFull()
+    }
+
+    func restoreLogoStateForCurrentScrollPosition(scrollView: UIScrollView) {
+        let finalOffset = scrollView.contentOffset.y + scrollView.safeAreaInsets.top
+        if finalOffset > 75 {
+            WMFNavigationBarHidingLogoState.isCompact = false  // reset so the guard passes
+            updateLogoImageOnScroll(scrollView: scrollView)
+        } else {
+            resetLogoToFull()
+        }
+    }
 
     private func swapLogoToCompact() {
         navigationItem.leftBarButtonItem?.image = UIImage(named: "W")

Wikipedia/Code/ExploreViewController.swift

@@ -123,11 +123,11 @@ class ExploreViewController: ColumnarCollectionViewController, ExploreCardViewCo
     }
 
     override func viewWillAppear(_ animated: Bool) {
-
         super.viewWillAppear(animated)
         isGranularUpdatingEnabled = true
         restoreScrollPositionIfNeeded()
         configureNavigationBar()
+        restoreLogoStateForCurrentScrollPosition(scrollView: collectionView)
     }
 
     override func viewWillTransition(to size: CGSize, with coordinator: any UIViewControllerTransitionCoordinator) {