blade/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2024-12-17 17:20:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ button when no custom lists

Browse Source
This commit is contained in:
Diogo
2024-12-13 23:18:01 +00:00
parent 1983653c5e
commit 617dee46c4
2 changed files with 79 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ios/Shared/Views/ChatList/ChatListNavLink.swift
+55 -49
View File
@@ -732,72 +732,78 @@ struct EmojiPickerView: UIViewControllerRepresentable {
}
struct CreateChatListTag: View {
var chat: Chat
var chat: Chat?
@Environment(\.dismiss) var dismiss: DismissAction
@EnvironmentObject var chatTagsModel: ChatTagsModel
@EnvironmentObject var m: ChatModel
@State private var emoji: Emoji? = nil
@State private var name: String = ""
@State private var isPickerPresented = false // Boolean to show picker sheet
@State private var isPickerPresented = false
var body: some View {
List {
HStack {
Button {
isPickerPresented.toggle()
} label: {
if let emoji {
Text(emoji.emoji)
} else {
Image(systemName: "face.smiling")
.resizable()
.scaledToFit()
.frame(width: 18, height: 18)
.foregroundColor(.secondary)
VStack {
List {
HStack {
Button {
isPickerPresented = true
} label: {
if let emoji {
Text(emoji.emoji)
} else {
Image(systemName: "face.smiling")
.resizable()
.scaledToFit()
.frame(width: 18, height: 18)
.foregroundColor(.secondary)
}
}
TextField("List name...", text: $name)
}
TextField("List name...", text: $name)
Button {
createChatTag()
} label: {
Text("Create list")
}
.disabled(name.isEmpty)
}
Button {
createChatTag()
} label: {
Text("Create list")
.listStyle(.insetGrouped)
if isPickerPresented {
EmojiPickerView(selectedEmoji: $emoji, showingPicker: $isPickerPresented)
}
.disabled(name.isEmpty)
}
if isPickerPresented {
EmojiPickerView(selectedEmoji: $emoji, showingPicker: $isPickerPresented)
}
}
private func createChatTag() {
Task {
do {
let (userTags, chatTags) = try await apiCreateChatTag(
type: chat.chatInfo.chatType,
id: chat.chatInfo.apiId,
tag: ChatTagData(emoji: emoji?.emoji ?? "😂", text: name)
)
await MainActor.run {
chatTagsModel.tags = userTags.map {
.chatTag(emoji: $0.chatTagEmoji, text: $0.chatTagText, tagId: $0.chatTagId)
// TODO: Allow creating tag without chat
if let chat = chat {
Task {
do {
let (userTags, chatTags) = try await apiCreateChatTag(
type: chat.chatInfo.chatType,
id: chat.chatInfo.apiId,
tag: ChatTagData(emoji: emoji?.emoji ?? "😂", text: name)
)
await MainActor.run {
chatTagsModel.tags = userTags.map {
.chatTag(emoji: $0.chatTagEmoji, text: $0.chatTagText, tagId: $0.chatTagId)
}
if var contact = chat.chatInfo.contact {
contact.chatTags = chatTags
m.updateContact(contact)
} else if var group = chat.chatInfo.groupInfo {
group.chatTags = chatTags
m.updateGroup(group)
}
dismiss()
}
if var contact = chat.chatInfo.contact {
contact.chatTags = chatTags
m.updateContact(contact)
} else if var group = chat.chatInfo.groupInfo {
group.chatTags = chatTags
m.updateGroup(group)
}
dismiss()
} catch let error {
showAlert(
NSLocalizedString("Error creating list", comment: "alert title"),
message: responseError(error)
)
}
} catch let error {
showAlert(
NSLocalizedString("Error creating list", comment: "alert title"),
message: responseError(error)
)
}
}
}
apps/ios/Shared/Views/ChatList/ChatListView.swift
+24 -1
View File
@@ -687,6 +687,7 @@ enum ChatTagFilter: Identifiable, Equatable {
struct ChatTagsView: View {
@EnvironmentObject var chatTagsModel: ChatTagsModel
@EnvironmentObject var chatModel: ChatModel
@State private var showChatListTagCreate = false
var body: some View {
HStack {
@@ -698,7 +699,6 @@ struct ChatTagsView: View {
} else {
collapsedTagsFilterView(enabledPresetFilters)
}
ForEach(chatTagsModel.tags, id: \.id) { tag in
let current = chatTagsModel.selectedTag == tag
let color: Color? = current ? .accentColor : nil
@@ -720,14 +720,37 @@ struct ChatTagsView: View {
}
}
}
if chatTagsModel.tags.isEmpty {
Button {
showChatListTagCreate = true
} label: {
Image(systemName: "plus")
}
.buttonStyle(PlainButtonStyle())
}
}.task {
getChatTags()
}
.onChange(of: chatModel.currentUser?.userId) { _ in
getChatTags()
}
.sheet(isPresented: $showChatListTagCreate) {
if #available(iOS 16.0, *) {
createChatListTagView()
.presentationDetents([.fraction(0.3)])
} else {
createChatListTagView()
}
}
}
@ViewBuilder private func createChatListTagView() -> some View {
NavigationView {
CreateChatListTag()
.modifier(ThemedBackground(grouped: true))
}
}
@ViewBuilder private func expandedPresetTagsFiltersView(_ filters: [ChatTagFilter]) -> some View {
ForEach(filters, id: \.id) { tag in