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

fix: don't push ack text left

Browse source 
Aligns RetryButton to look more like iMessages retry button
This commit is contained in:
Austin Payne 2024-02-17 13:59:42 -07:00
parent 8b751f462a
commit 9efdd568d8
2 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Meshtastic/Views/Messages/ChannelMessageList.swift
View file

@ -52,13 +52,20 @@ struct ChannelMessageList: View {
}
VStack(alignment: currentUser ? .trailing : .leading) {
let isDetectionSensorMessage = message.portNum == Int32(PortNum.detectionSensorApp.rawValue)
MessageText(
message: message,
tapBackDestination: .channel(channel),
isCurrentUser: currentUser
) {
self.replyMessageId = message.messageId
self.messageFieldFocused = true
HStack {
MessageText(
message: message,
tapBackDestination: .channel(channel),
isCurrentUser: currentUser
) {
self.replyMessageId = message.messageId
self.messageFieldFocused = true
}
if currentUser && message.canRetry {
RetryButton(message: message)
}
}
TapbackResponses(message: message) {
@ -87,10 +94,6 @@ struct ChannelMessageList: View {
.padding(.bottom)
.id(channel.allPrivateMessages.firstIndex(of: message))
if currentUser && message.canRetry {
RetryButton(message: message)
}
if !currentUser {
Spacer(minLength: 50)
}

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

@ -46,13 +46,19 @@ struct UserMessageList: View {
HStack(alignment: .top) {
if currentUser { Spacer(minLength: 50) }
VStack(alignment: currentUser ? .trailing : .leading) {
MessageText(
message: message,
tapBackDestination: .user(user),
isCurrentUser: currentUser
) {
self.replyMessageId = message.messageId
self.messageFieldFocused = true
HStack {
MessageText(
message: message,
tapBackDestination: .user(user),
isCurrentUser: currentUser
) {
self.replyMessageId = message.messageId
self.messageFieldFocused = true
}
if currentUser && message.canRetry || (message.receivedACK && !message.realACK) {
RetryButton(message: message)
}
}
TapbackResponses(message: message) {
@ -81,10 +87,6 @@ struct UserMessageList: View {
.padding(.bottom)
.id(user.messageList.firstIndex(of: message))
if currentUser && message.canRetry || (message.receivedACK && !message.realACK) {
RetryButton(message: message)
}
if !currentUser {
Spacer(minLength: 50)
}