From 469e41dc2fa6912f8d013b32b7c3acdfb2d15f50 Mon Sep 17 00:00:00 2001 From: Garth Vander Houwen Date: Sun, 25 Sep 2022 15:42:45 -0700 Subject: [PATCH] Add missing bracket from merge --- Meshtastic/Views/Settings/ShareChannels.swift | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/Meshtastic/Views/Settings/ShareChannels.swift b/Meshtastic/Views/Settings/ShareChannels.swift index 74bf5b40..255ec808 100644 --- a/Meshtastic/Views/Settings/ShareChannels.swift +++ b/Meshtastic/Views/Settings/ShareChannels.swift @@ -51,7 +51,7 @@ struct ShareChannels: View { let smallest = min(bounds.size.width, bounds.size.height) ScrollView { - + VStack { Text("Scan the QR code below with the Apple or Android device you would like to share your channel settings with.") .fixedSize(horizontal: false, vertical: true) @@ -89,23 +89,24 @@ struct ShareChannels: View { Text("Channel: \(channel.index) Name: \(channel.name ?? "")") } } + } + .frame(width: bounds.size.width, height: bounds.size.height) } - .frame(width: bounds.size.width, height: bounds.size.height) + } + .navigationTitle("Share Channel") + .navigationBarTitleDisplayMode(.automatic) + .navigationBarItems(trailing: + + ZStack { + + ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "????") + }) + .onAppear { + + self.bleManager.context = context } } - .navigationTitle("Share Channel") - .navigationBarTitleDisplayMode(.automatic) - .navigationBarItems(trailing: - - ZStack { - - ConnectedDevice(bluetoothOn: bleManager.isSwitchedOn, deviceConnected: bleManager.connectedPeripheral != nil, name: (bleManager.connectedPeripheral != nil) ? bleManager.connectedPeripheral.shortName : "????") - }) - .onAppear { - - self.bleManager.context = context - } + .navigationViewStyle(StackNavigationViewStyle()) } - .navigationViewStyle(StackNavigationViewStyle()) } }