meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Finish upgrading onchange events

Browse source
This commit is contained in:
Garth Vander Houwen 2024-10-06 09:07:55 -07:00
parent d7e887dd63
commit e89dc21942
2 changed files with 20 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift
View file

@ -278,14 +278,10 @@ struct MQTTConfig: View {
if newUsername != node?.mqttConfig?.username ?? "" { hasChanges = true }
}
.onChange(of: password) { newPassword in
if node != nil && node?.mqttConfig != nil {
if newPassword != node!.mqttConfig!.password { hasChanges = true }
}
if newPassword != node?.mqttConfig?.password ?? "" { hasChanges = true }
}
.onChange(of: root) { newRoot in
if node != nil && node?.mqttConfig != nil {
if newRoot != node!.mqttConfig!.root { hasChanges = true }
}
if newRoot != node?.mqttConfig?.root ?? "" { hasChanges = true }
}
.onChange(of: selectedTopic) { _, newSelectedTopic in
root = newSelectedTopic
@ -320,10 +316,8 @@ struct MQTTConfig: View {
.onChange(of: mapReportingEnabled) { _, newMapReportingEnabled in
if newMapReportingEnabled != node?.mqttConfig?.mapReportingEnabled { hasChanges = true }
}
.onChange(of: mapPublishIntervalSecs) { newMapPublishIntervalSecs in
if node != nil && node?.mqttConfig != nil {
if newMapPublishIntervalSecs != node!.mqttConfig!.mapPublishIntervalSecs { hasChanges = true }
}
.onChange(of: mapPublishIntervalSecs) { _, newMapPublishIntervalSecs in
if newMapPublishIntervalSecs != node?.mqttConfig?.mapPublishIntervalSecs ?? -1 { hasChanges = true }
}
.onFirstAppear {
// Need to request a MqttModuleConfig from the remote node before allowing changes

48
Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift
View file

@ -155,45 +155,29 @@ struct TelemetryConfig: View {
}
}
}
.onChange(of: deviceUpdateInterval) { newDeviceInterval in
if node != nil && node?.telemetryConfig != nil {
if newDeviceInterval != node!.telemetryConfig!.deviceUpdateInterval { hasChanges = true }
}
.onChange(of: deviceUpdateInterval) { _, newDeviceInterval in
if newDeviceInterval != node?.telemetryConfig?.deviceUpdateInterval ?? -1 { hasChanges = true }
}
.onChange(of: environmentUpdateInterval) { newEnvInterval in
if node != nil && node?.telemetryConfig != nil {
if newEnvInterval != node!.telemetryConfig!.environmentUpdateInterval { hasChanges = true }
}
.onChange(of: environmentUpdateInterval) { _, newEnvInterval in
if newEnvInterval != node?.telemetryConfig?.environmentUpdateInterval ?? -1 { hasChanges = true }
}
.onChange(of: environmentMeasurementEnabled) { newEnvEnabled in
if node != nil && node?.telemetryConfig != nil {
if newEnvEnabled != node!.telemetryConfig!.environmentMeasurementEnabled { hasChanges = true }
}
.onChange(of: environmentMeasurementEnabled) { _, newEnvEnabled in
if newEnvEnabled != node?.telemetryConfig?.environmentMeasurementEnabled { hasChanges = true }
}
.onChange(of: environmentScreenEnabled) { newEnvScreenEnabled in
if node!.telemetryConfig != nil {
if newEnvScreenEnabled != node!.telemetryConfig!.environmentScreenEnabled { hasChanges = true }
}
.onChange(of: environmentScreenEnabled) { _, newEnvScreenEnabled in
if newEnvScreenEnabled != node?.telemetryConfig?.environmentScreenEnabled { hasChanges = true }
}
.onChange(of: environmentDisplayFahrenheit) { newEnvDisplayF in
if node != nil && node?.telemetryConfig != nil {
if newEnvDisplayF != node!.telemetryConfig!.environmentDisplayFahrenheit { hasChanges = true }
}
.onChange(of: environmentDisplayFahrenheit) { _, newEnvDisplayF in
if newEnvDisplayF != node?.telemetryConfig?.environmentDisplayFahrenheit { hasChanges = true }
}
.onChange(of: powerMeasurementEnabled) { newPowerMeasurementEnabled in
if node != nil && node?.telemetryConfig != nil {
if newPowerMeasurementEnabled != node!.telemetryConfig!.powerMeasurementEnabled { hasChanges = true }
}
.onChange(of: powerMeasurementEnabled) { _, newPowerMeasurementEnabled in
if newPowerMeasurementEnabled != node?.telemetryConfig?.powerMeasurementEnabled { hasChanges = true }
}
.onChange(of: powerUpdateInterval) { newPowerUpdateInterval in
if node != nil && node?.telemetryConfig != nil {
if newPowerUpdateInterval != node!.telemetryConfig!.powerUpdateInterval { hasChanges = true }
}
.onChange(of: powerUpdateInterval) { _, newPowerUpdateInterval in
if newPowerUpdateInterval != node?.telemetryConfig?.powerUpdateInterval ?? -1 { hasChanges = true }
}
.onChange(of: powerScreenEnabled) { newPowerScreenEnabled in
if node != nil && node?.telemetryConfig != nil {
if newPowerScreenEnabled != node!.telemetryConfig!.powerScreenEnabled { hasChanges = true }
}
.onChange(of: powerScreenEnabled) { _, newPowerScreenEnabled in
if newPowerScreenEnabled != node?.telemetryConfig?.powerScreenEnabled { hasChanges = true }
}
}
}