[Feat] ring 배경 없애기 구현 #51

SOPT-33-iOS-Team-1 · Nov 25, 2023 · 33949c7 · 33949c7
1 parent bd4eee5
commit 33949c7
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 1 deletion.
diff --git a/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Network/MoyaAPI.swift b/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Network/MoyaAPI.swift
@@ -41,5 +41,13 @@ extension MoyaAPI {
                 completion: completion)
         }
     }
+//    
+//    public func getProgramDetailData(id: Int, completion: @escaping (NetworkResult<Any>) -> Void) {
+//        provider.request(.getProgramDetailData(id: id)) { (result) in
+//            self.disposeNetwork(
+//                result,
+//                dataModel: [ProgramModel].self,
+//                completion: completion)
+//        }
 }
 
diff --git a/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Network/MoyaService.swift b/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Network/MoyaService.swift
@@ -14,6 +14,7 @@ enum MoyaService {
     case getMainData
     case getGelationData
     case getProgramData(type: String)
+    case getProgramDetailData(id: Int)
 }
 
 extension MoyaService: BaseTargetType {
@@ -25,6 +26,8 @@ extension MoyaService: BaseTargetType {
             return "/api/v1/user/info/detail/\(1)"
         case .getProgramData:
             return "/api/v1/program"
+        case .getProgramDetailData:
+            return "/api/v1/program/detail"
         }
     }
 
@@ -36,6 +39,8 @@ extension MoyaService: BaseTargetType {
             return .get
         case .getProgramData:
             return .get
+        case .getProgramDetailData:
+            return .get
         }
     }
 
@@ -48,6 +53,8 @@ extension MoyaService: BaseTargetType {
             return .requestPlain
         case .getProgramData(let type):
             return .requestParameters(parameters: ["program_type": type], encoding: URLEncoding.default)
+        case .getProgramDetailData(let id):
+            return .requestParameters(parameters: ["programId": id], encoding: URLEncoding.default)
         }
     }
 }

diff --git a/...HON_33-iOS/SOPKATHON_33-iOS/Presentation/Detail/ViewController/DetailViewController.swift b/...HON_33-iOS/SOPKATHON_33-iOS/Presentation/Detail/ViewController/DetailViewController.swift
@@ -14,6 +14,8 @@ final class DetailViewController: UIViewController {
 
     // MARK: - Properties
 
+    var id: Int?
+
     private lazy var backButton = UIButton()
     private let backgroundImageView = UIImageView()
     private let scrollView = UIScrollView()
@@ -42,6 +44,11 @@ final class DetailViewController: UIViewController {
         setUI()
     }
 
+    @objc func backButtonDidTap() {
+        print(#function)
+        self.navigationController?.popViewController(animated: true)
+    }
+
 }
 
 // MARK: - Extensions
@@ -59,8 +66,11 @@ extension DetailViewController {
         backButton.do {
             $0.setImage(UIImage(systemName: "chevron.backward"), for: .normal)
             $0.tintColor = .white
+            $0.addTarget(self, action: #selector(backButtonDidTap), for: .touchUpInside)
         }
 
+
+
         backgroundImageView.do {
             $0.image = Image.dummy1
         }
@@ -159,7 +169,7 @@ extension DetailViewController {
     }
 
     private func setLayout() {
-        view.addSubviews(backButton, backgroundImageView, scrollView, applyView)
+        view.addSubviews(backgroundImageView, scrollView, applyView)
 
         backgroundImageView.snp.makeConstraints {
             $0.top.leading.trailing.equalToSuperview()

diff --git a/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Presentation/Main/View/ActivityCardView.swift b/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Presentation/Main/View/ActivityCardView.swift
@@ -30,9 +30,13 @@ final class ActivityCardView: UIView {
         self.setUI()
         self.setHierachy()
         self.setLayout()
+        progressView1.backgroundColor = .clear
         progressView1.ringColor = .blue1
+        progressView2.backgroundColor = .clear
         progressView2.ringColor = .blue2
+        progressView3.backgroundColor = .clear
         progressView3.ringColor = .blue3
+
     }
 
     @available(*, unavailable)

diff --git a/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Presentation/Program/Cell/ProgramCollectionViewCell.swift b/SOPKATHON_33-iOS/SOPKATHON_33-iOS/Presentation/Program/Cell/ProgramCollectionViewCell.swift
@@ -10,10 +10,15 @@ import UIKit
 import SnapKit
 import Then
 
+protocol ProgramCollectionViewCellDelegate: AnyObject {
+    func cellDidTap(id: Int)
+}
+
 final class ProgramCollectionViewCell: UICollectionViewCell {
 
     // MARK: - UI Components
 
+    private var id: Int?
     private let backgroundImageView = UIImageView()
     private let titleLabel = UILabel()
     private let areaLabel = UILabel()
@@ -101,6 +106,7 @@ final class ProgramCollectionViewCell: UICollectionViewCell {
     }
 
     func dataBind(_ data: ProgramModel) {
+        id = data.programID
         titleLabel.text = data.title
         backgroundImageView.kfSetImage(url: data.imageURL)
         areaLabel.text = data.region

diff --git a/...N_33-iOS/SOPKATHON_33-iOS/Presentation/Program/ViewController/ProgramViewController.swift b/...N_33-iOS/SOPKATHON_33-iOS/Presentation/Program/ViewController/ProgramViewController.swift
@@ -51,9 +51,13 @@ final class ProgramViewController: BaseViewController {
 
     @objc func voluteerButtonDidTap() {
         requestProgramAPI(type: "VOLUNTEERING")
+        rootView.programTopView.voluteerButton.setTitleColor(.white, for: .normal)
+        rootView.programTopView.employmentButton.setTitleColor(.gray500, for: .normal)
     }
     @objc func employmentButtonDidTap() {
         requestProgramAPI(type: "EMPLOYMENT")
+        rootView.programTopView.voluteerButton.setTitleColor(.gray500, for: .normal)
+        rootView.programTopView.employmentButton.setTitleColor(.white, for: .normal)
     }
     @objc func statusSupportButtonDidTap() {
         print(#function)
@@ -66,6 +70,12 @@ final class ProgramViewController: BaseViewController {
         }
     }
 
+    private func pushProgramDetailVC(id: Int) {
+        let programDetailVC = DetailViewController()
+        programDetailVC.id = id
+        self.navigationController?.pushViewController(programDetailVC, animated: true)
+    }
+
 }
 
 
@@ -76,6 +86,12 @@ extension ProgramViewController: UICollectionViewDelegateFlowLayout {
             height: 209
         )
     }
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        // 셀이 선택됐을 때 실행되는 함수
+        let selectedItemId = programData[indexPath.item].programID
+        pushProgramDetailVC(id: selectedItemId)
+
+    }
 }
 
 extension ProgramViewController: UICollectionViewDataSource {