Integarate more of the actions

Author: kean

WordPress/Classes/ViewRelated/Reader/ReaderPostCell.swift

@@ -7,6 +7,8 @@ final class ReaderPostCell: UITableViewCell {
 
     static let avatarSize: CGFloat = 28
 
+    private var viewModel: ReaderPostCellViewModel? // important: has to retain it
+
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
 
@@ -23,9 +25,8 @@ final class ReaderPostCell: UITableViewCell {
     }
 
     private func registerActions() {
-        // TODO: (reader) implement actions
-
         view.authorButton.addTarget(self, action: #selector(buttonAuthorTapped), for: .primaryActionTriggered)
+        view.buttonMore.addTarget(self, action: #selector(buttonMoreTapped), for: .primaryActionTriggered)
         view.buttons.bookmark.addTarget(self, action: #selector(buttonBookmarkTapped), for: .primaryActionTriggered)
         view.buttons.reblog.addTarget(self, action: #selector(buttonReblogTapped), for: .primaryActionTriggered)
         view.buttons.comment.addTarget(self, action: #selector(buttonCommentTapped), for: .primaryActionTriggered)
@@ -35,6 +36,7 @@ final class ReaderPostCell: UITableViewCell {
     override func prepareForReuse() {
         super.prepareForReuse()
 
+        viewModel = nil
         view.prepareForReuse()
     }
 
@@ -43,6 +45,8 @@ final class ReaderPostCell: UITableViewCell {
         isCompact: Bool,
         isSeparatorHidden: Bool
     ) {
+        self.viewModel = viewModel
+
         view.isCompact = isCompact
         separatorInset = UIEdgeInsets(.leading, isSeparatorHidden ? 9999 : view.insets.left)
         view.configure(with: viewModel)
@@ -51,23 +55,27 @@ final class ReaderPostCell: UITableViewCell {
     // MARK: - Actions
 
     @objc private func buttonAuthorTapped() {
-        print("author")
+        viewModel?.showSiteDetails()
+    }
+
+    @objc private func buttonMoreTapped() {
+        viewModel?.showMore(with: view.buttonMore)
     }
 
     @objc private func buttonBookmarkTapped() {
-        print("bookmark")
+        viewModel?.toogleBookmark()
     }
 
     @objc private func buttonReblogTapped() {
-        print("reblog")
+        viewModel?.reblog()
     }
 
     @objc private func buttonCommentTapped() {
-        print("comment")
+        viewModel?.comment()
     }
 
     @objc private func buttonLikeTapped() {
-        print("like")
+        viewModel?.toggleLike()
     }
 }
 
@@ -102,7 +110,6 @@ private final class ReaderPostCellView: UIView {
 
     private let coverAspectRatio: CGFloat = 239.0 / 358.0
     private var imageViewConstraints: [NSLayoutConstraint] = []
-    private var viewModel: ReaderPostCellViewModel? // important: has to retain it
     private var cancellables: [AnyCancellable] = []
 
     override init(frame: CGRect) {
@@ -221,15 +228,12 @@ private final class ReaderPostCellView: UIView {
 
     func prepareForReuse() {
         cancellables = []
-        viewModel = nil
         avatarView.prepareForReuse()
         imageView.prepareForReuse()
         imageView.isHidden = false
     }
 
     func configure(with viewModel: ReaderPostCellViewModel) {
-        self.viewModel = viewModel
-
         setAvatar(with: viewModel)
         authorButton.configuration?.attributedTitle = AttributedString(viewModel.author, attributes: Self.authorAttributes)
         timeLabel.text = viewModel.time
@@ -241,10 +245,24 @@ private final class ReaderPostCellView: UIView {
             imageView.isHidden = true
         }
 
+        buttons.bookmark.configuration = {
+            var configuration = buttons.bookmark.configuration ?? .plain()
+            configuration.image = UIImage(systemName: viewModel.isBookmarked ? "bookmark.fill" : "bookmark")
+            configuration.baseForegroundColor = viewModel.isBookmarked ? UIAppColor.brand : .secondaryLabel
+            return configuration
+        }()
+
         buttons.comment.isHidden = !viewModel.isCommentsEnabled
         buttons.comment.configuration?.attributedTitle = viewModel.commentCount.map { AttributedString($0, attributes: Self.toolbarAttributes) }
+
         buttons.like.isHidden = !viewModel.isLikesEnabled
-        buttons.like.configuration?.attributedTitle = viewModel.likeCount.map { AttributedString($0, attributes: Self.toolbarAttributes) }
+        buttons.like.configuration = {
+            var configuration = buttons.like.configuration ?? .plain()
+            configuration.attributedTitle = viewModel.likeCount.map { AttributedString($0, attributes: Self.toolbarAttributes) }
+            configuration.image = UIImage(systemName: viewModel.isLiked ? "star.fill" : "star")
+            configuration.baseForegroundColor = viewModel.isLiked ? .systemYellow : .secondaryLabel
+            return configuration
+        }()
     }
 
     private func setAvatar(with viewModel: ReaderPostCellViewModel) {

WordPress/Classes/ViewRelated/Reader/ReaderPostCellViewModel.swift

@@ -12,24 +12,33 @@ final class ReaderPostCellViewModel {
     var imageURL: URL?
 
     // Footer
+    var isBookmarked: Bool
     var isCommentsEnabled: Bool
     var commentCount: String?
     var isLikesEnabled: Bool
     var likeCount: String?
+    var isLiked: Bool
 
+    private var post: ReaderPost?
+    private var followCommentsService: FollowCommentsService?
     private var faviconTask: Task<Void, Never>?
 
+    weak var viewController: ReaderStreamViewController?
+
     deinit {
         faviconTask?.cancel()
     }
 
     init(post: ReaderPost) {
+        self.post = post
+
         self.author = post.blogNameForDisplay()
         self.time = post.dateForDisplay()?.toShortString() ?? "–"
         self.title = post.titleForDisplay()
         self.details = post.contentPreviewForDisplay()
         self.imageURL = post.featuredImageURLForDisplay()
 
+        self.isBookmarked = post.isSavedForLater
         // TODO: (reader) verify that is*Enabled is correct
         self.isCommentsEnabled = post.isCommentsEnabled
         if isCommentsEnabled, let count = post.commentCount?.intValue, count > 0 {
@@ -40,6 +49,7 @@ final class ReaderPostCellViewModel {
         if isLikesEnabled, let count = post.likeCount?.intValue, count > 0 {
             self.likeCount = kFormatted(count)
         }
+        self.isLiked = post.isLiked()
 
         if let avatarURL = post.siteIconForDisplay(ofSize: Int(ReaderPostCell.avatarSize)) {
             self.avatarURL = avatarURL
@@ -61,15 +71,66 @@ final class ReaderPostCellViewModel {
         self.title = "Discovering the Wonders of the Wild"
         self.details = "Lorem ipsum dolor sit amet. Non omnis quia et natus voluptatum et eligendi voluptate vel iusto fuga sit repellendus molestiae aut voluptatem blanditiis ad neque sapiente. Id galisum distinctio quo enim aperiam non veritatis vitae et ducimus rerum."
         self.imageURL = URL(string: "https://picsum.photos/1260/630.jpg")
+        self.isBookmarked = false
         self.isLikesEnabled = true
         self.likeCount = "9K"
         self.isCommentsEnabled = true
         self.commentCount = "213"
+        self.isLiked = true
     }
 
     static func mock() -> ReaderPostCellViewModel {
         ReaderPostCellViewModel()
     }
+
+    // MARK: Actions
+
+    func showSiteDetails() {
+        guard let post, let viewController else { return }
+        ReaderHeaderAction().execute(post: post, origin: viewController)
+    }
+
+    func toogleBookmark() {
+        guard let post, let viewController else { return }
+        // TODO: (reader) add accurate analytics
+        ReaderSaveForLaterAction().execute(with: post, origin: .otherStream, viewController: viewController)
+    }
+
+    func reblog() {
+        guard let post, let viewController else { return }
+        ReaderReblogAction().execute(readerPost: post, origin: viewController, reblogSource: .list)
+    }
+
+    func comment() {
+        guard let post, let viewController else { return }
+        ReaderCommentAction().execute(post: post, origin: viewController, source: .postCard)
+    }
+
+    func toggleLike() {
+        guard let post else { return }
+        ReaderLikeAction().execute(with: post)
+    }
+
+    // TODO: (reader) implement the new menu
+    func showMore(with anchor: UIView) {
+        guard let post,
+              let viewController,
+              let followCommentsService = FollowCommentsService(post: post) else {
+            return
+        }
+        self.followCommentsService = followCommentsService
+
+        ReaderMenuAction(logged: true).execute(
+            post: post,
+            context: viewController.viewContext,
+            readerTopic: viewController.readerTopic,
+            anchor: anchor,
+            vc: viewController,
+            source: ReaderPostMenuSource.card,
+            followCommentsService: followCommentsService
+        )
+        WPAnalytics.trackReader(.postCardMoreTapped)
+    }
 }
 
 private func kFormatted(_ count: Int) -> String {

WordPress/Classes/ViewRelated/Reader/ReaderSaveForLaterAction.swift

@@ -15,7 +15,7 @@ final class ReaderSaveForLaterAction {
         self.visibleConfirmation = visibleConfirmation
     }
 
-    func execute(with post: ReaderPost, context: NSManagedObjectContext, origin: ReaderSaveForLaterOrigin, viewController: UIViewController?, completion: (() -> Void)? = nil) {
+    func execute(with post: ReaderPost, context: NSManagedObjectContext = ContextManager.shared.mainContext, origin: ReaderSaveForLaterOrigin, viewController: UIViewController?, completion: (() -> Void)? = nil) {
         /// Preload the post
         if let viewController = viewController, !post.isSavedForLater {
             let offlineReaderWebView = OfflineReaderWebView()

WordPress/Classes/ViewRelated/Reader/ReaderStreamViewController.swift

@@ -1528,6 +1528,7 @@ extension ReaderStreamViewController: WPTableViewHandlerDelegate {
 
         let cell = tableConfiguration.postCell(in: tableView, for: indexPath)
         let viewModel = ReaderPostCellViewModel(post: post)
+        viewModel.viewController = self
         cell.configure(with: viewModel, isCompact: traitCollection.horizontalSizeClass == .compact, isSeparatorHidden: !showsSeparator)
         return cell
     }