diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift index 196c3fb1..ba3c638a 100644 --- a/Meshtastic/Views/Messages/ChannelMessageList.swift +++ b/Meshtastic/Views/Messages/ChannelMessageList.swift @@ -9,7 +9,7 @@ import SwiftUI import CoreData struct ChannelMessageList: View { - + @Environment(\.managedObjectContext) var context @EnvironmentObject var bleManager: BLEManager @EnvironmentObject var userSettings: UserSettings @@ -29,7 +29,7 @@ struct ChannelMessageList: View { @State private var deleteMessageId: Int64 = 0 @State private var replyMessageId: Int64 = 0 @State private var sendPositionWithMessage: Bool = false - + var body: some View { NavigationStack { ScrollViewReader { scrollView in @@ -244,7 +244,7 @@ struct ChannelMessageList: View { typingMessage = "📍 " + userLongName + " has shared their position with you." } - + } label: { Text("share.position") Image(systemName: "mappin.and.ellipse") @@ -260,7 +260,7 @@ struct ChannelMessageList: View { } #endif HStack(alignment: .top) { - + ZStack { let kbType = UIKeyboardType(rawValue: UserDefaults.standard.object(forKey: "keyboardType") as? Int ?? 0) TextField("message", text: $typingMessage, axis: .vertical) @@ -296,13 +296,13 @@ struct ChannelMessageList: View { typingMessage = "📍 " + userLongName + " has shared their position with you." } - + } label: { Image(systemName: "mappin.and.ellipse") .symbolRenderingMode(.hierarchical) .imageScale(.large).foregroundColor(.accentColor) } - + ProgressView("\(NSLocalizedString("bytes", comment: "")): \(totalBytes) / \(maxbytes)", value: Double(totalBytes), total: Double(maxbytes)) .frame(width: 130) .padding(5) @@ -316,7 +316,7 @@ struct ChannelMessageList: View { .frame(minHeight: 50) .keyboardShortcut(.defaultAction) .onSubmit { - #if targetEnvironment(macCatalyst) + #if targetEnvironment(macCatalyst) if bleManager.sendMessage(message: typingMessage, toUserNum: 0, channel: channel.index, isEmoji: false, replyID: replyMessageId) { typingMessage = "" focusedField = nil @@ -327,7 +327,7 @@ struct ChannelMessageList: View { } } } - #endif + #endif } Text(typingMessage).opacity(0).padding(.all, 0) } diff --git a/Meshtastic/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift index deca1d4a..83fd25f3 100644 --- a/Meshtastic/Views/Messages/UserMessageList.swift +++ b/Meshtastic/Views/Messages/UserMessageList.swift @@ -9,7 +9,7 @@ import SwiftUI import CoreData struct UserMessageList: View { - + @Environment(\.managedObjectContext) var context @EnvironmentObject var bleManager: BLEManager @EnvironmentObject var userSettings: UserSettings @@ -28,8 +28,8 @@ struct UserMessageList: View { @State private var deleteMessageId: Int64 = 0 @State private var replyMessageId: Int64 = 0 @State private var sendPositionWithMessage: Bool = false - - var body: some View { + + var body: some View { NavigationStack { ScrollViewReader { scrollView in ScrollView { @@ -37,7 +37,7 @@ struct UserMessageList: View { ForEach( user.messageList ) { (message: MessageEntity) in if user.num != userSettings.preferredNodeNum { let currentUser: Bool = (userSettings.preferredNodeNum == message.fromUser?.num ? true : false) - + if message.replyID > 0 { let messageReply = user.messageList.first(where: { $0.messageId == message.replyID }) HStack { @@ -61,10 +61,11 @@ struct UserMessageList: View { .offset(y: -5) } VStack(alignment: currentUser ? .trailing : .leading) { - let markdownText: LocalizedStringKey = LocalizedStringKey.init(message.messagePayloadMarkdown ?? (message.messagePayload ?? "EMPTY MESSAGE")) - let skyBlue = Color(red: 0.4627, green: 0.8392, blue: 1.0) + let markdownText: LocalizedStringKey = LocalizedStringKey.init(message.messagePayloadMarkdown ?? (message.messagePayload ?? "EMPTY MESSAGE")) + + let linkBlue = Color(red: 0.4627, green: 0.8392, blue: 1) /* #76d6ff */ Text(markdownText) - .tint(skyBlue) + .tint(linkBlue) .padding(10) .foregroundColor(.white) .background(currentUser ? .accentColor : Color(.gray)) @@ -259,7 +260,7 @@ struct UserMessageList: View { .padding(.trailing) } #endif - + HStack(alignment: .top) { ZStack { let kbType = UIKeyboardType(rawValue: UserDefaults.standard.object(forKey: "keyboardType") as? Int ?? 0) @@ -313,7 +314,7 @@ struct UserMessageList: View { .frame(minHeight: 50) .keyboardShortcut(.defaultAction) .onSubmit { - #if targetEnvironment(macCatalyst) + #if targetEnvironment(macCatalyst) if bleManager.sendMessage(message: typingMessage, toUserNum: user.num, channel: 0, isEmoji: false, replyID: replyMessageId) { typingMessage = "" focusedField = nil @@ -324,7 +325,7 @@ struct UserMessageList: View { } } } - #endif + #endif } Text(typingMessage).opacity(0).padding(.all, 0) } @@ -364,5 +365,5 @@ struct UserMessageList: View { } } } - } + } }