Background for full image/logo/clean up

Author: golson

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

@@ -47,7 +47,7 @@ public extension WMFNavigationBarHiding where Self:UIViewController {
 
     /// Call from UIViewController when the status bar height might change (like upon rotation)
     func calculateTopSafeAreaOverlayHeight() {
-        let statusBarHeight = UIApplication.shared.statusBarFrame.height
+        let statusBarHeight = view.window?.windowScene?.statusBarManager?.statusBarFrame.height ?? 0
         topSafeAreaOverlayHeightConstraint?.constant = statusBarHeight
     }
 
@@ -74,10 +74,18 @@ public extension WMFNavigationBarHiding where Self:UIViewController {
 
     private func swapLogoToCompact() {
         navigationItem.leftBarButtonItem?.image = UIImage(named: "W")
+        if #available(iOS 26.0, *) {
+            navigationItem.leftBarButtonItem?.hidesSharedBackground = false
+            navigationItem.leftBarButtonItem?.sharesBackground = true
+        }
     }
 
     private func swapLogoToFull() {
         navigationItem.leftBarButtonItem?.image = UIImage(named: "wikipedia")
+        if #available(iOS 26.0, *) {
+            navigationItem.leftBarButtonItem?.hidesSharedBackground = true
+            navigationItem.leftBarButtonItem?.sharesBackground = false
+        }
     }
 }
 

Wikipedia/Code/ColumnarCollectionViewController.swift

@@ -3,7 +3,6 @@ import WMFComponents
 
 class ColumnarCollectionViewController: ThemeableViewController, ColumnarCollectionViewLayoutDelegate, UICollectionViewDataSourcePrefetching, CollectionViewFooterDelegate, HintPresenting, WMFNavigationBarHiding {
     var topSafeAreaOverlayView: UIView?
-    
     var topSafeAreaOverlayHeightConstraint: NSLayoutConstraint?
 
 

Wikipedia/Code/ExploreViewController.swift

@@ -212,9 +212,11 @@ class ExploreViewController: ColumnarCollectionViewController, ExploreCardViewCo
         // Set up logo as left bar button item
 
         let logoBarButtonItem = UIBarButtonItem(image: UIImage(named: "wikipedia"), style: .plain, target: self, action: #selector(titleBarButtonPressed(_:)))
-        logoBarButtonItem.accessibilityLabel = titleButton.accessibilityLabel
-        logoBarButtonItem.accessibilityHint = titleButton.accessibilityHint
-        logoBarButtonItem.accessibilityIdentifier = titleButton.accessibilityIdentifier
+        if #available(iOS 26.0, *) {
+            logoBarButtonItem.hidesSharedBackground = true
+            logoBarButtonItem.sharesBackground = false
+        }
+        logoBarButtonItem.accessibilityLabel = WMFLocalizedString("home-title-accessibility-label", value: "Wikipedia, scroll to top of Explore", comment: "Accessibility heading for the Explore page, indicating that tapping it will scroll to the top of the explore page. \"Explore\" is the same as {{msg-wikimedia|Wikipedia-ios-welcome-explore-title}}.")
         navigationItem.leftBarButtonItem = logoBarButtonItem
     }
 
@@ -236,39 +238,6 @@ class ExploreViewController: ColumnarCollectionViewController, ExploreCardViewCo
     @objc func titleBarButtonPressed(_ sender: UIButton?) {
         scrollToTop()
     }
-    
-    @objc public var titleButton: UIView {
-        return titleView
-    }
-    
-    lazy var longTitleButton: UIButton = {
-        let longTitleButton = UIButton(type: .custom)
-        var deprecatedLongTitleButton = longTitleButton as DeprecatedButton
-        deprecatedLongTitleButton.deprecatedAdjustsImageWhenHighlighted = true
-        longTitleButton.setImage(UIImage(named: "wikipedia"), for: .normal)
-        longTitleButton.sizeToFit()
-        longTitleButton.addTarget(self, action: #selector(titleBarButtonPressed), for: .touchUpInside)
-        longTitleButton.isAccessibilityElement = false
-        longTitleButton.translatesAutoresizingMaskIntoConstraints = false
-        
-        return longTitleButton
-    }()
-    
-    lazy var titleView: UIView = {
-        let titleView = UIView()
-        titleView.translatesAutoresizingMaskIntoConstraints = false
-        titleView.addSubview(longTitleButton)
-        titleView.isAccessibilityElement = false
-
-        NSLayoutConstraint.activate([
-            longTitleButton.leadingAnchor.constraint(equalTo: titleView.leadingAnchor),
-            longTitleButton.trailingAnchor.constraint(equalTo: titleView.trailingAnchor),
-            longTitleButton.topAnchor.constraint(equalTo: titleView.topAnchor),
-            longTitleButton.bottomAnchor.constraint(equalTo: titleView.bottomAnchor)
-        ])
-        
-        return titleView
-    }()
 
     @objc func userDidTapProfile() {
 

Wikipedia/Code/WMFAppViewController.m

@@ -1735,10 +1735,7 @@ - (BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectView
 }
 
 - (void)updateActiveTitleAccessibilityButton:(UIViewController *)viewController {
-    if ([viewController isKindOfClass:[ExploreViewController class]]) {
-        ExploreViewController *vc = (ExploreViewController *)viewController;
-        vc.titleButton.accessibilityLabel = WMFLocalizedStringWithDefaultValue(@"home-title-accessibility-label", nil, nil, @"Wikipedia, scroll to top of Explore", @"Accessibility heading for the Explore page, indicating that tapping it will scroll to the top of the explore page. \"Explore\" is the same as {{msg-wikimedia|Wikipedia-ios-welcome-explore-title}}.");
-    } else if ([viewController isKindOfClass:[WMFArticleViewController class]]) {
+    if ([viewController isKindOfClass:[WMFArticleViewController class]]) {
         WMFArticleViewController *vc = (WMFArticleViewController *)viewController;
         if (self.selectedIndex == WMFAppTabTypeMain) {
             vc.navigationItem.titleView.accessibilityLabel = WMFLocalizedStringWithDefaultValue(@"home-button-explore-accessibility-label", nil, nil, @"Wikipedia, return to Explore", @"Accessibility heading for articles shown within the explore tab, indicating that tapping it will take you back to explore. \"Explore\" is the same as {{msg-wikimedia|Wikipedia-ios-welcome-explore-title}}.");