From 62baee75f4678481e4449fcfa419d263790160d6 Mon Sep 17 00:00:00 2001 From: kut7728 Date: Thu, 20 Mar 2025 14:50:45 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[FEAT]=20#18=20=ED=95=80=20=ED=97=A4?= =?UTF-8?q?=EB=8D=94=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EC=A0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift b/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift index cb9851d..6a1bb76 100644 --- a/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift +++ b/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift @@ -237,7 +237,6 @@ extension PinDetailViewController: UITableViewDataSource, UITableViewDelegate { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { return 70 } - } From 848d29e1c5e9918bf65bbf6cb4f7298c02f21b11 Mon Sep 17 00:00:00 2001 From: kut7728 Date: Fri, 21 Mar 2025 10:25:11 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[FEAT]=20#18=20=ED=95=80=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=EB=B7=B0=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=97=B0?= =?UTF-8?q?=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PinDetail/PinDetailViewController.swift | 45 ++++++++++++++----- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift b/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift index 6a1bb76..704d51d 100644 --- a/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift +++ b/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift @@ -16,6 +16,7 @@ final class PinDetailViewController: UIViewController { private var pinTableView = UITableView(frame: .zero, style: .grouped) private var pinEntity: PinEntity + private var useCase = DIContainer.usecase init(_ entity: PinEntity) { self.pinEntity = entity @@ -43,9 +44,18 @@ final class PinDetailViewController: UIViewController { setupReviewTable() addComponents() + loadReviewData() + + reviewPanelContainer.commitButton.addTarget(self, action: #selector(onCommitButtonTapped), for: .touchUpInside) } + private func loadReviewData() { + self.useCase.fetchAllReviewsByPinID(pinID: self.pinEntity.pin_id) {[weak self] items in + self?.datasource = items + self?.pinTableView.reloadData() + } + } // MARK: - View // 지도 뷰 @@ -55,7 +65,7 @@ final class PinDetailViewController: UIViewController { let long = pinEntity.longitude let center = CLLocationCoordinate2D(latitude: lat, longitude: long) // San Francisco, CA - let region = MKCoordinateRegion(center: center, span: MKCoordinateSpan(latitudeDelta: 0.05, longitudeDelta: 0.05)) + let region = MKCoordinateRegion(center: center, span: MKCoordinateSpan(latitudeDelta: 0.005, longitudeDelta: 0.005)) map.setRegion(region, animated: true) map.showsUserLocation = true @@ -146,6 +156,17 @@ extension PinDetailViewController { self.dismiss(animated: true, completion: nil) } + @objc func onCommitButtonTapped() { + var review: ReviewEntity = ReviewEntity(id: UUID(), pinID: pinEntity.pin_id, date: Date(), description: reviewPanelContainer.reviewText.text ?? "") + + reviewPanelContainer.reviewText.text = "" + + useCase.addReview(review: review) + self.datasource.append(review) + + self.pinTableView.reloadData() + } + @objc func pinMenuButtonTapped() { let actionSheet = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet) @@ -155,8 +176,10 @@ extension PinDetailViewController { vc.modalPresentationStyle = .fullScreen self.present(vc, animated: true, completion: nil) } - let deleteAction = UIAlertAction(title: "삭제", style: .destructive) { _ in + let deleteAction = UIAlertAction(title: "삭제", style: .destructive) {[weak self] _ in print("삭제") + self?.useCase.deletePin(pinID: (self?.pinEntity.pin_id)!) + self?.dismiss(animated: true, completion: nil) } let cancelAction = UIAlertAction(title: "취소", style: .cancel, handler: nil) @@ -180,15 +203,15 @@ extension PinDetailViewController: UITableViewDataSource, UITableViewDelegate { } // swipeAction -// func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? { -// let action = UIContextualAction(style: .destructive, title: "삭제") { [weak self] _, _, completion in -// if let deleted = self?.datasource.remove(at: indexPath.row).id { -// self?.coreData.deleteContent(id: deleted) -// self?.pinTableView.deleteRows(at: [indexPath], with: .automatic) -// } -// } -// return UISwipeActionsConfiguration(actions: [action]) -// } + func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? { + let action = UIContextualAction(style: .destructive, title: "삭제") { [weak self] _, _, completion in + if let deleted = self?.datasource.remove(at: indexPath.row).id { + self?.useCase.deleteReview(reviewId: deleted) + self?.pinTableView.deleteRows(at: [indexPath], with: .automatic) + } + } + return UISwipeActionsConfiguration(actions: [action]) + } // numberOfRowsInSection func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { From 8770c7d0532b83591aef0bb8e9eefc1d07e3c0b5 Mon Sep 17 00:00:00 2001 From: JungHm Date: Fri, 21 Mar 2025 10:29:35 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[CHORE]=20#18=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pinit/Pinit/Views/Home/HomeViewController.swift | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Pinit/Pinit/Views/Home/HomeViewController.swift b/Pinit/Pinit/Views/Home/HomeViewController.swift index 1c3b5cd..b238085 100644 --- a/Pinit/Pinit/Views/Home/HomeViewController.swift +++ b/Pinit/Pinit/Views/Home/HomeViewController.swift @@ -58,6 +58,7 @@ class HomeViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) + print("HHH") // loadAnnotations() } @@ -193,8 +194,8 @@ extension HomeViewController: MKMapViewDelegate { let visibleAnnotations = mapView.annotations(in: mapView.visibleMapRect) let visibleMarkers = visibleAnnotations.compactMap { $0 as? CustomAnnotation } // BottomSheet의 CollectionView 업데이트 - adapter?.data = visibleMarkers.map{ $0.pinData } - bottomSheet.collectionView.reloadData() +// adapter?.data = visibleMarkers.map{ $0.pinData } +// bottomSheet.collectionView.reloadData() } } @@ -224,7 +225,8 @@ extension HomeViewController: PinCollectionViewAdapterDelegate { func selectedItem(selected: PinEntity) { print("Selected: \(selected)") // 여기서 화면 이동 - // PinDetailViewController(usecase: usecase, pin: selected) + let vc = PinDetailViewController(selected) + present(vc, animated: true) } func deletedItem(deleted: PinEntity?) { From 45b7266e90de5e072c7db0415596756cd9b6e123 Mon Sep 17 00:00:00 2001 From: kut7728 Date: Fri, 21 Mar 2025 10:37:37 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[FEAT]=20#18=20=ED=95=80=EC=83=81=EC=84=B8?= =?UTF-8?q?=EB=B7=B0,=20=ED=99=88=EB=B7=B0=20=EC=82=AD=EC=A0=9C=EC=8B=9C?= =?UTF-8?q?=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pinit/Pinit/Views/Home/HomeViewController.swift | 5 +++++ Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift | 2 ++ 2 files changed, 7 insertions(+) diff --git a/Pinit/Pinit/Views/Home/HomeViewController.swift b/Pinit/Pinit/Views/Home/HomeViewController.swift index b238085..3b907b1 100644 --- a/Pinit/Pinit/Views/Home/HomeViewController.swift +++ b/Pinit/Pinit/Views/Home/HomeViewController.swift @@ -226,6 +226,11 @@ extension HomeViewController: PinCollectionViewAdapterDelegate { print("Selected: \(selected)") // 여기서 화면 이동 let vc = PinDetailViewController(selected) + vc.sendToBack = {[weak self] entity in + guard let entity else { return } + let annotation = CustomAnnotation(pinData: entity) + self?.mapView.removeAnnotation(annotation) + } present(vc, animated: true) } diff --git a/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift b/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift index 704d51d..b1c8b3d 100644 --- a/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift +++ b/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift @@ -17,6 +17,7 @@ final class PinDetailViewController: UIViewController { private var pinTableView = UITableView(frame: .zero, style: .grouped) private var pinEntity: PinEntity private var useCase = DIContainer.usecase + var sendToBack: ((PinEntity?) -> Void)! init(_ entity: PinEntity) { self.pinEntity = entity @@ -179,6 +180,7 @@ extension PinDetailViewController { let deleteAction = UIAlertAction(title: "삭제", style: .destructive) {[weak self] _ in print("삭제") self?.useCase.deletePin(pinID: (self?.pinEntity.pin_id)!) + self?.sendToBack(self?.pinEntity) self?.dismiss(animated: true, completion: nil) } let cancelAction = UIAlertAction(title: "취소", style: .cancel, handler: nil) From 8b5291dd7d70f6e3661e76958b57a93f4e3f4c53 Mon Sep 17 00:00:00 2001 From: kut7728 Date: Fri, 21 Mar 2025 13:21:49 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[FEAT]=20#18=20=EB=82=A0=EC=94=A8=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=EC=BD=98=20=EB=B3=80=EA=B2=BD,=20=ED=95=80?= =?UTF-8?q?=20=EC=83=81=EC=84=B8=EB=B7=B0=20=EB=94=94=EC=9E=90=EC=9D=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pinit/Pinit/Models/PinEntity.swift | 4 +- .../clear-day.imageset/Contents.json | 21 +++++++++ .../clear-day.imageset/clear-day.svg | 44 ++++++++++++++++++ .../weatherIcon/01d.imageset/01d.png | Bin 529 -> 0 bytes .../weatherIcon/01d.imageset/01d.svg | 16 +++++++ .../weatherIcon/01d.imageset/Contents.json | 2 +- .../weatherIcon/01n.imageset/01n.png | Bin 516 -> 0 bytes .../weatherIcon/01n.imageset/01n.svg | 8 ++++ .../weatherIcon/01n.imageset/Contents.json | 2 +- .../weatherIcon/02d.imageset/02d.png | Bin 852 -> 0 bytes .../weatherIcon/02d.imageset/02d.svg | 13 ++++++ .../weatherIcon/02d.imageset/Contents.json | 2 +- .../weatherIcon/02n.imageset/02n.png | Bin 867 -> 0 bytes .../weatherIcon/02n.imageset/02n.svg | 9 ++++ .../weatherIcon/02n.imageset/Contents.json | 2 +- .../weatherIcon/03d.imageset/03d.png | Bin 432 -> 0 bytes .../weatherIcon/03d.imageset/03d.svg | 13 ++++++ .../weatherIcon/03d.imageset/Contents.json | 2 +- .../weatherIcon/03n.imageset/03n.png | Bin 432 -> 0 bytes .../weatherIcon/03n.imageset/03n.svg | 10 ++++ .../weatherIcon/03n.imageset/Contents.json | 2 +- .../weatherIcon/04d.imageset/04d.png | Bin 1026 -> 0 bytes .../weatherIcon/04d.imageset/04d.svg | 8 ++++ .../weatherIcon/04d.imageset/Contents.json | 2 +- .../weatherIcon/04n.imageset/04n.png | Bin 1026 -> 0 bytes .../weatherIcon/04n.imageset/04n.svg | 8 ++++ .../weatherIcon/04n.imageset/Contents.json | 2 +- .../weatherIcon/09d.imageset/09d.png | Bin 1364 -> 0 bytes .../weatherIcon/09d.imageset/09d.svg | 19 ++++++++ .../weatherIcon/09d.imageset/Contents.json | 2 +- .../weatherIcon/09n.imageset/09n.png | Bin 1364 -> 0 bytes .../weatherIcon/09n.imageset/09n.svg | 19 ++++++++ .../weatherIcon/09n.imageset/Contents.json | 2 +- .../weatherIcon/10d.imageset/10d.png | Bin 1291 -> 0 bytes .../weatherIcon/10d.imageset/10d.svg | 16 +++++++ .../weatherIcon/10d.imageset/Contents.json | 2 +- .../weatherIcon/10n.imageset/10n.png | Bin 1307 -> 0 bytes .../weatherIcon/10n.imageset/10n.svg | 16 +++++++ .../weatherIcon/10n.imageset/Contents.json | 2 +- .../weatherIcon/11d.imageset/11d.png | Bin 1417 -> 0 bytes .../weatherIcon/11d.imageset/11d.svg | 19 ++++++++ .../weatherIcon/11d.imageset/Contents.json | 2 +- .../weatherIcon/11n.imageset/11n.png | Bin 1417 -> 0 bytes .../weatherIcon/11n.imageset/11n.svg | 19 ++++++++ .../weatherIcon/11n.imageset/Contents.json | 2 +- .../weatherIcon/13d.imageset/13d.png | Bin 759 -> 0 bytes .../weatherIcon/13d.imageset/13d.svg | 18 +++++++ .../weatherIcon/13d.imageset/Contents.json | 2 +- .../weatherIcon/13n.imageset/13n.png | Bin 759 -> 0 bytes .../weatherIcon/13n.imageset/13n.svg | 14 ++++++ .../weatherIcon/13n.imageset/Contents.json | 2 +- .../weatherIcon/50d.imageset/50d.png | Bin 401 -> 0 bytes .../weatherIcon/50d.imageset/50d.svg | 16 +++++++ .../weatherIcon/50d.imageset/Contents.json | 2 +- .../weatherIcon/50n.imageset/50n.png | Bin 401 -> 0 bytes .../weatherIcon/50n.imageset/50n.svg | 16 +++++++ .../weatherIcon/50n.imageset/Contents.json | 2 +- .../Views/PinDetail/PinDetailHeader.swift | 26 +++++++---- .../PinDetail/PinDetailViewController.swift | 2 +- 59 files changed, 359 insertions(+), 31 deletions(-) create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/clear-day.imageset/Contents.json create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/clear-day.imageset/clear-day.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/01d.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/01d.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/01n.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/01n.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/02d.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/02d.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/02n.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/02n.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/03d.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/03d.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/03n.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/03n.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/04d.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/04d.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/04n.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/04n.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/09d.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/09d.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/09n.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/09n.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/10d.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/10d.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/10n.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/10n.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/11d.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/11d.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/11n.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/11n.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/13d.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/13d.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/13n.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/13n.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/50d.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/50d.svg delete mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/50n.png create mode 100644 Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/50n.svg diff --git a/Pinit/Pinit/Models/PinEntity.swift b/Pinit/Pinit/Models/PinEntity.swift index d63abe1..c00c271 100644 --- a/Pinit/Pinit/Models/PinEntity.swift +++ b/Pinit/Pinit/Models/PinEntity.swift @@ -25,7 +25,7 @@ struct PinEntity { longitude: 126.97628375547349, address: "서울특별시 도로명주소 24번지", date: Date(), - weather: "비", + weather: "01d", description: "샘플 설명 83", mediaPath: nil), // 이미지 없음 @@ -35,7 +35,7 @@ struct PinEntity { longitude: 126.98134546666795, address: "서울특별시 도로명주소 51번지", date: Date(), - weather: "눈", + weather: "11d", description: "샘플 설명 67", mediaPath: nil), // 이미지 변환 diff --git a/Pinit/Pinit/Resources/Assets.xcassets/clear-day.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/clear-day.imageset/Contents.json new file mode 100644 index 0000000..41dfcff --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/clear-day.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "clear-day.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Pinit/Pinit/Resources/Assets.xcassets/clear-day.imageset/clear-day.svg b/Pinit/Pinit/Resources/Assets.xcassets/clear-day.imageset/clear-day.svg new file mode 100644 index 0000000..f9dce1c --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/clear-day.imageset/clear-day.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/01d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/01d.png deleted file mode 100644 index 87d2a51fbc3bc01de0dcfbfc50afb39c8852e003..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 529 zcmV+s0`C2ZP)V{iEEr6g#mQ zYcPrTc#eno{I38j&fU(cYf0AKqp=sq(&xGX#RojVRorTsbh2TreRzg@$;hCIj+How zn|PhRH=&i0Gq{UQ8Jdl_hAaPzk;^z)p+AC!+9GO=oW;@FA~1~`H34djY{zU(@&OLu zaH+V)$n^^CFy=~yrABrPc`DU1mG;b7j7&BDOAXRJIM(NiN{sADo3k&rVP+ggwqkjY zMx=L479~bjwXONDEXx&?7|Cul$C0DN$fp8LE?;v6B}Sg$Tl3O?=WVW_#7NiOE*9uU z_54PSGl6nH~YdUQ(hsLN@O*?R*SB8kgj9+St6`4awiQ&t$2j< zrLk(~kwa-RtmP?o*TiTsAx>AW%zbRZ_nIPF&FtOE9LKv1%@>?XhZa9-3ut+Y(hWsx zlcB{Szi_vaAL9g8<8-U!eVl8}r9-$~*pNEqiL?T5(zTa8 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/Contents.json index 60e45fb..b68beb6 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "01d.png", + "filename" : "01d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/01n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/01n.png deleted file mode 100644 index 527137b111a5472a5eb1d58b2be3b5c59ba5ed87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 516 zcmV+f0{i`mP)4~Tz1Hc&2 z53~Xez!&fgTmdJ*Y1jlu$A?xmC9FnAlK~cit}-KoP=mk%@Cd8`TRt9K>nT96;#puP zB*cH(flc5HXm%~YN01ia4wx4D!@xbz<5Glckc8RuZI1J#fJ>lBI)Q7DeIMJxP#5(9 z2*V}F6p(iCOVJ6;N<^0+>ke)ht3c9Lk_PEDFL@77K^kOF=*4B% zR*(ic2l8G@E=|@}kOuh$=7eq(OTeeC + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/Contents.json index 8a8cf33..dc2a0e8 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "01n.png", + "filename" : "01n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/02d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/02d.png deleted file mode 100644 index 01c3c9b7fa4eb21ce28e16a38702caaffcad1569..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 852 zcmV-a1FQUrP))j3Njw2SxFq2M^*&1y@wmi{eET z7rcmy3f?>kiU&bKA(}Z-KbsqG~v`YAv?PU=8RsYbvl7$x<_i$ z&JY3-?ZM3tVpq>e2Jf%km=x%|eMRE^N360C*uG>1|G{jXKr%f?UII(g8jup17eKVu z!-QhoqA5ep?;I!k@F7-Z`A9-KLzf;+PUj-i)=Fs2N>-&0Ib|lYs1z&Oll-Z$W%wxm zn#IWGwvkr%>A3JJL}lg*&K~}IU9%b)i;Yx~Mji8B_Q;Y{ zEBQUF86A9|KIDA2N_`}%E7T?li6%$tDdY7W!ib61@& z#g((ty47v1=9~$UQr*#zlgbu>xU0KNx3!**Ju;7^t}7z?Bcg5u>ZgOQkjp@S&cqDx z*vn*HA)iwpOS$3<@WzWTF9)LfYO4ZH0xN++!2R=Ec8sWms)OS@a00lV!=xDu27|$1 eFc=Ku3E(HhoZ~k*tr+(J0000 + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/Contents.json index 97441fe..1a0e9d2 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "02d.png", + "filename" : "02d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/02n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/02n.png deleted file mode 100644 index b6583d24f68629586ceaf635727ed7d640b1223f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 867 zcmV-p1DyPcP)jitURryQ;93lftwYEcqJZTcdiETI;z`ZOXp5fTJ$EBdCO+7xY~prU2p zM4PtNrd<$HYK@Ie^WHpX)b|m093w*WK1TXmx&pr2^heDxHC=?2XLZSHI z&}8B@O>;uBjIcp(te3Wv(?(sk15G$J(txRR@(f(UsCEEsLT_kCgqC65o4~0YuM>DZhCXjrE)W}Q{@eK?NWV3R7 zb~#n^t42oXIN8C=*RQFFM#ownk@1o5(Q;%aiIbDbWLR2TOXb{3Ow+>3){DmJvu9XY zUr!>L9BX-6#z#;gvw`bC7w{EWExS~=oF@ooN)YaET>Qh_m9Zn6kz={OXwos07ONT>Shs$C*7V*_pJ;DC!RPL7A~R>6^L;+Z z_>|4a&Z!U~2!(V82M4nqcFIn%q`I2(=gu;xqT-I{`zK3^r%Tz9ZR5Y^8p0_@bOVNA z(9_-1VwvXsqG?4etE(H=t?bc?6-tOe^kfScEojj7#rH*5AcL%sXTb8Q41NSHcQ@O1 zf1tlP*&4YfZpjJ8Hc=i2Stl!`GxxJpC@ui+g7^yZAU+4Gfiu8nAS|ANY{Qg4VnfBl tA!_jyaI1iurcfvp3WY+UQ2b8-zX05N^DHpxPAvcc002ovPDHLkV1oJ$k}m)N diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/02n.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/02n.svg new file mode 100644 index 0000000..5b07eb5 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/02n.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/Contents.json index 8d62610..beb3807 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "02n.png", + "filename" : "02n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/03d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/03d.png deleted file mode 100644 index c0f7e0714f87e9c295edfc9f13203e3aa37ac429..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 432 zcmV;h0Z;ykP)(2|?*6J(}Tuyc%@A;z0fi{8R z*nMJz$eq~EXGThffG*&*3LzUYvp|Uq&$n1-%Vi%eQ3QE4*G9#_Ls&%psM0pF + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/Contents.json index b0df74d..9996c33 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "03d.png", + "filename" : "03d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/03n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/03n.png deleted file mode 100644 index c0f7e0714f87e9c295edfc9f13203e3aa37ac429..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 432 zcmV;h0Z;ykP)(2|?*6J(}Tuyc%@A;z0fi{8R z*nMJz$eq~EXGThffG*&*3LzUYvp|Uq&$n1-%Vi%eQ3QE4*G9#_Ls&%psM0pF + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/Contents.json index a6a0c76..be53aa6 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "03n.png", + "filename" : "03n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/04d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/04d.png deleted file mode 100644 index 34346dc88a08272987cbc7acfd7103eeb5788d7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1026 zcmV+d1pWJoP)Iu!|at*IVJRawZiF1sfK20JPM^%-Lz)@fapaW^( zQ{baU>`u>21-^?k>}5zS%ffLS6onUn$%;{Hfz80nz;?iCc0P5rgskgbCob!4$C(sr z0@wlsFLML5N=O&*25=U*Y+2U%?N2{-jFacl=g4V>zE;IU>MXhn_;0cZSh z@o-(2&S(_ME+@xMaAEc$-N`N@5e>@aYBoLue(-bX4)6hRz4D{g%#i`$%gTqUs!}it zB$7H~Cr^0KzWREWo>Yo*bsj5p#;GeU-e&YH$mm3%HwM2j%AXE(QgpC@k^o{)vbMRJDWeG^a& zIvR1Nnb6uD<|9Q>yw&gP>tkT+Hilmurn|eF>*+LSC(m*7_HEX#SyOF?dVoW~Pr$cz z=c)HWjb#4}cqy!ym6a7wz}@8Yd0spCI=|ewL02LXR0sqYfnC!xQ-SBrzX`2=U{D+t zVF!pR*52NZX`0@`2mwn=OI`zNs;^)hUZ90WcN>v&j%C?juRnii&Iu~I6L)O8+g zYx8!of(L4u4U;2%ev{X7G)<#m7^Htrvus&hx^$V@xj7<{2zoq@>--}n($h0j8-jcY zvm>LcAwp0pmAnpM%eJlF{WH%EuxaxqPQ5>lQ7F*a(Q$VHI8@74m>d~wfzQ<^S5+^B zMDmLwP%IYNIk=0FeftXYnar=HQt76ms^0@Ufp2Qr3bP~e*0~;x$QMxztYwS+uO7%| zGMSB^PfXa!M8b_lqm^NH4`FuXxBDRkU(B+#EJAMmvE%P>^zdOf + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/Contents.json index 9fc19d7..c6b78da 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "04d.png", + "filename" : "04d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/04n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/04n.png deleted file mode 100644 index 34346dc88a08272987cbc7acfd7103eeb5788d7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1026 zcmV+d1pWJoP)Iu!|at*IVJRawZiF1sfK20JPM^%-Lz)@fapaW^( zQ{baU>`u>21-^?k>}5zS%ffLS6onUn$%;{Hfz80nz;?iCc0P5rgskgbCob!4$C(sr z0@wlsFLML5N=O&*25=U*Y+2U%?N2{-jFacl=g4V>zE;IU>MXhn_;0cZSh z@o-(2&S(_ME+@xMaAEc$-N`N@5e>@aYBoLue(-bX4)6hRz4D{g%#i`$%gTqUs!}it zB$7H~Cr^0KzWREWo>Yo*bsj5p#;GeU-e&YH$mm3%HwM2j%AXE(QgpC@k^o{)vbMRJDWeG^a& zIvR1Nnb6uD<|9Q>yw&gP>tkT+Hilmurn|eF>*+LSC(m*7_HEX#SyOF?dVoW~Pr$cz z=c)HWjb#4}cqy!ym6a7wz}@8Yd0spCI=|ewL02LXR0sqYfnC!xQ-SBrzX`2=U{D+t zVF!pR*52NZX`0@`2mwn=OI`zNs;^)hUZ90WcN>v&j%C?juRnii&Iu~I6L)O8+g zYx8!of(L4u4U;2%ev{X7G)<#m7^Htrvus&hx^$V@xj7<{2zoq@>--}n($h0j8-jcY zvm>LcAwp0pmAnpM%eJlF{WH%EuxaxqPQ5>lQ7F*a(Q$VHI8@74m>d~wfzQ<^S5+^B zMDmLwP%IYNIk=0FeftXYnar=HQt76ms^0@Ufp2Qr3bP~e*0~;x$QMxztYwS+uO7%| zGMSB^PfXa!M8b_lqm^NH4`FuXxBDRkU(B+#EJAMmvE%P>^zdOf + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/Contents.json index 4a444b7..955afc4 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "04n.png", + "filename" : "04n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/09d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/09d.png deleted file mode 100644 index 022feb37aa08865c09555bcfbf060b0cc0c11ef1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1364 zcmV-a1*`grP)Cm7gelfhni3~7AlotgOgCry-L<0kZ7)%hv7a(9F0x^IF zgow^y2owEAV9|(5bOKSfDH;-F1Yz9emlEAV-? zb&k{>&RI4s=aDwycDpeRL)z*XunxFK>Iggx90Xp;=Y9owmVX*BIh9Uv-{{eYN=kxN z=gwc4e0O=7rPP108K?oSajMTp$<-^f&D+F#Sl~;q$r5Hc)Dn0jq%bfTEiXlpgTDqI3=xS$C@Cpn$*|J5z4Md z9t8H~s>F?uN~IV&G{mw+i({7B^N$%c?5)y`C;`a~2=kuxd z$>Yb>aYlM=NHD1AD3i#My2FQZUDK{ds%(z$7jCzvydq;J-W8{E!UR^lxa@Sit9x5C z9^a_B-Q$3qm0$odqGtP0BMR!Jw_R?0V#j{yOE6 zL>>}79*=sqtBlNC-QC@xr{>P#t@Y~^<6Bx=?X6>Ha5NenYSoRxzVCd42B|`w(o_Ft zC_4~BJf~?|O;J%1O^uD5Jbr@e7jiH311X3P03QMqQFTHP3>LHN{hc&4G_Z5eE_!+l zOru8ywe*lw(&zP}r&8$2WPeI-k#(upo5jV&*MzfSi~(16A%r~OmCH?KmYMwM)P3o6 zI$U3WY;}QFU|4G_>L!!Pc;l&ti(|)+8|m};3ghv(n&Wc0q~yO@zw6MeP%f}t5Hqay zz5EYfYGM1fZRkn;%R7dJ-1}=j?KpGh43TJrMT-~H8Hup_gWdeu(o$Vsdgq=c)zwUU z;&G%hcH`-0u;r1=jnAF^gU@Pf`TE=Mh{R%JhlfHWMR6doK*o!% z>nnqSz?Q!vk%tV!_-W(1wal9RB=K1Mru*6Ph%H5G_aBf#(cIij{fQH_U%4XFq<3&( zp)Q0tC`@y{DZ~i3rnTX6T~4RdBjh}f$5VRQ}`HGj+F-0a3c@gW2 z+eWRKGiGHQQVv|QzL0FSZjSO!-fZ2=RpIPTB)HVp#-z$h_I|uq6~uTfcAYYI6v_AJ zpaifTIBKCV$G^oN$EOXuQ$)4IB?*=fddB)95~1efPVlw W1rxkTT*~zT0000 + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/Contents.json index 5f72daf..5309c06 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "09d.png", + "filename" : "09d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/09n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/09n.png deleted file mode 100644 index 022feb37aa08865c09555bcfbf060b0cc0c11ef1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1364 zcmV-a1*`grP)Cm7gelfhni3~7AlotgOgCry-L<0kZ7)%hv7a(9F0x^IF zgow^y2owEAV9|(5bOKSfDH;-F1Yz9emlEAV-? zb&k{>&RI4s=aDwycDpeRL)z*XunxFK>Iggx90Xp;=Y9owmVX*BIh9Uv-{{eYN=kxN z=gwc4e0O=7rPP108K?oSajMTp$<-^f&D+F#Sl~;q$r5Hc)Dn0jq%bfTEiXlpgTDqI3=xS$C@Cpn$*|J5z4Md z9t8H~s>F?uN~IV&G{mw+i({7B^N$%c?5)y`C;`a~2=kuxd z$>Yb>aYlM=NHD1AD3i#My2FQZUDK{ds%(z$7jCzvydq;J-W8{E!UR^lxa@Sit9x5C z9^a_B-Q$3qm0$odqGtP0BMR!Jw_R?0V#j{yOE6 zL>>}79*=sqtBlNC-QC@xr{>P#t@Y~^<6Bx=?X6>Ha5NenYSoRxzVCd42B|`w(o_Ft zC_4~BJf~?|O;J%1O^uD5Jbr@e7jiH311X3P03QMqQFTHP3>LHN{hc&4G_Z5eE_!+l zOru8ywe*lw(&zP}r&8$2WPeI-k#(upo5jV&*MzfSi~(16A%r~OmCH?KmYMwM)P3o6 zI$U3WY;}QFU|4G_>L!!Pc;l&ti(|)+8|m};3ghv(n&Wc0q~yO@zw6MeP%f}t5Hqay zz5EYfYGM1fZRkn;%R7dJ-1}=j?KpGh43TJrMT-~H8Hup_gWdeu(o$Vsdgq=c)zwUU z;&G%hcH`-0u;r1=jnAF^gU@Pf`TE=Mh{R%JhlfHWMR6doK*o!% z>nnqSz?Q!vk%tV!_-W(1wal9RB=K1Mru*6Ph%H5G_aBf#(cIij{fQH_U%4XFq<3&( zp)Q0tC`@y{DZ~i3rnTX6T~4RdBjh}f$5VRQ}`HGj+F-0a3c@gW2 z+eWRKGiGHQQVv|QzL0FSZjSO!-fZ2=RpIPTB)HVp#-z$h_I|uq6~uTfcAYYI6v_AJ zpaifTIBKCV$G^oN$EOXuQ$)4IB?*=fddB)95~1efPVlw W1rxkTT*~zT0000 + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/Contents.json index 226ddbb..df636a6 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "09n.png", + "filename" : "09n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/10d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/10d.png deleted file mode 100644 index 12d13ae5d12429c9d44c273ba3a18a5f4c3ceb76..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1291 zcmV+m1@!ufP);;;DjulR16rXS1wzaOHUne&4N?!>53DMQ-0fwWkrpx@SPD!AByd_- z!MEw|X~ZrZKnT!!Fxv#M3wRvZ<96ba6f&#iNJY6p*tv(C>e@xYX)}U7Tee^&;zJo{ zcS%&z&E(RH#{)0{*nhc*B94P_>}oxGSw+Rv`%o=ypj5H_8mw~bz(@&MGhnL_2)ny@ z8<@Qir!|RcyNFJvP=B}e36%rZo2T45Fj7lv`k?;^i7A}7oTX)=@GOhV%b#`!(r}C?wEGv zfYLaBv|-i9k@aOUe2z@|ZuIzzzgKGFuv)>@Af zLNrFBQK6JlyY}th6|k&UOUflyDCB6g7KmbD=;-Lke)j3X-=|J{aBM?ELoAoeVcWKl zQW{m~fWN$o!0Q{LdCF!fnJ5^VPyR$xQxji*dxW~$+VI?Gp3XHlH`CsJiTTgXr(oNB zxN#$AFZ}lExQ2#J3+6w2Y0kX47%|QuC*f!`dVPglzV?qFJ;si0+xh0mcVxSBci&K7 ze^v_7*_ld_x9tsD>q%9WmD5YhYfd5_-`>&L`Dm)EYv0P{%UJOILNb}mfcbRYh3wq6 zgG@Hd$&)8I`r`?b=`^*8M4~bj>d;DU(^}8dTGvS_FCs)wp-`wYc7Z@3iq3LylsNQALt#-NpYN%uLk*|ZBGOyxO^*2@Ey z)n}-+`D$^>^fP5T94_jky1JTVGKFOg@72h)bvzcME|Dl+!C;V*0CUKD9r(P|t^7gZ zQ0ce%YVu-vj95(#KmT%;H&(A9l}r+k#|Dgw8(c4~M;@MetuBqgd0+*w&iGw=|1Ok| zHfF!+?d|2ymKG*YoXFNswo(zQAe~AViwGW;)=0hTUQQSARw+t`(ZD~zymBAqI0OR$ zZXQ3LGw05;V)@H-=emoh0v{hAA0HndAD{mjz`tzD%_&51nVSFr002ovPDHLkV1g>M BZ-)Q? diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/10d.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/10d.svg new file mode 100644 index 0000000..4fad7a2 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/10d.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/Contents.json index c75e9ea..f09fc46 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "10d.png", + "filename" : "10d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/10n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/10n.png deleted file mode 100644 index 1f884d1145b049d9b5478d8469e1ba2f612f7f81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1307 zcmV+$1?2jPP)`Q5?(Dp;yEAi7oV#~I-C5l`J3=4s4+duLJm;L} zf6sHC=eZXL2L}fS2L}fShr6NJy+esaV%)aAN*~vHuhHDp%s?!G&+DlH-U40$W?E*K zfC#V!=qZeiw71#vOSffh6M2_}VIYK%0~>&E0RL^X%&|UefM%ezl(ot&WE!v%m<^~X z$~i^VK1*c=>jh#biUK2|is1sbS^BrxU05xnh($m*@E))bSa4(T#;VDaYtBD0cWxw= zN{u&;<*q$ockyxwc^EhVRNQ>1PXQ?b{#4uv=&(zYC`C`i~hdrbe=qA?$QtY z_HnW2GLx#SWf7gzelXH`uZ5fd9-F9;eBPkKU4hT*HGij5DONPDFwS&$w*>tDHOGEE zYHPkygbZ6%xNOL93I>B*?&&!b`LV4&5D3t)^o@Hiqz|~SoIF3V7oyCCW6JVR@1D@TqUmvz9` z@cL_+uC6Zn`ubV6d>OfHman&L;liJPt*@)C-P*WpY5(FS4M;Khe7@*9GIQC%wvd}+ z|Ky3^*|TdmN00wTdNA|&{WUcgR7DvWh{qYuX1@|b%<_6X^R4h&91ewcM+XL8iYJr% z*R5Vf)jR{jNQv(rG$7PjlkbX<~^4)!}g1<90`dVeAq@ED=IXQdRXj zigF{D%b68V*YyBGJgBJZ*(<%h%&o7d_1o>F)9IqmCw7I{J|myEw2(IpvtJ7O{Y;%Q zMYa_0h!JPDTfLObJm(N%wXSI+1BH-n^I2&p)3nbwQqe0bD~ZM8X8N57wnxk72ibPZ zkIUu45^xy!5ct_LlW$9&1P)riUj^PS%n_`r;*awe_-MmM;;|T^P;fj?jd#R$Xf1sH zg}a$dw_fqA1vX2+ftZzI%?u{%&Ct*ge_y%6?3pv!v2%yncO~KpGl@__XqEHjLjhTq zH(9$RnG9S5mJ|$(d>)ss^T@PmbYHy0+STtem>D#?0tW{N2L}fS2Z#R|z`ycw=_7V* RBM1Nh002ovPDHLkV1nnFagzW5 diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/10n.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/10n.svg new file mode 100644 index 0000000..4fad7a2 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/10n.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/Contents.json index d2ca6fc..882d44b 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "10n.png", + "filename" : "10n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/11d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/11d.png deleted file mode 100644 index 87aa0272883327865014db38fe097eb4713020b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1417 zcmV;41$O$0P))@b{A5y+nw#j@G$>mvYYuX=ljoh zIp^TQg$oxhT)1%IqR$|lIF3f6C9NL{hdB28QC?d5GRgK70l#k;uneeGV&DkyF|fs{ z&xV~lx|DlLiqIhh0?V>UrPFAd7z_Le1Upzy%0G3$!@aSl)(1SwQ>m11Samg#aG0oJ z>=l|8ETB6NSl%0p_7;&U;9cMk;A}FPJQI$Dx6hq3dut+@EHg|KP1g(AuITVT(%k@h zqqN4W67Cp;5CX$6>K>W@7{Rh2Z>?L88IKbT1VGAb?R~%p`Tpq-d;>fKWJ(F5rx_Up z{M6Z(v~8PsB0=5k+0-w1l4#86j0AZi&jKUzex3rhmKsP;iL5I$`BYXi=`@*4h6M|s zX4I{>@KJ!&M8@(?qoPp5X; zG$P>;7cN~=N`=hFloCu&_7OjjbYk!EcsOzVI29EYsA;Cq^mh|0Us=hojg1T(FaT-W z9Zf7i)!|uSBe1sEKGIzx%5Dg76eufZZ&@~xig0#+iN#{s428pClI=<6&Y4HdFewWL zx^hw9uyewXII6I>4f0vm;WifwFi45;e5?7E&B$!@XOHEA;r%s-t zVfSuYqfsg=DzGi9qw48mzMK+S)suibgOrl?_7wL`o^(|@>Hf*ASotcgZEaLUA{__7 zqGJA>_Q-=>O4WiwVEaQ?AL$R}-gg1jJE~XIFj4(;&-igHdH%VU%WZ8xn`Zogrt7L7 zrvST)1?V&*g${jrFJ7d_hj#K1A|6G?qll`Tux}iNu+v4ItA4Rb=-Am*(VF zsw5%`LWtFtWvTLF%CxC``pG6~bmZpcq#Aaj4XDIB zZafUR8Li)7WX%HzMW*vpZ)Z@ucRjgpgp@XsNF>`sqVSolTSOG@z_uqykFQF4184`o zo!tK6x``qZMg#-c7hA~ud5+N9^>0{X9!hH|(+QDS{yK1=kb)xA6}oe=YQ*bnMDxM+ zw@G~d#UXv@U{m;gx65>ppIj|oQF8fZD z2WzEen_0Q8zhGUC?y^t+))(;>gtLrjdhW~W9&9}~rL=utA!A0iFQhGJ0;7R<5aK;m zv9jq*&Q{g-|Bw|&MASY(zM-@e2eH22LgI(L=v9Ld0YB2Rw`EHXmSpw(9_;4xxpb?K zV3lxD>q z&))2PP53;BewAp0JgS`3qmpzRFrnjZQTY7W7cW9<6AT>DrvzNMaN)v*3l}b~R{;M2 XF75V&@oWz|00000NkvXXu0mjf0SB9% diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/11d.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/11d.svg new file mode 100644 index 0000000..746d623 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/11d.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/Contents.json index a00034c..e8863dd 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "11d.png", + "filename" : "11d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/11n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/11n.png deleted file mode 100644 index 87aa0272883327865014db38fe097eb4713020b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1417 zcmV;41$O$0P))@b{A5y+nw#j@G$>mvYYuX=ljoh zIp^TQg$oxhT)1%IqR$|lIF3f6C9NL{hdB28QC?d5GRgK70l#k;uneeGV&DkyF|fs{ z&xV~lx|DlLiqIhh0?V>UrPFAd7z_Le1Upzy%0G3$!@aSl)(1SwQ>m11Samg#aG0oJ z>=l|8ETB6NSl%0p_7;&U;9cMk;A}FPJQI$Dx6hq3dut+@EHg|KP1g(AuITVT(%k@h zqqN4W67Cp;5CX$6>K>W@7{Rh2Z>?L88IKbT1VGAb?R~%p`Tpq-d;>fKWJ(F5rx_Up z{M6Z(v~8PsB0=5k+0-w1l4#86j0AZi&jKUzex3rhmKsP;iL5I$`BYXi=`@*4h6M|s zX4I{>@KJ!&M8@(?qoPp5X; zG$P>;7cN~=N`=hFloCu&_7OjjbYk!EcsOzVI29EYsA;Cq^mh|0Us=hojg1T(FaT-W z9Zf7i)!|uSBe1sEKGIzx%5Dg76eufZZ&@~xig0#+iN#{s428pClI=<6&Y4HdFewWL zx^hw9uyewXII6I>4f0vm;WifwFi45;e5?7E&B$!@XOHEA;r%s-t zVfSuYqfsg=DzGi9qw48mzMK+S)suibgOrl?_7wL`o^(|@>Hf*ASotcgZEaLUA{__7 zqGJA>_Q-=>O4WiwVEaQ?AL$R}-gg1jJE~XIFj4(;&-igHdH%VU%WZ8xn`Zogrt7L7 zrvST)1?V&*g${jrFJ7d_hj#K1A|6G?qll`Tux}iNu+v4ItA4Rb=-Am*(VF zsw5%`LWtFtWvTLF%CxC``pG6~bmZpcq#Aaj4XDIB zZafUR8Li)7WX%HzMW*vpZ)Z@ucRjgpgp@XsNF>`sqVSolTSOG@z_uqykFQF4184`o zo!tK6x``qZMg#-c7hA~ud5+N9^>0{X9!hH|(+QDS{yK1=kb)xA6}oe=YQ*bnMDxM+ zw@G~d#UXv@U{m;gx65>ppIj|oQF8fZD z2WzEen_0Q8zhGUC?y^t+))(;>gtLrjdhW~W9&9}~rL=utA!A0iFQhGJ0;7R<5aK;m zv9jq*&Q{g-|Bw|&MASY(zM-@e2eH22LgI(L=v9Ld0YB2Rw`EHXmSpw(9_;4xxpb?K zV3lxD>q z&))2PP53;BewAp0JgS`3qmpzRFrnjZQTY7W7cW9<6AT>DrvzNMaN)v*3l}b~R{;M2 XF75V&@oWz|00000NkvXXu0mjf0SB9% diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/11n.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/11n.svg new file mode 100644 index 0000000..746d623 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/11n.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/Contents.json index 5c9ffcd..38657f0 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "11n.png", + "filename" : "11n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/13d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/13d.png deleted file mode 100644 index 5bff6c5e8b2887b43368563f1f55ace2cc576eb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 759 zcmVS7fmjF2Zldl@S7_V-7gIH&Y3%N&v(vz&pD%^p`oFnp`oFn zq2a%VBZm6B_{yvPZOKJ=8F%2-gDre#%iAOSF=6C8502S*1Y_8XS(uzV9>xW=H>^$M zI2?_Wa5Hwq>3ujAZ{SwU3CR;{Z9G=%LBVHKSN0vH`8oPgVMepz%<2rh{I1H3oHi5eO?2IuCu55HnYt`!~JlIV;@KgZ&eaqC1UBcnz{ z7Gfqo%6aG9wKzG+U@Tefl<1?s?yK}>gEUf0>>E?5J8Vs-`$IlCX(D&$+Q#16IT8GM zL!78Vq-bF&o{h7jn+~0@m-cL3%_#Rgic7F|h!Zt5@?hGJ(w@8$+op`A7~YxrD(p$y z(h;4XNOaK~88wLP8P{W#6#G*u`G(lLB6$=3?Dc00QUZ1ib)t3~e@=?q#dtb|UQA>7 zWHMXP%$G?LvqF3@YX4a6!Z-LMKT&5UYfVU2E6%@$-|-7}*4nssL^^zmWtkT;KlfhR p@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/Contents.json index 08250c4..74bb8ac 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "13d.png", + "filename" : "13d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/13n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/13n.png deleted file mode 100644 index 5bff6c5e8b2887b43368563f1f55ace2cc576eb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 759 zcmVS7fmjF2Zldl@S7_V-7gIH&Y3%N&v(vz&pD%^p`oFnp`oFn zq2a%VBZm6B_{yvPZOKJ=8F%2-gDre#%iAOSF=6C8502S*1Y_8XS(uzV9>xW=H>^$M zI2?_Wa5Hwq>3ujAZ{SwU3CR;{Z9G=%LBVHKSN0vH`8oPgVMepz%<2rh{I1H3oHi5eO?2IuCu55HnYt`!~JlIV;@KgZ&eaqC1UBcnz{ z7Gfqo%6aG9wKzG+U@Tefl<1?s?yK}>gEUf0>>E?5J8Vs-`$IlCX(D&$+Q#16IT8GM zL!78Vq-bF&o{h7jn+~0@m-cL3%_#Rgic7F|h!Zt5@?hGJ(w@8$+op`A7~YxrD(p$y z(h;4XNOaK~88wLP8P{W#6#G*u`G(lLB6$=3?Dc00QUZ1ib)t3~e@=?q#dtb|UQA>7 zWHMXP%$G?LvqF3@YX4a6!Z-LMKT&5UYfVU2E6%@$-|-7}*4nssL^^zmWtkT;KlfhR p@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/Contents.json index c9e69de..7e68ac3 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "13n.png", + "filename" : "13n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/50d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/50d.png deleted file mode 100644 index a1f918b475f64b03aa799a6ea85c93692c76eeb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 401 zcmV;C0dD?@P)5JivAbWM#6G*vKIOa&1ifr5bu{=y0-2KyhT21eo!s9#_rf~c8^U?66qsQAE< zUOHG7o$anE+~l69XS#1!U8ZZg5JCtcgb+dqQH{P__0r;U+4LlE*=37EU?U~g@yStg zUW3Ui)3^n;fT5Dr7tS$TcpG^JcAfW3!fIp|*pK?}Ozi;h2CM?t4jx)qjl2NoK!3;k zB0(GK@(Xx3#{LznkuzY;Gm)xz*T@bq6USv=r`z8$%-;iz)WF_G>cEPjZaN7^_9jQ* zZDiefzho>%wt>+<=0XvFCSJ7R=-mN(4n9mqHi7Awbk*3Wy);ty2<(kVjm!b#23-+b znc?^xj^k6jXtTezhmmG9<3VU~4tix|9;n6fqd`B?Hhu*@EJ=76DcTH70Am^22d{q1 v`yL6M??T4 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/Contents.json index bdd7d65..45134fd 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "50d.png", + "filename" : "50d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/50n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/50n.png deleted file mode 100644 index a1f918b475f64b03aa799a6ea85c93692c76eeb7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 401 zcmV;C0dD?@P)5JivAbWM#6G*vKIOa&1ifr5bu{=y0-2KyhT21eo!s9#_rf~c8^U?66qsQAE< zUOHG7o$anE+~l69XS#1!U8ZZg5JCtcgb+dqQH{P__0r;U+4LlE*=37EU?U~g@yStg zUW3Ui)3^n;fT5Dr7tS$TcpG^JcAfW3!fIp|*pK?}Ozi;h2CM?t4jx)qjl2NoK!3;k zB0(GK@(Xx3#{LznkuzY;Gm)xz*T@bq6USv=r`z8$%-;iz)WF_G>cEPjZaN7^_9jQ* zZDiefzho>%wt>+<=0XvFCSJ7R=-mN(4n9mqHi7Awbk*3Wy);ty2<(kVjm!b#23-+b znc?^xj^k6jXtTezhmmG9<3VU~4tix|9;n6fqd`B?Hhu*@EJ=76DcTH70Am^22d{q1 v`yL6M??T4 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/Contents.json index e871e5b..e8e748d 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "50n.png", + "filename" : "50n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Views/PinDetail/PinDetailHeader.swift b/Pinit/Pinit/Views/PinDetail/PinDetailHeader.swift index 884dba7..e3f36e3 100644 --- a/Pinit/Pinit/Views/PinDetail/PinDetailHeader.swift +++ b/Pinit/Pinit/Views/PinDetail/PinDetailHeader.swift @@ -34,14 +34,15 @@ class PinDetailHeader: UIView { let label = UILabel() label.text = "핀 제목 예시" label.font = DesignSystemFont.Pretendard_Bold30.value + label.numberOfLines = 0 return label }() - // 핀 날씨 - public lazy var pinWeather: UILabel = { - let label = UILabel() - label.text = "맑음" - return label + public lazy var pinWeather: UIImageView = { + let view = UIImageView() + view.image = UIImage(named: "clear-day") + view.contentMode = .scaleAspectFit + return view }() // 핀 생성 날짜 @@ -106,19 +107,21 @@ class PinDetailHeader: UIView { // subView pinTitle.snp.makeConstraints { $0.top.equalToSuperview().inset(10) + $0.width.lessThanOrEqualTo(260) + $0.width.greaterThanOrEqualTo(160) $0.leading.equalToSuperview().inset(10) } pinWeather.snp.makeConstraints { - $0.top.equalToSuperview().inset(10) - $0.leading.equalTo(pinTitle.snp.trailing).offset(10) - $0.bottomMargin.equalTo(pinTitle.snp.bottom) + $0.trailing.equalTo(pinMenuButton.snp.leading).offset(-10) + + $0.top.equalTo(pinTitle).offset(5) + $0.width.height.equalTo(40) } pinMenuButton.snp.makeConstraints { - $0.top.equalToSuperview().inset(10) + $0.top.equalTo(pinTitle) $0.trailing.equalToSuperview().inset(10) - } pinDate.snp.makeConstraints { @@ -151,3 +154,6 @@ class PinDetailHeader: UIView { PinDetailHeader() } +#Preview { + PinDetailViewController(PinEntity.sampleData[0]) +} diff --git a/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift b/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift index b1c8b3d..c4b0f82 100644 --- a/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift +++ b/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift @@ -241,7 +241,7 @@ extension PinDetailViewController: UITableViewDataSource, UITableViewDelegate { header.pinDate.text = pinEntity.date.koreanDateString() header.pinTitle.text = pinEntity.title header.pinImageView.image = pinEntity.mediaPath - header.pinWeather.text = pinEntity.weather + header.pinWeather.image = UIImage(named: pinEntity.weather) header.pinDescription.text = pinEntity.description header.pinMenuButton.addTarget(self, action: #selector(pinMenuButtonTapped), for: .touchUpInside) return header