From 15037467110cef0803b80b90f23e0042ec13d04b Mon Sep 17 00:00:00 2001 From: LeeMyeongJin Date: Sat, 30 Dec 2023 19:12:18 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[Feat]=20#235=20-=20(=EC=BD=94=EC=8A=A4=20?= =?UTF-8?q?=EC=97=85=EB=A1=9C=EB=93=9C)=20=EC=83=81=EC=84=B8=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EB=B0=98?= =?UTF-8?q?=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CourseDiscovery/Views/VC/CourseUploadVC.swift | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift index b655f479..8a5d5953 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift @@ -88,7 +88,17 @@ extension CourseUploadVC { guard let distance = courseModel.distance else { return } self.distanceInfoView.setDescriptionText(description: "\(String(distance))km") - self.departureInfoView.setDescriptionText(description: "\(courseModel.departure.region) \(courseModel.departure.city)") + + let departureString = [ + courseModel.departure.region, + courseModel.departure.city, + courseModel.departure.town, + courseModel.departure.name + ] + .compactMap { $0 } // 옵셔널 언래핑 + .joined(separator: " ") + + self.departureInfoView.setDescriptionText(description: departureString) } private func setAddTarget() { From aaace773e2d8e0208bc078bf01693a23afe30564 Mon Sep 17 00:00:00 2001 From: LeeMyeongJin Date: Sat, 30 Dec 2023 19:12:29 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[Feat]=20#235=20-=20(=EC=BD=94=EC=8A=A4=20?= =?UTF-8?q?=EC=83=81=EC=84=B8)=20=EC=83=81=EC=84=B8=20=EC=A3=BC=EC=86=8C?= =?UTF-8?q?=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CourseDetail/VC/CourseDetailVC.swift | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift index 6f3948e9..e3110733 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift @@ -309,8 +309,17 @@ extension CourseDetailVC { guard let distance = model.publicCourse.distance else { return } self.courseDistanceInfoView.setDescriptionText(description: "\(distance)km") - let location = "\(model.publicCourse.departure.region) \(model.publicCourse.departure.city)" - self.courseDepartureInfoView.setDescriptionText(description: location) + + let locate = [ + model.publicCourse.departure.region, + model.publicCourse.departure.city, + model.publicCourse.departure.town, + model.publicCourse.departure.name + ] + .compactMap { $0 } // 옵셔널 언래핑 + .joined(separator: " ") + + self.courseDepartureInfoView.setDescriptionText(description: locate) self.courseExplanationTextView.text = model.publicCourse.description } From a7aff4e2b083b2afbb1ab9be6e596c274bf889c4 Mon Sep 17 00:00:00 2001 From: LeeMyeongJin Date: Mon, 1 Jan 2024 19:05:12 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[Chore]=20#235=20-=20=ED=95=84=EC=9A=94=20?= =?UTF-8?q?=EC=97=86=EB=8A=94=20=EC=A3=BC=EC=84=9D=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Presentation/CourseDetail/VC/CourseDetailVC.swift | 2 +- .../Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift index e3110733..d3560772 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDetail/VC/CourseDetailVC.swift @@ -316,7 +316,7 @@ extension CourseDetailVC { model.publicCourse.departure.town, model.publicCourse.departure.name ] - .compactMap { $0 } // 옵셔널 언래핑 + .compactMap { $0 } .joined(separator: " ") self.courseDepartureInfoView.setDescriptionText(description: locate) diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift index 8a5d5953..92eba72f 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift @@ -95,7 +95,7 @@ extension CourseUploadVC { courseModel.departure.town, courseModel.departure.name ] - .compactMap { $0 } // 옵셔널 언래핑 + .compactMap { $0 } .joined(separator: " ") self.departureInfoView.setDescriptionText(description: departureString)