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>
171 lines
4.3 KiB
Swift
171 lines
4.3 KiB
Swift
import SwiftUI
|
|
import OSLog
|
|
import DatadogSessionReplay
|
|
|
|
struct TextMessageField: View {
|
|
static let maxbytes = 200
|
|
@EnvironmentObject var accessoryManager: AccessoryManager
|
|
|
|
let destination: MessageDestination
|
|
@Binding var replyMessageId: Int64
|
|
@FocusState.Binding var isFocused: Bool
|
|
let onSubmit: () -> Void
|
|
|
|
@State private var typingMessage: String = ""
|
|
@State private var totalBytes = 0
|
|
@State private var sendPositionWithMessage = false
|
|
|
|
var body: some View {
|
|
SessionReplayPrivacyView(textAndInputPrivacy: .maskAllInputs) {
|
|
VStack {
|
|
#if targetEnvironment(macCatalyst)
|
|
HStack {
|
|
if destination.showAlertButton {
|
|
Spacer()
|
|
AlertButton { typingMessage += "🔔 Alert Bell! \u{7}" }
|
|
}
|
|
Spacer()
|
|
RequestPositionButton(action: requestPosition)
|
|
TextMessageSize(maxbytes: Self.maxbytes, totalBytes: totalBytes).padding(.trailing)
|
|
}
|
|
#endif
|
|
|
|
HStack(alignment: .top) {
|
|
if replyMessageId != 0 {
|
|
HStack {
|
|
Button {
|
|
withAnimation(.easeInOut(duration: 0.2)) {
|
|
replyMessageId = 0
|
|
}
|
|
isFocused = false
|
|
} label: {
|
|
Image(systemName: "x.circle.fill")
|
|
}
|
|
Text("Reply")
|
|
}
|
|
.padding(.top)
|
|
}
|
|
|
|
ZStack {
|
|
TextField("Message", text: $typingMessage, axis: .vertical)
|
|
.onChange(of: typingMessage) { _, value in
|
|
totalBytes = value.utf8.count
|
|
while totalBytes > Self.maxbytes {
|
|
typingMessage = String(typingMessage.dropLast())
|
|
totalBytes = typingMessage.utf8.count
|
|
}
|
|
}
|
|
.keyboardType(.default)
|
|
.toolbar {
|
|
ToolbarItemGroup(placement: .keyboard) {
|
|
Button("Dismiss") {
|
|
isFocused = false
|
|
}
|
|
.font(.subheadline)
|
|
|
|
if destination.showAlertButton {
|
|
Spacer()
|
|
AlertButton { typingMessage += "🔔 Alert Bell Character! \u{7}" }
|
|
}
|
|
|
|
Spacer()
|
|
RequestPositionButton(action: requestPosition)
|
|
TextMessageSize(maxbytes: Self.maxbytes, totalBytes: totalBytes)
|
|
}
|
|
}
|
|
.padding(.horizontal, 8)
|
|
.focused($isFocused)
|
|
.multilineTextAlignment(.leading)
|
|
.frame(minHeight: 50)
|
|
.keyboardShortcut(.defaultAction)
|
|
.onSubmit {
|
|
#if targetEnvironment(macCatalyst)
|
|
sendMessage()
|
|
#endif
|
|
}
|
|
|
|
Text(typingMessage)
|
|
.opacity(0)
|
|
.padding(.all, 0)
|
|
}
|
|
.overlay(RoundedRectangle(cornerRadius: 20).stroke(.tertiary, lineWidth: 1))
|
|
.padding(.bottom, 15)
|
|
|
|
Button(action: sendMessage) {
|
|
Image(systemName: "arrow.up.circle.fill")
|
|
.font(.largeTitle)
|
|
.foregroundColor(.accentColor)
|
|
}
|
|
}
|
|
.padding(.all, 15)
|
|
}
|
|
}
|
|
}
|
|
|
|
private func requestPosition() {
|
|
let userLongName = accessoryManager.activeConnection?.device.longName ?? "Unknown"
|
|
sendPositionWithMessage = true
|
|
typingMessage = "📍 " + userLongName + " \(destination.positionShareMessage)."
|
|
}
|
|
|
|
private func sendMessage() {
|
|
Task {
|
|
do {
|
|
try await accessoryManager.sendMessage(
|
|
message: typingMessage,
|
|
toUserNum: destination.userNum,
|
|
channel: destination.channelNum,
|
|
isEmoji: false,
|
|
replyID: replyMessageId)
|
|
|
|
// If nothing thrown, then successful. Reset for the next message
|
|
typingMessage = ""
|
|
isFocused = false
|
|
replyMessageId = 0
|
|
onSubmit()
|
|
|
|
if sendPositionWithMessage {
|
|
try await accessoryManager.sendPosition(
|
|
channel: destination.channelNum,
|
|
destNum: destination.positionDestNum,
|
|
wantResponse: destination.wantPositionResponse
|
|
)
|
|
// If nothing thrown, then successful.
|
|
Logger.mesh.info("Location Sent")
|
|
}
|
|
} catch {
|
|
Logger.mesh.info("Error sending message")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private extension MessageDestination {
|
|
var positionShareMessage: String {
|
|
switch self {
|
|
case .user: return "has shared their position and requested a response with your position"
|
|
case .channel: return "has shared their position with you"
|
|
}
|
|
}
|
|
|
|
var positionDestNum: Int64 {
|
|
switch self {
|
|
case let .user(user): return user.num
|
|
case .channel: return Int64(Constants.maximumNodeNum)
|
|
}
|
|
}
|
|
|
|
var showAlertButton: Bool {
|
|
switch self {
|
|
case .user: return true
|
|
case .channel: return true
|
|
}
|
|
}
|
|
|
|
var wantPositionResponse: Bool {
|
|
switch self {
|
|
case .user: return true
|
|
case .channel: return false
|
|
}
|
|
}
|
|
}
|