diff --git a/Meshtastic/Views/Messages/Contacts.swift b/Meshtastic/Views/Messages/Contacts.swift index a5a391f9..7308201a 100644 --- a/Meshtastic/Views/Messages/Contacts.swift +++ b/Meshtastic/Views/Messages/Contacts.swift @@ -128,6 +128,12 @@ struct Contacts: View { .hidden() } .tint(Color(UIColor.systemGray)) + .navigationSplitViewStyle(.automatic) + .navigationTitle("Contacts") + .navigationBarTitleDisplayMode(.inline) + .navigationBarItems(leading: + MeshtasticLogo() + ) } detail: { @@ -140,11 +146,6 @@ struct Contacts: View { Text("Select a user") } } - .navigationSplitViewStyle(.automatic) - .navigationTitle("Contacts") - .navigationBarTitleDisplayMode(.inline) - .navigationBarItems(leading: - MeshtasticLogo() - ) + } } diff --git a/Meshtastic/Views/Nodes/NodeList.swift b/Meshtastic/Views/Nodes/NodeList.swift index 11a720a5..80a6c76a 100644 --- a/Meshtastic/Views/Nodes/NodeList.swift +++ b/Meshtastic/Views/Nodes/NodeList.swift @@ -123,6 +123,19 @@ struct NodeList: View { } } .tint(Color(UIColor.systemGray)) + .navigationTitle("All Nodes") + .navigationBarItems(leading: + MeshtasticLogo() + ) + .onAppear { + + if initialLoad { + + self.bleManager.userSettings = userSettings + self.bleManager.context = context + self.initialLoad = false + } + } } detail: { if let node = selection { @@ -134,18 +147,6 @@ struct NodeList: View { Text("Select a node") } } - .navigationTitle("All Nodes") - .navigationBarItems(leading: - MeshtasticLogo() - ) - .onAppear { - if initialLoad { - - self.bleManager.userSettings = userSettings - self.bleManager.context = context - self.initialLoad = false - } - } } }