From 3d950bf69f6e9f735099f30038b94314d3f31792 Mon Sep 17 00:00:00 2001 From: Sebastian Lenzlinger <74497638+sebaschi@users.noreply.github.com> Date: Mon, 10 Jul 2023 16:04:41 +0200 Subject: [PATCH] Toolbar experimentation --- RippleChat.xcodeproj/project.pbxproj | 20 ++++++++++++++++++++ RippleChat/ContentView.swift | 17 +++++------------ RippleChat/RippleChatApp.swift | 15 +++++++++++++++ RippleChat/Views/FeedListView.swift | 22 ++++++++++++++++++++++ RippleChat/Views/FriendsListView.swift | 20 ++++++++++++++++++++ RippleChat/Views/PeeringView.swift | 20 ++++++++++++++++++++ 6 files changed, 102 insertions(+), 12 deletions(-) create mode 100644 RippleChat/Views/FeedListView.swift create mode 100644 RippleChat/Views/FriendsListView.swift create mode 100644 RippleChat/Views/PeeringView.swift diff --git a/RippleChat.xcodeproj/project.pbxproj b/RippleChat.xcodeproj/project.pbxproj index 289fc70..31d578c 100644 --- a/RippleChat.xcodeproj/project.pbxproj +++ b/RippleChat.xcodeproj/project.pbxproj @@ -17,6 +17,9 @@ 96454F452A5593900040BEBD /* .gitignore in Resources */ = {isa = PBXBuildFile; fileRef = 96454F442A5593900040BEBD /* .gitignore */; }; 96BD330E2A5C254B007A6E53 /* TextApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BD330D2A5C254B007A6E53 /* TextApp.swift */; }; 96BD33102A5C27B0007A6E53 /* NewFeedEntryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BD330F2A5C27B0007A6E53 /* NewFeedEntryView.swift */; }; + 96BD33132A5C400B007A6E53 /* FeedListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BD33122A5C400B007A6E53 /* FeedListView.swift */; }; + 96BD33162A5C403C007A6E53 /* PeeringView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BD33152A5C403C007A6E53 /* PeeringView.swift */; }; + 96BD33182A5C404F007A6E53 /* FriendsListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BD33172A5C404F007A6E53 /* FriendsListView.swift */; }; F581F59B2A5AE72F0081C383 /* BluetoothViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F581F59A2A5AE72F0081C383 /* BluetoothViewModel.swift */; }; F5847B622A599BF4009E28D4 /* Body.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5847B612A599BF4009E28D4 /* Body.swift */; }; F5847B642A599CC3009E28D4 /* LogEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5847B632A599CC3009E28D4 /* LogEntry.swift */; }; @@ -56,6 +59,9 @@ 96454F442A5593900040BEBD /* .gitignore */ = {isa = PBXFileReference; lastKnownFileType = text; path = .gitignore; sourceTree = ""; }; 96BD330D2A5C254B007A6E53 /* TextApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextApp.swift; sourceTree = ""; }; 96BD330F2A5C27B0007A6E53 /* NewFeedEntryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewFeedEntryView.swift; sourceTree = ""; }; + 96BD33122A5C400B007A6E53 /* FeedListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedListView.swift; sourceTree = ""; }; + 96BD33152A5C403C007A6E53 /* PeeringView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PeeringView.swift; sourceTree = ""; }; + 96BD33172A5C404F007A6E53 /* FriendsListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FriendsListView.swift; sourceTree = ""; }; F581F59A2A5AE72F0081C383 /* BluetoothViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BluetoothViewModel.swift; sourceTree = ""; }; F5847B612A599BF4009E28D4 /* Body.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Body.swift; sourceTree = ""; }; F5847B632A599CC3009E28D4 /* LogEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogEntry.swift; sourceTree = ""; }; @@ -116,6 +122,7 @@ children = ( 96454F1A2A558EBC0040BEBD /* RippleChatApp.swift */, 96454F1C2A558EBC0040BEBD /* ContentView.swift */, + 96BD33112A5C3FFC007A6E53 /* Views */, F581F59A2A5AE72F0081C383 /* BluetoothViewModel.swift */, 96454F1E2A558EBD0040BEBD /* Assets.xcassets */, 96454F202A558EBD0040BEBD /* Preview Content */, @@ -154,6 +161,16 @@ path = RippleChatUITests; sourceTree = ""; }; + 96BD33112A5C3FFC007A6E53 /* Views */ = { + isa = PBXGroup; + children = ( + 96BD33122A5C400B007A6E53 /* FeedListView.swift */, + 96BD33152A5C403C007A6E53 /* PeeringView.swift */, + 96BD33172A5C404F007A6E53 /* FriendsListView.swift */, + ); + path = Views; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -287,7 +304,10 @@ buildActionMask = 2147483647; files = ( F5847B622A599BF4009E28D4 /* Body.swift in Sources */, + 96BD33162A5C403C007A6E53 /* PeeringView.swift in Sources */, + 96BD33182A5C404F007A6E53 /* FriendsListView.swift in Sources */, F5847B662A599EA4009E28D4 /* Feed.swift in Sources */, + 96BD33132A5C400B007A6E53 /* FeedListView.swift in Sources */, F5847B642A599CC3009E28D4 /* LogEntry.swift in Sources */, 96BD33102A5C27B0007A6E53 /* NewFeedEntryView.swift in Sources */, F5847B6A2A59AB24009E28D4 /* FeedStore.swift in Sources */, diff --git a/RippleChat/ContentView.swift b/RippleChat/ContentView.swift index 346ee46..c23ce88 100644 --- a/RippleChat/ContentView.swift +++ b/RippleChat/ContentView.swift @@ -12,6 +12,8 @@ struct ContentView: View { @ObservedObject private var bluetoothViewModel = BluetoothViewModel() @StateObject private var store = FeedStore(feed: Feed.sampleFeed) private var feedStores = [FeedStore(feed: Feed.sampleFeed), FeedStore(feed: Feed.sampleFeed2)] + //@Binding var currentView: CurrentView + var body: some View { VStack { @@ -40,25 +42,16 @@ struct ContentView: View { } .navigationTitle("Peripherals") } - .toolbar { - ToolbarItemGroup(placement: .bottomBar) { - Button("Peers") {} - - } - } + } } struct ContentView_Previews: PreviewProvider { + public static var cv = CurrentView.feeds static var previews: some View { ContentView() } } -enum CurrentView { - case peers - case feeds - case friends - case settings -} + diff --git a/RippleChat/RippleChatApp.swift b/RippleChat/RippleChatApp.swift index 5046989..815724c 100644 --- a/RippleChat/RippleChatApp.swift +++ b/RippleChat/RippleChatApp.swift @@ -9,9 +9,24 @@ import SwiftUI @main struct RippleChatApp: App { + @State private var currentView: CurrentView = CurrentView.feeds + var body: some Scene { WindowGroup { ContentView() + .toolbar { + ToolbarItemGroup(placement: .bottomBar) { + Button("Peers") {} + + } + } } } } + +enum CurrentView { + case peers + case feeds + case friends + case settings +} diff --git a/RippleChat/Views/FeedListView.swift b/RippleChat/Views/FeedListView.swift new file mode 100644 index 0000000..5843a79 --- /dev/null +++ b/RippleChat/Views/FeedListView.swift @@ -0,0 +1,22 @@ +// +// FeedListView.swift +// RippleChat +// +// Created by Sebastian Lenzlinger on 10.07.23. +// + +import SwiftUI + +struct FeedListView: View { + + + var body: some View { + Text("FeedListView") + } +} + +struct FeedListView_Previews: PreviewProvider { + static var previews: some View { + FeedListView() + } +} diff --git a/RippleChat/Views/FriendsListView.swift b/RippleChat/Views/FriendsListView.swift new file mode 100644 index 0000000..b262064 --- /dev/null +++ b/RippleChat/Views/FriendsListView.swift @@ -0,0 +1,20 @@ +// +// FriendsListView.swift +// RippleChat +// +// Created by Sebastian Lenzlinger on 10.07.23. +// + +import SwiftUI + +struct FriendsListView: View { + var body: some View { + Text("Friend List View") + } +} + +struct FriendsListView_Previews: PreviewProvider { + static var previews: some View { + FriendsListView() + } +} diff --git a/RippleChat/Views/PeeringView.swift b/RippleChat/Views/PeeringView.swift new file mode 100644 index 0000000..da9f6f7 --- /dev/null +++ b/RippleChat/Views/PeeringView.swift @@ -0,0 +1,20 @@ +// +// PeeringView.swift +// RippleChat +// +// Created by Sebastian Lenzlinger on 10.07.23. +// + +import SwiftUI + +struct PeeringView: View { + var body: some View { + Text("Peering View") + } +} + +struct PeeringView_Previews: PreviewProvider { + static var previews: some View { + PeeringView() + } +}