enable swipe to go back from ChatView

This commit is contained in:
Avently
2023-01-23 14:02:31 +03:00
parent 66662ccb2f
commit 22de79505c
2 changed files with 14 additions and 18 deletions

View File

@@ -63,7 +63,6 @@ struct ChatView: View {
.padding(.top, 1)
.navigationTitle(cInfo.chatViewName)
.navigationBarTitleDisplayMode(.inline)
.navigationBarBackButtonHidden(true)
.onAppear {
if chat.chatStats.unreadChat {
Task {
@@ -71,25 +70,20 @@ struct ChatView: View {
}
}
}
.onChange(of: chatModel.chatId) { _ in
if chatModel.chatId == nil { dismiss() }
}
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button {
chatModel.chatId = nil
DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
if chatModel.chatId == nil {
chatModel.reversedChatItems = []
}
}
} label: {
HStack(spacing: 0) {
Image(systemName: "chevron.backward")
Text("Chats")
.onChange(of: chatModel.chatId) { _ in
if chatModel.chatId == nil { dismiss() }
}
.onDisappear {
if chatModel.chatId == cInfo.id {
chatModel.chatId = nil
DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
if chatModel.chatId == nil {
chatModel.reversedChatItems = []
}
}
}
}
.toolbar {
ToolbarItem(placement: .principal) {
if case let .direct(contact) = cInfo {
Button {

View File

@@ -49,7 +49,7 @@ struct ChatListView: View {
.onAppear() { connectViaUrl() }
.offset(x: -8)
.listStyle(.plain)
.navigationTitle("Your chats")
.navigationTitle("Chats")
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
@@ -64,6 +64,8 @@ struct ChatListView: View {
}
Image(systemName: "theatermasks").frame(maxWidth: 24, maxHeight: 24, alignment: .center).foregroundColor(.indigo)
}
} else {
Text("Your chats").font(.headline)
}
}
ToolbarItem(placement: .navigationBarTrailing) {