Merge remote-tracking branch 'refs/remotes/origin/UIRefinementsSL'

.gitignore

@@ -1,2 +1,4 @@
 xcuserdata
 *.xcuserdatad
+.DS_STORE
+SLAppDevel.developerprofile

RippleChat.xcodeproj/project.pbxproj

@@ -130,6 +130,7 @@
 				96454F1C2A558EBC0040BEBD /* ContentView.swift */,
 				96BD33112A5C3FFC007A6E53 /* Views */,
 				F581F59A2A5AE72F0081C383 /* BluetoothController.swift */,
+				F5A4B1222A5D5F8B00F5AE01 /* BTPeripheral.swift */,
 				96454F1E2A558EBD0040BEBD /* Assets.xcassets */,
 				96454F202A558EBD0040BEBD /* Preview Content */,
 				F5847B612A599BF4009E28D4 /* Body.swift */,
@@ -137,7 +138,6 @@
 				F5847B652A599EA4009E28D4 /* Feed.swift */,
 				F5847B692A59AB24009E28D4 /* FeedStore.swift */,
 				96BD330D2A5C254B007A6E53 /* TextApp.swift */,
-				F5A4B1222A5D5F8B00F5AE01 /* BTPeripheral.swift */,
 				F5A4B1242A5D7A8D00F5AE01 /* DataStore.swift */,
 			);
 			path = RippleChat;

RippleChat/ContentView.swift

@@ -29,15 +29,13 @@ struct ContentView: View {
                 FeedListView(feeds: [])
                     .environmentObject(dataStore)
             }
-        }
+            HStack {
-        .padding()
+                Spacer()
-        .toolbar {
-            ToolbarItemGroup(placement: .bottomBar) {
                 Button(action: {
                     self.currentView = 0
                 }) {
                     VStack {
-                        Label("Discovery", systemImage: "dot.radiowaves.left.and.right")
+                        Image(systemName: "dot.radiowaves.left.and.right")
                         Text("Discovery")
                     }
                 }
@@ -46,7 +44,7 @@ struct ContentView: View {
                     self.currentView = 1
                 }) {
                     VStack {
-                        Label("Feeds", systemImage: "person.2")
+                        Image(systemName: "person.2")
                         Text("Feeds")
                     }
                 }
@@ -55,13 +53,16 @@ struct ContentView: View {
                     self.currentView = 2
                 }) {
                     VStack {
-                        Label("Settings", systemImage: "gear")
+                        Image(systemName: "gear")
                         Text("Settings")
                     }
                 }
+                Spacer()
             }
+            .frame(height: UIScreen.main.bounds.height * 0.05)
         }
  
+       
     }
 }
 

RippleChat/Views/PeeringView.swift

@@ -14,11 +14,12 @@ struct PeeringView: View {
     
     var body: some View {
         Text("Peering View")
-        NavigationView {
+        NavigationStack {
             List(bluetoothController.peripheralNames, id: \.self) { peripheral in
                 Text(peripheral)
             }
             .navigationTitle("Peripherals")
+            .navigationViewStyle(StackNavigationViewStyle())
         }
     }
 }

RippleChat/Views/SettingsView.swift

@@ -16,14 +16,8 @@ struct SettingsView: View {
     
     var body: some View {
         
-     
+        NavigationStack {
             List {
-                HStack {
-                    Spacer()
-                    Button("Edit") {
-                        isPresentingEditView = true
-                    }
-                }
                 Section(header: Text("Personal Feed ID")) {
                     Label(dataStore.personalID, systemImage: "person.crop.circle")
                 }
@@ -34,6 +28,14 @@ struct SettingsView: View {
                 }
             }
             .navigationTitle("Settings")
+            .navigationViewStyle(StackNavigationViewStyle())
+            .toolbar {
+                ToolbarItem(placement: .confirmationAction) {
+                    Button("Edit") {
+                        isPresentingEditView = true
+                    }
+                }
+            }
             .sheet(isPresented: $isPresentingEditView) {
                 NavigationStack {
                     SettingsEditView()
@@ -53,6 +55,7 @@ struct SettingsView: View {
                 }
         }
         }
+    }
     
 }