Remove NoteBlockCommentTableViewCell and related code (#24184)

* Fix formatting

* Remove NoteBlockCommentTableViewCell

* Remove LongPressGestureLabel

* Remove NoteBlockCommentTableViewCell usages

* Remove replyTextView

Author: kean

WordPress/Classes/Extensions/UIAlertController+Helpers.swift

@@ -33,17 +33,4 @@ extension UIAlertController {
         alertController.addCancelActionWithTitle(NSLocalizedString("Cancel", comment: "Cancel copying link to comment button title"))
         return alertController
     }
-
-    /// This method is will present an alert controller (action sheet style) that
-    /// provides a copy action to allow copying the url parameter to the clip board.
-    /// Once copied, a notice will be posted using the dispacher so the user will know
-    /// the url was copied.
-    @objc static func presentAlertAndCopyCommentURLToClipboard(url: URL) {
-        let noticeTitle = NSLocalizedString("Link Copied to Clipboard", comment: "Link copied to clipboard notice title")
-
-        let copyAlertController = UIAlertController.copyCommentURLAlertController(url) {
-            ActionDispatcher.dispatch(NoticeAction.post(Notice(title: noticeTitle)))
-        }
-        copyAlertController?.presentFromRootViewController()
-    }
 }

WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationDetailsViewController.swift

