Merge branch 'develop' into feat/CardChart

rriver2 · Nov 5, 2022 · 195f350 · 195f350
2 parents 8afa8ee + 7052a6b
commit 195f350
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 17 deletions.
diff --git a/2022/Playgrounds/GuestBook/GuestBookContainerView.swift b/2022/Playgrounds/GuestBook/GuestBookContainerView.swift
@@ -0,0 +1,20 @@
+//
+//  GuestBookContainerView.swift
+//  LetSwift
+//
+//  Created by Dongju on 2022/11/01.
+//
+
+import SwiftUI
+
+struct GuestBookContainerView: View {
+    var body: some View {
+        Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
+    }
+}
+
+struct GuestBookContainerView_Previews: PreviewProvider {
+    static var previews: some View {
+        GuestBookContainerView()
+    }
+}
diff --git a/App/View/TabNavigationView.swift b/App/View/TabNavigationView.swift
@@ -8,7 +8,7 @@
 import SwiftUI
 
 struct TabNavigationView: View {
-    @State private var selected: Tab = .home
+    @State private var selected: Tab = .sessions
 
     // MARK: - Body
     var body: some View {
@@ -27,10 +27,10 @@ struct TabNavigationView: View {
 // MARK: - Tab model
 extension TabNavigationView {
     enum Tab: Int, Identifiable, CaseIterable {
-        case home
-        case schedule
-//        case ticket
-        case people
+        case sessions
+        case badges
+        case playgrounds
+        case settings
 //        case location
 
         // MARK: Identifiable
@@ -41,10 +41,10 @@ extension TabNavigationView {
         // MARK:
         var presentingView: some View {
             switch self {
-            case .home: return AnyView(HomeView())
-            case .schedule: return AnyView(ScheduleView())
-//            case .ticket: return AnyView(TicketView())
-            case .people: return AnyView(PeopleView())
+            case .sessions: return AnyView(HomeView())
+            case .badges: return AnyView(ScheduleView())
+            case .playgrounds: return AnyView(EmptyView())
+            case .settings: return AnyView(PeopleView())
 //            case .location: return AnyView(LocationView())
             }
         }
@@ -58,20 +58,20 @@ extension TabNavigationView {
 
         private var name: String {
             switch self {
-            case .home: return "홈"
-            case .schedule: return "일정"
-//            case .ticket: return "티켓"
-            case .people: return "사람들"
+            case .sessions: return "세션"
+            case .badges: return "뱃지"
+            case .playgrounds: return "놀이터"
+            case .settings: return "설정"
 //            case .location: return "장소"
             }
         }
 
         private var imageName: String {
             switch self {
-            case .home: return "house.fill"
-            case .schedule: return "calendar"
-//            case .ticket: return "ticket.fill"
-            case .people: return "person.fill"
+            case .sessions: return "calendar"
+            case .badges: return "ticket.fill"
+            case .playgrounds: return "gamecontroller.fill"
+            case .settings: return "gearshape.fill"
 //            case .location: return "map.fill"
             }
         }

diff --git a/LetSwift.xcodeproj/project.pbxproj b/LetSwift.xcodeproj/project.pbxproj
@@ -124,6 +124,7 @@
 		6054DA7D256A9DBF00A49BD4 /* DateManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6054DA7C256A9DBF00A49BD4 /* DateManager.swift */; };
 		60E1766A256D4FBE0068B3F4 /* Event.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60E17669256D4FBE0068B3F4 /* Event.swift */; };
 		60E17672256D509B0068B3F4 /* Event.json in Resources */ = {isa = PBXBuildFile; fileRef = 60E17671256D509B0068B3F4 /* Event.json */; };
+		6F35A83829113BA40000DC45 /* GuestBookContainerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F35A83729113BA40000DC45 /* GuestBookContainerView.swift */; };
 		9A77C72F256EC0B300B30BC6 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A77C72E256EC0B300B30BC6 /* WidgetKit.framework */; platformFilter = ios; };
 		9A77C731256EC0B300B30BC6 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A77C730256EC0B300B30BC6 /* SwiftUI.framework */; };
 		9A77C734256EC0B300B30BC6 /* ScheduleWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A77C733256EC0B300B30BC6 /* ScheduleWidget.swift */; };
@@ -292,6 +293,7 @@
 		6054DA7C256A9DBF00A49BD4 /* DateManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DateManager.swift; sourceTree = "<group>"; };
 		60E17669256D4FBE0068B3F4 /* Event.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Event.swift; sourceTree = "<group>"; };
 		60E17671256D509B0068B3F4 /* Event.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = Event.json; sourceTree = "<group>"; };
+		6F35A83729113BA40000DC45 /* GuestBookContainerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GuestBookContainerView.swift; sourceTree = "<group>"; };
 		9A77C72C256EC0B300B30BC6 /* ScheduleWidgetExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = ScheduleWidgetExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		9A77C72E256EC0B300B30BC6 /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = Library/Frameworks/WidgetKit.framework; sourceTree = DEVELOPER_DIR; };
 		9A77C730256EC0B300B30BC6 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
@@ -640,6 +642,14 @@
 			path = Settings;
 			sourceTree = "<group>";
 		};
+		6F35A83629113B630000DC45 /* GuestBook */ = {
+			isa = PBXGroup;
+			children = (
+				6F35A83729113BA40000DC45 /* GuestBookContainerView.swift */,
+			);
+			path = GuestBook;
+			sourceTree = "<group>";
+		};
 		6FD7CDA8290C01F8002CF140 /* 2022 */ = {
 			isa = PBXGroup;
 			children = (
@@ -674,6 +684,7 @@
 				CCFF977E29114CEF00BC5FD3 /* ChartDataModel.swift */,
 				CC2DCDC829151F8700419AFC /* SurveyData.swift */,
 				CC1E753D291512820016092D /* ChartMockData.json */,
+				6F35A83629113B630000DC45 /* GuestBook */,
 			);
 			path = Playgrounds;
 			sourceTree = "<group>";
@@ -1031,6 +1042,7 @@
 				1624BF90256C4B0D00634E29 /* PastEventItemView.swift in Sources */,
 				16DBE6B1256A283E00B334A3 /* PeopleView.swift in Sources */,
 				A5704B1B256E8E2500EB6C8F /* DateFormatter.swift in Sources */,
+				6F35A83829113BA40000DC45 /* GuestBookContainerView.swift in Sources */,
 				16984E8F256A378C0011C872 /* SidebarNavigationView.swift in Sources */,
 				A5346BB2256BB8BB007C41CE /* Person.swift in Sources */,
 				1624BF93256C4B6300634E29 /* HeroItemView.swift in Sources */,