ios: enable swipe to go back from chat to list (#1824)

* ios: Testing workaround of a crash

* another try

* complete

* added file

* enable swipe to go back from ChatView

* Revert "enable swipe to go back from ChatView"

This reverts commit 22de79505c.

* ios: enable swipe to go back from ChatView

* remove title change

* remove unused

* remove unused variable

Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
This commit is contained in:
Stanislav Dmitrenko
2023-01-24 19:24:46 +00:00
committed by GitHub
parent 93ab713748
commit 2679bc2e94
3 changed files with 13 additions and 18 deletions

View File

@@ -946,7 +946,6 @@ func startChat() throws {
}
func changeActiveUser(_ userId: Int64) {
let m = ChatModel.shared
do {
try changeActiveUser_(userId)
} catch let error {

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

@@ -102,6 +102,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) {