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

layout, messages

Browse Source
This commit is contained in:
Evgeny Poberezkin
2025-07-21 10:19:00 +01:00
parent d9f71409ad
commit 372231bb14
2 changed files with 48 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ios/Shared/Model/SimpleXAPI.swift
+1 -1
View File
@@ -316,7 +316,7 @@ func apiDeleteUser(_ userId: Int64, _ delSMPQueues: Bool, viewPwd: String?) asyn
}
func apiStartChat(ctrl: chat_ctrl? = nil) throws -> Bool {
let r: ChatResponse0 = try chatSendCmdSync(.startChat(mainApp: true, enableSndFiles: true, largeLinkData: false), ctrl: ctrl)
let r: ChatResponse0 = try chatSendCmdSync(.startChat(mainApp: true, enableSndFiles: true, largeLinkData: true), ctrl: ctrl)
switch r {
case .chatStarted: return true
case .chatRunning: return false
apps/ios/Shared/Views/Chat/ChatView.swift
+47 -52
View File
@@ -733,6 +733,8 @@ struct ChatView: View {
return Group {
if case .chatBanner = ci.content {
ChatBannerView(chat: chat)
.padding(.bottom, 90)
.padding(.top, 8)
} else {
let voiceNoFrame = voiceWithoutFrame(ci)
let maxWidth = cInfo.chatType == .group
@@ -816,58 +818,51 @@ struct ChatView: View {
@ObservedObject var chat: Chat
var body: some View {
VStack {
Spacer().frame(height: 60)
VStack(spacing: 8) {
ChatInfoImage(chat: chat, size: alertProfileImageSize)
VStack(spacing: 8) {
ChatInfoImage(chat: chat, size: 80)
Text(chat.chatInfo.displayName)
.font(.title3)
.multilineTextAlignment(.center)
.lineLimit(2)
.fixedSize(horizontal: false, vertical: true)
.frame(maxWidth: 240)
Text(chat.chatInfo.displayName)
.font(.title3)
let fullName = chat.chatInfo.fullName.trimmingCharacters(in: .whitespacesAndNewlines)
if fullName != "" && fullName != chat.chatInfo.displayName && fullName != chat.chatInfo.displayName.trimmingCharacters(in: .whitespacesAndNewlines) {
Text(chat.chatInfo.fullName)
.font(.headline)
.fontWeight(.regular)
.multilineTextAlignment(.center)
.lineLimit(2)
.lineLimit(3)
.fixedSize(horizontal: false, vertical: true)
.frame(maxWidth: 240)
let fullName = chat.chatInfo.fullName.trimmingCharacters(in: .whitespacesAndNewlines)
if fullName != "" && fullName != chat.chatInfo.displayName && fullName != chat.chatInfo.displayName.trimmingCharacters(in: .whitespacesAndNewlines) {
Text(chat.chatInfo.fullName)
.font(.headline)
.fontWeight(.regular)
.multilineTextAlignment(.center)
.lineLimit(3)
.fixedSize(horizontal: false, vertical: true)
.frame(maxWidth: 260)
}
if let shortDescr = chat.chatInfo.shortDescr {
Text(shortDescr)
.font(.subheadline)
.multilineTextAlignment(.center)
.lineLimit(4)
.fixedSize(horizontal: false, vertical: true)
.padding(.horizontal)
}
if let chatContext = chatContext() {
Spacer().frame(height: 0)
Label(chatContext, systemImage: "info.circle")
.font(.subheadline)
.foregroundColor(theme.colors.secondary)
}
.frame(maxWidth: 260)
}
.frame(maxWidth: .infinity)
.padding()
.background {
Color.clear
.overlay(ToolbarMaterial.material(toolbarMaterial))
.clipShape(RoundedRectangle(cornerRadius: 18))
}
.padding(.horizontal)
Spacer().frame(height: 60)
if let shortDescr = chat.chatInfo.shortDescr {
Text(shortDescr)
.font(.subheadline)
.multilineTextAlignment(.center)
.lineLimit(4)
.fixedSize(horizontal: false, vertical: true)
.padding(.horizontal)
}
if let chatContext = chatContext() {
Label(chatContext, systemImage: "info.circle")
.font(.subheadline)
.foregroundColor(theme.colors.secondary)
.padding(.top, 8)
}
}
.frame(maxWidth: .infinity)
.padding()
.background {
Color.clear
.overlay(ToolbarMaterial.material(toolbarMaterial))
.clipShape(RoundedRectangle(cornerRadius: 18))
}
.padding(.horizontal)
}
func chatContext() -> String? {
@@ -876,14 +871,14 @@ struct ChatView: View {
if contact.nextConnectPrepared, let linkType = contact.preparedContact?.uiConnLinkType {
switch linkType {
case .inv:
NSLocalizedString("1-time invitation", comment: "chat context")
NSLocalizedString("Connect to chat", comment: "chat context")
case .con:
NSLocalizedString("Contact address", comment: "chat context")
NSLocalizedString("Send request to connect", comment: "chat context")
}
} else if contact.nextAcceptContactRequest {
NSLocalizedString("Contact request", comment: "chat context")
NSLocalizedString("Accept contact request", comment: "chat context")
} else {
NSLocalizedString("Contact", comment: "chat context")
NSLocalizedString("Your contact", comment: "chat context")
}
case let .group(groupInfo, _):
switch groupInfo.businessChat?.chatType {
@@ -891,12 +886,12 @@ struct ChatView: View {
if groupInfo.membership.memberStatus == .memCreator {
NSLocalizedString("Your group", comment: "chat context")
} else {
NSLocalizedString("Group", comment: "chat context")
NSLocalizedString("Join group", comment: "chat context")
}
case .business:
NSLocalizedString("Business", comment: "chat context")
NSLocalizedString("Connect to business", comment: "chat context")
case .customer:
NSLocalizedString("Customer", comment: "chat context")
NSLocalizedString("Your customer", comment: "chat context")
}
default: nil
}