Show manual sync-conflict fix instructions in-app instead of deep-linking to Help

NSWorkspace.shared.open() silently drops #fragment anchors on file://
URLs, so "Fix It Myself" always landed on the Help Book index instead
of the relevant section. Replaced with GitSyncManualFixSheet, an
in-app sheet showing the real conflicting filenames and sync path.

Also indent conversation rows one level deeper than their containing
folder in the sidebar and conversation list, so nesting is visible on
the conversations themselves and not just the folder headers.
This commit is contained in:
2026-08-04 12:21:15 +02:00
parent 125e1698f7
commit e2284aba2b
10 changed files with 556 additions and 14 deletions
+3 -2
View File
@@ -192,7 +192,7 @@ struct SidebarView: View {
Section {
if !collapsedFolders.contains(entry.folder.id) {
ForEach(folderConversations) { conversation in
conversationRow(conversation)
conversationRow(conversation, depth: entry.depth + 1)
}
}
} header: {
@@ -320,8 +320,9 @@ struct SidebarView: View {
}
@ViewBuilder
private func conversationRow(_ conversation: Conversation) -> some View {
private func conversationRow(_ conversation: Conversation, depth: Int = 0) -> some View {
SidebarConversationRow(conversation: conversation)
.padding(.leading, CGFloat(depth) * 14)
.contentShape(Rectangle())
.onTapGesture(count: 2) {
chatViewModel.loadConversation(conversation)