diff --git a/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/tanine.xcuserdatad/UserInterfaceState.xcuserstate b/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/tanine.xcuserdatad/UserInterfaceState.xcuserstate
index f02fd9f..76e83cb 100644
Binary files a/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/tanine.xcuserdatad/UserInterfaceState.xcuserstate 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
index 94bccea..1bf677d 100644
--- a/AcaMate.xcodeproj/xcuserdata/tanine.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/AcaMate.xcodeproj/xcuserdata/tanine.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -3,114 +3,4 @@
uuid = "800DD51A-C089-4DC4-AE55-7F5ABD5C0AE7"
type = "1"
version = "2.0">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/AcaMate/1. View/11. Intro & Login/LoginView.swift b/AcaMate/1. View/11. Intro & Login/LoginView.swift
index 45852ab..5fca873 100644
--- a/AcaMate/1. View/11. Intro & Login/LoginView.swift
+++ b/AcaMate/1. View/11. Intro & Login/LoginView.swift
@@ -59,7 +59,7 @@ struct LoginView: View {
.background {
RoundedRectangle(cornerRadius: 24)
.foregroundStyle(Color(.Normal.light))
- }.clipped()
+ }
Button {
// loginVM.toggleLoading = true
loginVM.loginAction(type: .Dev)
diff --git a/AcaMate/1. View/11. Intro & Login/SelectAcademyView.swift b/AcaMate/1. View/11. Intro & Login/SelectAcademyView.swift
index dab8784..6ef0e6d 100644
--- a/AcaMate/1. View/11. Intro & Login/SelectAcademyView.swift
+++ b/AcaMate/1. View/11. Intro & Login/SelectAcademyView.swift
@@ -27,6 +27,11 @@ struct SelectAcademyView: View {
.frame(width: 200, height: 200)
VStack(spacing: 4) {
+ Button {
+ vm.moveChatting()
+ } label: {
+ Text("채팅 진입")
+ }
HStack(spacing: 0){
Text("학원 코드")
.font(.nps(font: .bold, size: 16))
@@ -45,6 +50,7 @@ struct SelectAcademyView: View {
RoundedRectangle(cornerRadius: 24)
.foregroundStyle(Color(.Normal.light))
}
+ .clipped()
}
.padding(EdgeInsets(top: 12, leading: 24, bottom: 40, trailing: 24))
diff --git a/AcaMate/1. View/12. Main/123. Chatting/ChattingView.swift b/AcaMate/1. View/12. Main/123. Chatting/ChattingView.swift
index e4548ae..76f97e5 100644
--- a/AcaMate/1. View/12. Main/123. Chatting/ChattingView.swift
+++ b/AcaMate/1. View/12. Main/123. Chatting/ChattingView.swift
@@ -10,12 +10,19 @@ import SwiftUI
struct ChattingView: View {
@StateObject private var topVM = TopViewModel()
@StateObject private var btnVM = ButtonViewModel()
+ @StateObject private var vm: ChatViewModel
@State private var scrollOffset: CGPoint = .zero
@State private var leftBtnID = UUID()
@State private var rightBtnID = UUID()
+
+ init(_ appVM: AppViewModel, _ myType: Binding) {
+ _vm = StateObject(wrappedValue: ChatViewModel(appVM))
+ _myType = myType
+ }
+
let classList = [
SummaryChat(id: "00", chatName: "Class 101", teacherName: "홍길동",
lastMessage: "여기에는 채팅이 나올 예정입니다. 2줄 정도로 나올 예정이며 끝자리는 잘려서 나올 것 입니다. 이정도의 채팅으로는 택도 없어서 조금 더 길게 길게 작성을 해봅니다.",
@@ -125,10 +132,11 @@ struct ChattingView: View {
topVM.setLeftBtn(text: "\(myType.rawValue)", font: .nps(font: .bold, size: 24),
size: CGPoint(x: 40, y: 40), action: leftAct)
}
- topVM.setRightBtn(size: CGPoint(x: 40, y: 40), action: rightAct)
+ topVM.setRightBtn(Image(.Icon.plus), size: CGPoint(x: 40, y: 40), action: rightAct)
btnVM.setImage(for: leftBtnID, newImage: Image(.Icon.left))
btnVM.setImage(for: rightBtnID, newImage: Image(.Icon.right))
+
btnVM.setSize(for: leftBtnID, newWidth: 24, newHeight: 24)
btnVM.setSize(for: rightBtnID, newWidth: 24, newHeight: 24)
}
diff --git a/AcaMate/1. View/12. Main/MainView.swift b/AcaMate/1. View/12. Main/MainView.swift
index 231b6c8..aae081f 100644
--- a/AcaMate/1. View/12. Main/MainView.swift
+++ b/AcaMate/1. View/12. Main/MainView.swift
@@ -25,7 +25,7 @@ struct MainView: View {
case .Management:
ManagementView()
case .Chatting:
- ChattingView(myType: $myType)
+ ChattingView(appVM, $myType)
case .Calendar:
CalendarView()
case .Etc:
diff --git a/AcaMate/3. ViewModel/ChatViewModel.swift b/AcaMate/3. ViewModel/ChatViewModel.swift
index edeea55..8ee5ad9 100644
--- a/AcaMate/3. ViewModel/ChatViewModel.swift
+++ b/AcaMate/3. ViewModel/ChatViewModel.swift
@@ -6,10 +6,6 @@
//
import SwiftUI
-final class ChatVM: ObservableObject {
- @Published var vm: ChatViewModel?
-}
-
class ChatViewModel: ObservableObject {
private let appVM: AppViewModel
diff --git a/AcaMate/3. ViewModel/SelectAcademyViewModel.swift b/AcaMate/3. ViewModel/SelectAcademyViewModel.swift
index 5d7ce85..e2c470c 100644
--- a/AcaMate/3. ViewModel/SelectAcademyViewModel.swift
+++ b/AcaMate/3. ViewModel/SelectAcademyViewModel.swift
@@ -20,6 +20,11 @@ class SelectAcademyViewModel: ObservableObject {
@Published var academyList: [AcademyName] = []
@Published var selectNum: Int = -1
+ func moveChatting() {
+ appVM.naviState.set(act: .RESET, path: .Main)
+ }
+
+
func loadAcademy() {
@UserDefault(key: "token", defaultValue: "accToken") var token
@UserDefault(key: "refresh", defaultValue: "refreshToken") var refresh
@@ -50,5 +55,8 @@ class SelectAcademyViewModel: ObservableObject {
selectNum = -1
} else {
selectNum = index
- }}
+ }
+ }
+
+
}