Feat [#43] 마이페이지 뷰 SegmentControl 상단 고정 기능 구현 완료

DontBe-iOS/DontBe-iOS.xcodeproj/project.pbxproj

@@ -62,7 +62,6 @@
 		3C4993652B4F2471002A99CF /* MyPageSegmentedControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C4993642B4F2471002A99CF /* MyPageSegmentedControl.swift */; };
 		3C4993672B4F2644002A99CF /* MyPageContentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C4993662B4F2644002A99CF /* MyPageContentViewController.swift */; };
 		3C4993692B4F2653002A99CF /* MyPageCommentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C4993682B4F2653002A99CF /* MyPageCommentViewController.swift */; };
-		3C49936B2B4FF118002A99CF /* MyPageSegmentedControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C49936A2B4FF118002A99CF /* MyPageSegmentedControlView.swift */; };
 		3C6192ED2B3A719A00220CEB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C6192EC2B3A719A00220CEB /* AppDelegate.swift */; };
 		3C6192EF2B3A719A00220CEB /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C6192EE2B3A719A00220CEB /* SceneDelegate.swift */; };
 		3C6192F62B3A719C00220CEB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3C6192F52B3A719C00220CEB /* Assets.xcassets */; };
@@ -141,7 +140,6 @@
 		3C4993642B4F2471002A99CF /* MyPageSegmentedControl.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageSegmentedControl.swift; sourceTree = "<group>"; };
 		3C4993662B4F2644002A99CF /* MyPageContentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageContentViewController.swift; sourceTree = "<group>"; };
 		3C4993682B4F2653002A99CF /* MyPageCommentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageCommentViewController.swift; sourceTree = "<group>"; };
-		3C49936A2B4FF118002A99CF /* MyPageSegmentedControlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyPageSegmentedControlView.swift; sourceTree = "<group>"; };
 		3C6192E92B3A719A00220CEB /* DontBe-iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DontBe-iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3C6192EC2B3A719A00220CEB /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		3C6192EE2B3A719A00220CEB /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -500,6 +498,13 @@
 			path = Cells;
 			sourceTree = "<group>";
 		};
+		3C8A262D2B5194C100E549F3 /* Cells */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = Cells;
+			sourceTree = "<group>";
+		};
 		3CE9C1252B4BE5970086E4A3 /* Write */ = {
 			isa = PBXGroup;
 			children = (
@@ -556,6 +561,7 @@
 			children = (
 				3CF184C82B4EEBEA00816D5F /* Views */,
 				3CF184C92B4EEBF500816D5F /* ViewControllers */,
+				3C8A262D2B5194C100E549F3 /* Cells */,
 				3CEE4CBE2B500BA900F506AF /* Helpers */,
 			);
 			path = MyPage;
@@ -566,7 +572,6 @@
 			children = (
 				3CF184CC2B4EEC1900816D5F /* MyPageView.swift */,
 				3CF184D02B4EFF9900816D5F /* MyPageProfileView.swift */,
-				3C49936A2B4FF118002A99CF /* MyPageSegmentedControlView.swift */,
 				3C4993642B4F2471002A99CF /* MyPageSegmentedControl.swift */,
 			);
 			path = Views;
@@ -682,7 +687,6 @@
 				2A8D70C52B4D8079009F4C6C /* UIViewController+.swift in Sources */,
 				2A6D54C12B479B4300F9891E /* adjusted+.swift in Sources */,
 				2A8D70D12B4DD356009F4C6C /* JoinAgreementViewController.swift in Sources */,
-				3C49936B2B4FF118002A99CF /* MyPageSegmentedControlView.swift in Sources */,
 				3C2F54522B51224500E7BF01 /* MyPageAccountInfoViewController.swift in Sources */,
 				3CE9C1352B4C4BC20086E4A3 /* CircleProgressbar.swift in Sources */,
 				3C6193192B3A7AC700220CEB /* Config.swift in Sources */,

DontBe-iOS/DontBe-iOS/Presentation/Helpers/CircleProgressbar.swift

@@ -11,7 +11,7 @@ final class CircleProgressbar: UIView {
 
     var lineWidth: CGFloat = 2
     var circleBackgroundColor: UIColor = .gray
-    var circleTintColor: UIColor = .black
+    var circleTintColor: UIColor = .clear
 
     var value: Double? {
         didSet {
@@ -33,7 +33,11 @@ final class CircleProgressbar: UIView {
     override func draw(_ rect: CGRect) {
         let bezierPath = UIBezierPath()
 
-        bezierPath.addArc(withCenter: CGPoint(x: rect.midX, y: rect.midY), radius: rect.midX - ((lineWidth - 1) / 2), startAngle: 0, endAngle: .pi * 2, clockwise: true)
+        bezierPath.addArc(withCenter: CGPoint(x: rect.midX, y: rect.midY), 
+                          radius: rect.midX - ((lineWidth) / 2),
+                          startAngle: 0,
+                          endAngle: .pi * 2,
+                          clockwise: true)
 
         bezierPath.lineWidth = lineWidth
         circleBackgroundColor.set()
@@ -45,17 +49,22 @@ final class CircleProgressbar: UIView {
             return
         }
 
+
         self.subviews.forEach { $0.removeFromSuperview() }
         self.layer.sublayers?.forEach { $0.removeFromSuperlayer() }
 
         let bezierPath = UIBezierPath()
 
-        bezierPath.addArc(withCenter: CGPoint(x: rect.midX, y: rect.midY), radius: rect.midX - ((lineWidth - 1) / 2), startAngle: -.pi / 2, endAngle: ((.pi * 2) * value) - (.pi / 2), clockwise: true)
+        bezierPath.addArc(withCenter: CGPoint(x: rect.midX, y: rect.midY), 
+                          radius: rect.midX - ((lineWidth) / 2),
+                          startAngle: -.pi / 2,
+                          endAngle: ((.pi * 2) * value) - (.pi / 2),
+                          clockwise: true)
 
         let shapeLayer = CAShapeLayer()
 
         shapeLayer.path = bezierPath.cgPath
-        shapeLayer.lineCap = .square
+        shapeLayer.lineCap = .round
 
         shapeLayer.strokeColor = circleTintColor.cgColor
         shapeLayer.fillColor = UIColor.clear.cgColor

DontBe-iOS/DontBe-iOS/Presentation/MyPage/ViewControllers/MyPageCommentViewController.swift

@@ -7,23 +7,22 @@
 
 import UIKit
 
-class MyPageCommentViewController: UIViewController {
+import SnapKit
+
+final class MyPageCommentViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        self.view.backgroundColor = .donWhite
+        setUI()
+        setLayout()
     }
 
-
-    /*
-    // MARK: - Navigation
-
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destination.
-        // Pass the selected object to the new view controller.
+    private func setUI() {
+        self.view.backgroundColor = .donPale
+    }
+
+    private func setLayout() {
+
     }
-    */
-
 }

DontBe-iOS/DontBe-iOS/Presentation/MyPage/ViewControllers/MyPageContentViewController.swift

@@ -7,23 +7,224 @@
 
 import UIKit
 
-class MyPageContentViewController: UIViewController {
+import SnapKit
 
+final class MyPageContentViewController: UIViewController {
+
+    // MARK: - Properties
+
+    var tabBarHeight: CGFloat = 0
+    var showUploadToastView: Bool = false
+    var deleteBottomsheet = DontBeBottomSheetView(singleButtonImage: ImageLiterals.Posting.btnDelete)
+    private let refreshControl = UIRefreshControl()
+
+    // MARK: - UI Components
+
+    lazy var homeCollectionView = HomeCollectionView().collectionView
+    private let uploadToastView = DontBeToastView()
+
+    private let transparentButtonPopupView = DontBePopupView(popupImage: ImageLiterals.Popup.transparentButtonImage,
+                                                             popupTitle: StringLiterals.Home.transparentPopupTitleLabel,
+                                                             popupContent: StringLiterals.Home.transparentPopupContentLabel,
+                                                             leftButtonTitle: StringLiterals.Home.transparentPopupLefteftButtonTitle,
+                                                             rightButtonTitle: StringLiterals.Home.transparentPopupRightButtonTitle)
+
+    // MARK: - Life Cycles
+
     override func viewDidLoad() {
         super.viewDidLoad()
+
+        getAPI()
+        setUI()
+        setHierarchy()
+        setLayout()
+        setDelegate()
+        setNotification()
+        setRefreshControll()
+    }
+
+    // MARK: - TabBar Height
+
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+
+        tabBarHeight = tabBarController?.tabBar.frame.size.height ?? 0
+    }
+}
 
-        self.view.backgroundColor = .donWhite
+// MARK: - Extensions
+
+extension MyPageContentViewController {
+    private func setUI() {
+        self.view.backgroundColor = UIColor.donGray1
+        self.navigationController?.navigationBar.isHidden = true
+        uploadToastView.alpha = 0
+        transparentButtonPopupView.alpha = 0
+    }
+
+    private func setHierarchy() {
+        view.addSubviews(homeCollectionView,
+                         uploadToastView,
+                         transparentButtonPopupView)
+    }
+
+    private func setLayout() {
+        homeCollectionView.snp.makeConstraints {
+            $0.top.equalTo(self.view.safeAreaLayoutGuide.snp.top)
+            $0.leading.trailing.bottom.equalToSuperview()
+            $0.width.equalTo(UIScreen.main.bounds.width)
+        }
+
+        uploadToastView.snp.makeConstraints {
+            $0.leading.trailing.equalToSuperview().inset(16.adjusted)
+            $0.bottom.equalTo(tabBarHeight).inset(6.adjusted)
+            $0.height.equalTo(44)
+        }
+
+        transparentButtonPopupView.snp.makeConstraints {
+            $0.edges.equalToSuperview()
+        }
+    }
+
+    private func setDelegate() {
+        homeCollectionView.dataSource = self
+        homeCollectionView.delegate = self
+        transparentButtonPopupView.delegate = self
+    }
+
+    private func setNotification() {
+        NotificationCenter.default.addObserver(self, selector: #selector(showToast(_:)), name: WriteViewController.showUploadToastNotification, object: nil)
+    }
+
+    private func setRefreshControll() {
+        refreshControl.addTarget(self, action: #selector(refreshPost), for: .valueChanged)
+        homeCollectionView.refreshControl = refreshControl
+        refreshControl.backgroundColor = .donGray1
+    }
+
+    @objc
+    func refreshPost() {
+        DispatchQueue.main.async {
+            // ✅ 서버 통신 영역
+            //
+        }
+        self.homeCollectionView.reloadData()
+        self.perform(#selector(self.finishedRefreshing), with: nil, afterDelay: 0.1)
     }
+
+      @objc
+    func finishedRefreshing() {
+            refreshControl.endRefreshing()
+      }
+
+
 
+    @objc func showToast(_ notification: Notification) {
+        if let showToast = notification.userInfo?["showToast"] as? Bool {
+            if showToast == true {
+                uploadToastView.alpha = 1
+
+                var value: Double = 0.0
+                let duration: TimeInterval = 1.0 // 애니메이션 기간 (초 단위)
+                let increment: Double = 0.01 // 증가량
+
+                // 0에서 1까지 1초 동안 0.01씩 증가하는 애니메이션 블록
+                UIView.animate(withDuration: duration, delay: 0.0, options: .curveLinear, animations: {
+                    for i in 1...100 {
+                        DispatchQueue.main.asyncAfter(deadline: .now() + (duration / 100) * TimeInterval(i)) {
+                            value = Double(i) * increment
+                            self.uploadToastView.circleProgressBar.value = value
+                        }
+                    }
+                })
+
+                DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+                    self.uploadToastView.circleProgressBar.alpha = 0
+                    self.uploadToastView.checkImageView.alpha = 1
+                    self.uploadToastView.toastLabel.text = StringLiterals.Toast.uploaded
+                    self.uploadToastView.container.backgroundColor = .donPrimary
+                }
+
+                UIView.animate(withDuration: 1.0, delay: 3, options: .curveEaseIn) {
+                    self.uploadToastView.alpha = 0
+                }
+
+                DispatchQueue.main.asyncAfter(deadline: .now() + 4.0) {
+                    self.uploadToastView.circleProgressBar.alpha = 1
+                    self.uploadToastView.checkImageView.alpha = 0
+                    self.uploadToastView.toastLabel.text = StringLiterals.Toast.uploading
+                    self.uploadToastView.container.backgroundColor = .donGray3
+                }
+            }
+        }
+    }
+}
+
+// MARK: - Network
 
-    /*
-    // MARK: - Navigation
+extension MyPageContentViewController {
+    private func getAPI() {
+
+    }
+}
+
+extension MyPageContentViewController: UICollectionViewDelegate { }
+
+extension MyPageContentViewController: UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return 10
+    }
+
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        let cell =
+        HomeCollectionViewCell.dequeueReusableCell(collectionView: collectionView, indexPath: indexPath)
+        cell.KebabButtonAction = {
+            self.deleteBottomsheet.showSettings()
+        }
+        cell.LikeButtonAction = {
+            cell.isLiked.toggle()
+            cell.likeButton.setImage(cell.isLiked ? ImageLiterals.Posting.btnFavoriteActive : ImageLiterals.Posting.btnFavoriteInActive, for: .normal)
+        }
+        cell.TransparentButtonAction = {
+            self.transparentButtonPopupView.alpha = 1
+        }
+        return cell
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+        return CGSize(width: 343.adjusted, height: 210.adjusted)
+    }
+
+    func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
+        guard let footer = homeCollectionView.dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: "HomeCollectionFooterView", for: indexPath) as? HomeCollectionFooterView else { return UICollectionReusableView() }
+        return footer
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, referenceSizeForFooterInSection section: Int) -> CGSize {
+
+        return CGSize(width: UIScreen.main.bounds.width, height: 24.adjusted)
+    }
+}
 
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-        // Get the new view controller using segue.destination.
-        // Pass the selected object to the new view controller.
+extension MyPageContentViewController: UIScrollViewDelegate {
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        let yOffset = scrollView.contentOffset.y
+        let navigationBarHeight = self.navigationController?.navigationBar.frame.height ?? 0
+        if yOffset > 0 {
+            scrollView.isScrollEnabled = true
+        } else if yOffset < 0 {
+            scrollView.isScrollEnabled = false
+        }
     }
-    */
+}
 
+extension MyPageContentViewController: DontBePopupDelegate {
+    func cancleButtonTapped() {
+        transparentButtonPopupView.alpha = 0
+    }
+
+    func confirmButtonTapped() {
+        transparentButtonPopupView.alpha = 0
+        // ✅ 투명도 주기 버튼 클릭 시 액션 추가
+    }
 }