[iOS] 마이페이지 이미지 리소스, 외부 링크 적용 (#54)

TTOzzi · web-flow · commit 0601399e70c8 · 2025-08-19T20:59:41.000+09:00
* [NL-82]: 추천 번호 정렬 처리

* [NL-82]: 마이페이지 이미지 리소스 적용

* [NL-82]: 마이페이지 외부 링크 연결

* [NL-82]: 마이페이지 navigation title 설정

* [NL-82]: 레이아웃 경고 제거
diff --git a/Common/Base/Sources/Model/ExternalLinks.swift b/Common/Base/Sources/Model/ExternalLinks.swift
@@ -1,11 +1,12 @@
 //
-//  NotionLinke.swift
+//  ExternalLinks.swift
 //  FeatureLayer
 //
 //  Created by 최재혁 on 8/19/25.
 //
 
-enum NotionLinke: String {
+public enum ExternalLinks: String {
   case terms = "https://www.notion.so/satto-terms-consent/253180ab3dd7818b9a13c04f1df34044"
   case infoProvision = "https://satto-terms-consent.notion.site/253180ab3dd781088ab9e2afdd7da150"
+  case feedbackChannel = "https://pf.kakao.com/_bfCen/chat"
 }
diff --git a/DesignSystem/DesignSystem/Resources/Images.xcassets/chevron-right-s.imageset/Contents.json b/DesignSystem/DesignSystem/Resources/Images.xcassets/chevron-right-s.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "chevron-right-s.svg",
+      "filename" : "line.svg",
       "idiom" : "universal"
     }
   ],
diff --git a/DesignSystem/DesignSystem/Resources/Images.xcassets/chevron-right-s.imageset/chevron-right-s.svg b/DesignSystem/DesignSystem/Resources/Images.xcassets/chevron-right-s.imageset/chevron-right-s.svg
diff --git a/DesignSystem/DesignSystem/Resources/Images.xcassets/chevron-right-s.imageset/line.svg b/DesignSystem/DesignSystem/Resources/Images.xcassets/chevron-right-s.imageset/line.svg
diff --git a/DesignSystem/DesignSystem/Resources/Images.xcassets/image_profile.imageset/Contents.json b/DesignSystem/DesignSystem/Resources/Images.xcassets/image_profile.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "image_profile.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DesignSystem/DesignSystem/Resources/Images.xcassets/image_profile.imageset/image_profile.png b/DesignSystem/DesignSystem/Resources/Images.xcassets/image_profile.imageset/image_profile.png
diff --git a/DesignSystem/DesignSystem/Resources/Images.xcassets/image_send.imageset/Contents.json b/DesignSystem/DesignSystem/Resources/Images.xcassets/image_send.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "line.svg",
+      "filename" : "image_send.png",
       "idiom" : "universal"
     }
   ],
