From 4c7be36300fb4f78d908bb02a6b6e3b4f1d0004d Mon Sep 17 00:00:00 2001 From: "hsj._.06" Date: Mon, 6 Mar 2023 21:37:08 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix=20::=20=ED=95=99=EA=B5=90=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=9E=85=EB=A0=A5=20=EC=84=A4=EB=AA=85=EB=9E=80=20?= =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/SchoolCode/SchoolCodeView.swift | 2 +- ...62\255\352\262\260\352\263\274_20230306.xlsx" | Bin 0 -> 4295 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 "\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" 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 0000000000000000000000000000000000000000..1310dcc55e703c74e4d2b39110a7f4f6f3945d45 GIT binary patch literal 4295 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 Date: Mon, 6 Mar 2023 23:08:14 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat=20::=20new=20Notice=20=EC=9E=88?= =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4?= =?UTF-8?q?=EC=85=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Projects/Features/HomeFeature/Sources/HomeView.swift | 10 ++++++++-- .../Features/HomeFeature/Sources/HomeViewModel.swift | 9 +++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Projects/Features/HomeFeature/Sources/HomeView.swift b/Projects/Features/HomeFeature/Sources/HomeView.swift index af4c3d57..1721fc1c 100644 --- a/Projects/Features/HomeFeature/Sources/HomeView.swift +++ b/Projects/Features/HomeFeature/Sources/HomeView.swift @@ -44,14 +44,20 @@ struct HomeView: View { } label: { NoticeView() } + .offset(x: viewModel.isExistNewNotice ? 0 : 50) + .opacity(viewModel.isExistNewNotice ? 1 : 0) + .animation( + .easeInOut(duration: 1), + 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 + } + } } } From 6dba742ec8ca48be262877b7ab737efc92377c2b Mon Sep 17 00:00:00 2001 From: "hsj._.06" Date: Mon, 6 Mar 2023 23:36:14 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix=20::=20=EC=95=A0=EB=8B=88=EB=A9=94?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Projects/Features/HomeFeature/Sources/HomeView.swift | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Projects/Features/HomeFeature/Sources/HomeView.swift b/Projects/Features/HomeFeature/Sources/HomeView.swift index 1721fc1c..4c96ecb4 100644 --- a/Projects/Features/HomeFeature/Sources/HomeView.swift +++ b/Projects/Features/HomeFeature/Sources/HomeView.swift @@ -44,10 +44,8 @@ struct HomeView: View { } label: { NoticeView() } - .offset(x: viewModel.isExistNewNotice ? 0 : 50) - .opacity(viewModel.isExistNewNotice ? 1 : 0) .animation( - .easeInOut(duration: 1), + .easeIn(duration: 1.5), value: viewModel.isExistNewNotice ) }