Commit `d151e20a46`

d151e20a46f18addc04dcc976dd41307266d7e6d

parent: 9d4296fb07

Unsigned

cmc <hello@cleberg.net> · 2026-04-01 17:15 UTC

fix: fixed inbox's inconsistent UX and adds a Mark All Read button

Fixes: https://todo.sr.ht/~ccleberg/Hutch/10

Layout: unified · split

Hutch/Views/Home/HomeView.swift +13 −15

	@@ -26,11 +26,18 @@ struct HomeView: View {
26	}	26	}
27	}	27	}
28	.task {	28	.task {
29	if viewModel == nil, let currentUser = appState.currentUser {	29	guard let currentUser = appState.currentUser else { return }
30	let vm = HomeViewModel(currentUser: currentUser, client: appState.client)	30
31	viewModel = vm	31	let vm: HomeViewModel
32	await vm.loadDashboard()	32	if let viewModel {
		33	vm = viewModel
		34	} else {
		35	let newViewModel = HomeViewModel(currentUser: currentUser, client: appState.client)
		36	viewModel = newViewModel
		37	vm = newViewModel
33	}	38	}
		39
		40	await vm.loadDashboard()
34	}	41	}
35	}	42	}
36		43
	@@ -214,17 +221,8 @@ private struct HomeInboxToolbarIcon: View {
214	let hasUnreadThreads: Bool	221	let hasUnreadThreads: Bool
215		222
216	var body: some View {	223	var body: some View {
217	ZStack(alignment: .topTrailing) {	224	Image(systemName: hasUnreadThreads ? "tray.fill" : "tray")
218	Image(systemName: hasUnreadThreads ? "tray.fill" : "tray")	225	.accessibilityLabel(hasUnreadThreads ? "Inbox, unread messages" : "Inbox")
219
220	if hasUnreadThreads {
221	Circle()
222	.fill(.blue)
223	.frame(width: 9, height: 9)
224	.offset(x: 4, y: -2)
225	}
226	}
227	.accessibilityLabel(hasUnreadThreads ? "Inbox, unread messages" : "Inbox")
228	}	226	}
229	}	227	}
230		228

Hutch/Views/Inbox/InboxView.swift +31 −5

 struct InboxView: View {
     @Environment(AppState.self) private var appState
+    @Environment(\.scenePhase) private var scenePhase
     @State private var viewModel: InboxViewModel?
     @State private var selectedThreadID: InboxThreadSummary.ID?
     @State private var selectedThreadSnapshot: InboxThreadSummary?
         }
         .navigationTitle("Inbox")
         .task {
-            if viewModel == nil {
+            let vm: InboxViewModel
-                let vm = InboxViewModel(client: appState.client)
+            if let viewModel {
-                viewModel = vm
+                vm = viewModel
-                await vm.loadThreads()
+            } else {
+                let newViewModel = InboxViewModel(client: appState.client)
+                viewModel = newViewModel
+                vm = newViewModel
+            }
+            await vm.loadThreads()
+        }
+        .onChange(of: scenePhase) { _, newPhase in
+            guard newPhase == .active, let viewModel, !isShowingThreadDetail else { return }
+            Task {
+                await viewModel.loadThreads()
             }
         }
     }
             prompt: "Search inbox"
         )
         .listStyle(.plain)
+        .toolbar {
+            ToolbarItem(placement: .topBarTrailing) {
+                if viewModel.hasUnreadThreads {
+                    Button("Mark All Read") {
+                        withAnimation(.easeInOut(duration: 0.2)) {
+                            viewModel.markAllThreadsRead()
+                        }
+                        Task {
+                            await viewModel.loadThreads()
+                        }
+                    }
+                }
+            }
+        }
         .overlay {
             if viewModel.isLoading, viewModel.threads.isEmpty {
                 SRHTLoadingStateView(message: "Loading inbox…")
                 ContentUnavailableView(
                     "Inbox Zero",
                     systemImage: "tray",
-                    description: Text("Unread threads will appear here.")
+                    description: Text("You're up to date.")
                 )
             }
         }

Hutch/Views/Inbox/InboxViewModel.swift +16

	@@ -150,6 +150,18 @@ final class InboxViewModel {
150	NeedsAttentionSnapshotStore.adjustUnreadInboxThreads(by: -1)	150	NeedsAttentionSnapshotStore.adjustUnreadInboxThreads(by: -1)
151	}	151	}
152		152
		153	func markAllThreadsRead() {
		154	guard !threads.isEmpty else { return }
		155
		156	let viewedAt = Date()
		157	for thread in threads where thread.isUnread {
		158	InboxReadStateStore.markViewed(max(viewedAt, thread.lastActivityAt), for: thread.id)
		159	}
		160
		161	threads.removeAll { $0.isUnread }
		162	NeedsAttentionSnapshotStore.update(unreadInboxThreads: threads.count)
		163	}
		164
153	func markThreadUnread(_ thread: InboxThreadSummary) {	165	func markThreadUnread(_ thread: InboxThreadSummary) {
154	InboxReadStateStore.markUnread(for: thread.id)	166	InboxReadStateStore.markUnread(for: thread.id)
155	updateThread(thread, isUnread: true)	167	updateThread(thread, isUnread: true)
	@@ -178,6 +190,10 @@ final class InboxViewModel {
178	}	190	}
179	}	191	}
180		192
		193	var hasUnreadThreads: Bool {
		194	threads.contains(where: \.isUnread)
		195	}
		196
181	private func fetchSubscriptions() async throws -> [InboxActivitySubscription] {	197	private func fetchSubscriptions() async throws -> [InboxActivitySubscription] {
182	var subscriptions: [InboxActivitySubscription] = []	198	var subscriptions: [InboxActivitySubscription] = []
183	var cursor: String?	199	var cursor: String?

Commit d151e20a46

Commit `d151e20a46`