CHANGELOG-release.md

@@ -1,34 +1,3 @@
-## 2024.3
-This update includes a number of bugfixes and performance improvements. See below for a list of fixes.
-
-Bugfixes:
-- Fix an issue displaying rich text in certain cases
-- Fix crash when video attachment finishes playing
-- Fix video attachment thumbnails being flipped on Compose screen
-- Fix profile header images being blurry
-- Fix crash when opening push notifications in certain circumstances
-- Fix certain links in profile fields not being tappable
-- Fix gifv playback pausing audio from other apps
-- Fix gifv playback being paused when returning from background
-- Fix badges on gifv attachments not appearing
-- Fix excessive network traffic when opening profile pages
-- Fix controls visibility not matching across attachment gallery pages
-- Fix add hashtag/instance pinned timeline sheet in Customize Timelines dismissing instantly
-- Fix Dynamic Type not applying to status content
-- Fix mention/status push notifications not showing CW
-- Fix sensitive attachment thumbnails being shown in push notifications
-- Fix profile moved overlay visual and VoiceOver issues
-- Fix opening Mastodon remote status links
-- Fix reply author avatar on Compose screen not being pinned to top when scrolling while typing
-- Pleroma/Akkoma: Fix editing attachment descriptions not working
-- Pixelfed/Firefish: Fix error loading certain accounts
-- Pixelfed: Fix error loading relationships and follow/block/etc. actions
-- iPadOS: Fix pointer interactions throughout the app
-- iPadOS: Fix multiple close buttons being added in multi-column interface
-- iPadOS: Fix Cmd+1/etc. removing columns when returning to previous tab
-- iPadOS: Fix multi-column interface not animating for some actions
-- iPadOS: Fix selecting search results always adding new column
-
 ## 2024.2
 This release introduces push notifications as well as an enhanced multi-column interface on iPadOS!
 

CHANGELOG.md

@@ -1,9 +1,5 @@
 # Changelog
 
-## 2024.3 (131)
-Bugfixes:
-- Fix Cmd+3 not correctly switching to Explore tab
-
 ## 2024.3 (130)
 Bugfixes:
 - Fix reply author avatar on Compose screen not being pinned to top when scrolling while typing

Tusker/MenuController.swift