diff --git a/DesignSystem/DesignSystem/Resources/Images.xcassets/image_send.imageset/image_send.png b/DesignSystem/DesignSystem/Resources/Images.xcassets/image_send.imageset/image_send.png
diff --git a/Feature/Home/Sources/Home/HomeService.swift b/Feature/Home/Sources/Home/HomeService.swift
@@ -33,14 +33,16 @@ struct HomeService {
       if let recommendationContent = lottoRecommendation.content {
         HomeRecommendationCollectionViewCellModel(
           title: "\(name)님을 위한 로또 번호 추천",
-          state: .recommended(numbers: [
-            recommendationContent.num1,
-            recommendationContent.num2,
-            recommendationContent.num3,
-            recommendationContent.num4,
-            recommendationContent.num5,
-            recommendationContent.num6,
-          ])  // TODO: 결과 확인 여부 추가 예정
+          state: .recommended( // TODO: 서버 - 결과 확인 여부 추가 예정
+            numbers: [
+              recommendationContent.num1,
+              recommendationContent.num2,
+              recommendationContent.num3,
+              recommendationContent.num4,
+              recommendationContent.num5,
+              recommendationContent.num6,
+            ].sorted()
+          )
         )
       } else {
         HomeRecommendationCollectionViewCellModel(
diff --git a/Feature/Home/Sources/RecommendationDetail/RecommendationDetailService.swift b/Feature/Home/Sources/RecommendationDetail/RecommendationDetailService.swift
@@ -58,7 +58,7 @@ struct RecommendationDetailService {
           content.num4,
           content.num5,
           content.num6,
-        ]
+        ].sorted()
       ),
       AIAnalysisResultCollectionViewCellModel(
         description: content.reason,
diff --git a/Feature/Onboarding/Sources/Agreement/AgreementCell.swift b/Feature/Onboarding/Sources/Agreement/AgreementCell.swift
@@ -24,7 +24,7 @@ public final class AgreementCell: UICollectionViewCell {
   }
 
   public private(set) lazy var detailButton: UIButton = UIButton().then {
-    $0.setImage(STImages.line.image, for: .normal)
+    $0.setImage(STImages.chevronRightS.image, for: .normal)
     $0.tintColor = STColors.gray5.color
   }
 
diff --git a/Feature/Onboarding/Sources/Agreement/AgreementViewModel.swift b/Feature/Onboarding/Sources/Agreement/AgreementViewModel.swift
@@ -5,6 +5,7 @@
 //  Created by 최재혁 on 8/19/25.
 //
 
+import Base
 import Combine
 import SafariServices
 
@@ -24,11 +25,11 @@ final class AgreementViewModel {
   func send(input: Input) {
     switch input {
     case .acceptTermTapped:
-      let url = NSURL(string: NotionLinke.terms.rawValue)
+      let url = NSURL(string: ExternalLinks.terms.rawValue)
       let termSafariView: SFSafariViewController = SFSafariViewController(url: url! as URL)
       output.presentSafariViewController.send(termSafariView)
     case .acceptInfoProvisionTapped:
-      let url = NSURL(string: NotionLinke.infoProvision.rawValue)
+      let url = NSURL(string: ExternalLinks.infoProvision.rawValue)
       let infoProvisionSafariView: SFSafariViewController = SFSafariViewController(url: url! as URL)
       output.presentSafariViewController.send(infoProvisionSafariView)
     }
diff --git a/Feature/Setting/Sources/MyPage/Cells/MyProfileInfoCollectionViewCell.swift b/Feature/Setting/Sources/MyPage/Cells/MyProfileInfoCollectionViewCell.swift
@@ -14,9 +14,8 @@ import UIKit
 
 struct MyProfileInfoCollectionViewCellModel {
   let nickname: String
-  // let profileImageURL: URL?
-  let gender: String  // TODO: 데이터 타입 확인 필요
-  let birthDate: String  // TODO: 데이터 타입 확인 필요
+  let gender: String
+  let birthDate: String
   let birthTime: String
 }
 
@@ -30,6 +29,8 @@ final class MyProfileInfoCollectionViewCell: BaseCollectionViewCell {
   private lazy var profileImageView = UIImageView().then {
     $0.layer.cornerRadius = 44
     $0.clipsToBounds = true
+    $0.contentMode = .scaleAspectFit
+    $0.image = STImages.imageProfile.image
   }
   private lazy var nicknameStackView = UIStackView().then {
     $0.axis = .horizontal
@@ -61,7 +62,6 @@ final class MyProfileInfoCollectionViewCell: BaseCollectionViewCell {
   override init(frame: CGRect) {
     super.init(frame: frame)
     setupUI()
-    profileImageView.backgroundColor = .gray  // TODO: 임시
   }
 
   required init?(coder: NSCoder) {
diff --git a/Feature/Setting/Sources/MyPage/Cells/SendFeedbackCollectionViewCell.swift b/Feature/Setting/Sources/MyPage/Cells/SendFeedbackCollectionViewCell.swift
@@ -19,6 +19,7 @@ final class SendFeedbackCollectionViewCell: UICollectionViewCell {
 
   private lazy var contentStackView = UIStackView().then {
     $0.axis = .horizontal
+    $0.alignment = .center
     $0.spacing = 14
   }
   private lazy var feedbackAreaStackView = UIStackView().then {
@@ -30,29 +31,31 @@ final class SendFeedbackCollectionViewCell: UICollectionViewCell {
     $0.style = Typography.Body_14_SB
     $0.numberOfLines = 2
   }
-  private lazy var sendFeedbackButton = UIView().then {
+  private lazy var sendFeedbackStackView = UIStackView().then {
+    $0.axis = .horizontal
+    $0.spacing = 4
+    $0.alignment = .center
+    $0.layoutMargins = UIEdgeInsets(top: .zero, left: 12, bottom: .zero, right: 12)
+    $0.isLayoutMarginsRelativeArrangement = true
     $0.backgroundColor = STColors.primary8.color
-    $0.isUserInteractionEnabled = false
     $0.clipsToBounds = true
     $0.layer.cornerRadius = 6
   }
-
   private lazy var sendFeedbackLabel = UILabel().then {
     $0.backgroundColor = .clear
     $0.style = Typography.Caption_12_B
     $0.textColor = STColors.primary2.color
     $0.styledText = "의견 보내기"
   }
-
   private lazy var arrowRightView = UIImageView().then {
-    $0.image = STImages.iconArrow.image.withRenderingMode(.alwaysTemplate)
+    $0.image = STImages.chevronRightS.image.withRenderingMode(.alwaysTemplate)
     $0.contentMode = .scaleAspectFit
-    $0.transform = CGAffineTransform(rotationAngle: .pi)
     $0.tintColor = STColors.primary2.color
   }
-
   private lazy var imageView = UIImageView().then {
-    $0.backgroundColor = .gray  // TODO: 이미지 리소스 확인 필요
+    $0.contentMode = .scaleAspectFit
+    $0.image = STImages.imageSend.image
+    $0.setContentHuggingPriority(.required, for: .horizontal)
   }
 
   override init(frame: CGRect) {
@@ -75,32 +78,19 @@ final class SendFeedbackCollectionViewCell: UICollectionViewCell {
 
     contentStackView.addArrangedSubview(feedbackAreaStackView)
     feedbackAreaStackView.addArrangedSubview(descriptionLabel)
-    feedbackAreaStackView.addArrangedSubview(sendFeedbackButton)
-
-    contentStackView.addArrangedSubview(imageView)
-
-    imageView.snp.makeConstraints { make in
-      make.centerY.equalToSuperview()
-      make.width.equalTo(imageView.snp.height)
+    feedbackAreaStackView.addArrangedSubview(sendFeedbackStackView)
+    sendFeedbackStackView.snp.makeConstraints { make in
+      make.height.equalTo(32)
     }
-
-    sendFeedbackButton.addSubview(sendFeedbackLabel)
-    sendFeedbackButton.addSubview(arrowRightView)
-
-    sendFeedbackButton.snp.makeConstraints { make in
-      make.height.equalTo(40)
-      make.width.greaterThanOrEqualTo(103)
-    }
-
-    sendFeedbackLabel.snp.makeConstraints { make in
-      make.leading.equalToSuperview().offset(12)
-      make.centerY.equalToSuperview()
-    }
-
+    sendFeedbackStackView.addArrangedSubview(sendFeedbackLabel)
+    sendFeedbackStackView.addArrangedSubview(arrowRightView)
     arrowRightView.snp.makeConstraints { make in
-      make.height.width.equalTo(15)
-      make.trailing.equalToSuperview().inset(12)
-      make.centerY.equalToSuperview()
+      make.size.equalTo(20)
+    }
+    
+    contentStackView.addArrangedSubview(imageView)
+    imageView.snp.makeConstraints { make in
+      make.size.equalTo(86)
     }
   }
 
diff --git a/Feature/Setting/Sources/MyPage/MyPageService.swift b/Feature/Setting/Sources/MyPage/MyPageService.swift
@@ -38,23 +38,39 @@ struct MyPageService {
         MyProfileInfoCollectionViewCellModel(
           nickname: userData.name,
           gender: gender,
-          birthDate: birthDate,  // TODO: 서버 데이터 양식 확인 필요
-          birthTime: birthTime  // TODO: 서버 데이터 양식 확인 필요
+          birthDate: birthDate,
+          birthTime: birthTime
         )
       ),
       .feedback(
         SendFeedbackCollectionViewCellModel(
-          description: "더 나은 서비스를 위해,\n여러분의 목소리를 들려주세요",
+          description: "더 나은 서비스를 위하여,\n그대의 목소리를 들려주시게",
           feedbackButtonTitle: "의견 보내기"
         )
       ),
       .menu([
-        MyPageMenuCollectionViewCellModel(
-          style: .icon(STImages.chevronRightS.image), title: "이용약관"),
-        MyPageMenuCollectionViewCellModel(
-          style: .icon(STImages.chevronRightS.image), title: "개인정보 처리방침"),
-        MyPageMenuCollectionViewCellModel(style: .text(appVersion ?? "1.0.0"), title: "앱 버전"),
+        .termsOfService(MyPageMenuCollectionViewCellModel(
+          style: .icon(STImages.chevronRightS.image), title: "이용약관")),
+        .privacyPolicy(MyPageMenuCollectionViewCellModel(
+          style: .icon(STImages.chevronRightS.image), title: "개인정보 처리방침")),
+        .appVersion(MyPageMenuCollectionViewCellModel(style: .text(appVersion ?? "1.0.0"), title: "앱 버전")),
       ]),
     ]
   }
 }
+
+enum MyPageMenu {
+  
+  case termsOfService(MyPageMenuCollectionViewCellModel)
+  case privacyPolicy(MyPageMenuCollectionViewCellModel)
+  case appVersion(MyPageMenuCollectionViewCellModel)
+  
+  var item: MyPageMenuCollectionViewCellModel {
+    switch self {
+    case .termsOfService(let myPageMenuCollectionViewCellModel),
+        .privacyPolicy(let myPageMenuCollectionViewCellModel),
+        .appVersion(let myPageMenuCollectionViewCellModel):
+      return myPageMenuCollectionViewCellModel
+    }
+  }
+}
diff --git a/Feature/Setting/Sources/MyPage/MyPageViewController.swift b/Feature/Setting/Sources/MyPage/MyPageViewController.swift
@@ -16,7 +16,7 @@ import UIKit
 enum MyPageSection {
   case profile(MyProfileInfoCollectionViewCellModel)
   case feedback(SendFeedbackCollectionViewCellModel)
-  case menu([MyPageMenuCollectionViewCellModel])
+  case menu([MyPageMenu])
 }
 
 public final class MyPageViewController: BaseViewController {
@@ -59,13 +59,9 @@ public final class MyPageViewController: BaseViewController {
     setupBinding()
     viewModel.send(input: .viewDidLoad)
   }
-
-  public override func viewWillAppear(_ animated: Bool) {
-    super.viewWillAppear(animated)
-
-  }
-
+  
   private func setupUI() {
+    title = "마이"
     view.backgroundColor = STColors.primary9.color
 
     view.addSubview(collectionView)
@@ -81,8 +77,16 @@ public final class MyPageViewController: BaseViewController {
         self?.collectionView.reloadData()
       }
       .store(in: &cancellables)
+    
+    viewModel.output.showWebView
+      .receive(on: DispatchQueue.main)
+      .sink { [weak self] url in
+        let safariViewController = SFSafariViewController(url: url)
+        self?.present(safariViewController, animated: true)
+      }
+      .store(in: &cancellables)
 
-    viewModel.output.showToadt
+    viewModel.output.showToast
       .receive(on: DispatchQueue.main)
       .sink { [weak self] in
         guard let self else { return }
@@ -227,7 +231,7 @@ extension MyPageViewController: UICollectionViewDataSource {
       let cell = collectionView.dequeueReusableCell(
         withReuseIdentifier: MyPageMenuCollectionViewCell.typeName, for: indexPath)
       if let cell = cell as? MyPageMenuCollectionViewCell {
-        let model = models[indexPath.item]
+        let model = models[indexPath.item].item
         cell.update(with: model)
       }
       return cell
@@ -258,6 +262,7 @@ extension MyPageViewController: UICollectionViewDelegateFlowLayout {
   import Auth
   import DIInjector
   import NetworkCore
+import SafariServices
 
   @available(iOS 17.0, *)
   #Preview {
diff --git a/Feature/Setting/Sources/MyPage/MyPageViewModel.swift b/Feature/Setting/Sources/MyPage/MyPageViewModel.swift

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"images" : [`
`3`	`3`	`{`
`4`		`- "filename" : "chevron-right-s.svg",`
	`4`	`+ "filename" : "line.svg",`
`5`	`5`	`"idiom" : "universal"`
`6`	`6`	`}`
`7`	`7`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"images" : [`
`3`	`3`	`{`
`4`		`- "filename" : "line.svg",`
	`4`	`+ "filename" : "image_send.png",`
`5`	`5`	`"idiom" : "universal"`
`6`	`6`	`}`
`7`	`7`	`],`