[FEAT] #18 데이터 연결 & 세팅 탭 세부조정

Author: kut7728

Pinit/Pinit/Views/PinDetail/PinDetailHeader.swift

@@ -64,6 +64,7 @@ class PinDetailHeader: UIView {
     public lazy var pinImageView: UIImageView = {
         let imageView = UIImageView()
         imageView.image = UIImage(named: "sampleImg.jpg")
+        imageView.contentMode = .scaleAspectFit
         return imageView
     }()
 

Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift

@@ -20,10 +20,6 @@ final class PinDetailViewController: UIViewController {
     init(_ entity: PinEntity) {
         self.pinEntity = entity
 
-        if entity.address == "" {
-            self.reviewPanelContainer.isHidden = true
-            self.pinTableView.isHidden = true
-        }
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -66,8 +62,8 @@ final class PinDetailViewController: UIViewController {
 
         let annotation = MKPointAnnotation()
         annotation.coordinate = CLLocationCoordinate2D(latitude: lat, longitude: long) // San Francisco, CA
-        annotation.title = "San Francisco"
-        annotation.subtitle = "CA"
+        annotation.title = pinEntity.title
+        annotation.subtitle = pinEntity.weather
         map.addAnnotation(annotation)
 
         return map
@@ -219,6 +215,7 @@ extension PinDetailViewController: UITableViewDataSource, UITableViewDelegate {
         let header = PinDetailHeader()
         header.pinDate.text = pinEntity.date.koreanDateString()
         header.pinTitle.text = pinEntity.title
+        header.pinImageView.image = pinEntity.mediaPath
         header.pinWeather.text = pinEntity.weather
         header.pinDescription.text = pinEntity.description
         header.pinMenuButton.addTarget(self, action: #selector(pinMenuButtonTapped), for: .touchUpInside)

Pinit/Pinit/Views/Setting/ProducerCollectionViewCell.swift

@@ -20,7 +20,7 @@ class ProducerCollectionViewCell : UICollectionViewCell {
 
     public lazy var thumbnailImageView: UIImageView = {
         let imageView = UIImageView()
-        imageView.contentMode = .scaleAspectFill
+        imageView.contentMode = .scaleToFill
         imageView.backgroundColor = .lightGray
         return imageView
     }()
@@ -87,3 +87,7 @@ class ProducerCollectionViewCell : UICollectionViewCell {
         }
     }
 }
+
+#Preview {
+    SettingViewController()
+}

Pinit/Pinit/Views/Setting/SettingViewController.swift

@@ -30,13 +30,16 @@ final class SettingViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        view.backgroundColor = .white
+        navigationController?.setNavigationBarHidden(true, animated: true)
+        extendedLayoutIncludesOpaqueBars = true
+        view.backgroundColor = .secondarySystemBackground
 
         view.addSubview(produceCollectionView)
         view.addSubview(resetButton)
 
         produceCollectionView.delegate = self
         produceCollectionView.dataSource = self
+        produceCollectionView.backgroundColor = .secondarySystemBackground
 
         //버튼 레이아웃 설정
         resetButton.setTitle("전체 기록 삭제", for: .normal)
@@ -78,7 +81,7 @@ final class SettingViewController: UIViewController {
 extension SettingViewController : UICollectionViewDelegate, UICollectionViewDelegateFlowLayout, UICollectionViewDataSource {
 
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        let detailVC = PinDetailViewController() //프로필 누르면 상세 화면으로
+        let detailVC = PinDetailViewController(PinEntity.producerData[indexPath.row]) //프로필 누르면 상세 화면으로
 
         present(detailVC, animated: true ,completion: nil )
     }
@@ -104,16 +107,16 @@ extension SettingViewController : UICollectionViewDelegate, UICollectionViewDele
 extension SettingViewController {
     private func autoLayout() {
         resetButton.snp.makeConstraints {
-            $0.bottom.equalTo(view.safeAreaLayoutGuide)
-            $0.height.equalTo(70)
+            $0.bottom.equalTo(view.safeAreaLayoutGuide).inset(10)
+            $0.height.equalTo(60)
             $0.leading.equalToSuperview().inset(10)
             $0.trailing.equalToSuperview().offset(-10)
         }
         //컬렉션 뷰 제약 설정 부분 예정
         produceCollectionView.snp.makeConstraints {
             $0.top.equalTo(view.safeAreaLayoutGuide).inset(10)
             $0.width.equalToSuperview()
-            $0.bottom.equalTo(resetButton.snp.top)
+            $0.bottom.equalTo(resetButton.snp.top).offset(-10)
         }
     }
 }