From f3316518cc2a8c021e3c9664bb1b31f5589c245d Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Thu, 12 Jun 2025 09:44:31 -0700 Subject: [PATCH] Remove reply overlay until it can look decent --- Localizable.xcstrings | 1 + Meshtastic/Views/Messages/ChannelMessageList.swift | 11 +++++------ .../Messages/TextMessageField/TextMessageField.swift | 3 ++- Meshtastic/Views/Messages/UserMessageList.swift | 10 +++++----- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Localizable.xcstrings b/Localizable.xcstrings index 9ea910d4..7b68ae40 100644 --- a/Localizable.xcstrings +++ b/Localizable.xcstrings @@ -24354,6 +24354,7 @@ } }, "Replying to a message" : { + "extractionState" : "stale", "localizations" : { "zh-Hant-TW" : { "stringUnit" : { diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift index 458d20ed..9dd3b5cf 100644 --- a/Meshtastic/Views/Messages/ChannelMessageList.swift +++ b/Meshtastic/Views/Messages/ChannelMessageList.swift @@ -136,12 +136,11 @@ struct ChannelMessageList: View { Spacer(minLength: 50) } } - - .overlay { - RoundedRectangle(cornerRadius: 10) - .stroke(.blue, lineWidth: 2) - .opacity(((messageToHighlight == message.messageId) || (replyMessageId == message.messageId)) ? 1 : 0) - } +// .overlay { +// RoundedRectangle(cornerRadius: 18) +// .stroke(.blue, lineWidth: 2) +// .opacity(((messageToHighlight == message.messageId) || (replyMessageId == message.messageId)) ? 1 : 0) +// } .padding([.leading, .trailing]) .frame(maxWidth: .infinity) .id(message.messageId) diff --git a/Meshtastic/Views/Messages/TextMessageField/TextMessageField.swift b/Meshtastic/Views/Messages/TextMessageField/TextMessageField.swift index d60a0381..945b41c0 100644 --- a/Meshtastic/Views/Messages/TextMessageField/TextMessageField.swift +++ b/Meshtastic/Views/Messages/TextMessageField/TextMessageField.swift @@ -39,8 +39,9 @@ struct TextMessageField: View { } label: { Image(systemName: "x.circle.fill") } - Text("Replying to a message") + Text("Reply") } + .padding(.top) } ZStack { diff --git a/Meshtastic/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift index 2a4756fd..e84686d6 100644 --- a/Meshtastic/Views/Messages/UserMessageList.swift +++ b/Meshtastic/Views/Messages/UserMessageList.swift @@ -123,11 +123,11 @@ struct UserMessageList: View { Spacer(minLength: 50) } } - .overlay { - RoundedRectangle(cornerRadius: 10) - .stroke(.blue, lineWidth: 2) - .opacity(((messageToHighlight == message.messageId) || (replyMessageId == message.messageId)) ? 1 : 0) - } +// .overlay { +// RoundedRectangle(cornerRadius: 10) +// .stroke(.blue, lineWidth: 2) +// .opacity(((messageToHighlight == message.messageId) || (replyMessageId == message.messageId)) ? 1 : 0) +// } .padding([.leading, .trailing]) .frame(maxWidth: .infinity) .id(message.messageId)