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..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: 30) - .padding(.bottom, 44) + .frame(height: 20) + .padding(.bottom, 30) 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: 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") ?? "")" ) 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) 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) ) } } 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 } }