Show Reader comments in a modal

wordpress-mobile · Feb 27, 2025 · 6fcb639 · 6fcb639
1 parent 5ebee56
commit 6fcb639
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.m b/WordPress/Classes/ViewRelated/Reader/Comments/ReaderCommentsViewController.m
@@ -146,9 +146,7 @@ - (void)trackReplyTo:(BOOL)replyTarget {
 
 - (void)configureNavbar
 {
-    // Don't show 'Reader' in the next-view back button
-    UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:@" " style:UIBarButtonItemStylePlain target:nil action:nil];
-    self.navigationItem.backBarButtonItem = backButton;
+    self.navigationItem.backButtonTitle = @"";
 
     self.title = NSLocalizedString(@"Comments", @"Title of the reader's comments screen");
     self.navigationItem.largeTitleDisplayMode = UINavigationItemLargeTitleDisplayModeNever;

diff --git a/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderCommentAction.swift b/WordPress/Classes/ViewRelated/Reader/Controllers/ReaderPostActions/ReaderCommentAction.swift
@@ -8,12 +8,21 @@ final class ReaderCommentAction {
         navigateToCommentID: Int? = nil,
         source: ReaderCommentsSource
     ) {
-        guard let controller = ReaderCommentsViewController(post: post, source: source) else {
+        guard let commentsVC = ReaderCommentsViewController(post: post, source: source) else {
             return
         }
-        controller.navigateToCommentID = navigateToCommentID as NSNumber?
-        controller.trackCommentsOpened()
-        controller.hidesBottomBarWhenPushed = true
-        origin.navigationController?.pushViewController(controller, animated: true)
+        commentsVC.navigateToCommentID = navigateToCommentID as NSNumber?
+        commentsVC.trackCommentsOpened()
+        commentsVC.hidesBottomBarWhenPushed = true
+
+        if origin.traitCollection.horizontalSizeClass == .compact {
+            let navigationVC = UINavigationController(rootViewController: commentsVC)
+            commentsVC.navigationItem.leftBarButtonItem = UIBarButtonItem(title: SharedStrings.Button.close, primaryAction: UIAction { [weak origin] _ in
+                origin?.dismiss(animated: true)
+            })
+            origin.present(navigationVC, animated: true)
+        } else {
+            origin.navigationController?.pushViewController(commentsVC, animated: true)
+        }
     }
 }