mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
* Update messaging list separator insets
* Dont show unread messages or notifications for emoji reactions matching iMessage.
* Restore ble state method (#1416)
* Restore BLE State
* Log privacy
* AccessoryManager to handle restored connection
* Comment task out
* Update restore state function based on conversation with jake
* Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---------
Co-authored-by: Jake-B <jake-b@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Two Column Node List (#1425)
* Restore BLE State
* Log privacy
* AccessoryManager to handle restored connection
* Comment task out
* Switch the node list to a two column layout
* Keep asian translations of channel details string
* Update restore state function based on conversation with jake
* Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLETransport.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* always show node list search bar
* Update auto correct modifier
* Dont show online animations for ios 17, remove online animation from node map, remove online circle from position popover
* Work in progress.
* Update detents
* Gate the discovery process while restoring
* Use geometry reader to size weather tiles on node details
* Update BLE Transport
* Update location weather condistion styles
* Log privacy in didReceive
* Remove extra dividers from admin key config, fix onboarding typo
* Bump minimum catalyst target
* Bump mac target version
* Use @FetchRequest for UserList to try and use less memory on ios 17
* Revert change to @fetchrequest
* Stab in the dark for Devices crash
* Updated UserList (back?) to @FetchRequest
* Set mac minimum to 15
* Nil out continuation after use
* Use @FetchRequest for the node list to stop crashes on iOS 17
* Handle failed connections during restoration
---------
Co-authored-by: Jake-B <jake-b@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update protos
* Update protos
* Remove stale keys
* Serbian translations update (#1422)
* Log privacy
* Add Serbian translations
---------
Co-authored-by: Garth Vander Houwen <garthvh@yahoo.com>
* Clarify public key sub-text in security settings (#1412)
* Clarify public key sub-text in settings
* Trigger lint
* freq slot num pad (#1410)
* kill keyboard toolbar on lora config
* delete extranious scrollDismissesKeyboard
* Properly set catalyst target
* Update Meshtastic/Views/Onboarding/DeviceOnboarding.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Meshtastic/Views/Settings/Config/SecurityConfig.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Update Meshtastic/Enums/DeviceEnums.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Make current location nilable, remove log spam
* clean up toUser logic
* Fix telemetry entity not added in nodeInfoPacket
* fix typo: powerMetrics.hasChXCurrent mismatch
* Duplicate decoding of telemetry.current removed
* Clean up mesh map fetch request and distance filter logic
* Revert attempt to fix message logic
* Bump datadog version
* Missing message fix, attempt #2 (#1431)
Co-authored-by: Jake-B <jake-b@users.noreply.github.com>
* Retry fewer times for longer
* Revert "Missing message fix, attempt #2 (#1431)" (#1432)
This reverts commit a96d318adb.
* Make retry 2 seconds
* Add back link to node details from position popover without navigation stack and link, clear notifications when deleting database
* Add clear notifications function
* Link from channel messages to node info
* Link to node details
* Discovery on retry fix
* Discovery on retry fix fix
* Add contact to device node db if you get an encrypted send faild routing error
* Seperate channel message view into two views for better performance.
* Refactor User Message List
* Update device hardware
Add liquid glass to config save button
* Save button cleanup
* Update button structure on users view
* Move encrypted send logic out of the router. Update protos
* Restore node long- and short- names (#1442)
Co-authored-by: Jake-B <jake-b@users.noreply.github.com>
* Update Meshtastic/Accessory/Transports/Bluetooth Low Energy/BLEConnection.swift
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
* Revert routing error
* Toggle for enabling device telemetry broadcast enable
* Update
* Enhancements for interval dropdowns (#1445)
* Cleanup
* Fix core data version
* Add never to update interval
* Device telemetry Enabled Boolean (#1446)
* Update core data and interval picker
* Move formatter
* Rework to nest options under enabled
* Clearer names
* Safer devicehardware api call, remove node history filter from mesh map
* Fix build
* Simplify mesh map filter
* Remove stale translation keys
---------
Co-authored-by: Jake-B <jake-b@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Nikola Dašić <dasic.nikola@yandex.com>
Co-authored-by: Spencer Smith <dontaskspencer@gmail.com>
Co-authored-by: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
173 lines
5.5 KiB
Swift
173 lines
5.5 KiB
Swift
//
|
||
// UserMessageRow.swift
|
||
// MeshtasticApple
|
||
//
|
||
// Copyright(c) Garth Vander Houwen 10/1/2025
|
||
//
|
||
|
||
import CoreData
|
||
import MeshtasticProtobufs
|
||
import SwiftUI
|
||
|
||
struct UserMessageRow: View {
|
||
|
||
@EnvironmentObject var router: Router
|
||
@ObservedObject var message: MessageEntity
|
||
let allMessages: [MessageEntity]
|
||
let previousMessage: MessageEntity?
|
||
let preferredPeripheralNum: Int
|
||
let user: UserEntity // The direct message user
|
||
@Binding var replyMessageId: Int64
|
||
@FocusState.Binding var messageFieldFocused: Bool
|
||
@Binding var messageToHighlight: Int64
|
||
let scrollView: ScrollViewProxy
|
||
let onInteractionComplete: () -> Void
|
||
|
||
private var isCurrentUser: Bool {
|
||
Int64(preferredPeripheralNum) == message.fromUser?.num
|
||
}
|
||
|
||
init(message: MessageEntity,
|
||
allMessages: [MessageEntity],
|
||
previousMessage: MessageEntity?,
|
||
preferredPeripheralNum: Int,
|
||
user: UserEntity,
|
||
replyMessageId: Binding<Int64>,
|
||
messageFieldFocused: FocusState<Bool>.Binding,
|
||
messageToHighlight: Binding<Int64>,
|
||
scrollView: ScrollViewProxy,
|
||
onInteractionComplete: @escaping () -> Void) {
|
||
// Initialize ObservedObject with the concrete instance
|
||
self._message = ObservedObject(initialValue: message)
|
||
self.allMessages = allMessages
|
||
self.previousMessage = previousMessage
|
||
self.preferredPeripheralNum = preferredPeripheralNum
|
||
self.user = user
|
||
self._replyMessageId = replyMessageId
|
||
self._messageFieldFocused = messageFieldFocused
|
||
self._messageToHighlight = messageToHighlight
|
||
self.scrollView = scrollView
|
||
self.onInteractionComplete = onInteractionComplete
|
||
}
|
||
|
||
var body: some View {
|
||
VStack(alignment: .leading, spacing: 0) {
|
||
|
||
// Timestamp Header
|
||
if message.displayTimestamp(aboveMessage: previousMessage) {
|
||
Text(message.timestamp.formatted(date: .abbreviated, time: .shortened))
|
||
.font(.caption)
|
||
.foregroundColor(.gray)
|
||
.frame(maxWidth: .infinity, alignment: .center)
|
||
.padding(.vertical, 5)
|
||
}
|
||
|
||
// Reply Message Block
|
||
if message.replyID > 0 {
|
||
let messageReply = allMessages.first(where: { $0.messageId == message.replyID })
|
||
|
||
HStack {
|
||
Spacer(minLength: isCurrentUser ? 50 : 0)
|
||
|
||
Button {
|
||
if let messageNum = messageReply?.messageId {
|
||
withAnimation(.easeInOut(duration: 0.5)) {
|
||
messageToHighlight = messageNum
|
||
}
|
||
scrollView.scrollTo(messageNum, anchor: .center)
|
||
Task {
|
||
DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
|
||
withAnimation(.easeInOut(duration: 0.5)) {
|
||
messageToHighlight = -1
|
||
}
|
||
}
|
||
}
|
||
}
|
||
} label: {
|
||
HStack {
|
||
Image(systemName: "arrowshape.turn.up.left.fill")
|
||
.symbolRenderingMode(.hierarchical).imageScale(.large)
|
||
.foregroundColor(.accentColor).padding(.leading)
|
||
Text(messageReply?.messagePayload ?? "EMPTY MESSAGE").foregroundColor(.accentColor).font(.caption2)
|
||
}
|
||
.padding(10)
|
||
.overlay(RoundedRectangle(cornerRadius: 18).stroke(Color.blue, lineWidth: 0.5))
|
||
}
|
||
if !isCurrentUser { Spacer(minLength: 50) }
|
||
}
|
||
}
|
||
|
||
HStack(alignment: .bottom) {
|
||
if isCurrentUser { Spacer(minLength: 50) }
|
||
|
||
// Node Detail Tap
|
||
if !isCurrentUser {
|
||
CircleText(text: message.fromUser?.shortName ?? "?", color: Color(UIColor(hex: UInt32(message.fromUser?.num ?? 0))), circleSize: 50)
|
||
.onTapGesture(count: 2) {
|
||
if let nodeNum = message.fromUser?.num {
|
||
router.navigateToNodeDetail(nodeNum: Int64(nodeNum))
|
||
}
|
||
}
|
||
.padding(.all, 5).offset(y: -7)
|
||
}
|
||
|
||
VStack(alignment: isCurrentUser ? .trailing : .leading) {
|
||
|
||
// Sender Name Header
|
||
if !isCurrentUser && message.fromUser != nil {
|
||
Text("\(message.fromUser?.longName ?? "Unknown".localized ) (\(message.fromUser?.userId ?? "?"))")
|
||
.font(.caption).foregroundColor(.gray).offset(y: 8)
|
||
}
|
||
|
||
// Message Bubble
|
||
HStack {
|
||
MessageText(
|
||
message: message,
|
||
tapBackDestination: .user(user), // Destination is the user
|
||
isCurrentUser: isCurrentUser
|
||
) {
|
||
self.replyMessageId = message.messageId
|
||
self.messageFieldFocused = true
|
||
}
|
||
|
||
if isCurrentUser && message.canRetry || (isCurrentUser && message.receivedACK && !message.realACK) {
|
||
RetryButton(message: message, destination: .user(user))
|
||
}
|
||
}
|
||
|
||
// Tapback Responses - Pass the closure to trigger the parent redraw
|
||
TapbackResponses(message: message, onRead: onInteractionComplete)
|
||
|
||
// ACK Error
|
||
HStack {
|
||
let ackErrorVal = RoutingError(rawValue: Int(message.ackError))
|
||
if isCurrentUser && 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 isCurrentUser && message.ackError == 0 {
|
||
// Empty Error
|
||
Text("Waiting to be acknowledged. . .").font(.caption2).foregroundColor(.yellow)
|
||
} else if isCurrentUser && message.ackError > 0 {
|
||
Text("\(ackErrorVal?.display ?? "Empty Ack Error")").fixedSize(horizontal: false, vertical: true)
|
||
.foregroundStyle(ackErrorVal?.color ?? Color.red)
|
||
.font(.caption2)
|
||
}
|
||
}
|
||
}
|
||
.padding(.bottom)
|
||
|
||
if !isCurrentUser { Spacer(minLength: 50) }
|
||
}
|
||
.padding([.leading, .trailing])
|
||
.frame(maxWidth: .infinity)
|
||
|
||
}
|
||
.id(message.messageId)
|
||
}
|
||
}
|