diff --git a/Projects/Features/HomeFeature/Sources/HomeView.swift b/Projects/Features/HomeFeature/Sources/HomeView.swift index af4c3d57..4c96ecb4 100644 --- a/Projects/Features/HomeFeature/Sources/HomeView.swift +++ b/Projects/Features/HomeFeature/Sources/HomeView.swift @@ -44,14 +44,18 @@ struct HomeView: View { } label: { NoticeView() } + .animation( + .easeIn(duration: 1.5), + value: viewModel.isExistNewNotice + ) } Text("오늘의 급식") .dmsFont(.title(.title1), color: .GrayScale.gray7) - .padding(.top, viewModel.isExistNewNotice ? 16 : 46) + .padding(.top, viewModel.isExistNewNotice ? 10 : 46) selectDateView() - .padding(.top, 24) + .padding(.top, 15) MealCarouselView( meal: viewModel.selectedDateMeal, diff --git a/Projects/Features/HomeFeature/Sources/HomeViewModel.swift b/Projects/Features/HomeFeature/Sources/HomeViewModel.swift index 4a9bbd89..63a6c45d 100644 --- a/Projects/Features/HomeFeature/Sources/HomeViewModel.swift +++ b/Projects/Features/HomeFeature/Sources/HomeViewModel.swift @@ -4,10 +4,11 @@ import DomainModule import ErrorModule import Foundation import Utility +import SwiftUI final class HomeViewModel: BaseViewModel { @Published var selectedDate = Date() - @Published var isExistNewNotice = true + @Published var isExistNewNotice = false @Published var meals: [String: MealEntity] = [:] @Published var prevMonth = Date().month var selectedDateString: String { @@ -36,7 +37,11 @@ final class HomeViewModel: BaseViewModel { func onAppear() { addCancellable(fetchWhetherNewNoticeUseCase.execute()) { [weak self] isExistNewNotice in - self?.isExistNewNotice = isExistNewNotice + DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) { + withAnimation { + self?.isExistNewNotice = isExistNewNotice + } + } } } diff --git a/Projects/Features/SignupFeature/Sources/SchoolCode/SchoolCodeView.swift b/Projects/Features/SignupFeature/Sources/SchoolCode/SchoolCodeView.swift index 964ae943..70e3a1bd 100644 --- a/Projects/Features/SignupFeature/Sources/SchoolCode/SchoolCodeView.swift +++ b/Projects/Features/SignupFeature/Sources/SchoolCode/SchoolCodeView.swift @@ -22,7 +22,7 @@ struct SchoolCodeView: View { VStack(spacing: 24) { DMSPassCodeView(codeCount: 8, text: $viewModel.schoolCode) - Text(viewModel.isErrorOcuured ? viewModel.errorMessage : "이메일로 전송된 인증코드 8자리를 입력해주세요.") + Text(viewModel.isErrorOcuured ? viewModel.errorMessage : "소속된 학교의 인증코드 8자리를 입력해주세요.") .dmsFont(.body(.body3), color: viewModel.isErrorOcuured ? .System.error : .GrayScale.gray5) } .padding(.top, 56) diff --git "a/\353\214\200\353\215\225\354\206\214\355\224\204\355\212\270\354\233\250\354\226\264\353\247\210\354\235\264\354\212\244\355\204\260\352\263\240\353\223\261\355\225\231\352\265\220_\354\236\224\353\245\230_\354\213\240\354\262\255\352\262\260\352\263\274_20230306.xlsx" "b/\353\214\200\353\215\225\354\206\214\355\224\204\355\212\270\354\233\250\354\226\264\353\247\210\354\235\264\354\212\244\355\204\260\352\263\240\353\223\261\355\225\231\352\265\220_\354\236\224\353\245\230_\354\213\240\354\262\255\352\262\260\352\263\274_20230306.xlsx" new file mode 100644 index 00000000..1310dcc5 Binary files /dev/null and "b/\353\214\200\353\215\225\354\206\214\355\224\204\355\212\270\354\233\250\354\226\264\353\247\210\354\235\264\354\212\244\355\204\260\352\263\240\353\223\261\355\225\231\352\265\220_\354\236\224\353\245\230_\354\213\240\354\262\255\352\262\260\352\263\274_20230306.xlsx" differ