diff --git a/Deartoday/Deartoday.xcodeproj/project.pbxproj b/Deartoday/Deartoday.xcodeproj/project.pbxproj index ec2c1fa0..209d305c 100644 --- a/Deartoday/Deartoday.xcodeproj/project.pbxproj +++ b/Deartoday/Deartoday.xcodeproj/project.pbxproj @@ -82,7 +82,6 @@ 98D912C5287DB0130088A7F9 /* Lottie.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98D912C4287DB0130088A7F9 /* Lottie.swift */; }; 98D912C8287DC30F0088A7F9 /* CheckMessage.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 98D912C7287DC30F0088A7F9 /* CheckMessage.storyboard */; }; 98D912CE287DC3430088A7F9 /* CheckMessageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98D912CD287DC3430088A7F9 /* CheckMessageViewController.swift */; }; - 98D912D0287DC34F0088A7F9 /* CheckMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98D912CF287DC34F0088A7F9 /* CheckMessageView.swift */; }; 98D912D2287DC3590088A7F9 /* CheckMessageDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98D912D1287DC3590088A7F9 /* CheckMessageDataModel.swift */; }; A3EDF83E9CD70073D83CA26D /* Pods_Deartoday.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 91A3CEAB5A8D31B890C8B41E /* Pods_Deartoday.framework */; }; /* End PBXBuildFile section */ @@ -168,7 +167,6 @@ 98D912C4287DB0130088A7F9 /* Lottie.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Lottie.swift; sourceTree = ""; }; 98D912C7287DC30F0088A7F9 /* CheckMessage.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = CheckMessage.storyboard; sourceTree = ""; }; 98D912CD287DC3430088A7F9 /* CheckMessageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckMessageViewController.swift; sourceTree = ""; }; - 98D912CF287DC34F0088A7F9 /* CheckMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckMessageView.swift; sourceTree = ""; }; 98D912D1287DC3590088A7F9 /* CheckMessageDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckMessageDataModel.swift; sourceTree = ""; }; A1A07BC470FAC0358D40F43A /* Pods-Deartoday.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Deartoday.release.xcconfig"; path = "Target Support Files/Pods-Deartoday/Pods-Deartoday.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -690,7 +688,6 @@ 98D912CB287DC3330088A7F9 /* View */ = { isa = PBXGroup; children = ( - 98D912CF287DC34F0088A7F9 /* CheckMessageView.swift */, 9858B3CE288097B000860439 /* MessageCollectionViewCell.swift */, 9858B3CF288097B000860439 /* MessageCollectionViewCell.xib */, ); @@ -870,7 +867,6 @@ 98B4B5AC287EB5EF00F4AD7A /* Storyboard.swift in Sources */, 92DB35662875652F001E2006 /* OnboardingViewController.swift in Sources */, 92DB3560287564ED001E2006 /* MainModel.swift in Sources */, - 98D912D0287DC34F0088A7F9 /* CheckMessageView.swift in Sources */, 92DB35722875661A001E2006 /* Constant.swift in Sources */, 92DB358228756B0B001E2006 /* GeneralResponse.swift in Sources */, 92DB357E28756AB8001E2006 /* NetworkConstant.swift in Sources */, diff --git a/Deartoday/Deartoday/Screen/CheckMessage/Controller/CheckMessageViewController.swift b/Deartoday/Deartoday/Screen/CheckMessage/Controller/CheckMessageViewController.swift index 997014d7..3a4c3364 100644 --- a/Deartoday/Deartoday/Screen/CheckMessage/Controller/CheckMessageViewController.swift +++ b/Deartoday/Deartoday/Screen/CheckMessage/Controller/CheckMessageViewController.swift @@ -58,6 +58,7 @@ final class CheckMessageViewController: UIViewController { } private func setCollectionView() { + collectionView.delegate = self registerXib() setDataSource() collectionView.setCollectionViewLayout(createLayout(), animated: true) @@ -106,6 +107,17 @@ final class CheckMessageViewController: UIViewController { } } +// MARK: - UICollectionViewDelegate + +extension CheckMessageViewController: UICollectionViewDelegate { + func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { + guard let messageDetail = UIStoryboard(name: Constant.Storyboard.CheckMessageDetail, bundle: nil) + .instantiateViewController(withIdentifier: Constant.ViewController.CheckMessageDetail) as? CheckMessageDetailViewController else { return } + messageDetail.modalPresentationStyle = .overFullScreen + present(messageDetail, animated: false, completion: nil) + } +} + // MARK: - Component UI Setting functions extension CheckMessageViewController { diff --git a/Deartoday/Deartoday/Screen/CheckMessage/View/CheckMessageView.swift b/Deartoday/Deartoday/Screen/CheckMessage/View/CheckMessageView.swift deleted file mode 100644 index d623fe96..00000000 --- a/Deartoday/Deartoday/Screen/CheckMessage/View/CheckMessageView.swift +++ /dev/null @@ -1,8 +0,0 @@ -// -// CheckMessageView.swift -// Deartoday -// -// Created by 이경민 on 2022/07/12. -// - -import Foundation diff --git a/Deartoday/Deartoday/Screen/CheckMessageDetail/Controller/CheckMessageDetailViewController.swift b/Deartoday/Deartoday/Screen/CheckMessageDetail/Controller/CheckMessageDetailViewController.swift index 9a18ae93..6f1cf385 100644 --- a/Deartoday/Deartoday/Screen/CheckMessageDetail/Controller/CheckMessageDetailViewController.swift +++ b/Deartoday/Deartoday/Screen/CheckMessageDetail/Controller/CheckMessageDetailViewController.swift @@ -8,6 +8,10 @@ import UIKit final class CheckMessageDetailViewController: UIViewController { + + // MARK: - Property + + var content: String = "" // MARK: - UI Property @@ -20,6 +24,7 @@ final class CheckMessageDetailViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() + setData() setUI() } @@ -40,6 +45,11 @@ final class CheckMessageDetailViewController: UIViewController { writerLabel.font = .p6 } + private func setData() { + contentLabel.text = content + contentLabel.sizeToFit() + } + private func setMessageViewDynamicHeight() { messageViewHeightConstraint.constant = (contentLabel.frame.height < 145) ? 200 : contentLabel.layer.frame.height + 80 @@ -48,6 +58,6 @@ final class CheckMessageDetailViewController: UIViewController { // MARK: - IBAction @IBAction func closeButtonDidTap(_ sender: Any) { - dismiss(animated: true) + dismiss(animated: false) } }