Maintain consistent top-down menu order in posts screen (#1185)

* Maintain consistent top-down menu order in posts screen * Delete CopyMarkdown extension and detritus No more copypasting posts into issues for me.
Awful · Mar 18, 2024 · 1db2f32 · 1db2f32
1 parent 38e8b4d
commit 1db2f32
Show file tree

Hide file tree

Showing 17 changed files with 13 additions and 1,272 deletions.
diff --git a/App/View Controllers/Posts/PostsPageViewController.swift b/App/View Controllers/Posts/PostsPageViewController.swift
@@ -110,6 +110,9 @@ final class PostsPageViewController: ViewController {
     private lazy var hiddenMenuButton: HiddenMenuButton = {
         let postActionButton = HiddenMenuButton()
         postActionButton.alpha = 0
+        if #available(iOS 16.0, *) {
+            postActionButton.preferredMenuElementOrder = .fixed
+        }
         postsView.addSubview(postActionButton)
         return postActionButton
     }()
@@ -555,7 +558,11 @@ final class PostsPageViewController: ViewController {
 
 
     private func actionsItem() -> UIBarButtonItem {
-        UIBarButtonItem(title: "Menu", image: UIImage(named: "steamed-ham"), primaryAction: nil, menu: threadActionsMenu())
+        let buttonItem = UIBarButtonItem(title: "Menu", image: UIImage(named: "steamed-ham"), menu: threadActionsMenu())
+        if #available(iOS 16.0, *) {
+            buttonItem.preferredMenuElementOrder = .fixed
+        }
+        return buttonItem
     }
 
     private func refetchPosts() {

diff --git a/App/View Controllers/Threads/BookmarksTableViewController.swift b/App/View Controllers/Threads/BookmarksTableViewController.swift
@@ -292,10 +292,14 @@ extension BookmarksTableViewController {
         contextMenuConfigurationForRowAt indexPath: IndexPath,
         point: CGPoint
     ) -> UIContextMenuConfiguration? {
-        return .makeFromThreadList(
+        let configuration = UIContextMenuConfiguration.makeFromThreadList(
             for: dataSource!.thread(at: indexPath),
                presenter: self
         )
+        if #available(iOS 16.0, *) {
+            configuration.preferredMenuElementOrder = .fixed
+        }
+        return configuration
     }
 }
 

diff --git a/Awful.xcodeproj/project.pbxproj b/Awful.xcodeproj/project.pbxproj
diff --git a/Awful.xcodeproj/xcshareddata/xcschemes/CopyMarkdownApp.xcscheme b/Awful.xcodeproj/xcshareddata/xcschemes/CopyMarkdownApp.xcscheme
diff --git a/Awful.xcodeproj/xcshareddata/xcschemes/CopyMarkdownExtension.xcscheme b/Awful.xcodeproj/xcshareddata/xcschemes/CopyMarkdownExtension.xcscheme
diff --git a/CopyMarkdown/App/App.entitlements b/CopyMarkdown/App/App.entitlements
diff --git a/CopyMarkdown/App/AppDelegate.swift b/CopyMarkdown/App/AppDelegate.swift
diff --git a/CopyMarkdown/App/Assets.xcassets/AccentColor.colorset/Contents.json b/CopyMarkdown/App/Assets.xcassets/AccentColor.colorset/Contents.json
diff --git a/CopyMarkdown/App/Assets.xcassets/AppIcon.appiconset/Contents.json b/CopyMarkdown/App/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/CopyMarkdown/App/Assets.xcassets/Contents.json b/CopyMarkdown/App/Assets.xcassets/Contents.json