Fix toolbar items not displaying for iOS target (#26)

IEEE-VIT · Oct 7, 2021 · 4345fa4 · 4345fa4
1 parent be019e9
commit 4345fa4
Showing 1 changed file with 27 additions and 20 deletions.
diff --git a/Shared/App/SwiftUIView.swift b/Shared/App/SwiftUIView.swift
@@ -16,12 +16,13 @@ struct ContentView: View {
     @State var searchString: String = ""
 
     var body: some View {
-        VStack {
+        NavigationView {
+            VStack(spacing: .zero) {
                 HStack {
                     Image(systemName: "magnifyingglass")
                         .foregroundColor(.gray)
                         .padding(.leading)
-                        TextField("Search", text: $searchString).padding()
+                    TextField("Search", text: $searchString).padding()
                     if(searchString != "") {
                         Button(action: {
                             searchString = ""
@@ -32,28 +33,34 @@ struct ContentView: View {
                         }
                     }
                 }
-            List {
-                ForEach(balanceSheet) {
-                    if(searchString == "") {
-                        Text("\($0.title )")
-                            .foregroundColor($0.action.color)
-                    } else if($0.title.lowercased().contains(searchString.lowercased())){
-                        Text("\($0.title )")
-                            .foregroundColor($0.action.color)
+                List {
+                    ForEach(balanceSheet) {
+                        if(searchString == "") {
+                            Text("\($0.title )")
+                                .foregroundColor($0.action.color)
+                        } else if($0.title.lowercased().contains(searchString.lowercased())){
+                            Text("\($0.title )")
+                                .foregroundColor($0.action.color)
+                        }
                     }
+                    #if os(iOS)
+                    .onDelete(perform: deleteRow(at:))
+                    #endif
                 }
-                #if os(iOS)
-                .onDelete(perform: deleteRow(at:))
-                #endif
+                .navigationBarHidden(true)
             }
-        }
-        .toolbar {
-            #if os(iOS)
-            EditButton()
-            #endif
+            .toolbar {
+                ToolbarItem(placement: .bottomBar) {
+                    #if os(iOS)
+                    EditButton()
+                    #endif
+                }
 
-            Button(action: addItem) {
-                Label("Add Item", systemImage: "plus")
+                ToolbarItem(placement: .bottomBar) {
+                    Button(action: addItem) {
+                        Label("Add Item", systemImage: "plus")
+                    }
+                }
             }
         }
     }