From e095e053a5e4ff4b244ed1a1b4af355207327a69 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Tue, 4 Oct 2022 18:19:02 -0700 Subject: [PATCH] Fix all the module confirmation dialogs --- .../Views/Settings/Config/Module/CannedMessagesConfig.swift | 3 ++- .../Settings/Config/Module/ExternalNotificationConfig.swift | 4 ++-- Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift | 3 ++- Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift | 4 ++-- Meshtastic/Views/Settings/Config/Module/SerialConfig.swift | 3 ++- Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift | 3 ++- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift b/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift index 622dd08b..ea8560dc 100644 --- a/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift @@ -224,7 +224,8 @@ struct CannedMessagesConfig: View { .confirmationDialog( "Are you sure?", - isPresented: $isPresentingSaveConfirm + isPresented: $isPresentingSaveConfirm, + titleVisibility: .visible ) { Button("Save Canned Messages Module Config to \(bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral.longName : "Unknown")?") { diff --git a/Meshtastic/Views/Settings/Config/Module/ExternalNotificationConfig.swift b/Meshtastic/Views/Settings/Config/Module/ExternalNotificationConfig.swift index 7e2ad96b..7e85192c 100644 --- a/Meshtastic/Views/Settings/Config/Module/ExternalNotificationConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/ExternalNotificationConfig.swift @@ -145,9 +145,9 @@ struct ExternalNotificationConfig: View { .controlSize(.large) .padding() .confirmationDialog( - "Are you sure?", - isPresented: $isPresentingSaveConfirm + isPresented: $isPresentingSaveConfirm, + titleVisibility: .visible ) { Button("Save External Notification Module Config to \(bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral.longName : "Unknown")?") { diff --git a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift index 8d103493..b4bc8c96 100644 --- a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift @@ -161,7 +161,8 @@ struct MQTTConfig: View { .confirmationDialog( "Are you sure?", - isPresented: $isPresentingSaveConfirm + isPresented: $isPresentingSaveConfirm, + titleVisibility: .visible ) { Button("Save MQTT Config to \(bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral.longName : "Unknown")?") { diff --git a/Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift b/Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift index 8bb25733..311fec72 100644 --- a/Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift @@ -109,9 +109,9 @@ struct RangeTestConfig: View { .controlSize(.large) .padding() .confirmationDialog( - "Are you sure?", - isPresented: $isPresentingSaveConfirm + isPresented: $isPresentingSaveConfirm, + titleVisibility: .visible ) { Button("Save Range Test Module Config to \(bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral.longName : "Unknown")?") { diff --git a/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift b/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift index 2971b599..fd4e5d8e 100644 --- a/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift @@ -123,7 +123,8 @@ struct SerialConfig: View { .confirmationDialog( "Are you sure?", - isPresented: $isPresentingSaveConfirm + isPresented: $isPresentingSaveConfirm, + titleVisibility: .visible ) { Button("Save Serial Module Config to \(bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral.longName : "Unknown")?") { diff --git a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift index a3cce9f8..1ccecd4b 100644 --- a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift @@ -152,7 +152,8 @@ struct TelemetryConfig: View { .confirmationDialog( "Are you sure?", - isPresented: $isPresentingSaveConfirm + isPresented: $isPresentingSaveConfirm, + titleVisibility: .visible ) { Button("Save Telemetry Module Config to \(bleManager.connectedPeripheral != nil ? bleManager.connectedPeripheral.longName : "Unknown")?") {