[Fix] Runnect#54 - Keybord 이슈 해결 및 셀 like 버튼 크기 조정

lee-yeonwoo · Jan 10, 2023 · 00cd943 · 00cd943
1 parent 6320cc8
commit 00cd943
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 32 deletions.
diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseDiscovery/Views/VC/CourseUploadVC.swift
@@ -65,18 +65,21 @@ class CourseUploadVC: UIViewController {
         super.viewWillDisappear(animated)
         self.tabBarController?.tabBar.isHidden = false
     }
-
+
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
 }
 
 // MARK: - Methods
 
 extension CourseUploadVC {
-
+    
     private func setAddTarget() {
         self.uploadButton.addTarget(self, action: #selector(pushToCourseDiscoveryVC), for: .touchUpInside)
         self.courseTitleTextField.addTarget(self, action: #selector(textFieldTextDidChange), for: .editingChanged)
-
     }
+
     // 키보드가 올라오면 scrollView 위치 조정
     private func setKeyboardNotification() {
         NotificationCenter.default.addObserver(
@@ -100,18 +103,17 @@ extension CourseUploadVC {
     }
 
     private func addKeyboardObserver() {
-            // Register Keyboard notifications
-            NotificationCenter.default.addObserver(
-                self,
-                selector: #selector(keyboardWillShow),
-                name: UIResponder.keyboardWillShowNotification,
-                object: nil)
-            NotificationCenter.default.addObserver(
-                self,
-                selector: #selector(keyboardWillHide),
-                name: UIResponder.keyboardWillHideNotification,
-                object: nil)
-        }
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(keyboardWillShow),
+            name: UIResponder.keyboardWillShowNotification,
+            object: nil)
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(keyboardWillHide),
+            name: UIResponder.keyboardWillHideNotification,
+            object: nil)
+    }
 }
 
 // MARK: - @objc Function
@@ -122,16 +124,21 @@ extension CourseUploadVC {
         let nextVC = CourseDiscoveryVC()
         self.navigationController?.pushViewController(nextVC, animated: true)
     }
+
     @objc private func textFieldTextDidChange() {
         guard let text = courseTitleTextField.text else { return }
-
-        uploadButton.isEnabled = !text.isEmpty
-
+
         if text.count > courseTitleMaxLength {
             let index = text.index(text.startIndex, offsetBy: courseTitleMaxLength)
             let newString = text[text.startIndex..<index]
             self.courseTitleTextField.text = String(newString)
         }
+
+        if !text.isEmpty && activityTextView.text != self.placeholder {
+            uploadButton.setEnabled(true)
+        } else {
+            uploadButton.setEnabled(false)
+        }
     }
 
     @objc private func keyboardWillShow(_ notification: Notification) {
@@ -148,6 +155,14 @@ extension CourseUploadVC {
         scrollView.contentInset = contentInset
         scrollView.scrollIndicatorInsets = contentInset
 
+        if activityTextView.isFirstResponder {
+            let contentViewHeight = scrollView.contentSize.height
+            let textViewHeight = activityTextView.frame.height
+            let textViewOffsetY = contentViewHeight - (contentInset.bottom + textViewHeight)
+            let position = CGPoint(x: 0, y: textViewOffsetY + 100)
+            scrollView.setContentOffset(position, animated: true)
+            return
+        }
     }
 
     @objc private func keyboardWillHide() {
@@ -194,6 +209,11 @@ extension CourseUploadVC {
             make.height.equalTo(44)
             make.bottom.equalToSuperview().inset(34)
         }
+
+        setScrollViewLayout()
+    }
+
+    private func setScrollViewLayout() {
         view.addSubview(scrollView)
         [mapImageView,
          courseTitleTextField,
@@ -243,19 +263,15 @@ extension CourseUploadVC {
             make.bottom.equalToSuperview()
             make.height.equalTo(187)
         }
-
     }
 
-        func setupTextView() {
-            activityTextView.delegate = self
-            activityTextView.text = placeholder
-            activityTextView.textColor = .g3
-        }
-//        override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
-//            self.view.endEditing(true)
-//        }
+    func setupTextView() {
+        activityTextView.delegate = self
+        activityTextView.text = placeholder
+        activityTextView.textColor = .g3
     }
-
+}
+
 extension CourseUploadVC: UITextViewDelegate {
     func textViewDidBeginEditing(_ textView: UITextView) {
         if textView.text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
@@ -265,11 +281,16 @@ extension CourseUploadVC: UITextViewDelegate {
         } else if textView.text == placeholder {
             activityTextView.textColor = .g1
             activityTextView.text = nil
-            self.uploadButton.setEnabled(true)
         }
     }
 
     func textViewDidChange(_ textView: UITextView) {
+        if !courseTitleTextField.isEmpty && !activityTextView.text.isEmpty {
+            uploadButton.setEnabled(true)
+        } else {
+            uploadButton.setEnabled(false)
+        }
+
         if activityTextView.text.count > 150 {
             activityTextView.deleteBackward()
         }
@@ -278,7 +299,6 @@ extension CourseUploadVC: UITextViewDelegate {
         if textView.text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty || textView.text == placeholder {
             activityTextView.textColor = .g3
             activityTextView.text = placeholder
-            uploadButton.setColor(bgColor: .m3, disableColor: .g3)
         }
     }
-  }
+}
diff --git a/Runnect-iOS/Runnect-iOS/Presentation/CourseStorage/Views/CVC/CourseListCVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/CourseStorage/Views/CVC/CourseListCVC.swift
@@ -140,7 +140,8 @@ extension CourseListCVC {
         likeButton.snp.makeConstraints { make in
             make.top.equalTo(courseImageView.snp.bottom).offset(7)
             make.trailing.equalToSuperview()
-            make.width.height.equalTo(14)
+            make.width.equalTo(14)
+            make.height.equalTo(12)
         }
 
         labelStackView.snp.makeConstraints { make in

diff --git a/Runnect-iOS/Runnect-iOS/Presentation/Running/VC/RunningRecordVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/Running/VC/RunningRecordVC.swift
@@ -83,6 +83,10 @@ final class RunningRecordVC: UIViewController {
         super.viewDidAppear(true)
         self.setTextFieldBottomBorder()
     }
+
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
 }
 
 // MARK: - Methods