@@ -32,7 +32,7 @@ struct MenuController {
     static let sidebarItemKeyCommands: [UIKeyCommand] = [
         sidebarCommand(item: .tab(.timelines), command: "1", action: #selector(MainSplitViewController.handleSidebarCommandTimelines)),
         sidebarCommand(item: .tab(.notifications), command: "2", action: #selector(MainSplitViewController.handleSidebarCommandNotifications)),
-        sidebarCommand(item: .tab(.explore), command: "3", action: #selector(MainSplitViewController.handleSidebarCommandExplore)),
+        sidebarCommand(item: .explore, command: "3", action: #selector(MainSplitViewController.handleSidebarCommandExplore)),
         sidebarCommand(item: .bookmarks, command: "4", action: #selector(MainSplitViewController.handleSidebarCommandBookmarks)),
         sidebarCommand(item: .tab(.myProfile), command: "5", action: #selector(MainSplitViewController.handleSidebarCommandMyProfile)),
     ]

Tusker/Screens/Main/MainSidebarViewController.swift

@@ -43,7 +43,7 @@ class MainSidebarViewController: UIViewController {
     }
     
     var exploreTabItems: [Item] {
-        var items: [Item] = [.tab(.explore), .bookmarks, .favorites]
+        var items: [Item] = [.explore, .bookmarks, .favorites]
         let snapshot = dataSource.snapshot()
         for case let .list(list) in snapshot.itemIdentifiers(inSection: .lists) {
             items.append(.list(list))
@@ -170,7 +170,7 @@ class MainSidebarViewController: UIViewController {
         snapshot.appendItems([
             .tab(.timelines),
             .tab(.notifications),
-            .tab(.explore),
+            .explore,
             .bookmarks,
             .favorites,
             .tab(.myProfile)
@@ -302,7 +302,7 @@ class MainSidebarViewController: UIViewController {
             return UserActivityManager.checkNotificationsActivity(mode: Preferences.shared.defaultNotificationsMode, accountID: id)
         case .tab(.compose):
             return UserActivityManager.newPostActivity(accountID: id)
-        case .tab(.explore):
+        case .explore:
             return UserActivityManager.searchActivity(query: nil, accountID: id)
         case .bookmarks:
             return UserActivityManager.bookmarksActivity(accountID: id)
@@ -340,7 +340,7 @@ extension MainSidebarViewController {
     }
     enum Item: Hashable {
         case tab(MainTabBarViewController.Tab)
-        case bookmarks, favorites
+        case explore, bookmarks, favorites
         case listsHeader, list(List), addList
         case savedHashtagsHeader, savedHashtag(String), addSavedHashtag
         case savedInstancesHeader, savedInstance(URL), addSavedInstance
@@ -349,6 +349,8 @@ extension MainSidebarViewController {
             switch self {
             case let .tab(tab):
                 return tab.title
+            case .explore:
+                return "Explore"
             case .bookmarks:
                 return "Bookmarks"
             case .favorites:
@@ -378,6 +380,8 @@ extension MainSidebarViewController {
             switch self {
             case let .tab(tab):
                 return tab.imageName
+            case .explore:
+                return "magnifyingglass"
             case .bookmarks:
                 return "bookmark"
             case .favorites:

Tusker/Screens/Main/MainSplitViewController.swift

@@ -279,7 +279,7 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
                 $0.1 > $1.1
             }
         if let mostRecentExploreItem = mostRecentExploreItem?.0,
-           mostRecentExploreItem != .tab(.explore) {
+           mostRecentExploreItem != .explore {
             let exploreNav = tabBarViewController.viewController(for: .explore) as! UINavigationController
             // Pop back to root, so we're appending to the Explore VC instead of some other VC
             exploreNav.popToRootViewController(animated: false)
@@ -292,7 +292,11 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
         case nil:
             break
             
-        case .tab(.explore):
+        case let .tab(tab):
+            // sidebar items that map 1 <-> 1 can be transferred directly
+            tabBarViewController.select(tab: tab, dismissPresented: false)
+            
+        case .explore:
             // Search sidebar item maps to the Explore tab with the search controller/results visible
             // The nav stack can't be copied directly, since the split VC uses a different SearchViewController
             // so that explore items aren't shown multiple times.
@@ -331,14 +335,10 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
             }
             
             // Transfer the navigation stack, dropping the search VC, to keep anything the user has opened
-            transferNavigationStack(from: .tab(.explore), to: exploreNav, dropFirst: true, append: true)
+            transferNavigationStack(from: .explore, to: exploreNav, dropFirst: true, append: true)
             
             tabBarViewController.select(tab: .explore, dismissPresented: false)
             
-        case let .tab(tab):
-            // sidebar items that map 1 <-> 1 can be transferred directly
-            tabBarViewController.select(tab: tab, dismissPresented: false)
-
         case .bookmarks, .favorites, .list(_), .savedHashtag(_), .savedInstance(_):
             tabBarViewController.select(tab: .explore, dismissPresented: false)
             // Make sure the Explore VC doesn't show its search bar when it appears, in case the user was previously
@@ -396,9 +396,9 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
                 // For other items, the 2nd VC in the nav stack determines which sidebar item they map to.
                 // Search screen has special considerations, all others can be transferred directly.
                 if tabNavigationStack.count == 1 || ((tabNavigationStack.first as? ExploreViewController)?.searchController?.isActive ?? false) {
-                    exploreItem = .tab(.explore)
+                    exploreItem = .explore
                     // reuse the existing VC, if there is one
-                    let searchVC = getOrCreateNavigationStack(item: .tab(.explore)).first! as! InlineTrendsViewController
+                    let searchVC = getOrCreateNavigationStack(item: .explore).first! as! InlineTrendsViewController
                     // load the view so that the search controller is accessible
                     searchVC.loadViewIfNeeded()
                     let explore = tabNavigationStack.first as! ExploreViewController
@@ -426,16 +426,16 @@ extension MainSplitViewController: UISplitViewControllerDelegate {
                     case let instanceVC as InstanceTimelineViewController:
                         exploreItem = .savedInstance(instanceVC.instanceURL)
                     case is TrendsViewController:
-                        exploreItem = .tab(.explore)
+                        exploreItem = .explore
                         // skip transferring the ExploreViewController and TrendsViewController
                         skipFirst = 2
                         // prepend the InlineTrendsViewController
-                        toPrepend = getOrCreateNavigationStack(item: .tab(.explore)).first!
+                        toPrepend = getOrCreateNavigationStack(item: .explore).first!
                     default:
                         // transfer the navigation stack prepending, the existing explore VC
                         // if there was other stuff on the explore stack, it will get discarded
-                        toPrepend = getOrCreateNavigationStack(item: .tab(.explore)).first!
-                        exploreItem = .tab(.explore)
+                        toPrepend = getOrCreateNavigationStack(item: .explore).first!
+                        exploreItem = .explore
                     }
                 }
                 transferNavigationStack(from: tabNavController, to: exploreItem!, skipFirst: skipFirst, prepend: toPrepend)
@@ -502,10 +502,10 @@ fileprivate extension MainSidebarViewController.Item {
     @MainActor
     func createRootViewController(_ mastodonController: MastodonController) -> UIViewController? {
         switch self {
-        case .tab(.explore):
-            return InlineTrendsViewController(mastodonController: mastodonController)
         case let .tab(tab):
             return tab.createViewController(mastodonController)
+        case .explore:
+            return InlineTrendsViewController(mastodonController: mastodonController)
         case .bookmarks:
             return BookmarksViewController(mastodonController: mastodonController)
         case .favorites:
@@ -562,7 +562,7 @@ extension MainSplitViewController: TuskerRootViewController {
         case .myProfile:
             item = .tab(.myProfile)
         case .explore:
-            item = .tab(.explore)
+            item = .explore
         case .bookmarks:
             item = .bookmarks
         case .list(id: let id):
@@ -616,8 +616,8 @@ extension MainSplitViewController: TuskerRootViewController {
             return
         }
         
-        if sidebar.selectedItem != .tab(.explore) {
-            select(newItem: .tab(.explore), oldItem: sidebar.selectedItem)
+        if sidebar.selectedItem != .explore {
+            select(newItem: .explore, oldItem: sidebar.selectedItem)
         }
         
         guard let searchViewController = secondaryNavController.viewControllers.first as? InlineTrendsViewController else {

Version.xcconfig

@@ -10,7 +10,7 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 MARKETING_VERSION = 2024.3
-CURRENT_PROJECT_VERSION = 131
+CURRENT_PROJECT_VERSION = 130
 CURRENT_PROJECT_VERSION = $(inherited)$(CURRENT_PROJECT_VERSION_BUILD_SUFFIX_$(CONFIGURATION))
 
 CURRENT_PROJECT_VERSION_BUILD_SUFFIX_Debug=-dev