dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-05-14 23:25:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

texts, icons

Browse Source
This commit is contained in:
spaced4ndy
2025-07-21 15:47:03 +04:00
parent fc3a2e0b6e
commit 2be919510e
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ios/Shared/Views/Chat/ChatView.swift
+20 -12
View File
@@ -847,8 +847,8 @@ struct ChatView: View {
.padding(.horizontal)
}
if let chatContext = chatContext() {
Label(chatContext, systemImage: "info.circle")
if let (chatContext, image) = chatContext() {
Label(chatContext, systemImage: image)
.font(.callout)
.foregroundColor(theme.colors.secondary)
.padding(.top, 8)
@@ -864,33 +864,41 @@ struct ChatView: View {
.padding(.horizontal)
}
func chatContext() -> String? {
func chatContext() -> (String, String)? {
switch chat.chatInfo {
case let .direct(contact):
if contact.nextConnectPrepared, let linkType = contact.preparedContact?.uiConnLinkType {
switch linkType {
case .inv:
NSLocalizedString("Connect to chat", comment: "chat context")
(NSLocalizedString("Connect to chat", comment: "chat context"), "arrow.forward.circle")
case .con:
NSLocalizedString("Send request to connect", comment: "chat context")
(NSLocalizedString("Send request to connect", comment: "chat context"), "arrow.forward.circle")
}
} else if contact.nextAcceptContactRequest {
NSLocalizedString("Accept contact request", comment: "chat context")
(NSLocalizedString("Accept contact request", comment: "chat context"), "arrow.forward.circle")
} else {
NSLocalizedString("Your contact", comment: "chat context")
(NSLocalizedString("Your contact", comment: "chat context"), "info.circle")
}
case let .group(groupInfo, _):
switch groupInfo.businessChat?.chatType {
case .none:
if groupInfo.membership.memberStatus == .memCreator {
NSLocalizedString("Your group", comment: "chat context")
if groupInfo.nextConnectPrepared {
(NSLocalizedString("Join group", comment: "chat context"), "arrow.forward.circle")
} else {
NSLocalizedString("Join group", comment: "chat context")
switch (groupInfo.membership.memberStatus) {
case .memInvited: (NSLocalizedString("Join group", comment: "chat context"), "arrow.forward.circle")
case .memCreator: (NSLocalizedString("Your group", comment: "chat context"), "info.circle")
default: (NSLocalizedString("Group", comment: "chat context"), "info.circle")
}
}
case .business:
NSLocalizedString("Connect to business", comment: "chat context")
if groupInfo.nextConnectPrepared {
(NSLocalizedString("Connect to business", comment: "chat context"), "arrow.forward.circle")
} else {
(NSLocalizedString("Business connection", comment: "chat context"), "info.circle")
}
case .customer:
NSLocalizedString("Your customer", comment: "chat context")
(NSLocalizedString("Your customer", comment: "chat context"), "info.circle")
}
default: nil
}
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
+1 -1
View File
@@ -883,7 +883,7 @@ object ChatController {
}
suspend fun apiStartChat(ctrl: ChatCtrl? = null): Boolean {
val r = sendCmd(null, CC.StartChat(mainApp = true, largeLinkData = false), ctrl)
val r = sendCmd(null, CC.StartChat(mainApp = true, largeLinkData = true), ctrl)
when (r.result) {
is CR.ChatStarted -> return true
is CR.ChatRunning -> return false