Add bookmark control to comments toolbar

Author: weiran

Features/Comments/Sources/Comments/CommentsComponents.swift

@@ -484,6 +484,32 @@ struct ToolbarTitle: View {
     }
 }
 
+struct BookmarkToolbarButton: View {
+    let isBookmarked: Bool
+    let toggleBookmark: @Sendable () async -> Bool
+    @State private var isSubmitting = false
+
+    var body: some View {
+        Button {
+            guard !isSubmitting else { return }
+            isSubmitting = true
+            Task { @MainActor in
+                _ = await toggleBookmark()
+                isSubmitting = false
+            }
+        } label: {
+            Image(systemName: isBookmarked ? "bookmark.fill" : "bookmark")
+        }
+        .accessibilityLabel(isBookmarked ? "Remove Bookmark" : "Save Bookmark")
+        .accessibilityHint(
+            isBookmarked
+                ? "Double-tap to remove from bookmarks"
+                : "Double-tap to add to bookmarks"
+        )
+        .disabled(isSubmitting)
+    }
+}
+
 struct ShareMenu: View {
     let post: Post
 

Features/Comments/Sources/Comments/CommentsView.swift

@@ -98,6 +98,14 @@ public struct CommentsView<NavigationStore: NavigationStoreProtocol>: View {
                     )
                 }
             }
+            ToolbarItem(placement: .navigationBarTrailing) {
+                if let post = viewModel.post {
+                    BookmarkToolbarButton(
+                        isBookmarked: post.isBookmarked,
+                        toggleBookmark: { await viewModel.toggleBookmark() }
+                    )
+                }
+            }
             ToolbarItem(placement: .navigationBarTrailing) {
                 if let post = viewModel.post {
                     ShareMenu(post: post)

Features/Comments/Sources/Comments/CommentsViewModel.swift

@@ -28,6 +28,7 @@ public final class CommentsViewModel: @unchecked Sendable {
     private let settingsUseCase: any SettingsUseCase
     private let bookmarksController: BookmarksController
     private var settingsCancellable: AnyCancellable?
+    private var bookmarksObservation: AnyCancellable?
 
     public var comments: [Comment] { commentsLoader.data }
     public var isLoading: Bool { commentsLoader.isLoading }
@@ -77,6 +78,20 @@ public final class CommentsViewModel: @unchecked Sendable {
                     self.showThumbnails = currentValue
                 }
             }
+
+        bookmarksObservation = NotificationCenter.default.publisher(for: .bookmarksDidChange)
+            .receive(on: DispatchQueue.main)
+            .sink { [weak self] notification in
+                guard let self else { return }
+                guard let postId = notification.userInfo?["postId"] as? Int,
+                      postId == self.postID,
+                      let isBookmarked = notification.userInfo?["isBookmarked"] as? Bool
+                else { return }
+                if var currentPost = self.post {
+                    currentPost.isBookmarked = isBookmarked
+                    self.post = currentPost
+                }
+            }
     }
 
     @MainActor

Features/Comments/Tests/CommentsTests/CommentsViewModelTests.swift

@@ -209,6 +209,47 @@ struct CommentsViewModelTests {
         #expect(viewModel.showThumbnails == true)
     }
 
+    @Test("Bookmark notifications update local post state")
+    @MainActor
+    func bookmarkNotificationsUpdatePostState() async {
+        var unbookmarkedPost = testPost
+        unbookmarkedPost.isBookmarked = false
+        let viewModel = CommentsViewModel(
+            post: unbookmarkedPost,
+            postUseCase: mockPostUseCase,
+            commentUseCase: mockCommentUseCase,
+            voteUseCase: mockVoteUseCase,
+            settingsUseCase: StubSettingsUseCase(showThumbnails: true),
+            bookmarksController: bookmarksController
+        )
+
+        #expect(viewModel.post?.isBookmarked == false)
+
+        NotificationCenter.default.post(
+            name: .bookmarksDidChange,
+            object: nil,
+            userInfo: ["postId": unbookmarkedPost.id, "isBookmarked": true]
+        )
+        await Task.yield()
+        #expect(viewModel.post?.isBookmarked == true)
+
+        NotificationCenter.default.post(
+            name: .bookmarksDidChange,
+            object: nil,
+            userInfo: ["postId": unbookmarkedPost.id + 1, "isBookmarked": false]
+        )
+        await Task.yield()
+        #expect(viewModel.post?.isBookmarked == true)
+
+        NotificationCenter.default.post(
+            name: .bookmarksDidChange,
+            object: nil,
+            userInfo: ["postId": unbookmarkedPost.id, "isBookmarked": false]
+        )
+        await Task.yield()
+        #expect(viewModel.post?.isBookmarked == false)
+    }
+
     // MARK: - Voting Tests
 
     @Test("Upvoting post updates state correctly", arguments: [