meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move the lock to the message corner

Browse source
This commit is contained in:
Garth Vander Houwen 2024-08-14 17:04:48 -07:00
parent c48f96b2b4
commit 8c3b4ada37
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Meshtastic/Views/Messages/MessageText.swift
View file

@ -24,11 +24,25 @@ struct MessageText: View {
let markdownText = LocalizedStringKey(message.messagePayloadMarkdown ?? (message.messagePayload ?? "EMPTY MESSAGE"))
return Text(markdownText)
.tint(Self.linkBlue)
.padding(10)
.padding(.vertical, 10)
.padding(.horizontal, 8)
.foregroundColor(.white)
.background(isCurrentUser ? .accentColor : Color(.gray))
.cornerRadius(15)
.overlay {
if message.pkiEncrypted {
VStack (alignment: .trailing) {
Spacer()
HStack {
Spacer()
Image(systemName: "lock.circle.fill")
.symbolRenderingMode(.palette)
.foregroundStyle(.white, .green)
.font(.system(size: 20))
.offset(x: 8, y: 8)
}
}
}
let isDetectionSensorMessage = message.portNum == Int32(PortNum.detectionSensorApp.rawValue)
if tapBackDestination.overlaySensorMessage {
VStack {

6
Meshtastic/Views/Messages/UserMessageList.swift
View file

@ -57,12 +57,6 @@ struct UserMessageList: View {
self.replyMessageId = message.messageId
self.messageFieldFocused = true
}
if message.pkiEncrypted {
Image(systemName: "lock.circle.fill")
.foregroundStyle(.green)
.frame(height: 25)
.padding(.top, 5)
}
if currentUser && message.canRetry || (message.receivedACK && !message.realACK) {
RetryButton(message: message, destination: .user(user))