github/openhaystack
1
0
Fork 0
mirror of https://github.com/seemoo-lab/openhaystack.git synced 2026-08-19 11:36:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use NavigationView

Browse Source
This commit is contained in:
Milan Stute
2021-03-11 08:57:44 +01:00
parent da302c7b0c
commit 48897cd890
1 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenHaystack/OpenHaystack/HaystackApp/Views/OpenHaystackMainView.swift
+9 -26
View File
@@ -31,29 +31,16 @@ struct OpenHaystackMainView: View {
@State var showESP32DeploySheet = false
var body: some View {
GeometryReader { geo in
ZStack {
VStack {
HStack {
ManageAccessoriesView(
alertType: self.$alertType,
focusedAccessory: self.$focusedAccessory,
accessoryToDeploy: self.$accessoryToDeploy,
showESP32DeploySheet: self.$showESP32DeploySheet)
Spacer()
VStack {
self.mapView
}.frame(width: geo.size.width * 0.5, alignment: .trailing)
}
if searchPartyTokenLoaded == false {
TextField("Search Party token", text: self.$searchPartyToken)
}
}
NavigationView {
ManageAccessoriesView(
alertType: self.$alertType,
focusedAccessory: self.$focusedAccessory,
accessoryToDeploy: self.$accessoryToDeploy,
showESP32DeploySheet: self.$showESP32DeploySheet)
VStack {
self.mapView
if self.popUpAlertType != nil {
VStack {
Spacer()
@@ -88,8 +75,7 @@ struct OpenHaystackMainView: View {
self.onAppear()
}
}
.padding([.leading, .trailing, .bottom])
.frame(minWidth: 720, maxWidth: .infinity, minHeight: 480, maxHeight: .infinity)
.navigationTitle("OpenHaystack")
}
// MARK: Subviews
@@ -113,9 +99,6 @@ struct OpenHaystackMainView: View {
AccessoryMapView(accessoryController: self.accessoryController, mapType: self.$mapType, focusedAccessory: self.focusedAccessory)
.overlay(self.mapOverlay)
.cornerRadius(15.0)
.clipped()
.padding([.top, .bottom], 15)
VStack {
Spacer()