diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..dad9b10
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,13 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Rider ignored files
+/contentModel.xml
+/projectSettingsUpdater.xml
+/.idea.AcaMate_iOS.iml
+/modules.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/indexLayout.xml b/.idea/indexLayout.xml
new file mode 100644
index 0000000..7b08163
--- /dev/null
+++ b/.idea/indexLayout.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/tanine.xcuserdatad/UserInterfaceState.xcuserstate b/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/tanine.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..eee7cfb
Binary files /dev/null and b/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/tanine.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/AcaMate.xcodeproj/xcuserdata/tanine.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/AcaMate.xcodeproj/xcuserdata/tanine.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
new file mode 100644
index 0000000..1bf677d
--- /dev/null
+++ b/AcaMate.xcodeproj/xcuserdata/tanine.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,6 @@
+
+
+
diff --git a/AcaMate/1. View/1. Intro & Login/LoginView.swift b/AcaMate/1. View/1. Intro & Login/LoginView.swift
deleted file mode 100644
index 96535fa..0000000
--- a/AcaMate/1. View/1. Intro & Login/LoginView.swift
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// LoginView.swift
-// AcaMate
-//
-// Created by Sean Kim on 12/1/24.
-//
-
-import SwiftUI
-
-struct LoginView: View {
- @EnvironmentObject var alertController: AlertController
- @Binding var naviState : NaviState
-
- var body: some View {
- VStack(spacing: 0) {
- Image("Team_Icon")
- .resizable()
- .frame(width: 200, height: 200)
- .background(.white)
- .border(.black)
- .padding(.bottom, 84)
- Button {
-
- } label: {
- HStack(spacing: 12) {
- Image("Kakao_Icon")
- .resizable()
- .frame(width: 32, height: 32)
- Text("카카오 계정으로 시작하기")
- .font(.nps(font: .regular, size: 16))
- .foregroundStyle(Color(.Text.black))
- }
- .padding(12)
- .background {
- RoundedRectangle(cornerRadius: 12)
- .foregroundStyle(Color(.Other.yellow))
- }
- }
-
- Button {
- alertController.alertData = SetAlertData().setTest()
- alertController.showAlert.toggle()
-// naviState.set(act: .MOVE,path: .Intro)
-
- } label: {
- Text("111111111")
- }
- .padding()
- }
- .fullView(.Normal.normal)
-
- }
-}
-
-//#Preview {
-// LoginView()
-//}
diff --git a/AcaMate/1. View/0. Common/NavigationView.swift b/AcaMate/1. View/10. Common/NavigationView.swift
similarity index 85%
rename from AcaMate/1. View/0. Common/NavigationView.swift
rename to AcaMate/1. View/10. Common/NavigationView.swift
index 9024bc6..85a8ffb 100644
--- a/AcaMate/1. View/0. Common/NavigationView.swift
+++ b/AcaMate/1. View/10. Common/NavigationView.swift
@@ -9,7 +9,7 @@ import SwiftUI
import Combine
-
+/// 이거 위에 다른 뷰들이 위젯 느낌으로 계속 갈아 끼워지는거
struct NavigationView: View {
@State private var naviState : NaviState = .init(act: .NONE, path: .Intro)
@State private var history: [PathName] = [.Intro]
@@ -25,7 +25,7 @@ struct NavigationView: View {
case .Login :
LoginView(naviState: $naviState)
case .Main:
- EmptyView()
+ MainView(naviState: $naviState)
}
}
.onChange(of: naviState) { old, new in
@@ -41,30 +41,33 @@ struct NavigationView: View {
case .MOVE:
moveHistory(path: new.path)
}
-
// LOG
printLog("\(old.path) => \(new.path)")
showHistory()
}
- .fullView(.Normal.normal)
+ .fullDrawView(.Normal.normal)
.setAlert()
.setNetwork()
}
+ /// 경로에 한 단계 추가
private func addHistory(path: PathName) {
history.append(path)
}
+ /// 가장 가까운 경로 삭제
private func popHistory() {
history.removeLast()
naviState.set(act: .NONE, path: history.last ?? .NONE)
}
+ /// 경로 기록 전체 삭제
private func resetHistory(path: PathName) {
history.removeAll()
addHistory(path: path)
}
+ /// 경로의 최상단 지우고, 새로 이동하는 경로로 설정
private func moveHistory(path: PathName) {
if path == .NONE {
naviState.set(act: .RESET, path: history.first ?? .Main)
diff --git a/AcaMate/1. View/1. Intro & Login/IntroView.swift b/AcaMate/1. View/11. Intro & Login/IntroView.swift
similarity index 97%
rename from AcaMate/1. View/1. Intro & Login/IntroView.swift
rename to AcaMate/1. View/11. Intro & Login/IntroView.swift
index 4d21e43..ab09092 100644
--- a/AcaMate/1. View/1. Intro & Login/IntroView.swift
+++ b/AcaMate/1. View/11. Intro & Login/IntroView.swift
@@ -67,8 +67,6 @@ struct IntroView: View {
}
}
.store(in: &cancellables)
-
-
}
}
@@ -78,7 +76,8 @@ struct IntroView: View {
.sink { action in
if action == "updateNow" {
exit(1)
- //MARK: - TODO (앱스토어 이동 로직 넣을 것)
+ // MARK: TO-DO
+ // (앱스토어 이동 로직 넣을 것)
} else {
naviState.set(act: .RESET, path: .Login)
}
diff --git a/AcaMate/1. View/11. Intro & Login/LoginView.swift b/AcaMate/1. View/11. Intro & Login/LoginView.swift
new file mode 100644
index 0000000..18c277f
--- /dev/null
+++ b/AcaMate/1. View/11. Intro & Login/LoginView.swift
@@ -0,0 +1,93 @@
+//
+// LoginView.swift
+// AcaMate
+//
+// Created by Sean Kim on 12/1/24.
+//
+
+import SwiftUI
+
+struct LoginView: View {
+ @EnvironmentObject var alertController: AlertController
+ @Binding var naviState : NaviState
+
+ var body: some View {
+ VStack(spacing: 0) {
+ Image("Team_Icon")
+ .resizable()
+ .frame(maxWidth: 200, maxHeight: 200)
+ .frame(width: 200, height: 200)
+ .background(.white)
+ .border(.black)
+ .padding(.bottom, 84)
+ /// 앱 아이콘 이미지
+
+ VStack(spacing: 16) {
+ Button {
+ // MARK: TO-DO
+ // 카카오 로그인 연동
+ naviState.set(act: .MOVE, path: .Main)
+ } label: {
+ HStack(spacing: 24) {
+ Image("Kakao_Icon")
+ .resizable()
+ .frame(width: 32, height: 32)
+ Text("카카오 계정으로 시작하기")
+ .font(.nps(font: .regular, size: 16))
+ .foregroundStyle(Color(.Text.black))
+ }
+ .frame(maxWidth: .infinity)
+ .padding(12)
+ .background {
+ RoundedRectangle(cornerRadius: 12)
+ .foregroundStyle(Color(.Other.yellow))
+ }
+ }
+ .frame(maxWidth: .infinity)
+ /// KAKAO 로그인 버튼
+
+ Button {
+ // MARK: TO-DO
+ // 애플 로그인 연동
+ } label: {
+ HStack(spacing: 24) {
+ Image(systemName: "apple.logo")
+ .resizable()
+ .accentColor(Color(.Text.white))
+ .frame(width: 32, height: 32)
+
+ Text("애플 계정으로 시작하기")
+ .font(.nps(font: .regular, size: 16))
+ .foregroundStyle(Color(.Text.white))
+ }
+ .frame(maxWidth: .infinity)
+ .padding(12)
+ .background {
+ RoundedRectangle(cornerRadius: 12)
+ .foregroundStyle(Color(.Text.black))
+ }
+ }
+ .frame(maxWidth: .infinity)
+ /// APPLE 로그인 버튼
+ }
+ .padding([.leading,.trailing], 28)
+ /// 버튼 조합
+
+ // 삭제
+// Button {
+// alertController.alertData = SetAlertData().setTest()
+// alertController.showAlert.toggle()
+// // naviState.set(act: .MOVE,path: .Intro)
+//
+// } label: {
+// Text("111111111")
+// }
+
+ }
+ .fullDrawView(.Normal.normal)
+ }
+}
+
+//#Preview {
+// LoginView()
+//}
diff --git a/AcaMate/1. View/12. Main/121. Button/BoxBtnView.swift b/AcaMate/1. View/12. Main/121. Button/BoxBtnView.swift
new file mode 100644
index 0000000..10747fb
--- /dev/null
+++ b/AcaMate/1. View/12. Main/121. Button/BoxBtnView.swift
@@ -0,0 +1,39 @@
+//
+// BoxBtnView.swift
+// AcaMate
+//
+// Created by TAnine on 2/4/25.
+//
+
+import SwiftUI
+
+struct BoxBtnView: View {
+ let width: CGFloat
+ let height: CGFloat
+ let action: VOID_TO_VOID?
+
+ @ViewBuilder let content: Content
+
+ var body: some View {
+ Button{
+ guard let action = action else { return }
+ action()
+ } label: {
+ content
+// if let image = image {
+// image
+// .resizable()
+// .frame(width: width, height: height)
+// }
+ }
+ }
+}
+
+#Preview {
+ BoxBtnView(width: 40, height: 40, action: nil){
+ VStack {
+ Text("Test1")
+ Text("Test2")
+ }
+ }
+}
diff --git a/AcaMate/1. View/12. Main/121. Button/CircleBtnView.swift b/AcaMate/1. View/12. Main/121. Button/CircleBtnView.swift
new file mode 100644
index 0000000..80ce92b
--- /dev/null
+++ b/AcaMate/1. View/12. Main/121. Button/CircleBtnView.swift
@@ -0,0 +1,56 @@
+//
+// ButtonView.swift
+// AcaMate
+//
+// Created by TAnine on 2/4/25.
+//
+
+import SwiftUI
+
+
+
+struct CircleBtnView: View {
+ let title: String?
+ let image: Image
+ @Binding var isSelected: Bool
+ let isReverse: Bool
+
+ let action: VOID_TO_VOID?
+
+ var backColor: Color {isReverse ? Color(.Second.light) : Color(.Normal.normal)}
+ var tintColor: Color {isSelected ? Color(.Second.normal) : Color(.Disable.normal)}
+
+ var body: some View {
+ Button{
+ guard let action = action else {return}
+ action()
+ } label: {
+ VStack(alignment: .center, spacing: 0) {
+ self.image
+ .resizable()
+ .renderingMode(.template)
+ .foregroundStyle(self.tintColor)
+ .frame(width: 24, height: 24)
+ if let title = self.title {
+ Text("\(title)")
+ .font(.nps(font: .bold, size: 6))
+ .tint(self.tintColor)
+ }
+ }
+ .padding()
+ .background {
+ if isReverse {
+ Circle()
+ .accentColor(self.backColor)
+ .frame(width: 48, height: 48)
+ .innerShadow(shape: Circle(), color: Color(.Text.black).opacity(0.75), blur: 8, x: 0, y: 4)
+ } else {
+ Circle()
+ .accentColor(self.backColor)
+ .frame(width: 48, height: 48)
+ .shadow(color: Color(.Text.black).opacity(0.75), radius: 8, x: 4, y: 8)
+ }
+ }
+ }
+ }
+}
diff --git a/AcaMate/1. View/12. Main/121. Button/SimpleBtnView.swift b/AcaMate/1. View/12. Main/121. Button/SimpleBtnView.swift
new file mode 100644
index 0000000..dae991c
--- /dev/null
+++ b/AcaMate/1. View/12. Main/121. Button/SimpleBtnView.swift
@@ -0,0 +1,45 @@
+//
+// SimpleBtnView.swift
+// AcaMate
+//
+// Created by TAnine on 2/4/25.
+//
+
+import SwiftUI
+
+struct SimpleBtnView: View {
+ let title: String?
+ let image: Image?
+ let font: Font?
+ let width: CGFloat
+ let height: CGFloat
+
+ let action: VOID_TO_VOID?
+
+
+ var body: some View {
+ Button{
+ guard let action = action else { return }
+ action()
+ } label: {
+ if let title = title, let font = font {
+ Text("\(title)")
+ .font(font)
+ .tint(Color(.Second.dark))
+ .frame(width: width, height: height)
+ }
+ else if let image = image {
+ image
+ .resizable()
+ .frame(width: width, height: height)
+ }
+ }
+ }
+}
+
+#Preview {
+ SimpleBtnView(title: "체크 합니다", image: Image(.BottomBar.home),
+ font: .nps(font: .bold, size: 12),
+ width: 40, height: 40,
+ action: nil)
+}
diff --git a/AcaMate/1. View/12. Main/BottomView.swift b/AcaMate/1. View/12. Main/BottomView.swift
new file mode 100644
index 0000000..72c9e42
--- /dev/null
+++ b/AcaMate/1. View/12. Main/BottomView.swift
@@ -0,0 +1,79 @@
+//
+// BottomView.swift
+// AcaMate
+//
+// Created by TAnine on 2/4/25.
+//
+
+import SwiftUI
+
+struct BottomView: View {
+ @State private var isHomeSelected: Bool = true
+ @State private var isManagementSelected: Bool = false
+ @State private var isChattingSelected: Bool = false
+ @State private var isCalendarSelected: Bool = false
+ @State private var isEtcSelected: Bool = false
+
+ var body: some View {
+ HStack(spacing: 0){
+ Spacer(minLength: 1)
+ CircleBtnView(title: "홈", image: Image(.BottomBar.home),
+ isSelected: $isHomeSelected, isReverse: false,
+ action: {
+ btnAllFalse()
+ isHomeSelected.toggle()
+ })
+ Spacer(minLength: 1)
+
+ CircleBtnView(title: "학습 관리", image: Image(.BottomBar.management),
+ isSelected: $isManagementSelected, isReverse: false,
+ action: {
+ btnAllFalse()
+ isManagementSelected.toggle()
+ })
+ Spacer(minLength: 1)
+ CircleBtnView(title: "채팅", image: Image(.BottomBar.chatting),
+ isSelected: $isChattingSelected, isReverse: false,
+ action: {
+ btnAllFalse()
+ isChattingSelected.toggle()
+ })
+ Spacer(minLength: 1)
+ CircleBtnView(title: "일정", image: Image(.BottomBar.calendar),
+ isSelected: $isCalendarSelected, isReverse: false,
+ action: {
+ btnAllFalse()
+ isCalendarSelected.toggle()
+ })
+ Spacer(minLength: 1)
+ CircleBtnView(title: "더보기", image: Image(.BottomBar.etc),
+ isSelected: $isEtcSelected, isReverse: false,
+ action: {
+ btnAllFalse()
+ isEtcSelected.toggle()
+ })
+ Spacer(minLength: 1)
+ }
+ .padding([.top],12)
+ .background {
+ Rectangle()
+ .foregroundStyle(Color(.Normal.dark))
+ .ignoresSafeArea(edges: .bottom)
+ }
+ .frame(maxWidth: .infinity)
+
+
+ }
+
+ private func btnAllFalse() {
+ isHomeSelected = false
+ isManagementSelected = false
+ isChattingSelected = false
+ isCalendarSelected = false
+ isEtcSelected = false
+ }
+}
+
+#Preview {
+ BottomView()
+}
diff --git a/AcaMate/1. View/12. Main/MainView.swift b/AcaMate/1. View/12. Main/MainView.swift
new file mode 100644
index 0000000..42b7453
--- /dev/null
+++ b/AcaMate/1. View/12. Main/MainView.swift
@@ -0,0 +1,34 @@
+//
+// MainView.swift
+// AcaMate
+//
+// Created by TAnine on 2/4/25.
+//
+
+import SwiftUI
+import Combine
+
+struct MainView: View {
+ @EnvironmentObject var alertController: AlertController
+ @State var cancellables: Set = []
+ @Binding var naviState : NaviState
+
+ var body: some View {
+ VStack(spacing: 0) {
+ TopView(titleName: "Name")
+
+ Spacer()
+
+ BottomView()
+ .frame(maxWidth: .infinity)
+
+// .backgroundStyle(Color(.Normal.dark))
+// .safeAreaInset(edge: .bottom, spacing: 0) {
+// Color(.Normal.dark)
+//// .frame(height: 0)
+// }
+ }
+// .fullDrawView(Color(.Normal.dark))
+ }
+}
+
diff --git a/AcaMate/1. View/12. Main/TopView.swift b/AcaMate/1. View/12. Main/TopView.swift
new file mode 100644
index 0000000..aee8b74
--- /dev/null
+++ b/AcaMate/1. View/12. Main/TopView.swift
@@ -0,0 +1,43 @@
+//
+// TopView.swift
+// AcaMate
+//
+// Created by TAnine on 2/4/25.
+//
+
+import SwiftUI
+
+struct TopView: View {
+ @State var titleName: String = ""
+
+ var body: some View {
+ HStack(alignment: .center, spacing: 0) {
+ SimpleBtnView(title: nil, image: Image(.TopBar.face), font: nil, width: 40, height: 40, action: {
+
+ })
+ .padding(EdgeInsets(top: 12, leading: 24, bottom: 12, trailing: 12))
+
+ Text("\(titleName)")
+ .tint(Color(.Text.disabled))
+ .font(.nps(font: .bold, size: 20))
+ Spacer()
+
+ SimpleBtnView(title: nil, image: Image(.TopBar.face), font: nil, width: 40, height: 40, action: {
+
+ })
+ .hidden()
+
+ }
+ .background {
+ Rectangle()
+ .foregroundStyle(Color(.Other.cell))
+ .ignoresSafeArea(edges: .top)
+ }
+ .frame(maxWidth: .infinity)
+
+ }
+}
+
+#Preview {
+ TopView(titleName: "Name")
+}
diff --git a/AcaMate/2. Common/SwiftUI_Prefix.swift b/AcaMate/2. Common/SwiftUI_Prefix.swift
index b84cff5..2c388b4 100644
--- a/AcaMate/2. Common/SwiftUI_Prefix.swift
+++ b/AcaMate/2. Common/SwiftUI_Prefix.swift
@@ -16,6 +16,7 @@ public let API_URL: String = "https://acamate.ipstein.myds.me"
// MARK: - TYPEALIAS
typealias VOID_TO_VOID = () -> ()
+
// MARK: - VARIABLE
public var APPSTORE_URL = "https://itunes.apple.com/app/"
public var KEYBOARD_UP_HEIGHT: CGFloat = 46.0
diff --git a/AcaMate/5. Modifier/View.swift b/AcaMate/5. Modifier/View.swift
index 89b8997..f5a7b1c 100644
--- a/AcaMate/5. Modifier/View.swift
+++ b/AcaMate/5. Modifier/View.swift
@@ -46,7 +46,8 @@ struct AlertModifier: ViewModifier {
}
extension View {
- func fullView(_ backColor: Color) -> some View {
+ /// View에 전체적으로 색 입히기
+ func fullDrawView(_ backColor: Color) -> some View {
return self
.frame(maxWidth: .infinity, maxHeight: .infinity)
.background(backColor)
@@ -68,4 +69,14 @@ extension View {
.navigationBarBackButtonHidden(true)
.toolbar(.hidden, for: .navigationBar)
}
+
+ func innerShadow (shape: S, color: Color, lineWidth: CGFloat = 6, blur: CGFloat, x: CGFloat, y: CGFloat) -> some View {
+ return self.overlay {
+ shape
+ .stroke(color, lineWidth: lineWidth)
+ .offset(x: x, y: y)
+ .blur(radius: blur)
+ .mask(shape.fill(LinearGradient(gradient: Gradient(colors: [.black, .clear]), startPoint: .topLeading, endPoint: .bottomTrailing)))
+ }
+ }
}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Calendar.imageset/Calendar.png b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Calendar.imageset/Calendar.png
new file mode 100644
index 0000000..17b4f33
Binary files /dev/null and b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Calendar.imageset/Calendar.png differ
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Calendar.imageset/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Calendar.imageset/Contents.json
new file mode 100644
index 0000000..71e4791
--- /dev/null
+++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Calendar.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "Calendar.png",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Chatting.imageset/Chatting.png b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Chatting.imageset/Chatting.png
new file mode 100644
index 0000000..e6f9671
Binary files /dev/null and b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Chatting.imageset/Chatting.png differ
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Chatting.imageset/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Chatting.imageset/Contents.json
new file mode 100644
index 0000000..62dd517
--- /dev/null
+++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Chatting.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "Chatting.png",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Contents.json
new file mode 100644
index 0000000..6e96565
--- /dev/null
+++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Contents.json
@@ -0,0 +1,9 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "properties" : {
+ "provides-namespace" : true
+ }
+}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Etc.imageset/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Etc.imageset/Contents.json
new file mode 100644
index 0000000..4e58ea0
--- /dev/null
+++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Etc.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "Etc.png",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Etc.imageset/Etc.png b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Etc.imageset/Etc.png
new file mode 100644
index 0000000..4842ed5
Binary files /dev/null and b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Etc.imageset/Etc.png differ
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Home.imageset/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Home.imageset/Contents.json
new file mode 100644
index 0000000..92754fa
--- /dev/null
+++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Home.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "Home.png",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Home.imageset/Home.png b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Home.imageset/Home.png
new file mode 100644
index 0000000..b5b2daa
Binary files /dev/null and b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Home.imageset/Home.png differ
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Management.imageset/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Management.imageset/Contents.json
new file mode 100644
index 0000000..2061f1b
--- /dev/null
+++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Management.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "Management.png",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Management.imageset/Management.png b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Management.imageset/Management.png
new file mode 100644
index 0000000..fdb724b
Binary files /dev/null and b/AcaMate/6. Resources/Assets.xcassets/Image Folder/BottomBar/Management.imageset/Management.png differ
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Back.imageset/Back.png b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Back.imageset/Back.png
new file mode 100644
index 0000000..e0e5fa4
Binary files /dev/null and b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Back.imageset/Back.png differ
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Back.imageset/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Back.imageset/Contents.json
new file mode 100644
index 0000000..7731df3
--- /dev/null
+++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Back.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "Back.png",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Contents.json
new file mode 100644
index 0000000..6e96565
--- /dev/null
+++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Contents.json
@@ -0,0 +1,9 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ },
+ "properties" : {
+ "provides-namespace" : true
+ }
+}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Edit.imageset/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Edit.imageset/Contents.json
new file mode 100644
index 0000000..39f0462
--- /dev/null
+++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Edit.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "Edit.png",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Edit.imageset/Edit.png b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Edit.imageset/Edit.png
new file mode 100644
index 0000000..45cec8c
Binary files /dev/null and b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Edit.imageset/Edit.png differ
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Face.imageset/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Face.imageset/Contents.json
new file mode 100644
index 0000000..04b803f
--- /dev/null
+++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Face.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "Face.png",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Face.imageset/Face.png b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Face.imageset/Face.png
new file mode 100644
index 0000000..1e1f225
Binary files /dev/null and b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Face.imageset/Face.png differ
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Market.imageset/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Market.imageset/Contents.json
new file mode 100644
index 0000000..d60e6f5
--- /dev/null
+++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Market.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "Market.png",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Market.imageset/Market.png b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Market.imageset/Market.png
new file mode 100644
index 0000000..65c9d0a
Binary files /dev/null and b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Market.imageset/Market.png differ
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Person.imageset/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Person.imageset/Contents.json
new file mode 100644
index 0000000..d2ba7bf
--- /dev/null
+++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Person.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "Person.png",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Person.imageset/Person.png b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Person.imageset/Person.png
new file mode 100644
index 0000000..11d4da1
Binary files /dev/null and b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Person.imageset/Person.png differ
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Plus.imageset/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Plus.imageset/Contents.json
new file mode 100644
index 0000000..8517f1f
--- /dev/null
+++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Plus.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "Plus.png",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Plus.imageset/Plus.png b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Plus.imageset/Plus.png
new file mode 100644
index 0000000..c139f41
Binary files /dev/null and b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Plus.imageset/Plus.png differ
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Save.imageset/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Save.imageset/Contents.json
new file mode 100644
index 0000000..f69137d
--- /dev/null
+++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Save.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "Save.png",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Save.imageset/Save.png b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Save.imageset/Save.png
new file mode 100644
index 0000000..d0934d3
Binary files /dev/null and b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Save.imageset/Save.png differ
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Setting.imageset/Contents.json b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Setting.imageset/Contents.json
new file mode 100644
index 0000000..af49693
--- /dev/null
+++ b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Setting.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "Setting.png",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Setting.imageset/Setting.png b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Setting.imageset/Setting.png
new file mode 100644
index 0000000..067e9d3
Binary files /dev/null and b/AcaMate/6. Resources/Assets.xcassets/Image Folder/TopBar/Setting.imageset/Setting.png differ
diff --git a/AcaMate/6. Resources/Images/BottomBar/Calendar.png b/AcaMate/6. Resources/Images/BottomBar/Calendar.png
new file mode 100644
index 0000000..17b4f33
Binary files /dev/null and b/AcaMate/6. Resources/Images/BottomBar/Calendar.png differ
diff --git a/AcaMate/6. Resources/Images/BottomBar/Chatting.png b/AcaMate/6. Resources/Images/BottomBar/Chatting.png
new file mode 100644
index 0000000..e6f9671
Binary files /dev/null and b/AcaMate/6. Resources/Images/BottomBar/Chatting.png differ
diff --git a/AcaMate/6. Resources/Images/BottomBar/Etc.png b/AcaMate/6. Resources/Images/BottomBar/Etc.png
new file mode 100644
index 0000000..4842ed5
Binary files /dev/null and b/AcaMate/6. Resources/Images/BottomBar/Etc.png differ
diff --git a/AcaMate/6. Resources/Images/BottomBar/Home.png b/AcaMate/6. Resources/Images/BottomBar/Home.png
new file mode 100644
index 0000000..b5b2daa
Binary files /dev/null and b/AcaMate/6. Resources/Images/BottomBar/Home.png differ
diff --git a/AcaMate/6. Resources/Images/BottomBar/Management.png b/AcaMate/6. Resources/Images/BottomBar/Management.png
new file mode 100644
index 0000000..fdb724b
Binary files /dev/null and b/AcaMate/6. Resources/Images/BottomBar/Management.png differ
diff --git a/AcaMate/6. Resources/Images/TopBar/Back.png b/AcaMate/6. Resources/Images/TopBar/Back.png
new file mode 100644
index 0000000..e0e5fa4
Binary files /dev/null and b/AcaMate/6. Resources/Images/TopBar/Back.png differ
diff --git a/AcaMate/6. Resources/Images/TopBar/Edit.png b/AcaMate/6. Resources/Images/TopBar/Edit.png
new file mode 100644
index 0000000..45cec8c
Binary files /dev/null and b/AcaMate/6. Resources/Images/TopBar/Edit.png differ
diff --git a/AcaMate/6. Resources/Images/TopBar/Face.png b/AcaMate/6. Resources/Images/TopBar/Face.png
new file mode 100644
index 0000000..1e1f225
Binary files /dev/null and b/AcaMate/6. Resources/Images/TopBar/Face.png differ
diff --git a/AcaMate/6. Resources/Images/TopBar/Market.png b/AcaMate/6. Resources/Images/TopBar/Market.png
new file mode 100644
index 0000000..65c9d0a
Binary files /dev/null and b/AcaMate/6. Resources/Images/TopBar/Market.png differ
diff --git a/AcaMate/6. Resources/Images/TopBar/Person.png b/AcaMate/6. Resources/Images/TopBar/Person.png
new file mode 100644
index 0000000..11d4da1
Binary files /dev/null and b/AcaMate/6. Resources/Images/TopBar/Person.png differ
diff --git a/AcaMate/6. Resources/Images/TopBar/Plus.png b/AcaMate/6. Resources/Images/TopBar/Plus.png
new file mode 100644
index 0000000..c139f41
Binary files /dev/null and b/AcaMate/6. Resources/Images/TopBar/Plus.png differ
diff --git a/AcaMate/6. Resources/Images/TopBar/Save.png b/AcaMate/6. Resources/Images/TopBar/Save.png
new file mode 100644
index 0000000..d0934d3
Binary files /dev/null and b/AcaMate/6. Resources/Images/TopBar/Save.png differ
diff --git a/AcaMate/6. Resources/Images/TopBar/Setting.png b/AcaMate/6. Resources/Images/TopBar/Setting.png
new file mode 100644
index 0000000..067e9d3
Binary files /dev/null and b/AcaMate/6. Resources/Images/TopBar/Setting.png differ