mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
* Initial implementation of transports * Initial LogRadio implementation * Fixes for Settings view (caused by debug commenting) * Refinement of the object and actor model * Connect view text and tab updates * Fix mac catalyst and tests * Warning and logging clean-up * In progress commit * Serial Transport and Reconnect draft work * Serial transport and reconnection draft work * Quick fix for BLE - still more work to do * interim commit * More in progress changes * Minor improvements * Pretty good initial implementation * Bump version beyond the app store * Fix for disconnection swipeAction * Tweaks to TCPConnection implementation * Retry for NONCE_ONLY_DB * Revert json string change * Simplified some of the API + "Anti-discovery" * Tweaks for devices leaving the discovery process * Bump version * iOS26 Tweaks * Tweaks and bug fixes * Add link with slash sf symbol * update symbol image on connect view * BLE disconnect handling * Log privacy attributes * Onboarding and minor fixes. * change database to nodes, add emoji to tcp logs * Error handling improvements * More logging emojis * Suppressed unnecessary errors on disconnect * Heartbeat emoji * Add bluetooth symbol * add privacy attributes to [TCP] logs, add custom bluetooth logo * Improve routing logs * Emoji for connect logs * Heartbeat emoji * Add CBCentralManagerScanOptionAllowDuplicatesKey options to central for bluetooth * fix nav errors by switching from observableobject to state * Update connection indicator icon * fix for BLE disconnects * Connection process fixes * More fixes/tweaks to connection process * Strict concurrency * Fix some warnings, remove wifi warning * delete stale keys * interim commit * Update privacy for log, fix wrong space * fix a couple of linting items * Switch to targeted * interim commit * BLE Signal strenth on connect view * Remove BLE RSSI from long press menu * Modem lights * minor spacing tweak * Additional BLE logging and a scanning fix. * Discovery and BLE RSSI improvements * Background suspension * Update isConnected to enable UI during db load * update protobufs * Replace config if statements with switches, Fix unknown module config logging, make dark mode modem circle stroke color white so they are visible * Additional logging cleanup * hast * Set unmessagable to true if the longname has the unmessagable emoji * Connect error handling improvements * Admin popup list icon and activity lights updates * Revert use of .toolbar back to .navigationBarItems * More public logging * Better BLE error handling * Node DB progress meter * minor tweak to activity light interaction timing * Fix comment linting, remove stale keys * Remove stale keys * Easy linting fixes * Two more simple linting fixes * clean up meshtasticapp * More public logging * Replay config * Logging * Fix for unselected node on Settings * Tweak to progress meter based on device idiom * Update protos * Session replay redaction of messages * Serial fix for old devices, and a let statement * Mask text too * Fix typo * BLE poweredOff is now an auto-reconnectable error * Update logging * Fix for peerRemovedPairingInformation * Logging for BLE peripheral:didUpdateValueFor errors. * Fix for inconsistent swipe disconnect behavior * periperal:didUpdateValueFor error handling * Fix for BLEConnection continuation guarding * BLEConnection actor deadlock on disconnect * Heartbeat nonce * Fix for swipe disconnect and task cancellation * Fix for swipe actions not honoring .disabled() * Tell BLETransport when BLEConnection is cancelled * Update navigation logging * Logging updates * Bump version to 2.7.0 * Organize into folders and heartbeat stuff * Minor improvements to manual TCP connection * Auto-connect toggle * Possible BLE bug, still waiting to see in logs * Concurrency tweaks * Concurrency improvements * requestDeviceMetadata fix. fixes remote admin * Minor typo fixes * "All" button for log filters: category and level * More robust continuation handling for BLE * @FetchRequest based ChannelMessageList * Update info.plist and device hardware file * Move auto connect toggle to app settings and debug mode, tint properly with the accent color * Add label to auto connect toggle * Update log for node info received from ourselves over the mesh * Remove unused scrollViewProxy * Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update target for connect view * Properly Set datadog environment * Comment out ble manager * Adjust cyclomatic complexity thresholds in .swiftlint.yml * Linting fixes, delete ble manager * Make session replay debug only --------- Co-authored-by: jake-b <jake-b@users.noreply.github.com> Co-authored-by: jake <jake@jakes-Mac-mini.local> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
264 lines
8.6 KiB
Swift
264 lines
8.6 KiB
Swift
//
|
|
// UserMessageList.swift
|
|
// MeshtasticApple
|
|
//
|
|
// Created by Garth Vander Houwen on 12/24/21.
|
|
//
|
|
|
|
import SwiftUI
|
|
import CoreData
|
|
import OSLog
|
|
|
|
struct UserMessageList: View {
|
|
|
|
@EnvironmentObject var appState: AppState
|
|
@EnvironmentObject var accessoryManager: AccessoryManager
|
|
@Environment(\.managedObjectContext) var context
|
|
// Keyboard State
|
|
@FocusState var messageFieldFocused: Bool
|
|
// View State Items
|
|
@ObservedObject var user: UserEntity
|
|
@State private var replyMessageId: Int64 = 0
|
|
// Scroll state
|
|
@State private var showScrollToBottomButton = false
|
|
@State private var hasReachedBottom = false
|
|
@State private var gotFirstUnreadMessage: Bool = false
|
|
@State private var messageToHighlight: Int64 = 0
|
|
|
|
var body: some View {
|
|
VStack {
|
|
ScrollViewReader { scrollView in
|
|
ZStack(alignment: .bottomTrailing) {
|
|
ScrollView {
|
|
LazyVStack {
|
|
ForEach( Array(user.messageList.enumerated()), id: \.element.id) { index, message in
|
|
// Get the previous message, if it exists
|
|
let previousMessage = index > 0 ? user.messageList[index - 1] : nil
|
|
if message.displayTimestamp(aboveMessage: previousMessage) {
|
|
Text(message.timestamp.formatted(date: .abbreviated, time: .shortened))
|
|
.font(.caption)
|
|
.foregroundColor(.gray)
|
|
}
|
|
if user.num != accessoryManager.activeDeviceNum ?? -1 {
|
|
let currentUser: Bool = (Int64(UserDefaults.preferredPeripheralNum) == message.fromUser?.num ?? -1 ? true : false)
|
|
|
|
if message.replyID > 0 {
|
|
let messageReply = user.messageList.first(where: { $0.messageId == message.replyID })
|
|
HStack {
|
|
Button {
|
|
if let messageNum = messageReply?.messageId {
|
|
withAnimation(.easeInOut(duration: 0.5)) {
|
|
messageToHighlight = messageNum
|
|
}
|
|
scrollView.scrollTo(messageNum, anchor: .center)
|
|
// Reset highlight after delay
|
|
Task {
|
|
try? await Task.sleep(nanoseconds: 1_000_000_000) // 1 second
|
|
withAnimation(.easeInOut(duration: 0.5)) {
|
|
messageToHighlight = -1
|
|
}
|
|
}
|
|
}
|
|
} label: {
|
|
Text(messageReply?.messagePayload ?? "EMPTY MESSAGE").foregroundColor(.accentColor).font(.caption2)
|
|
.padding(10)
|
|
.overlay(
|
|
RoundedRectangle(cornerRadius: 18)
|
|
.stroke(Color.blue, lineWidth: 0.5)
|
|
)
|
|
Image(systemName: "arrowshape.turn.up.left.fill")
|
|
.symbolRenderingMode(.hierarchical)
|
|
.imageScale(.large).foregroundColor(.accentColor)
|
|
.padding(.trailing)
|
|
}
|
|
}
|
|
}
|
|
HStack(alignment: .top) {
|
|
if currentUser { Spacer(minLength: 50) }
|
|
VStack(alignment: currentUser ? .trailing : .leading) {
|
|
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, destination: .user(user))
|
|
}
|
|
}
|
|
|
|
TapbackResponses(message: message) {
|
|
appState.unreadDirectMessages = user.unreadMessages
|
|
}
|
|
|
|
HStack {
|
|
let ackErrorVal = RoutingError(rawValue: Int(message.ackError))
|
|
if currentUser && message.receivedACK {
|
|
// Ack Received
|
|
if message.realACK {
|
|
Text("\(ackErrorVal?.display ?? "Empty Ack Error")")
|
|
.font(.caption2)
|
|
.foregroundStyle(ackErrorVal?.color ?? Color.secondary)
|
|
} else {
|
|
Text("Acknowledged by another node").font(.caption2).foregroundColor(.orange)
|
|
}
|
|
} else if currentUser && message.ackError == 0 {
|
|
// Empty Error
|
|
Text("Waiting to be acknowledged. . .").font(.caption2).foregroundColor(.yellow)
|
|
} else if currentUser && message.ackError > 0 {
|
|
Text("\(ackErrorVal?.display ?? "Empty Ack Error")").fixedSize(horizontal: false, vertical: true)
|
|
.foregroundStyle(ackErrorVal?.color ?? Color.red)
|
|
.font(.caption2)
|
|
}
|
|
}
|
|
}
|
|
.padding(.bottom)
|
|
.id(user.messageList.firstIndex(of: message))
|
|
|
|
if !currentUser {
|
|
Spacer(minLength: 50)
|
|
}
|
|
}
|
|
// .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)
|
|
.onAppear {
|
|
if gotFirstUnreadMessage {
|
|
if !message.read {
|
|
message.read = true
|
|
do {
|
|
for unreadMessage in user.messageList.filter({ !$0.read }) {
|
|
unreadMessage.read = true
|
|
}
|
|
try context.save()
|
|
Logger.data.info("📖 [App] Read message \(message.messageId, privacy: .public) ")
|
|
appState.unreadDirectMessages = user.unreadMessages
|
|
} catch {
|
|
Logger.data.error("Failed to read message \(message.messageId, privacy: .public): \(error.localizedDescription, privacy: .public)")
|
|
}
|
|
}
|
|
// Check if we've reached the bottom message
|
|
if message.messageId == user.messageList.last?.messageId {
|
|
hasReachedBottom = true
|
|
showScrollToBottomButton = false
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
// Invisible spacer to detect reaching bottom
|
|
Color.clear
|
|
.frame(height: 1)
|
|
.id("bottomAnchor")
|
|
.onAppear {
|
|
hasReachedBottom = true
|
|
showScrollToBottomButton = false
|
|
}
|
|
}
|
|
}
|
|
.scrollDismissesKeyboard(.interactively)
|
|
.onFirstAppear {
|
|
if user.unreadMessages == 0 {
|
|
withAnimation {
|
|
scrollView.scrollTo("bottomAnchor", anchor: .bottom)
|
|
hasReachedBottom = true
|
|
}
|
|
} else {
|
|
if let firstUnreadMessageId = user.messageList.first(where: { !$0.read })?.messageId {
|
|
withAnimation {
|
|
scrollView.scrollTo(firstUnreadMessageId, anchor: .top)
|
|
showScrollToBottomButton = true
|
|
}
|
|
}
|
|
}
|
|
gotFirstUnreadMessage = true
|
|
}
|
|
.onReceive(NotificationCenter.default.publisher(for: UIResponder.keyboardDidShowNotification)) { _ in
|
|
withAnimation {
|
|
scrollView.scrollTo("bottomAnchor", anchor: .bottom)
|
|
hasReachedBottom = true
|
|
showScrollToBottomButton = false
|
|
}
|
|
}
|
|
.onChange(of: user.messageList) {
|
|
if hasReachedBottom {
|
|
withAnimation {
|
|
scrollView.scrollTo("bottomAnchor", anchor: .bottom)
|
|
}
|
|
} else {
|
|
showScrollToBottomButton = true
|
|
}
|
|
}
|
|
// Scroll to bottom button
|
|
if showScrollToBottomButton {
|
|
Button {
|
|
withAnimation {
|
|
scrollView.scrollTo("bottomAnchor", anchor: .bottom)
|
|
hasReachedBottom = true
|
|
showScrollToBottomButton = false
|
|
}
|
|
} label: {
|
|
ScrollToBottomButtonView()
|
|
}
|
|
.padding(.bottom, 8)
|
|
.padding(.trailing, 16)
|
|
.transition(.opacity)
|
|
}
|
|
}
|
|
}
|
|
|
|
TextMessageField(
|
|
destination: .user(user),
|
|
replyMessageId: $replyMessageId,
|
|
isFocused: $messageFieldFocused
|
|
) {
|
|
context.refresh(user, mergeChanges: true)
|
|
}
|
|
}
|
|
.navigationBarTitleDisplayMode(.large)
|
|
.toolbar {
|
|
if !user.keyMatch {
|
|
ToolbarItem(placement: .bottomBar) {
|
|
VStack {
|
|
HStack {
|
|
Image(systemName: "key.slash.fill")
|
|
.symbolRenderingMode(.multicolor)
|
|
.foregroundStyle(.red)
|
|
.font(.caption2)
|
|
Text("There is an issue with this contact's public key.")
|
|
.foregroundStyle(.secondary)
|
|
.font(.caption2)
|
|
}
|
|
Link(destination: URL(string: "meshtastic:///nodes?nodenum=\(user.num)")!) {
|
|
Text("Details...")
|
|
.font(.caption2)
|
|
.offset(y: -15)
|
|
}
|
|
}
|
|
.offset(y: -15)
|
|
}
|
|
}
|
|
ToolbarItem(placement: .principal) {
|
|
HStack {
|
|
CircleText(text: user.shortName ?? "?", color: Color(UIColor(hex: UInt32(user.num))), circleSize: 44)
|
|
}
|
|
}
|
|
ToolbarItem(placement: .navigationBarTrailing) {
|
|
ZStack {
|
|
ConnectedDevice(
|
|
deviceConnected: accessoryManager.isConnected,
|
|
name: accessoryManager.activeConnection?.device.shortName ?? "?")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|