[Merge] #58 - 프로젝트 레포에 머지

[Feat] #58 - 플로팅 버튼 터치 시 화면전환 및 코드 다시 입력하기 기능 구현
TeamSparker · Jan 15, 2022 · 026f688 · 026f688
2 parents b9cd7ce + 6a1c233
commit 026f688
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/Spark-iOS/Spark-iOS/Source/ViewControllers/CodeJoin/CodeJoinVC.swift b/Spark-iOS/Spark-iOS/Source/ViewControllers/CodeJoin/CodeJoinVC.swift
@@ -30,6 +30,11 @@ class CodeJoinVC: UIViewController {
         setDelegate()
     }
 
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        resetUI()
+    }
+
     // MARK: - @IBAction Properties
     @IBAction func touchOutsideButton(_ sender: Any) {
         self.dismiss(animated: false, completion: nil)
@@ -68,6 +73,13 @@ extension CodeJoinVC {
         NotificationCenter.default.addObserver(self, selector: #selector(textFieldDidChange(_:)), name: UITextField.textDidChangeNotification, object: nil)
     }
 
+    func resetUI() {
+        textField.text = ""
+        lineView.backgroundColor = .sparkGray
+        okView.backgroundColor = .sparkGray
+        okButton.isEnabled = false
+    }
+
     // MARK: - @objc Function
     @objc
     private func textFieldDidChange(_ notification: Notification) {

diff --git a/Spark-iOS/Spark-iOS/Source/ViewControllers/CodeJoin/JoinCheckVC.swift b/Spark-iOS/Spark-iOS/Source/ViewControllers/CodeJoin/JoinCheckVC.swift
@@ -27,16 +27,17 @@ class JoinCheckVC: UIViewController {
     // MARK: - @IBAction Properties
     // TODO: - 코드 다시 입력하기 기능 구현
     @IBAction func touchReinputCode(_ sender: Any) {
-
+        self.dismiss(animated: true)
     }
 
     @IBAction func touchEnterWaitingVC(_ sender: Any) {
         let nextSB = UIStoryboard.init(name: Const.Storyboard.Name.waiting, bundle:nil)
 
         guard let nextVC = nextSB.instantiateViewController(identifier: Const.ViewController.Identifier.waiting) as? WaitingVC else {return}
 
-        nextVC.modalPresentationStyle = .overFullScreen
-        self.present(nextVC, animated: false, completion: nil)
+        let navi = UINavigationController(rootViewController: nextVC)
+        navi.modalPresentationStyle = .fullScreen
+        self.present(navi, animated: true)
     }
 }
 

diff --git a/Spark-iOS/Spark-iOS/Source/ViewControllers/StorageMore/StorageMoreVC.swift b/Spark-iOS/Spark-iOS/Source/ViewControllers/StorageMore/StorageMoreVC.swift
@@ -22,6 +22,8 @@ class StorageMoreVC: UIViewController {
 
         let cv = UICollectionView(frame: CGRect(x: 0,y: 120,width: 375,height: 520), collectionViewLayout: layout)
         cv.backgroundColor = .clear
+        cv.indicatorStyle = .white
+        cv.showsVerticalScrollIndicator = true
 
         return cv
     }()

diff --git a/Spark-iOS/Spark-iOS/Source/ViewControllers/TabBar/MainTBC.swift b/Spark-iOS/Spark-iOS/Source/ViewControllers/TabBar/MainTBC.swift
@@ -106,13 +106,18 @@ extension MainTBC {
     // TODO: - 화면전환
 
     private func presentToCodeJoinVC() {
-
+        let nextSB = UIStoryboard.init(name: Const.Storyboard.Name.codeJoin, bundle:nil)
+
+        guard let nextVC = nextSB.instantiateViewController(identifier: Const.ViewController.Identifier.codeJoin) as? CodeJoinVC else {return}
+
+        nextVC.modalPresentationStyle = .overFullScreen
+        nextVC.modalTransitionStyle = .crossDissolve
+        self.present(nextVC, animated: true)
     }
 
     // TODO: - 화면전환
 
     private func presentToWaitingVC() {
-
     }
 
     // MARK: - @objc