Fix [#163] 릴리즈 QA 수정사항 2차 반영

DontBe-iOS/DontBe-iOS/Global/Literals/StringLiterals.swift

@@ -18,7 +18,7 @@ enum StringLiterals {
     enum Write {
         static let writeNavigationTitle = "새로운 글"
         static let writeNavigationBarButtonItemTitle = "취소"
-        static let writeContentPlaceholder = "어떤 생각을 하고 있나요?"
+        static let writeContentPlaceholder = "무슨 고민이 있나요?"
         static let writePostButtonTitle = "게시"
         static let writePopupContentLabel = "작성 중인 글을 삭제하시겠어요?"
         static let writePopupCancleButtonTitle = "취소"

DontBe-iOS/DontBe-iOS/Global/Resources/Assets.xcassets/etc/title_fourth.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "title_four.png",
+      "filename" : "title_fourth.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "title_four@2x.png",
+      "filename" : "title_fourth@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "title_four@3x.png",
+      "filename" : "title_fourth@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

DontBe-iOS/DontBe-iOS/Network/Post/DTO/ResponseDTO/PostDetailResponseDTO.swift

@@ -18,4 +18,5 @@ struct PostDetailResponseDTO: Decodable {
     let likedNumber: Int
     let commentNumber: Int
     let contentText: String
+    let isDeleted: Bool
 }

DontBe-iOS/DontBe-iOS/Presentation/Home/ViewControllers/HomeViewController.swift

@@ -24,7 +24,6 @@ final class HomeViewController: UIViewController {
     var ghostReason: String = ""
     var hasAppearedBefore = false
 
-    var transparentPopupVC = TransparentPopupViewController()
     var transparentReasonView = DontBePopupReasonView()
     var deletePostPopupVC = DeletePopupViewController(viewModel: DeletePostViewModel(networkProvider: NetworkService()))
 
@@ -125,7 +124,6 @@ extension HomeViewController {
     private func setUI() {
         self.view.backgroundColor = UIColor.donGray1
 
-        transparentPopupVC.modalPresentationStyle = .overFullScreen
         deletePostPopupVC.modalPresentationStyle = .overFullScreen
     }
 
@@ -215,7 +213,6 @@ extension HomeViewController {
     private func setDelegate() {
         homeCollectionView.dataSource = self
         homeCollectionView.delegate = self
-        transparentPopupVC.transparentButtonPopupView.delegate = self
         transparentReasonView.delegate = self
     }
 
@@ -555,7 +552,25 @@ extension HomeViewController: UICollectionViewDataSource, UICollectionViewDelega
             self.alarmTriggerType = cell.alarmTriggerType
             self.targetMemberId = cell.targetMemberId
             self.alarmTriggerdId = cell.alarmTriggerdId
-            self.present(self.transparentPopupVC, animated: false, completion: nil)
+
+            if let window = UIApplication.shared.keyWindowInConnectedScenes {
+                window.addSubviews(self.transparentReasonView)
+
+                self.transparentReasonView.snp.makeConstraints {
+                    $0.edges.equalToSuperview()
+                }
+
+                let radioButtonImage = ImageLiterals.TransparencyInfo.btnRadio
+
+                self.transparentReasonView.firstReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+                self.transparentReasonView.secondReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+                self.transparentReasonView.thirdReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+                self.transparentReasonView.fourthReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+                self.transparentReasonView.fifthReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+                self.transparentReasonView.sixthReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+                self.transparentReasonView.warnLabel.isHidden = true
+                self.ghostReason = ""
+            }
         }
 
         cell.nicknameLabel.text = homeViewModel.postDatas[indexPath.row].memberNickname
@@ -577,6 +592,15 @@ extension HomeViewController: UICollectionViewDataSource, UICollectionViewDelega
             cell.grayView.alpha = CGFloat(Double(-alpha) / 100)
         }
 
+        // 탈퇴한 회원 닉네임 텍스트 색상 변경, 프로필로 이동 못하도록 적용
+        if self.homeViewModel.postDatas[indexPath.row].isDeleted {
+            cell.nicknameLabel.textColor = .donGray12
+            cell.profileImageView.isUserInteractionEnabled = false
+        } else {
+            cell.nicknameLabel.textColor = .donBlack
+            cell.profileImageView.isUserInteractionEnabled = true
+        }
+
         self.contentId = homeViewModel.postDatas[indexPath.row].contentId
 
         return cell
@@ -586,6 +610,7 @@ extension HomeViewController: UICollectionViewDataSource, UICollectionViewDelega
         let destinationViewController = PostDetailViewController(viewModel: PostDetailViewModel(networkProvider: NetworkService()))
         destinationViewController.contentId = homeViewModel.postDatas[indexPath.row].contentId
         destinationViewController.memberId = homeViewModel.postDatas[indexPath.row].memberId
+        destinationViewController.userProfileURL = homeViewModel.postDatas[indexPath.row].memberProfileUrl
         self.navigationController?.pushViewController(destinationViewController, animated: true)
     }
 
@@ -600,35 +625,6 @@ extension HomeViewController: UICollectionViewDataSource, UICollectionViewDelega
     }
 }
 
-extension HomeViewController: DontBePopupDelegate {
-    func cancleButtonTapped() {
-        self.dismiss(animated: false)
-    }
-
-    func confirmButtonTapped() {
-        self.dismiss(animated: false)
-
-        if let window = UIApplication.shared.keyWindowInConnectedScenes {
-            window.addSubviews(transparentReasonView)
-
-            transparentReasonView.snp.makeConstraints {
-                $0.edges.equalToSuperview()
-            }
-
-            let radioButtonImage = ImageLiterals.TransparencyInfo.btnRadio
-
-            self.transparentReasonView.firstReasonView.radioButton.setImage(radioButtonImage, for: .normal)
-            self.transparentReasonView.secondReasonView.radioButton.setImage(radioButtonImage, for: .normal)
-            self.transparentReasonView.thirdReasonView.radioButton.setImage(radioButtonImage, for: .normal)
-            self.transparentReasonView.fourthReasonView.radioButton.setImage(radioButtonImage, for: .normal)
-            self.transparentReasonView.fifthReasonView.radioButton.setImage(radioButtonImage, for: .normal)
-            self.transparentReasonView.sixthReasonView.radioButton.setImage(radioButtonImage, for: .normal)
-            self.transparentReasonView.warnLabel.isHidden = true
-            self.ghostReason = ""
-        }
-    }
-}
-
 extension HomeViewController: DontBePopupReasonDelegate {
     func reasonCancelButtonTapped() {
         transparentReasonView.removeFromSuperview()

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

@@ -240,6 +240,11 @@ extension MyPageContentViewController: UICollectionViewDelegate { }
 
 extension MyPageContentViewController: UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        if self.contentDatas.count == 0 {
+            firstContentButton.isHidden = false
+        } else {
+            firstContentButton.isHidden = true
+        }
         return self.contentDatas.count
     }
 
@@ -339,7 +344,8 @@ extension MyPageContentViewController: UICollectionViewDataSource, UICollectionV
 
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         let contentId = contentDatas[indexPath.row].contentId
-        NotificationCenter.default.post(name: MyPageContentViewController.pushViewController, object: nil, userInfo: ["contentId": contentId])
+        let profileImageURL = contentDatas[indexPath.row].memberProfileUrl
+        NotificationCenter.default.post(name: MyPageContentViewController.pushViewController, object: nil, userInfo: ["contentId": contentId, "profileImageURL": profileImageURL])
     }
 
     func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {

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

@@ -69,7 +69,6 @@ final class MyPageViewController: UIViewController {
     var deleteBottomsheet = DontBeBottomSheetView(singleButtonImage: ImageLiterals.Posting.btnDelete)
     var warnBottomsheet = DontBeBottomSheetView(singleButtonImage: ImageLiterals.Posting.btnWarn)
 
-    var transparentPopupVC = TransparentPopupViewController()
     var transparentReasonView = DontBePopupReasonView()
     var deletePostPopupVC = DeletePopupViewController(viewModel: DeletePostViewModel(networkProvider: NetworkService()))
 
@@ -187,7 +186,6 @@ extension MyPageViewController {
     private func setUI() {
         self.view.backgroundColor = .donBlack
 
-        transparentPopupVC.modalPresentationStyle = .overFullScreen
         deletePostPopupVC.modalPresentationStyle = .overFullScreen
     }
 
@@ -207,7 +205,6 @@ extension MyPageViewController {
         rootView.myPageScrollView.delegate = self
         rootView.pageViewController.delegate = self
         rootView.pageViewController.dataSource = self
-        transparentPopupVC.transparentButtonPopupView.delegate = self
         transparentReasonView.delegate = self
     }
 
@@ -475,7 +472,6 @@ extension MyPageViewController {
         } else {
             self.rootView.myPageContentViewController.noContentLabel.text = "\(data.nickname)" + StringLiterals.MyPage.myPageNoContentLabel
             self.rootView.myPageCommentViewController.noCommentLabel.text = StringLiterals.MyPage.myPageNoCommentLabel
-            self.rootView.myPageContentViewController.firstContentButton.isHidden = false
 
             saveUserData(UserInfo(isSocialLogined: true,
                                   isFirstUser: false,
@@ -489,9 +485,10 @@ extension MyPageViewController {
 
     @objc
     private func pushViewController(_ notification: Notification) {
-        if let contentId = notification.userInfo?["contentId"] as? Int {
+        if let contentId = notification.userInfo?["contentId"] as? Int, let profileImageURL = notification.userInfo?["profileImageURL"] as? String {
             let destinationViewController = PostDetailViewController(viewModel: PostDetailViewModel(networkProvider: NetworkService()))
             destinationViewController.contentId = contentId
+            destinationViewController.userProfileURL = profileImageURL
             self.navigationController?.pushViewController(destinationViewController, animated: true)
         }
     }
@@ -592,15 +589,51 @@ extension MyPageViewController {
         self.alarmTriggerType = rootView.myPageContentViewController.alarmTriggerType
         self.targetMemberId = rootView.myPageContentViewController.targetMemberId
         self.alarmTriggerdId = rootView.myPageContentViewController.alarmTriggerdId
-        self.present(self.transparentPopupVC, animated: false, completion: nil)
+
+        if let window = UIApplication.shared.keyWindowInConnectedScenes {
+            window.addSubviews(transparentReasonView)
+
+            transparentReasonView.snp.makeConstraints {
+                $0.edges.equalToSuperview()
+            }
+
+            let radioButtonImage = ImageLiterals.TransparencyInfo.btnRadio
+
+            self.transparentReasonView.firstReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+            self.transparentReasonView.secondReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+            self.transparentReasonView.thirdReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+            self.transparentReasonView.fourthReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+            self.transparentReasonView.fifthReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+            self.transparentReasonView.sixthReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+            self.transparentReasonView.warnLabel.isHidden = true
+            self.ghostReason = ""
+        }
     }
 
     @objc
     private func commentGhostButtonTapped() {
         self.alarmTriggerType = rootView.myPageCommentViewController.alarmTriggerType
         self.targetMemberId = rootView.myPageCommentViewController.targetMemberId
         self.alarmTriggerdId = rootView.myPageCommentViewController.alarmTriggerdId
-        self.present(self.transparentPopupVC, animated: false, completion: nil)
+
+        if let window = UIApplication.shared.keyWindowInConnectedScenes {
+            window.addSubviews(transparentReasonView)
+
+            transparentReasonView.snp.makeConstraints {
+                $0.edges.equalToSuperview()
+            }
+
+            let radioButtonImage = ImageLiterals.TransparencyInfo.btnRadio
+
+            self.transparentReasonView.firstReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+            self.transparentReasonView.secondReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+            self.transparentReasonView.thirdReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+            self.transparentReasonView.fourthReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+            self.transparentReasonView.fifthReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+            self.transparentReasonView.sixthReasonView.radioButton.setImage(radioButtonImage, for: .normal)
+            self.transparentReasonView.warnLabel.isHidden = true
+            self.ghostReason = ""
+        }
     }
 
     private func moveTop() {
@@ -717,56 +750,29 @@ extension MyPageViewController: UICollectionViewDelegate {
 
 extension MyPageViewController: DontBePopupDelegate {
     func cancleButtonTapped() {
-        if self.logoutPopupView != nil {
-            self.logoutPopupView?.removeFromSuperview()
-        } else {
-            self.dismiss(animated: false)
-        }
+        self.logoutPopupView?.removeFromSuperview()
     }
 
     func confirmButtonTapped() {
-        if self.logoutPopupView != nil {
-            self.logoutPopupView?.removeFromSuperview()
-            self.rootView.myPageBottomsheet.handleDismiss()
-
-            if let sceneDelegate = UIApplication.shared.connectedScenes.first?.delegate as? SceneDelegate {
-                DispatchQueue.main.async {
-                    let rootViewController = LoginViewController(viewModel: LoginViewModel(networkProvider: NetworkService()))
-                    sceneDelegate.window?.rootViewController = UINavigationController(rootViewController: rootViewController)
-                }
-            }
-
-            saveUserData(UserInfo(isSocialLogined: false,
-                                  isFirstUser: false,
-                                  isJoinedApp: true,
-                                  isOnboardingFinished: true,
-                                  userNickname: loadUserData()?.userNickname ?? "",
-                                  memberId: loadUserData()?.memberId ?? 0,
-                                  userProfileImage: loadUserData()?.userProfileImage ?? StringLiterals.Network.baseImageURL))
+        self.logoutPopupView?.removeFromSuperview()
+        self.rootView.myPageBottomsheet.handleDismiss()
 
-            OnboardingViewController.pushCount = 0
-        } else {
-            self.dismiss(animated: false)
-
-            if let window = UIApplication.shared.keyWindowInConnectedScenes {
-                window.addSubviews(transparentReasonView)
-
-                transparentReasonView.snp.makeConstraints {
-                    $0.edges.equalToSuperview()
-                }
-
-                let radioButtonImage = ImageLiterals.TransparencyInfo.btnRadio
-
-                self.transparentReasonView.firstReasonView.radioButton.setImage(radioButtonImage, for: .normal)
-                self.transparentReasonView.secondReasonView.radioButton.setImage(radioButtonImage, for: .normal)
-                self.transparentReasonView.thirdReasonView.radioButton.setImage(radioButtonImage, for: .normal)
-                self.transparentReasonView.fourthReasonView.radioButton.setImage(radioButtonImage, for: .normal)
-                self.transparentReasonView.fifthReasonView.radioButton.setImage(radioButtonImage, for: .normal)
-                self.transparentReasonView.sixthReasonView.radioButton.setImage(radioButtonImage, for: .normal)
-                self.transparentReasonView.warnLabel.isHidden = true
-                self.ghostReason = ""
+        if let sceneDelegate = UIApplication.shared.connectedScenes.first?.delegate as? SceneDelegate {
+            DispatchQueue.main.async {
+                let rootViewController = LoginViewController(viewModel: LoginViewModel(networkProvider: NetworkService()))
+                sceneDelegate.window?.rootViewController = UINavigationController(rootViewController: rootViewController)
             }
         }
+
+        saveUserData(UserInfo(isSocialLogined: false,
+                              isFirstUser: false,
+                              isJoinedApp: true,
+                              isOnboardingFinished: true,
+                              userNickname: loadUserData()?.userNickname ?? "",
+                              memberId: loadUserData()?.memberId ?? 0,
+                              userProfileImage: loadUserData()?.userProfileImage ?? StringLiterals.Network.baseImageURL))
+
+        OnboardingViewController.pushCount = 0
     }
 }