From 77192f7cf63eb60fc9be8be8e10e363edcc607e0 Mon Sep 17 00:00:00 2001 From: juyeong525 Date: Fri, 12 May 2023 22:35:46 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E2=99=BB=EF=B8=8F=C2=A0::=20=EC=99=B8?= =?UTF-8?q?=EC=B6=9C=EC=A6=9D=20=ED=8F=B0=ED=8A=B8=20=EC=A7=80=ED=82=B4?= =?UTF-8?q?=EC=9D=B4=20=EC=8C=A4=20=EC=9A=94=EA=B5=AC=EC=82=AC=ED=95=AD?= =?UTF-8?q?=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Scene/OutingPass/Animation/SlidingTextView.swift | 2 +- .../Information/OutingInformationView.swift | 8 ++++---- .../Sources/Scene/OutingPass/OutingPassView.swift | 11 ++++++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Application/Sources/Scene/OutingPass/Animation/SlidingTextView.swift b/Application/Sources/Scene/OutingPass/Animation/SlidingTextView.swift index 3b6ac446..50429d13 100644 --- a/Application/Sources/Scene/OutingPass/Animation/SlidingTextView.swift +++ b/Application/Sources/Scene/OutingPass/Animation/SlidingTextView.swift @@ -19,7 +19,7 @@ struct SlidingTextView: View { .onReceive(timer) { _ in self.animatedSliding.toggle() } - .frame(height: 30) + .frame(height: 20) } } .frame( diff --git a/Application/Sources/Scene/OutingPass/Information/OutingInformationView.swift b/Application/Sources/Scene/OutingPass/Information/OutingInformationView.swift index 52f04c66..ac8f6674 100644 --- a/Application/Sources/Scene/OutingPass/Information/OutingInformationView.swift +++ b/Application/Sources/Scene/OutingPass/Information/OutingInformationView.swift @@ -8,15 +8,15 @@ struct OutingInformationView: View { var content: String var body: some View { - VStack(alignment: .leading, spacing: 8) { + VStack(alignment: .leading, spacing: 6) { Text(title) - .sdText(type: .body3) + .sdText(type: .body1) HStack { Text(content) - .sdText(type: .body2) + .sdText(type: .heading6) Spacer() } - .padding(EdgeInsets(top: 10, leading: 16, bottom: 10, trailing: 0)) + .padding(EdgeInsets(top: 8, leading: 16, bottom: 8, trailing: 0)) .background(Color.GrayScale.gray50) .cornerRadius(8) } diff --git a/Application/Sources/Scene/OutingPass/OutingPassView.swift b/Application/Sources/Scene/OutingPass/OutingPassView.swift index 6215750a..edfc0f0e 100644 --- a/Application/Sources/Scene/OutingPass/OutingPassView.swift +++ b/Application/Sources/Scene/OutingPass/OutingPassView.swift @@ -14,8 +14,8 @@ struct OutingPassView: View { GeometryReader { gemotry in SlidingTextView(geometryProxy: gemotry) } - .frame(height: 30) - .padding(.bottom, 44) + .frame(height: 20) + .padding(.bottom, 20) HStack(alignment: .center) { AsyncImage(url: URL(string: viewModel.outingPassData?.profileFileName ?? "DefaultImage")) { image in image @@ -30,16 +30,17 @@ struct OutingPassView: View { .cornerRadius(30) Spacer().frame(width: 16) Text("\(viewModel.outingPassData?.studentNumber ?? "") \(viewModel.outingPassData?.studentName ?? "")") - .sdText(type: .heading6) + .sdText(type: .heading5) Spacer() } - Spacer().frame(height: 38) + Spacer().frame(height: 18) + OutingInformationView(title: "외출 날짜", content: "2023년 5월 12일") OutingInformationView( title: "외출 시간", content: "\(viewModel.outingPassData?.startTime.toString(format: "HH:mm") ?? "") ~ \(viewModel.outingPassData?.endTime.toString(format: "HH:mm") ?? "")" ) OutingInformationView(title: "사유", content: viewModel.outingPassData?.reason ?? "") - OutingInformationView(title: "확인교사", content: viewModel.outingPassData?.teacherName ?? "") + OutingInformationView(title: "확인교사", content: "\(viewModel.outingPassData?.teacherName ?? "") 선생님") Spacer() GeometryReader { gemotry in SlidingTextView(geometryProxy: gemotry) From 9cddbde886ff284f4ccc2b1dbd45127206f30ed1 Mon Sep 17 00:00:00 2001 From: juyeong525 Date: Fri, 12 May 2023 22:53:35 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=C2=A0::=20OutingPassEnti?= =?UTF-8?q?ty=EC=97=90=20picnicDate=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PickService/Sources/Domain/Entity/OutingPassEntity.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Services/PickService/Sources/Domain/Entity/OutingPassEntity.swift b/Services/PickService/Sources/Domain/Entity/OutingPassEntity.swift index 73b05202..ccd5fe4b 100644 --- a/Services/PickService/Sources/Domain/Entity/OutingPassEntity.swift +++ b/Services/PickService/Sources/Domain/Entity/OutingPassEntity.swift @@ -8,6 +8,7 @@ public struct OutingPassEntity: Equatable { public let endTime: Date public let reason: String public let teacherName: String + public let picnicDate: Date public init( profileFileName: String, @@ -16,7 +17,8 @@ public struct OutingPassEntity: Equatable { startTime: Date, endTime: Date, reason: String, - teacherName: String + teacherName: String, + picnicDate: Date ) { self.profileFileName = profileFileName self.studentNumber = studentNumber @@ -25,5 +27,6 @@ public struct OutingPassEntity: Equatable { self.endTime = endTime self.reason = reason self.teacherName = teacherName + self.picnicDate = picnicDate } } From a45cbb71c34d2fa8e7aaa0b1162162394cd24a3c Mon Sep 17 00:00:00 2001 From: juyeong525 Date: Fri, 12 May 2023 22:54:02 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=C2=A0::=20OutingPassResp?= =?UTF-8?q?onse=EC=97=90=20picnicDate=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sources/Data/Remote/Response/OutingPassResponse.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Services/PickService/Sources/Data/Remote/Response/OutingPassResponse.swift b/Services/PickService/Sources/Data/Remote/Response/OutingPassResponse.swift index de58eaea..ec03076c 100644 --- a/Services/PickService/Sources/Data/Remote/Response/OutingPassResponse.swift +++ b/Services/PickService/Sources/Data/Remote/Response/OutingPassResponse.swift @@ -11,6 +11,8 @@ struct OutingPassResponse: Decodable { case endTime = "end_time" case reason case teacherName = "teacher_name" + case picnicDate = "picnic_date" + } let profileFileName: String @@ -20,6 +22,7 @@ struct OutingPassResponse: Decodable { let endTime: String let reason: String let teacherName: String + let picnicDate: String } @@ -32,7 +35,8 @@ extension OutingPassResponse { startTime: self.startTime.toDate(format: .time), endTime: self.endTime.toDate(format: .time), reason: self.reason, - teacherName: self.teacherName + teacherName: self.teacherName, + picnicDate: self.picnicDate.toDate(format: .fullDate) ) } } From adb577c3f93e419674e467a0c504a5a01b3073d9 Mon Sep 17 00:00:00 2001 From: juyeong525 Date: Fri, 12 May 2023 22:54:25 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=C2=A0::=20=EC=99=B8?= =?UTF-8?q?=EC=B6=9C=EC=A6=9D=20=EB=B7=B0=20=EA=B0=84=EA=B2=A9=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sources/Scene/OutingPass/OutingPassView.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Sources/Scene/OutingPass/OutingPassView.swift b/Application/Sources/Scene/OutingPass/OutingPassView.swift index edfc0f0e..578b5bcf 100644 --- a/Application/Sources/Scene/OutingPass/OutingPassView.swift +++ b/Application/Sources/Scene/OutingPass/OutingPassView.swift @@ -10,12 +10,12 @@ struct OutingPassView: View { var body: some View { VStack { Spacer() - .frame(height: 12) + .frame(height: 8) GeometryReader { gemotry in SlidingTextView(geometryProxy: gemotry) } .frame(height: 20) - .padding(.bottom, 20) + .padding(.bottom, 30) HStack(alignment: .center) { AsyncImage(url: URL(string: viewModel.outingPassData?.profileFileName ?? "DefaultImage")) { image in image @@ -34,7 +34,7 @@ struct OutingPassView: View { Spacer() } Spacer().frame(height: 18) - OutingInformationView(title: "외출 날짜", content: "2023년 5월 12일") + OutingInformationView(title: "외출 날짜", content: viewModel.outingPassData?.picnicDate.toString(format: "yyyy년 M월 d일 ") ?? "") OutingInformationView( title: "외출 시간", content: "\(viewModel.outingPassData?.startTime.toString(format: "HH:mm") ?? "") ~ \(viewModel.outingPassData?.endTime.toString(format: "HH:mm") ?? "")"