From 861d8241836ae6feb194e5af554b3a984a24981e Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Tue, 29 Nov 2022 22:28:52 -0800 Subject: [PATCH] Navigation Stack view cleanup --- Meshtastic/Views/Messages/ChannelMessageList.swift | 1 - Meshtastic/Views/Messages/UserMessageList.swift | 1 - Meshtastic/Views/Settings/Config/BluetoothConfig.swift | 1 - Meshtastic/Views/Settings/Config/DeviceConfig.swift | 1 - Meshtastic/Views/Settings/Config/DisplayConfig.swift | 1 - Meshtastic/Views/Settings/Config/LoRaConfig.swift | 1 - .../Views/Settings/Config/Module/CannedMessagesConfig.swift | 1 - Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift | 1 - Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift | 1 - Meshtastic/Views/Settings/Config/Module/SerialConfig.swift | 1 - Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift | 1 - Meshtastic/Views/Settings/Config/NetworkConfig.swift | 1 - Meshtastic/Views/Settings/UserConfig.swift | 1 - 13 files changed, 13 deletions(-) diff --git a/Meshtastic/Views/Messages/ChannelMessageList.swift b/Meshtastic/Views/Messages/ChannelMessageList.swift index 6146e275..3854f7e8 100644 --- a/Meshtastic/Views/Messages/ChannelMessageList.swift +++ b/Meshtastic/Views/Messages/ChannelMessageList.swift @@ -337,7 +337,6 @@ struct ChannelMessageList: View { } .padding(.all, 15) } - .navigationViewStyle(.stack) .navigationBarTitleDisplayMode(.inline) .toolbar { ToolbarItem(placement: .principal) { diff --git a/Meshtastic/Views/Messages/UserMessageList.swift b/Meshtastic/Views/Messages/UserMessageList.swift index 12760a29..f2c4f98e 100644 --- a/Meshtastic/Views/Messages/UserMessageList.swift +++ b/Meshtastic/Views/Messages/UserMessageList.swift @@ -329,7 +329,6 @@ struct UserMessageList: View { } .padding(.all, 15) } - .navigationViewStyle(.stack) .navigationBarTitleDisplayMode(.inline) .toolbar { ToolbarItem(placement: .principal) { diff --git a/Meshtastic/Views/Settings/Config/BluetoothConfig.swift b/Meshtastic/Views/Settings/Config/BluetoothConfig.swift index fed85cab..7eabda05 100644 --- a/Meshtastic/Views/Settings/Config/BluetoothConfig.swift +++ b/Meshtastic/Views/Settings/Config/BluetoothConfig.swift @@ -151,6 +151,5 @@ struct BluetoothConfig: View { if newFixedPin != String(node!.bluetoothConfig!.fixedPin) { hasChanges = true } } } - .navigationViewStyle(StackNavigationViewStyle()) } } diff --git a/Meshtastic/Views/Settings/Config/DeviceConfig.swift b/Meshtastic/Views/Settings/Config/DeviceConfig.swift index 841d6b4b..26b3bcdc 100644 --- a/Meshtastic/Views/Settings/Config/DeviceConfig.swift +++ b/Meshtastic/Views/Settings/Config/DeviceConfig.swift @@ -192,6 +192,5 @@ struct DeviceConfig: View { if newDebugLog != node!.deviceConfig!.debugLogEnabled { hasChanges = true } } } - .navigationViewStyle(StackNavigationViewStyle()) } } diff --git a/Meshtastic/Views/Settings/Config/DisplayConfig.swift b/Meshtastic/Views/Settings/Config/DisplayConfig.swift index 49c77a31..99e8df47 100644 --- a/Meshtastic/Views/Settings/Config/DisplayConfig.swift +++ b/Meshtastic/Views/Settings/Config/DisplayConfig.swift @@ -161,6 +161,5 @@ struct DisplayConfig: View { if newFlipScreen != node!.displayConfig!.flipScreen { hasChanges = true } } } - .navigationViewStyle(StackNavigationViewStyle()) } } diff --git a/Meshtastic/Views/Settings/Config/LoRaConfig.swift b/Meshtastic/Views/Settings/Config/LoRaConfig.swift index 191f1f5b..6288fb67 100644 --- a/Meshtastic/Views/Settings/Config/LoRaConfig.swift +++ b/Meshtastic/Views/Settings/Config/LoRaConfig.swift @@ -127,6 +127,5 @@ struct LoRaConfig: View { if newHopLimit != node!.loRaConfig!.hopLimit { hasChanges = true } } } - .navigationViewStyle(StackNavigationViewStyle()) } } diff --git a/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift b/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift index 148f9d72..4d11470e 100644 --- a/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/CannedMessagesConfig.swift @@ -361,7 +361,6 @@ struct CannedMessagesConfig: View { if newKeyPress != node!.cannedMessageConfig!.inputbrokerEventPress { hasChanges = true } } } - .navigationViewStyle(StackNavigationViewStyle()) } } } diff --git a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift index 34844075..208f8d68 100644 --- a/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/MQTTConfig.swift @@ -212,6 +212,5 @@ struct MQTTConfig: View { if newJsonEnabled != node!.mqttConfig!.jsonEnabled { hasChanges = true } } } - .navigationViewStyle(StackNavigationViewStyle()) } } diff --git a/Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift b/Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift index f8265571..58c51e6d 100644 --- a/Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/RangeTestConfig.swift @@ -141,7 +141,6 @@ struct RangeTestConfig: View { if newSender != node!.rangeTestConfig!.sender { hasChanges = true } } } - .navigationViewStyle(StackNavigationViewStyle()) } } } diff --git a/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift b/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift index 3c21b899..df362039 100644 --- a/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/SerialConfig.swift @@ -217,7 +217,6 @@ struct SerialConfig: View { if newMode != node!.serialConfig!.mode { hasChanges = true } } } - .navigationViewStyle(StackNavigationViewStyle()) } } } diff --git a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift index 2289aa2e..c8af1300 100644 --- a/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift +++ b/Meshtastic/Views/Settings/Config/Module/TelemetryConfig.swift @@ -193,7 +193,6 @@ struct TelemetryConfig: View { if newEnvDisplayF != node!.telemetryConfig!.environmentDisplayFahrenheit { hasChanges = true } } } - .navigationViewStyle(StackNavigationViewStyle()) } } } diff --git a/Meshtastic/Views/Settings/Config/NetworkConfig.swift b/Meshtastic/Views/Settings/Config/NetworkConfig.swift index db6b6e66..8a488a97 100644 --- a/Meshtastic/Views/Settings/Config/NetworkConfig.swift +++ b/Meshtastic/Views/Settings/Config/NetworkConfig.swift @@ -168,6 +168,5 @@ struct NetworkConfig: View { if newEthEnabled != node!.networkConfig!.ethEnabled { hasChanges = true } } } - .navigationViewStyle(StackNavigationViewStyle()) } } diff --git a/Meshtastic/Views/Settings/UserConfig.swift b/Meshtastic/Views/Settings/UserConfig.swift index 97c6fa5a..87eefd16 100644 --- a/Meshtastic/Views/Settings/UserConfig.swift +++ b/Meshtastic/Views/Settings/UserConfig.swift @@ -119,6 +119,5 @@ struct UserConfig: View { if newLong != node?.user!.longName { hasChanges = true } } } - .navigationViewStyle(StackNavigationViewStyle()) } }