From f88d479e1217eafdaa411c133daefcef54996e89 Mon Sep 17 00:00:00 2001
From: Doy Kim <kimdee.dev@gmail.com>
Date: Sun, 23 Oct 2022 17:48:18 +0900
Subject: [PATCH] =?UTF-8?q?[Feat]=20#33=20=EA=B8=B0=EC=A1=B4=20=EC=A2=85?=
 =?UTF-8?q?=EB=A5=98=EC=84=A0=ED=83=9D=20VC=EC=97=90=20PanModal=EC=9D=84?=
 =?UTF-8?q?=20=EB=B6=99=EC=97=AC=EC=84=9C=20=EB=AA=A8=EB=8B=AC=EB=B7=B0?=
 =?UTF-8?q?=EB=A5=BC=20=EB=A7=8C=EB=93=AC.=20=ED=99=95=EC=9D=B8=EC=9D=84?=
 =?UTF-8?q?=20=EC=9C=84=ED=95=B4=20dismiss=EC=97=90=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xcshareddata/swiftpm/Package.resolved     | 14 -----
 .../Presentation/WriteView/VC/writeVC.swift   |  4 +-
 .../typeSelect/typeSelectVC.swift             | 60 +++++++++++--------
 3 files changed, 37 insertions(+), 41 deletions(-)
 delete mode 100644 SMSH-Summer/SMSH-Summer.xcworkspace/xcshareddata/swiftpm/Package.resolved

diff --git a/SMSH-Summer/SMSH-Summer.xcworkspace/xcshareddata/swiftpm/Package.resolved b/SMSH-Summer/SMSH-Summer.xcworkspace/xcshareddata/swiftpm/Package.resolved
deleted file mode 100644
index 8c63ab8..0000000
--- a/SMSH-Summer/SMSH-Summer.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "panmodal",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/slackhq/PanModal",
-      "state" : {
-        "revision" : "b012aecb6b67a8e46369227f893c12544846613f",
-        "version" : "1.2.7"
-      }
-    }
-  ],
-  "version" : 2
-}
diff --git a/SMSH-Summer/SMSH-Summer/Presentation/WriteView/VC/writeVC.swift b/SMSH-Summer/SMSH-Summer/Presentation/WriteView/VC/writeVC.swift
index fb82ae2..d8c3559 100644
--- a/SMSH-Summer/SMSH-Summer/Presentation/WriteView/VC/writeVC.swift
+++ b/SMSH-Summer/SMSH-Summer/Presentation/WriteView/VC/writeVC.swift
@@ -64,7 +64,9 @@ extension writeVC {
     
     // MARK: - Actions
     @objc func dismissButtonTapped(_ sender: UIBarButtonItem) {
-        self.navigationController?.popViewController(animated: true)
+        //self.navigationController?.popViewController(animated: true)
+        let vc = typeSelectVC()
+        self.presentPanModal(vc)
     }
     
     @objc func saveButtonTapped(_ sender: UIBarButtonItem) {
diff --git a/SMSH-Summer/SMSH-Summer/Presentation/typeSelect/typeSelectVC.swift b/SMSH-Summer/SMSH-Summer/Presentation/typeSelect/typeSelectVC.swift
index 4f8e526..369cd23 100644
--- a/SMSH-Summer/SMSH-Summer/Presentation/typeSelect/typeSelectVC.swift
+++ b/SMSH-Summer/SMSH-Summer/Presentation/typeSelect/typeSelectVC.swift
@@ -6,19 +6,15 @@
 //
 
 import UIKit
+import PanModal
 
 class typeSelectVC: UIViewController {
 
     // MARK: - Properties
     private var typeBtn: [UIButton] = []
+    // var delegate: SelectedTypeProtocol?
     
     // MARK: - UI Components
-    private let typeSelectView = UIView().then {
-        $0.backgroundColor = .white
-        $0.layer.cornerRadius = 20
-        $0.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
-    }
-    
     private let selectTitleLabel = UILabel().then {
         $0.text = "종류선택"
         $0.textColor = .Black
@@ -27,9 +23,9 @@ class typeSelectVC: UIViewController {
     
     private let btnStackView = UIStackView().then {
         $0.axis = .horizontal
-        $0.spacing = 24
-        $0.distribution = .fillEqually
-        $0.alignment = .leading
+        $0.spacing = 12
+        $0.distribution = .equalSpacing
+        $0.alignment = .center
     }
     
     private let ploggingBtn = UIButton().then {
@@ -80,37 +76,49 @@ class typeSelectVC: UIViewController {
 
 extension typeSelectVC {
     private func setUI() {
-        self.view.backgroundColor = .clear.withAlphaComponent(60)
+        view.backgroundColor = .white
+        typeBtn = [ploggingBtn, animalBtn,
+                   donationBtn, volunteerBtn, etcBtn]
     }
     
     private func setStackView() {
-        btnStackView.addArrangedSubviews(ploggingBtn, animalBtn,
-                                         donationBtn, volunteerBtn, etcBtn)
+        view.addSubviews(selectTitleLabel, btnStackView, selectBtn)
+        typeBtn.forEach {
+            btnStackView.addArrangedSubviews($0)
+        }
     }
     
     private func setLayout() {
-        view.addSubviews(typeSelectView)
-        typeSelectView.addSubviews(selectTitleLabel, btnStackView, selectBtn)
-        
-        typeSelectView.snp.makeConstraints { make in
-            make.height.equalToSuperview().multipliedBy(0.31)
-            make.leading.trailing.equalToSuperview()
-            make.width.bottom.equalToSuperview()
-        }
-        
+
         selectTitleLabel.snp.makeConstraints { make in
-            make.top.leading.equalToSuperview().inset(20)
-            make.trailing.equalToSuperview().inset(295)
+            make.leading.equalToSuperview().inset(20)
+            make.top.equalToSuperview().inset(24)
         }
+        
         btnStackView.snp.makeConstraints { make in
             make.top.equalTo(selectTitleLabel.snp.bottom).offset(17)
             make.leading.trailing.equalToSuperview().inset(18)
         }
         selectBtn.snp.makeConstraints { make in
-            make.top.equalTo(btnStackView.snp.bottom).offset(30)
-            make.bottom.equalToSuperview().inset(50)
-            make.leading.trailing.equalToSuperview().inset(19)
+            make.top.greaterThanOrEqualTo(btnStackView.snp.bottom).offset(24)
+            make.bottom.equalTo(view.safeAreaLayoutGuide).inset(12)
+            make.height.equalTo(48)
+            make.leading.trailing.equalToSuperview().inset(20)
         }
     }
     
 }
+
+// MARK: - Pan Modal
+extension typeSelectVC: PanModalPresentable {
+    var panScrollable: UIScrollView? {
+        return nil
+    }
+    var shortFormHeight: PanModalHeight {
+        return .contentHeight(220)
+    }
+    var longFormHeight: PanModalHeight {
+        return .contentHeight(220)
+    }
+    
+}