diff --git a/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/tanine.xcuserdatad/UserInterfaceState.xcuserstate b/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/tanine.xcuserdatad/UserInterfaceState.xcuserstate index 76e83cb..70a1d78 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/1. View/11. Intro & Login/IntroView.swift b/AcaMate/1. View/11. Intro & Login/IntroView.swift index 89c39c3..e4f665f 100644 --- a/AcaMate/1. View/11. Intro & Login/IntroView.swift +++ b/AcaMate/1. View/11. Intro & Login/IntroView.swift @@ -22,7 +22,7 @@ struct IntroView: View { VStack(spacing: 0) { Spacer() .frame(height: 100) - Image(.Logo.appIcon) + Image(.Logo.crystalIcon) .resizable() .frame(width: 200, height: 200) Spacer() diff --git a/AcaMate/1. View/11. Intro & Login/LoginView.swift b/AcaMate/1. View/11. Intro & Login/LoginView.swift index 5fca873..fb9a23c 100644 --- a/AcaMate/1. View/11. Intro & Login/LoginView.swift +++ b/AcaMate/1. View/11. Intro & Login/LoginView.swift @@ -21,7 +21,7 @@ struct LoginView: View { var body: some View { VStack(spacing: 0) { Spacer().frame(height: 100) - Image(.Logo.appIcon) + Image(.Logo.crystalIcon) .resizable() .frame(width: 200, height: 200) // .padding(.top, 80) diff --git a/AcaMate/3. ViewModel/ChatViewModel.swift b/AcaMate/3. ViewModel/ChatViewModel.swift index 8ee5ad9..49c5241 100644 --- a/AcaMate/3. ViewModel/ChatViewModel.swift +++ b/AcaMate/3. ViewModel/ChatViewModel.swift @@ -10,9 +10,9 @@ class ChatViewModel: ObservableObject { private let appVM: AppViewModel @Published var messages: [ChatMesage] = [] + init(_ appVM: AppViewModel) { self.appVM = appVM } - } diff --git a/AcaMate/3. ViewModel/LoginViewModel.swift b/AcaMate/3. ViewModel/LoginViewModel.swift index 9901143..e60788a 100644 --- a/AcaMate/3. ViewModel/LoginViewModel.swift +++ b/AcaMate/3. ViewModel/LoginViewModel.swift @@ -13,8 +13,8 @@ class LoginViewModel: ObservableObject { private var cancellables = Set() -// @Published var toggleLoading: Bool = false -// @Published var pathName: PathName = .NONE + // @Published var toggleLoading: Bool = false + // @Published var pathName: PathName = .NONE @UserDefault(key: "token", defaultValue: "accToken") var accToken @UserDefault(key: "refresh", defaultValue: "refreshToken") var refresh @@ -34,13 +34,14 @@ class LoginViewModel: ObservableObject { let acctype: String = type == .Apple ? "ST00": (type == .Kakao ? "ST01" : "ST02") LoginController().login(type, devId) .flatMap{ snsId in - self.appVM.apiManager.loadAPIData(APIRequest(path: "/api/v1/in/user/login", - headers: [API_HEADER : self.headerValue], - parameters: [ - "acctype": acctype, - "snsId": "\(snsId.snsId)" - ], - decoding: APIResponse.self)) + self.appVM.apiManager.loadAPIData( + APIRequest(path: "/api/v1/in/user/login", + headers: [API_HEADER : self.headerValue], + parameters: [ + "acctype": acctype, + "snsId": "\(snsId.snsId)" + ], + decoding: APIResponse.self)) .map { response in return (snsId: snsId.snsId, response: response) } @@ -63,7 +64,7 @@ class LoginViewModel: ObservableObject { if code == "000" { if let data = response.response.data, let accToken = data.token, - let refresh = data.refresh { + let refresh = data.refresh { printLog(accToken) printLog(refresh) diff --git a/AcaMate/3. ViewModel/TopViewModel.swift b/AcaMate/3. ViewModel/TopViewModel.swift index 7a84292..963fe8b 100644 --- a/AcaMate/3. ViewModel/TopViewModel.swift +++ b/AcaMate/3. ViewModel/TopViewModel.swift @@ -40,4 +40,5 @@ class TopViewModel: ObservableObject { } btnVM.setAction(for: rightBtnID, newAction: action) } +// 여기에 프린트 문만 찍어줘 } diff --git a/AcaMate/LaunchScreen.storyboard b/AcaMate/LaunchScreen.storyboard index a412ffc..8171429 100644 --- a/AcaMate/LaunchScreen.storyboard +++ b/AcaMate/LaunchScreen.storyboard @@ -54,7 +54,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/AcaMate/Resources/Assets.xcassets/AppIcon.appiconset/LOGO 1.png b/AcaMate/Resources/Assets.xcassets/AppIcon.appiconset/LOGO 1.png index 38f90a2..0ed3dfc 100644 Binary files a/AcaMate/Resources/Assets.xcassets/AppIcon.appiconset/LOGO 1.png and b/AcaMate/Resources/Assets.xcassets/AppIcon.appiconset/LOGO 1.png differ diff --git a/AcaMate/Resources/Assets.xcassets/AppIcon.appiconset/LOGO 2.png b/AcaMate/Resources/Assets.xcassets/AppIcon.appiconset/LOGO 2.png index 38f90a2..0ed3dfc 100644 Binary files a/AcaMate/Resources/Assets.xcassets/AppIcon.appiconset/LOGO 2.png and b/AcaMate/Resources/Assets.xcassets/AppIcon.appiconset/LOGO 2.png differ diff --git a/AcaMate/Resources/Assets.xcassets/AppIcon.appiconset/LOGO.png b/AcaMate/Resources/Assets.xcassets/AppIcon.appiconset/LOGO.png index 38f90a2..0ed3dfc 100644 Binary files a/AcaMate/Resources/Assets.xcassets/AppIcon.appiconset/LOGO.png and b/AcaMate/Resources/Assets.xcassets/AppIcon.appiconset/LOGO.png differ diff --git a/AcaMate/Resources/Assets.xcassets/Color Folder.zip b/AcaMate/Resources/Assets.xcassets/Color Folder.zip new file mode 100644 index 0000000..e4b332d Binary files /dev/null and b/AcaMate/Resources/Assets.xcassets/Color Folder.zip differ diff --git a/AcaMate/Resources/Assets.xcassets/Image Folder/Logo/Crystal_Icon.imageset/Contents.json b/AcaMate/Resources/Assets.xcassets/Image Folder/Logo/Crystal_Icon.imageset/Contents.json new file mode 100644 index 0000000..c603ce8 --- /dev/null +++ b/AcaMate/Resources/Assets.xcassets/Image Folder/Logo/Crystal_Icon.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "LogoImage.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/AcaMate/Resources/Assets.xcassets/Image Folder/Logo/Crystal_Icon.imageset/LogoImage.png b/AcaMate/Resources/Assets.xcassets/Image Folder/Logo/Crystal_Icon.imageset/LogoImage.png new file mode 100644 index 0000000..f0762e3 Binary files /dev/null and b/AcaMate/Resources/Assets.xcassets/Image Folder/Logo/Crystal_Icon.imageset/LogoImage.png differ diff --git a/AcaMate/Resources/Assets.xcassets/Image Folder/Logo/Logo.imageset/LOGO.png b/AcaMate/Resources/Assets.xcassets/Image Folder/Logo/Logo.imageset/LOGO.png index 38f90a2..0ed3dfc 100644 Binary files a/AcaMate/Resources/Assets.xcassets/Image Folder/Logo/Logo.imageset/LOGO.png and b/AcaMate/Resources/Assets.xcassets/Image Folder/Logo/Logo.imageset/LOGO.png differ diff --git a/AcaMate/Resources/Images/Logo/Crystal_Icon.png b/AcaMate/Resources/Images/Logo/Crystal_Icon.png new file mode 100644 index 0000000..f0762e3 Binary files /dev/null and b/AcaMate/Resources/Images/Logo/Crystal_Icon.png differ diff --git a/AcaMate/Resources/Images/Logo/LOGO.png b/AcaMate/Resources/Images/Logo/LOGO.png index 38f90a2..0ed3dfc 100644 Binary files a/AcaMate/Resources/Images/Logo/LOGO.png and b/AcaMate/Resources/Images/Logo/LOGO.png differ diff --git a/AcaMate/Resources/Images/Logo/OldLogo.png b/AcaMate/Resources/Images/Logo/OldLogo.png new file mode 100644 index 0000000..38f90a2 Binary files /dev/null and b/AcaMate/Resources/Images/Logo/OldLogo.png differ