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>
255 lines
8.5 KiB
Swift
255 lines
8.5 KiB
Swift
//
|
|
// User.swift
|
|
// Meshtastic Apple
|
|
//
|
|
// Copyright (c) Garth Vander Houwen 6/27/22.
|
|
//
|
|
import CoreData
|
|
import MeshtasticProtobufs
|
|
import SwiftUI
|
|
|
|
struct UserConfig: View {
|
|
|
|
@Environment(\.managedObjectContext) var context
|
|
@EnvironmentObject var accessoryManager: AccessoryManager
|
|
@Environment(\.dismiss) private var goBack
|
|
|
|
var node: NodeInfoEntity?
|
|
|
|
enum Field: Hashable {
|
|
case frequencyOverride
|
|
}
|
|
|
|
@State private var isPresentingFactoryResetConfirm: Bool = false
|
|
@State private var isPresentingSaveConfirm: Bool = false
|
|
@State var hasChanges = false
|
|
@State var shortName = ""
|
|
@State var longName: String = ""
|
|
@State var isUnmessagable: Bool = false
|
|
@State var isLicensed = false
|
|
@State var overrideDutyCycle = false
|
|
@State var overrideFrequency: Float = 0.0
|
|
@State var txPower = 0
|
|
@FocusState var focusedField: Field?
|
|
|
|
public var minimumVersion = "2.6.9"
|
|
let floatFormatter: NumberFormatter = {
|
|
let formatter = NumberFormatter()
|
|
formatter.numberStyle = .decimal
|
|
return formatter
|
|
}()
|
|
|
|
var body: some View {
|
|
|
|
Form {
|
|
Section(header: Text("User Details")) {
|
|
|
|
VStack(alignment: .leading) {
|
|
HStack {
|
|
Label(isLicensed ? "Call Sign" : "Long Name", systemImage: "person.crop.rectangle.fill")
|
|
|
|
TextField("Long Name", text: $longName)
|
|
.onChange(of: longName) {
|
|
var newValue = longName.withoutVariationSelectors
|
|
var totalBytes = newValue.utf8.count
|
|
// Only mess with the value if it is too big
|
|
while totalBytes > (isLicensed ? 6 : 36) {
|
|
newValue = String(newValue.dropLast())
|
|
totalBytes = newValue.utf8.count
|
|
}
|
|
longName = newValue
|
|
if longName.contains("📵") {
|
|
isUnmessagable = true
|
|
}
|
|
}
|
|
}
|
|
.keyboardType(.default)
|
|
.disableAutocorrection(true)
|
|
if longName.isEmpty && isLicensed {
|
|
Label("Call Sign must not be empty", systemImage: "exclamationmark.square")
|
|
.foregroundColor(.red)
|
|
}
|
|
Text("\(String(isLicensed ? "Call Sign" : "Long Name")) can be up to \(isLicensed ? "8" : "36") bytes long.")
|
|
.foregroundColor(.gray)
|
|
.font(.callout)
|
|
|
|
}
|
|
VStack(alignment: .leading) {
|
|
HStack {
|
|
Label("Short Name", systemImage: "circlebadge.fill")
|
|
TextField("Short Name", text: $shortName)
|
|
.foregroundColor(.gray)
|
|
.onChange(of: shortName) {
|
|
let newValue = shortName.withoutVariationSelectors
|
|
let totalBytes = newValue.utf8.count
|
|
// Only mess with the value if it is too big
|
|
if totalBytes > 4 {
|
|
// If too long, drop the last thing entered
|
|
shortName = String(shortName.dropLast())
|
|
} else if shortName != newValue {
|
|
// If not too long, make sure the stripped
|
|
// variant is placed back in text field if necessary
|
|
shortName = newValue
|
|
}
|
|
}
|
|
.foregroundColor(.gray)
|
|
}
|
|
.keyboardType(.default)
|
|
.disableAutocorrection(true)
|
|
Text("The last 4 of the device MAC address will be appended to the short name to set the device's BLE Name. Short name can be up to 4 bytes long.")
|
|
.foregroundColor(.gray)
|
|
.font(.callout)
|
|
let supportedVersion = accessoryManager.checkIsVersionSupported(forVersion: minimumVersion)
|
|
Toggle(isOn: $isUnmessagable) {
|
|
Label("Unmessagable", systemImage: "iphone.slash")
|
|
Text("Used to identify unmonitored or infrastructure nodes so that messaging is not avaliable to nodes that will never respond.")
|
|
.font(.caption2)
|
|
}
|
|
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
|
|
.disabled(!supportedVersion)
|
|
}
|
|
// Only manage ham mode for the locally connected node
|
|
if node?.num ?? 0 > 0 && node?.num ?? 0 == accessoryManager.activeDeviceNum ?? 0 {
|
|
Toggle(isOn: $isLicensed) {
|
|
Label("Licensed Operator", systemImage: "person.text.rectangle")
|
|
}
|
|
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
|
|
if isLicensed {
|
|
|
|
Text("Onboarding for licensed operators requires firmware 2.0.20 or greater. Make sure to refer to your local regulations and contact the local amateur frequency coordinators with questions.")
|
|
.font(.caption2)
|
|
Text("What licensed operator mode does:\n* Sets the node name to your call sign \n* Broadcasts node info every 10 minutes \n* Overrides frequency, dutycycle and tx power \n* Disables encryption")
|
|
.font(.caption2)
|
|
|
|
HStack {
|
|
Label("Frequency", systemImage: "waveform.path.ecg")
|
|
Spacer()
|
|
TextField("Frequency Override", value: $overrideFrequency, formatter: floatFormatter)
|
|
.toolbar {
|
|
ToolbarItemGroup(placement: .keyboard) {
|
|
Button("Dismiss") {
|
|
focusedField = nil
|
|
}
|
|
.font(.subheadline)
|
|
}
|
|
}
|
|
.keyboardType(.decimalPad)
|
|
.scrollDismissesKeyboard(.immediately)
|
|
.focused($focusedField, equals: .frequencyOverride)
|
|
}
|
|
HStack {
|
|
Image(systemName: "antenna.radiowaves.left.and.right")
|
|
.foregroundColor(.accentColor)
|
|
Stepper("\(txPower)db Transmit Power", value: $txPower, in: 1...30, step: 1)
|
|
.padding(5)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.disabled(!accessoryManager.isConnected)
|
|
.safeAreaInset(edge: .bottom, alignment: .center) {
|
|
HStack(spacing: 0) {
|
|
if accessoryManager.isConnected && hasChanges {
|
|
Button {
|
|
isPresentingSaveConfirm = true
|
|
} label: {
|
|
Label("Save", systemImage: "square.and.arrow.down")
|
|
}
|
|
.padding(.bottom)
|
|
.controlSize(.large)
|
|
.buttonStyle(.borderedProminent)
|
|
.buttonBorderShape(.capsule)
|
|
.confirmationDialog(
|
|
"Are you sure?",
|
|
isPresented: $isPresentingSaveConfirm,
|
|
titleVisibility: .visible
|
|
) {
|
|
Button("Save User Config to \(node?.user?.longName ?? "Unknown")?") {
|
|
if longName.isEmpty && isLicensed {
|
|
return
|
|
}
|
|
|
|
let connectedUser = getUser(id: accessoryManager.activeDeviceNum ?? -1, context: context)
|
|
let connectedNode = getNodeInfo(id: accessoryManager.activeDeviceNum ?? -1, context: context)
|
|
if node != nil && connectedNode != nil {
|
|
|
|
if !isLicensed {
|
|
var u = User()
|
|
u.shortName = shortName
|
|
u.longName = longName
|
|
u.isUnmessagable = isUnmessagable
|
|
|
|
Task {
|
|
_ = try await accessoryManager.saveUser(config: u, fromUser: connectedUser, toUser: node!.user!)
|
|
Task { @MainActor in
|
|
hasChanges = false
|
|
goBack()
|
|
}
|
|
}
|
|
} else {
|
|
var ham = HamParameters()
|
|
ham.shortName = shortName
|
|
// ham.isUnmessagable = isUnmessagable
|
|
ham.callSign = longName
|
|
ham.txPower = Int32(txPower)
|
|
ham.frequency = overrideFrequency
|
|
Task {
|
|
_ = try await accessoryManager.saveLicensedUser(ham: ham, fromUser: connectedUser, toUser: node!.user!)
|
|
Task { @MainActor in
|
|
hasChanges = false
|
|
goBack()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} message: {
|
|
Text("After config values save the node will reboot.")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.navigationTitle("User Config")
|
|
.navigationBarItems(trailing:
|
|
ZStack {
|
|
ConnectedDevice(deviceConnected: accessoryManager.isConnected, name: accessoryManager.activeConnection?.device.shortName ?? "?")
|
|
})
|
|
.onAppear {
|
|
self.shortName = node?.user?.shortName ?? ""
|
|
self.longName = node?.user?.longName ?? ""
|
|
self.isUnmessagable = node?.user?.unmessagable ?? false
|
|
self.isLicensed = node?.user?.isLicensed ?? false
|
|
self.txPower = Int(node?.loRaConfig?.txPower ?? 0)
|
|
self.overrideFrequency = node?.loRaConfig?.overrideFrequency ?? 0.00
|
|
self.hasChanges = false
|
|
}
|
|
.onChange(of: shortName) { oldShort, newShort in
|
|
if oldShort != newShort && newShort != node?.user?.shortName ?? "Unknown" { hasChanges = true }
|
|
}
|
|
.onChange(of: longName) { oldLong, newLong in
|
|
if oldLong != newLong && newLong != node?.user?.longName ?? "Unknown" { hasChanges = true }
|
|
}
|
|
.onChange(of: isUnmessagable) { oldIsUnmessagable, newIsUnmessagable in
|
|
if oldIsUnmessagable != newIsUnmessagable && newIsUnmessagable != node?.user?.unmessagable ?? true { hasChanges = true }
|
|
}
|
|
.onChange(of: isLicensed) { _, newIsLicensed in
|
|
if node != nil && node!.user != nil {
|
|
if newIsLicensed != node?.user!.isLicensed {
|
|
hasChanges = true
|
|
if newIsLicensed {
|
|
if node?.user?.longName?.count ?? 0 > 8 {
|
|
longName = ""
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.onChange(of: overrideFrequency) {
|
|
if isLicensed { hasChanges = true }
|
|
}
|
|
.onChange(of: txPower) {
|
|
if isLicensed { hasChanges = true }
|
|
}
|
|
}
|
|
}
|