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>
237 lines
8.8 KiB
Swift
237 lines
8.8 KiB
Swift
//
|
|
// DeviceSettings.swift
|
|
// Meshtastic Apple
|
|
//
|
|
// Copyright (c) Garth Vander Houwen 6/7/22.
|
|
//
|
|
|
|
import MeshtasticProtobufs
|
|
import OSLog
|
|
import SwiftUI
|
|
|
|
struct DisplayConfig: View {
|
|
|
|
@Environment(\.managedObjectContext) var context
|
|
@EnvironmentObject var accessoryManager: AccessoryManager
|
|
@Environment(\.dismiss) private var goBack
|
|
|
|
var node: NodeInfoEntity?
|
|
|
|
@State var hasChanges = false
|
|
@State var screenOnSeconds = 0
|
|
@State var screenCarouselInterval = 0
|
|
@State var gpsFormat = 0
|
|
@State var compassNorthTop = false
|
|
@State var wakeOnTapOrMotion = false
|
|
@State var flipScreen = false
|
|
@State var oledType = 0
|
|
@State var displayMode = 0
|
|
@State var units = 0
|
|
@State var use12HourClock = false
|
|
@State var headingBold = false
|
|
|
|
var body: some View {
|
|
Form {
|
|
ConfigHeader(title: "Display", config: \.displayConfig, node: node, onAppear: setDisplayValues)
|
|
|
|
Section(header: Text("Device Screen")) {
|
|
|
|
Toggle(isOn: $compassNorthTop) {
|
|
Label("Always point north", systemImage: "location.north.circle")
|
|
Text("The compass heading on the screen outside of the circle will always point north.")
|
|
}
|
|
.tint(Color.accentColor)
|
|
|
|
Toggle(isOn: $use12HourClock) {
|
|
Label("12 Hour Clock", systemImage: "clock")
|
|
Text("Sets the screen clock format to 12-hour.")
|
|
}
|
|
.tint(Color.accentColor)
|
|
|
|
Toggle(isOn: $headingBold) {
|
|
Label("Bold Heading", systemImage: "bold")
|
|
Text("Bold the heading text on the screen.")
|
|
}
|
|
.tint(Color.accentColor)
|
|
VStack(alignment: .leading) {
|
|
Picker("Display Units", selection: $units ) {
|
|
ForEach(Units.allCases) { un in
|
|
Text(un.description)
|
|
}
|
|
}
|
|
Text("Units displayed on the device screen")
|
|
.foregroundColor(.gray)
|
|
.font(.callout)
|
|
}
|
|
.pickerStyle(DefaultPickerStyle())
|
|
}
|
|
Section(header: Text("Timing and Overrides")) {
|
|
VStack(alignment: .leading) {
|
|
Picker("Screen on for", selection: $screenOnSeconds ) {
|
|
ForEach(ScreenOnIntervals.allCases) { soi in
|
|
Text(soi.description)
|
|
}
|
|
}
|
|
Text("How long the screen remains on after the user button is pressed or messages are received.")
|
|
.foregroundColor(.gray)
|
|
.font(.callout)
|
|
}
|
|
.pickerStyle(DefaultPickerStyle())
|
|
|
|
VStack(alignment: .leading) {
|
|
Picker("Carousel Interval", selection: $screenCarouselInterval ) {
|
|
ForEach(ScreenCarouselIntervals.allCases) { sci in
|
|
Text(sci.description)
|
|
}
|
|
}
|
|
|
|
Text("Automatically toggles to the next page on the screen like a carousel, based the specified interval.")
|
|
.foregroundColor(.gray)
|
|
.font(.callout)
|
|
}
|
|
.pickerStyle(DefaultPickerStyle())
|
|
|
|
Toggle(isOn: $wakeOnTapOrMotion) {
|
|
Label("Wake Screen on tap or motion", systemImage: "gyroscope")
|
|
Text("Requires that there be an accelerometer on your device.")
|
|
}
|
|
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
|
|
|
|
Toggle(isOn: $flipScreen) {
|
|
Label("Flip Screen", systemImage: "pip.swap")
|
|
Text("Flip screen vertically")
|
|
}
|
|
.toggleStyle(SwitchToggleStyle(tint: .accentColor))
|
|
|
|
VStack(alignment: .leading) {
|
|
Picker("Display Mode", selection: $displayMode ) {
|
|
ForEach(DisplayModes.allCases) { dm in
|
|
Text(dm.description)
|
|
}
|
|
}
|
|
Text("Override default screen layout.")
|
|
.foregroundColor(.gray)
|
|
.font(.callout)
|
|
}
|
|
.pickerStyle(DefaultPickerStyle())
|
|
VStack(alignment: .leading) {
|
|
Picker("OLED Type", selection: $oledType ) {
|
|
ForEach(OledTypes.allCases) { ot in
|
|
Text(ot.description)
|
|
}
|
|
}
|
|
Text("Override automatic OLED screen detection.")
|
|
.foregroundColor(.gray)
|
|
.font(.callout)
|
|
}
|
|
.pickerStyle(DefaultPickerStyle())
|
|
}
|
|
}
|
|
.disabled(!accessoryManager.isConnected || node?.displayConfig == nil)
|
|
.safeAreaInset(edge: .bottom, alignment: .center) {
|
|
HStack(spacing: 0) {
|
|
SaveConfigButton(node: node, hasChanges: $hasChanges) {
|
|
if let deviceNum = accessoryManager.activeDeviceNum, let connectedNode = getNodeInfo(id: deviceNum, context: context) {
|
|
var dc = Config.DisplayConfig()
|
|
dc.screenOnSecs = UInt32(screenOnSeconds)
|
|
dc.autoScreenCarouselSecs = UInt32(screenCarouselInterval)
|
|
dc.compassNorthTop = compassNorthTop
|
|
dc.wakeOnTapOrMotion = wakeOnTapOrMotion
|
|
dc.flipScreen = flipScreen
|
|
dc.oled = OledTypes(rawValue: oledType)!.protoEnumValue()
|
|
dc.displaymode = DisplayModes(rawValue: displayMode)!.protoEnumValue()
|
|
dc.units = Units(rawValue: units)!.protoEnumValue()
|
|
dc.use12HClock = use12HourClock
|
|
dc.headingBold = headingBold
|
|
|
|
Task {
|
|
_ = try await accessoryManager.saveDisplayConfig(config: dc, fromUser: connectedNode.user!, toUser: node!.user!)
|
|
Task { @MainActor in
|
|
// Should show a saved successfully alert once I know that to be true
|
|
// for now just disable the button after a successful save
|
|
hasChanges = false
|
|
goBack()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.navigationTitle("Display Config")
|
|
.navigationBarItems(
|
|
trailing: ZStack {
|
|
ConnectedDevice(deviceConnected: accessoryManager.isConnected, name: accessoryManager.activeConnection?.device.shortName ?? "?")
|
|
|
|
}
|
|
)
|
|
.onFirstAppear {
|
|
// Need to request a DisplayConfig from the remote node before allowing changes
|
|
if let deviceNum = accessoryManager.activeDeviceNum, let node {
|
|
if let connectedNode = getNodeInfo(id: deviceNum, context: context) {
|
|
if node.num != deviceNum {
|
|
if UserDefaults.enableAdministration {
|
|
/// 2.5 Administration with session passkey
|
|
let expiration = node.sessionExpiration ?? Date()
|
|
if expiration < Date() || node.displayConfig == nil {
|
|
Task {
|
|
do {
|
|
Logger.mesh.info("⚙️ Empty or expired display config requesting via PKI admin")
|
|
try await accessoryManager.requestDisplayConfig(fromUser: connectedNode.user!, toUser: node.user!)
|
|
} catch {
|
|
Logger.mesh.error("🚨 Display config request failed")
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
/// Legacy Administration
|
|
Logger.mesh.info("☠️ Using insecure legacy admin that is no longer supported, please upgrade your firmware.")
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.onChange(of: screenOnSeconds) { oldScreenSecs, newScreenSecs in
|
|
if oldScreenSecs != newScreenSecs && newScreenSecs != node?.displayConfig?.screenOnSeconds ?? -1 { hasChanges = true }
|
|
}
|
|
.onChange(of: screenCarouselInterval) { oldCarouselSecs, newCarouselSecs in
|
|
if oldCarouselSecs != newCarouselSecs && newCarouselSecs != node?.displayConfig?.screenCarouselInterval ?? -1 { hasChanges = true }
|
|
}
|
|
.onChange(of: compassNorthTop) { oldCompassNorthTop, newCompassNorthTop in
|
|
if oldCompassNorthTop != newCompassNorthTop && newCompassNorthTop != node?.displayConfig?.compassNorthTop { hasChanges = true }
|
|
}
|
|
.onChange(of: wakeOnTapOrMotion) { oldWakeOnTapOrMotion, newWakeOnTapOrMotion in
|
|
if oldWakeOnTapOrMotion != newWakeOnTapOrMotion && newWakeOnTapOrMotion != node?.displayConfig?.wakeOnTapOrMotion { hasChanges = true }
|
|
}
|
|
.onChange(of: flipScreen) { oldFlipScreen, newFlipScreen in
|
|
if oldFlipScreen != newFlipScreen && newFlipScreen != node?.displayConfig?.flipScreen { hasChanges = true }
|
|
}
|
|
.onChange(of: oledType) { oldOledType, newOledType in
|
|
if oldOledType != newOledType && newOledType != node?.displayConfig?.oledType ?? -1 { hasChanges = true }
|
|
}
|
|
.onChange(of: displayMode) { oldDisplayMode, newDisplayMode in
|
|
if oldDisplayMode != newDisplayMode && newDisplayMode != node?.displayConfig?.displayMode ?? -1 { hasChanges = true }
|
|
}
|
|
.onChange(of: units) { oldUnits, newUnits in
|
|
if oldUnits != newUnits && newUnits != node?.displayConfig?.units ?? -1 { hasChanges = true }
|
|
}
|
|
.onChange(of: use12HourClock) { oldUse12HourClock, newUse12HourClock in
|
|
if oldUse12HourClock != newUse12HourClock && newUse12HourClock != node?.displayConfig?.use12HClock { hasChanges = true }
|
|
}
|
|
.onChange(of: headingBold) { oldHeadingBold, newHeadingBold in
|
|
if oldHeadingBold != newHeadingBold && newHeadingBold != node?.displayConfig?.headingBold { hasChanges = true }
|
|
}
|
|
}
|
|
func setDisplayValues() {
|
|
self.screenOnSeconds = Int(node?.displayConfig?.screenOnSeconds ?? 0)
|
|
self.screenCarouselInterval = Int(node?.displayConfig?.screenCarouselInterval ?? 0)
|
|
self.compassNorthTop = node?.displayConfig?.compassNorthTop ?? false
|
|
self.wakeOnTapOrMotion = node?.displayConfig?.wakeOnTapOrMotion ?? false
|
|
self.flipScreen = node?.displayConfig?.flipScreen ?? false
|
|
self.oledType = Int(node?.displayConfig?.oledType ?? 0)
|
|
self.displayMode = Int(node?.displayConfig?.displayMode ?? 0)
|
|
self.units = Int(node?.displayConfig?.units ?? 0)
|
|
self.headingBold = node?.displayConfig?.headingBold ?? false
|
|
self.use12HourClock = node?.displayConfig?.use12HClock ?? false
|
|
self.hasChanges = false
|
|
}
|
|
}
|