rune/oai-swift
1
0
Fork 0
Code Issues Pull Requests Releases 15 Activity

2.5.0 #10

Merged
rune merged 41 commits from 2.5.0 into main 2026-08-03 08:33:23 +02:00
Conversation 0 Commits 41 Files Changed 124
+12 -32
2 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7fbac5e809 - Show all commits
oAI/Views/Main/SidebarView.swift
+6 -16
View File
@@ -131,9 +131,11 @@ struct SidebarView: View {
ForEach(folders) { folder in
let folderConversations = conversationsByFolder[folder.id] ?? []
if !folderConversations.isEmpty || searchText.isEmpty {
Section(isExpanded: isExpandedBinding(for: folder.id)) {
ForEach(folderConversations) { conversation in
conversationRow(conversation)
Section {
if !collapsedFolders.contains(folder.id) {
ForEach(folderConversations) { conversation in
conversationRow(conversation)
}
}
} header: {
folderHeader(folder)
@@ -204,19 +206,6 @@ struct SidebarView: View {
}
}
private func isExpandedBinding(for folderId: UUID) -> Binding<Bool> {
Binding(
get: { !collapsedFolders.contains(folderId) },
set: { isExpanded in
if isExpanded {
collapsedFolders.remove(folderId)
} else {
collapsedFolders.insert(folderId)
}
}
)
}
private func handleDrop(_ items: [String], toFolder folderId: UUID?) -> Bool {
var moved = false
for idString in items {
@@ -423,6 +412,7 @@ struct SidebarConversationRow: View {
VStack(alignment: .leading, spacing: 2) {
Text(conversation.name)
.font(.system(size: 13, weight: .medium))
.foregroundStyle(.primary)
.lineLimit(1)
HStack(spacing: 4) {
Text("^[\(conversation.messageCount) message](inflect: true)")
oAI/Views/Screens/ConversationListView.swift
+6 -16
View File
@@ -221,9 +221,11 @@ struct ConversationListView: View {
ForEach(folders) { folder in
let folderConversations = conversationsByFolder[folder.id] ?? []
if !folderConversations.isEmpty || searchText.isEmpty {
Section(isExpanded: isExpandedBinding(for: folder.id)) {
ForEach(folderConversations) { conversation in
conversationRow(conversation)
Section {
if !collapsedFolders.contains(folder.id) {
ForEach(folderConversations) { conversation in
conversationRow(conversation)
}
}
} header: {
folderHeader(folder)
@@ -443,19 +445,6 @@ struct ConversationListView: View {
}
}
private func isExpandedBinding(for folderId: UUID) -> Binding<Bool> {
Binding(
get: { !collapsedFolders.contains(folderId) },
set: { isExpanded in
if isExpanded {
collapsedFolders.remove(folderId)
} else {
collapsedFolders.insert(folderId)
}
}
)
}
private func handleDrop(_ items: [String], toFolder folderId: UUID?) -> Bool {
var moved = false
for idString in items {
@@ -696,6 +685,7 @@ struct ConversationRow: View {
VStack(alignment: .leading, spacing: 4) {
Text(conversation.name)
.font(.system(size: 15, weight: .semibold))
.foregroundStyle(.primary)
.lineLimit(1)
HStack(spacing: 6) {