@@ -48,10 +48,6 @@ class NotificationDetailsViewController: UIViewController, NoResultsViewHost {
     ///
     @IBOutlet var badgeCenterLayoutConstraint: NSLayoutConstraint!
 
-    /// RelpyTextView
-    ///
-    @IBOutlet var replyTextView: CommentLargeButton!
-
     /// Embedded Media Downloader
     ///
     fileprivate var mediaDownloader = NotificationMediaDownloader()
@@ -139,7 +135,6 @@ class NotificationDetailsViewController: UIViewController, NoResultsViewHost {
         setupTableView()
         setupTableViewCells()
         setupTableDelegates()
-        setupReplyTextView()
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -201,7 +196,6 @@ class NotificationDetailsViewController: UIViewController, NoResultsViewHost {
     fileprivate func refreshInterface() {
         formatter.resetCache()
         tableView.reloadData()
-        attachReplyViewIfNeeded()
         adjustLayoutConstraintsIfNeeded()
         refreshNavigationBar()
     }
@@ -358,7 +352,6 @@ extension NotificationDetailsViewController {
         let cellClassNames: [NoteBlockTableViewCell.Type] = [
             NoteBlockHeaderTableViewCell.self,
             NoteBlockTextTableViewCell.self,
-            NoteBlockCommentTableViewCell.self,
             NoteBlockImageTableViewCell.self,
             NoteBlockUserTableViewCell.self,
             NoteBlockButtonTableViewCell.self
@@ -395,22 +388,6 @@ extension NotificationDetailsViewController {
         }
     }
 
-    func setupReplyTextView() {
-        let replyTextView = CommentLargeButton()
-
-        replyTextView.placeholder = NSLocalizedString("Write a reply", comment: "Placeholder text for inline compose view")
-        replyTextView.accessibilityLabel = NSLocalizedString("Reply Text", comment: "Notifications Reply Accessibility Identifier")
-
-        replyTextView.onTap = {
-            // TODO: (kean) remove the remaining .comment-related code
-            wpAssertionFailure("Notifications have been using NotificationCommentDetailViewController since 2023")
-        }
-
-        replyTextView.setContentCompressionResistancePriority(.required, for: .vertical)
-
-        self.replyTextView = replyTextView
-    }
-
     func setupNotificationListeners() {
         let nc = NotificationCenter.default
         nc.addObserver(self, selector: #selector(notificationWasUpdated), name: .NSManagedObjectContextObjectsDidChange, object: note.managedObjectContext)
@@ -422,28 +399,6 @@ extension NotificationDetailsViewController {
     }
 }
 
-// MARK: - Reply View Helpers
-//
-extension NotificationDetailsViewController {
-    func attachReplyViewIfNeeded() {
-        guard shouldAttachReplyView else {
-            replyTextView.removeFromSuperview()
-            return
-        }
-
-        stackView.addArrangedSubview(replyTextView)
-    }
-
-    var shouldAttachReplyView: Bool {
-        // Attach the Reply component only if the notification has a comment, and it can be replied to.
-        //
-        guard let block: FormattableCommentContent = note.contentGroup(ofKind: .comment)?.blockOfKind(.comment) else {
-            return false
-        }
-        return block.action(id: ReplyToCommentAction.actionIdentifier())?.on ?? false
-    }
-}
-
 // MARK: - Layout Helpers
 //
 private extension NotificationDetailsViewController {
@@ -479,16 +434,14 @@ private extension NotificationDetailsViewController {
             fallthrough
         case .text:
             return NoteBlockTextTableViewCell.reuseIdentifier()
-        case .comment:
-            return NoteBlockCommentTableViewCell.reuseIdentifier()
         case .image:
             return NoteBlockImageTableViewCell.reuseIdentifier()
         case .user:
             return NoteBlockUserTableViewCell.reuseIdentifier()
         case .button:
             return NoteBlockButtonTableViewCell.reuseIdentifier()
         default:
-            assertionFailure("Unmanaged group kind: \(blockGroup.kind)")
+            wpAssertionFailure("Unmanaged group kind", userInfo: ["kind": "\(blockGroup.kind)"])
             return NoteBlockTextTableViewCell.reuseIdentifier()
         }
     }
@@ -512,8 +465,6 @@ private extension NotificationDetailsViewController {
             setupFooterCell(cell, blockGroup: blockGroup)
         case let cell as NoteBlockUserTableViewCell:
             setupUserCell(cell, blockGroup: blockGroup)
-        case let cell as NoteBlockCommentTableViewCell:
-            setupCommentCell(cell, blockGroup: blockGroup, at: indexPath)
         case let cell as NoteBlockImageTableViewCell:
             setupImageCell(cell, blockGroup: blockGroup)
         case let cell as NoteBlockTextTableViewCell:
@@ -587,76 +538,6 @@ private extension NotificationDetailsViewController {
         cell.downloadGravatarWithURL(mediaURL)
     }
 
-    func setupCommentCell(_ cell: NoteBlockCommentTableViewCell, blockGroup: FormattableContentGroup, at indexPath: IndexPath) {
-        // Note:
-        // The main reason why it's a very good idea *not* to reuse NoteBlockHeaderTableViewCell, just to display the
-        // gravatar, is because we're implementing a custom behavior whenever the user approves/ unapproves the comment.
-        //
-        //  -   Font colors are updated.
-        //  -   A left separator is displayed.
-        //
-        guard let commentBlock: FormattableCommentContent = blockGroup.blockOfKind(.comment) else {
-            assertionFailure("Missing Comment Block for Notification [\(note.notificationId)]")
-            return
-        }
-
-        guard let userBlock: FormattableUserContent = blockGroup.blockOfKind(.user) else {
-            assertionFailure("Missing User Block for Notification [\(note.notificationId)]")
-            return
-        }
-
-        // Merge the Attachments with their ranges: [NSRange: UIImage]
-        let mediaMap = mediaDownloader.imagesForUrls(commentBlock.imageUrls)
-        let mediaRanges = commentBlock.buildRangesToImagesMap(mediaMap)
-
-        let styles = RichTextContentStyles(key: "RichText-\(indexPath)")
-        let text = formatter.render(content: commentBlock, with: styles).stringByEmbeddingImageAttachments(mediaRanges)
-
-        // Setup: Properties
-        cell.name                   = userBlock.text
-        cell.timestamp              = (note.timestampAsDate as NSDate).mediumString()
-        cell.site                   = userBlock.metaTitlesHome ?? userBlock.metaLinksHome?.host
-        cell.attributedCommentText  = text.trimNewlines()
-        cell.isApproved             = commentBlock.isCommentApproved
-
-        // Add comment author's name to Reply placeholder.
-        let placeholderFormat = NSLocalizedString("Reply to %1$@",
-                                                  comment: "Placeholder text for replying to a comment. %1$@ is a placeholder for the comment author's name.")
-        replyTextView.placeholder = String(format: placeholderFormat, cell.name ?? String())
-
-        // Setup: Callbacks
-        cell.onUserClick = { [weak self] in
-            guard let homeURL = userBlock.metaLinksHome else {
-                return
-            }
-
-            self?.displayURL(homeURL)
-        }
-
-        cell.onUrlClick = { [weak self] url in
-            self?.displayURL(url as URL)
-        }
-
-        cell.onAttachmentClick = { [weak self] attachment in
-            guard let image = attachment.image else {
-                return
-            }
-            self?.router.routeTo(image)
-        }
-
-        cell.onTimeStampLongPress = { [weak self] in
-            guard let urlString = self?.note.url,
-            let url = URL(string: urlString) else {
-                return
-            }
-            UIAlertController.presentAlertAndCopyCommentURLToClipboard(url: url)
-        }
-
-        // Download the Gravatar
-        let mediaURL = userBlock.media.first?.mediaURL
-        cell.downloadGravatarWithURL(mediaURL)
-    }
-
     func setupImageCell(_ cell: NoteBlockImageTableViewCell, blockGroup: FormattableContentGroup) {
         guard let imageBlock = blockGroup.blocks.first as? NotificationTextContent else {
             assertionFailure("Missing Image Block for Notification [\(note.notificationId)")
@@ -974,19 +855,19 @@ private extension NotificationDetailsViewController {
     }
 
     enum ContentMedia {
-        static let richBlockTypes           = Set(arrayLiteral: FormattableContentKind.text, FormattableContentKind.comment)
-        static let duration                 = TimeInterval(0.25)
-        static let delay                    = TimeInterval(0)
+        static let richBlockTypes = Set(arrayLiteral: FormattableContentKind.text, FormattableContentKind.comment)
+        static let duration = TimeInterval(0.25)
+        static let delay = TimeInterval(0)
         static let options: UIView.AnimationOptions = [.overrideInheritedDuration, .beginFromCurrentState]
     }
 
     enum Settings {
-        static let numberOfSections         = 1
-        static let estimatedRowHeight       = CGFloat(44)
+        static let numberOfSections = 1
+        static let estimatedRowHeight = CGFloat(44)
     }
 
     enum Assets {
-        static let confettiBackground       = "notifications-confetti-background"
+        static let confettiBackground = "notifications-confetti-background"
     }
 }
 
@@ -1003,5 +884,4 @@ extension NotificationDetailsViewController {
 //
 private extension String {
     static let notificationDetailsTableAccessibilityId = "notifications-details-table"
-    static let replyTextViewAccessibilityId = "reply-text-view"
 }

WordPress/Classes/ViewRelated/Notifications/Style/WPStyleGuide+Notifications.swift

@@ -13,13 +13,13 @@ extension WPStyleGuide {
         public static let unreadIndicatorColor = UIAppColor.primaryLight
 
         // Notification cells
-        public static let noticonFont               = UIFont(name: "Noticons", size: 16)
-        public static let noticonReadColor          = UIColor.systemGray
+        public static let noticonFont = UIFont(name: "Noticons", size: 16)
+        public static let noticonReadColor = UIColor.systemGray
 
         // Notification undo overlay
-        public static let noteUndoBackgroundColor   = UIAppColor.error
-        public static let noteUndoTextColor         = UIColor.white
-        public static let noteUndoTextFont          = subjectRegularFont
+        public static let noteUndoBackgroundColor = UIAppColor.error
+        public static let noteUndoTextColor = UIColor.white
+        public static let noteUndoTextFont = subjectRegularFont
 
         // Subject Text
         public static var subjectRegularStyle: [NSAttributedString.Key: Any] {
@@ -64,11 +64,11 @@ extension WPStyleGuide {
         //
 
         // Header
-        public static let headerTitleColor          = blockTextColor
-        public static let headerTitleBoldFont       = blockBoldFont
+        public static let headerTitleColor = blockTextColor
+        public static let headerTitleBoldFont = blockBoldFont
 
-        public static let headerDetailsColor        = UIAppColor.primary
-        public static let headerDetailsRegularFont  = blockRegularFont
+        public static let headerDetailsColor = UIAppColor.primary
+        public static let headerDetailsRegularFont = blockRegularFont
 
         public static var headerTitleRegularStyle: [NSAttributedString.Key: Any] {
             return [.font: headerTitleRegularFont,
@@ -132,27 +132,17 @@ extension WPStyleGuide {
         }
 
         // Blocks
-        public static let contentBlockRegularFont   = WPFontManager.notoRegularFont(ofSize: blockFontSize)
-        public static let contentBlockBoldFont      = WPFontManager.notoBoldFont(ofSize: blockFontSize)
-        public static let contentBlockItalicFont    = WPFontManager.notoItalicFont(ofSize: blockFontSize)
-        public static let blockRegularFont          = WPFontManager.systemRegularFont(ofSize: blockFontSize)
-        public static let blockBoldFont             = WPFontManager.systemSemiBoldFont(ofSize: blockFontSize)
-
-        public static let blockTextColor            = UIColor.label
-        public static let blockQuotedColor          = UIAppColor.neutral
-        public static let blockBackgroundColor      = UIColor.secondarySystemGroupedBackground
-        public static let blockLinkColor            = UIAppColor.primary
-        public static let blockSeparatorColor       = UIColor.separator
-
-        public static let blockApprovedBgColor      = UIColor.clear
-
-        public static let blockUnapprovedSideColor  = UIAppColor.warning(.shade60)
-        public static let blockUnapprovedBgColor    = UIColor(
-            light: UIAppColor.warning(.shade0),
-            dark: UIAppColor.warning(.shade90)
-        )
-        public static let blockUnapprovedTextColor  = UIColor.label
-        public static let blockUnapprovedLinkColor  = UIAppColor.primary
+        public static let contentBlockRegularFont = WPFontManager.notoRegularFont(ofSize: blockFontSize)
+        public static let contentBlockBoldFont = WPFontManager.notoBoldFont(ofSize: blockFontSize)
+        public static let contentBlockItalicFont = WPFontManager.notoItalicFont(ofSize: blockFontSize)
+        public static let blockRegularFont = WPFontManager.systemRegularFont(ofSize: blockFontSize)
+        public static let blockBoldFont = WPFontManager.systemSemiBoldFont(ofSize: blockFontSize)
+
+        public static let blockTextColor = UIColor.label
+        public static let blockQuotedColor = UIAppColor.neutral
+        public static let blockBackgroundColor = UIColor.secondarySystemGroupedBackground
+        public static let blockLinkColor = UIAppColor.primary
+        public static let blockSeparatorColor = UIColor.separator
 
         public static var contentBlockRegularStyle: [NSAttributedString.Key: Any] {
             return  [.paragraphStyle: contentBlockParagraph,
@@ -195,31 +185,6 @@ extension WPStyleGuide {
             return isBadge ? badgeBackgroundColor : blockBackgroundColor
         }
 
-        // Comment Helpers
-        public static func blockGravatarPlaceholderImage(isApproved approved: Bool) -> UIImage {
-            return approved ? .gravatarPlaceholderImage : .gravatarUnapprovedImage
-        }
-
-        public static func blockSeparatorColorForComment(isApproved approved: Bool) -> UIColor {
-            return (approved ? blockSeparatorColor : blockUnapprovedSideColor)
-        }
-
-        public static func blockBackgroundColorForComment(isApproved approved: Bool) -> UIColor {
-            return approved ? blockApprovedBgColor : blockUnapprovedBgColor
-        }
-
-        public static func blockTitleColorForComment(isApproved approved: Bool) -> UIColor {
-            return (approved ? blockTextColor : blockUnapprovedTextColor)
-        }
-
-        public static func blockDetailsColorForComment(isApproved approved: Bool) -> UIColor {
-            return approved ? blockQuotedColor : blockUnapprovedSideColor
-        }
-
-        public static func blockLinkColorForComment(isApproved approved: Bool) -> UIColor {
-            return (approved ? blockLinkColor : blockUnapprovedLinkColor)
-        }
-
         // User Cell Helpers
         public static func configureFollowButton(_ button: UIButton) {
             // General