Sidebar: Minor Improvements

WordPress/Classes/Stores/UserPersistentRepositoryUtility.swift

@@ -16,6 +16,7 @@ private enum UPRUConstants {
     static let jetpackContentMigrationStateKey = "jetpackContentMigrationState"
     static let mediaAspectRatioModeEnabledKey = "mediaAspectRatioModeEnabled"
     static let readerSidebarSelectionKey = "readerSidebarSelectionKey"
+    static let isReaderSelectedKey = "isReaderSelectedKey"
 }
 
 protocol UserPersistentRepositoryUtility: AnyObject {
@@ -157,6 +158,15 @@ extension UserPersistentRepositoryUtility {
         }
     }
 
+    var isReaderSelected: Bool {
+        get {
+            UserPersistentStoreFactory.instance().bool(forKey: UPRUConstants.isReaderSelectedKey)
+        }
+        set {
+            UserPersistentStoreFactory.instance().set(newValue, forKey: UPRUConstants.isReaderSelectedKey)
+        }
+    }
+
     var readerSidebarSelection: ReaderStaticScreen? {
         get {
             let repository = UserPersistentStoreFactory.instance()

WordPress/Classes/System/SplitViewRootPresenter+Site.swift

@@ -20,7 +20,6 @@ class SiteSplitViewContent: SiteMenuViewControllerDelegate, SplitViewDisplayable
     func displayed(in splitVC: UISplitViewController) {
         RecentSitesService().touch(blog: blog)
 
-        // TODO: (wpsidebar) Refactor this (initial .secondary vc managed based on the VC presentation)
         _ = siteMenuVC.view
     }
 

WordPress/Classes/System/SplitViewRootPresenter.swift

@@ -57,8 +57,8 @@ final class SplitViewRootPresenter: RootViewPresenter {
             self?.sidebarViewModel.selection = .blog(TaggedManagedObjectID(site))
         }.store(in: &cancellables)
 
+        // -warning: List occasionally sets the selection to `nil` when switching items.
         sidebarViewModel.$selection.compactMap { $0 }
-            .removeDuplicates()
             .sink { [weak self] in self?.configure(for: $0) }
             .store(in: &cancellables)
 
@@ -100,12 +100,10 @@ final class SplitViewRootPresenter: RootViewPresenter {
                     siteContent = SiteSplitViewContent(blog: site)
                     content = siteContent!
                 } catch {
-                    // TODO: (wpsidebar) switch to a different blog?
-                    return
+                    return wpAssertionFailure("selected blog not found")
                 }
             }
         case .notifications:
-            // TODO: (wpsidebar) update tab bar item when new notifications arrive
             if let notificationsContent {
                 content = notificationsContent
             } else {
@@ -123,6 +121,8 @@ final class SplitViewRootPresenter: RootViewPresenter {
 
         display(content: content)
 
+        // The `main.async` call fixed an issue where sometimes the sidebar doesn't
+        // update the displayed selection in the list after switching to a new item
         DispatchQueue.main.async {
             self.splitVC.hide(.primary)
         }
@@ -135,6 +135,10 @@ final class SplitViewRootPresenter: RootViewPresenter {
         return navigationVC
     }
 
+    private func makeErrorViewController() -> UIViewController {
+        UIHostingController(rootView: EmptyStateView(SharedStrings.Error.generic, systemImage: "exclamationmark.circle"))
+    }
+
     private func navigate(to step: SidebarNavigationStep) {
         switch step {
         case .allSites(let sourceRect):

WordPress/Classes/Utility/App Configuration/AppColor.swift

@@ -90,10 +90,12 @@ struct UIAppColor {
     static let accent = CSColor.Pink.base
 
 #if IS_JETPACK
+    static let tint = UIColor.label
     static let brand = CSColor.JetpackGreen.base
 #endif
 
 #if IS_WORDPRESS
+    static let tint = brand
     static let brand = CSColor.WordPressBlue.base
 #endif
 
@@ -128,11 +130,6 @@ struct UIAppColor {
 }
 
 struct AppColor {
-#if IS_JETPACK
-    static let brand = Color(CSColor.JetpackGreen.base)
-#endif
-
-#if IS_WORDPRESS
-    static let brand = Color(CSColor.WordPressBlue.base)
-#endif
+    static let tint = Color(UIAppColor.tint)
+    static let brand = Color(UIAppColor.brand)
 }

WordPress/Classes/ViewRelated/Blog/Blog Details/BlogDetailsViewController+SectionHelpers.swift

@@ -93,7 +93,7 @@ extension BlogDetailsViewController {
     }
 
     @objc func shouldAddMeRow() -> Bool {
-        return JetpackFeaturesRemovalCoordinator.currentAppUIType == .simplified
+        JetpackFeaturesRemovalCoordinator.currentAppUIType == .simplified && !isSidebarModeEnabled
     }
 
     @objc func shouldAddSharingRow() -> Bool {

WordPress/Classes/ViewRelated/NUX/WordPressAuthenticationManager.swift

@@ -121,8 +121,8 @@ extension WordPressAuthenticationManager {
             secondaryNormalBorderColor: .systemGray3,
             secondaryHighlightBackgroundColor: .systemGray3,
             secondaryHighlightBorderColor: .systemGray3,
-            disabledBackgroundColor: UIAppColor.gray,
-            disabledBorderColor: UIAppColor.neutral(.shade10),
+            disabledBackgroundColor: .secondarySystemFill,
+            disabledBorderColor: .secondarySystemFill,
             primaryTitleColor: .white,
             secondaryTitleColor: .label,
             disabledTitleColor: UIAppColor.neutral(.shade20),

WordPress/Classes/ViewRelated/Reader/ReaderSidebarViewController.swift

@@ -33,15 +33,18 @@ final class ReaderSidebarViewController: UIHostingController<AnyView> {
     func showInitialSelection() {
         cancellables = []
 
-        viewModel.$selection.sink { [weak self] in
-            self?.configure(for: $0)
-        }.store(in: &cancellables)
+        // -warning: List occasionally sets the selection to `nil` when switching items.
+        viewModel.$selection.compactMap { $0 }
+            .removeDuplicates { [weak self] in
+                guard $0 == $1 else { return false }
+                self?.popSecondaryViewControllerToRoot()
+                return true
+            }
+            .sink { [weak self] in self?.configure(for: $0) }
+            .store(in: &cancellables)
     }
 
-    private func configure(for selection: ReaderSidebarItem?) {
-        guard let selection else {
-            return
-        }
+    private func configure(for selection: ReaderSidebarItem) {
         switch selection {
         case .main(let screen):
             showSecondary(makeViewController(for: screen))
@@ -58,6 +61,11 @@ final class ReaderSidebarViewController: UIHostingController<AnyView> {
         }
     }
 
+    private func popSecondaryViewControllerToRoot() {
+        let secondaryVC = splitViewController?.viewController(for: .secondary)
+        (secondaryVC as? UINavigationController)?.popToRootViewController(animated: true)
+    }
+
     private func makeViewController<T: ReaderAbstractTopic>(withTopicID objectID: TaggedManagedObjectID<T>) -> UIViewController {
         do {
             let topic = try viewContext.existingObject(with: objectID)
@@ -199,6 +207,19 @@ private struct ReaderSidebarView: View {
         .toolbar {
             EditButton()
         }
+        .tint(preferredTintColor)
+    }
+
+    private var preferredTintColor: Color {
+        if #available(iOS 18, *) {
+            return AppColor.tint
+        } else {
+            // This is a workaround for an iOS issue where it will not apply the
+            // correrect colors in dark mode when the sidebar is displayed in a
+            // supplementary column. If use use black as a tint color, it
+            // displays white text on white background
+            return Color(UIColor(light: UIAppColor.tint, dark: .secondaryLabel))
+        }
     }
 
     @ViewBuilder

WordPress/Classes/ViewRelated/System/Sidebar/SidebarViewController.swift

@@ -46,6 +46,7 @@ private struct SidebarView: View {
             }
         }
         .listStyle(.sidebar)
+        .tint(AppColor.tint)
         .overlay(alignment: .bottom) {
             SidebarProfileContainerView(viewModel: viewModel)
         }

WordPress/Classes/ViewRelated/System/Sidebar/SidebarViewModel.swift

@@ -77,11 +77,16 @@ final class SidebarViewModel: ObservableObject {
                 self.account = try? WPAccount.lookupDefaultWordPressComAccount(in: self.contextManager.mainContext)
             }
             .store(in: &cancellables)
+
+        $selection.sink {
+            UserDefaults.standard.isReaderSelected = $0 == .reader
+        }.store(in: &cancellables)
     }
 
     private func resetSelection() {
-        let blog = Blog.lastUsedOrFirst(in: contextManager.mainContext)
-        if let blog {
+        if UserDefaults.standard.isReaderSelected {
+            selection = .reader
+        } else if let blog = Blog.lastUsedOrFirst(in: contextManager.mainContext) {
             selection = .blog(TaggedManagedObjectID(blog))
         } else {
             selection = .welcome

WordPress/Classes/ViewRelated/System/Sidebar/SiteMenuViewController.swift

@@ -86,6 +86,8 @@ private final class SiteMenuListViewController: BlogDetailsViewController {
             container.pinSubviewToAllEdges(backgroundView, insets: UIEdgeInsets(top: 0, left: 16, bottom: 0, right: 16))
             return container
         }()
+        cell.focusStyle = .custom
+        cell.focusEffect = nil
 
         return cell
     }