updated ChatView one button instead four
iOS CI / Build and Test SwiftUI App (push) Canceled after 0s
Build Unsigned iOS and macOS Apps / Build Unsigned iOS IPA (push) Canceled after 0s
Build Unsigned iOS and macOS Apps / Build macOS ZIP (push) Canceled after 0s

This commit is contained in:
wt committed 2026-08-19 23:34:47 +07:00
1 parent 0bf01fafa4
commit e31b3bf81a
6 files changed
+353 -90

No files matched your search

+36 -30
View File
@@ -83,7 +83,7 @@ struct ChatView: View {
}
}
.background(Color.secondary.opacity(0.035))
.navigationTitle(conversation.displayName)
.navigationTitle("")
#if os(iOS)
.navigationBarTitleDisplayMode(.inline)
#endif
@@ -100,36 +100,43 @@ struct ChatView: View {
.font(.subheadline.weight(.semibold))
}
} else {
ToolbarItemGroup(placement: .primaryAction) {
if !conversation.isGroup {
Button {
Task { await model.startCall(to: conversation.jid, withVideo: false) }
} label: {
Image(systemName: "phone")
ToolbarItem(placement: .primaryAction) {
HStack {
AvatarView(
conversation: liveConversation,
imageData: model.avatarData(for: conversation.jid),
size: 28
).padding(4)
if !conversation.isGroup {
Menu {
Button {
Task { await model.startCall(to: conversation.jid, withVideo: false) }
} label: {
Label("Аудиозвонок", systemImage: "phone")
}
.disabled(!canStartCall)
.help("Аудиозвонок")
Button {
Task { await model.startCall(to: conversation.jid, withVideo: true) }
} label: {
Label("Видеозвонок", systemImage: "video")
}
.disabled(!canStartCall)
.help("Видеозвонок")
encryptionMenu
} label: {
Image(systemName: "ellipsis.circle")
}
.disabled(!canStartCall)
}
.disabled(!canStartCall)
.help("Аудиозвонок")
Button {
Task { await model.startCall(to: conversation.jid, withVideo: true) }
} label: {
Image(systemName: "video")
if conversation.isGroup {
Button { showingGroupInfo = true } label: {
Image(systemName: "person.3")
}
.help("Информация о группе")
}
.disabled(!canStartCall)
.help("Видеозвонок")
}
AvatarView(
conversation: liveConversation,
imageData: model.avatarData(for: conversation.jid),
size: 28
)
if conversation.isGroup {
Button { showingGroupInfo = true } label: {
Image(systemName: "person.3")
}
.help("Информация о группе")
}
encryptionMenu
}
}
}
@@ -321,8 +328,7 @@ struct ChatView: View {
}
}
} label: {
Image(systemName: encryptionIcon)
.foregroundStyle(encryptionEnabled ? Color.primary : Color.orange)
Label("Шифрование", systemImage: encryptionIcon)
}
.help(encryptionEnabled ? "OMEMO включено" : "Сообщения отправляются без OMEMO")
}