Feature/#352 mvp7 qa3 (#353)

Nexters · Sep 13, 2024 · 86f951d · 86f951d
1 parent 0be27c3
commit 86f951d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 32 deletions.
diff --git a/Boolti/Boolti/Sources/UILayer/Concert/ConcertDetail/ConcertDetailViewController.swift b/Boolti/Boolti/Sources/UILayer/Concert/ConcertDetail/ConcertDetailViewController.swift
@@ -347,18 +347,6 @@ extension ConcertDetailViewController {
             link: link,
             domainURIPrefix: dynamicLinksDomainURIPrefix
         ) else { return nil }
-
-        // iOS
-        linkBuilder.iOSParameters = DynamicLinkIOSParameters(bundleID: AppInfo.bundleID)
-
-        // Android
-        #if DEBUG
-        linkBuilder.androidParameters = DynamicLinkAndroidParameters(packageName: AppInfo.androidDebugPackageName)
-        #elseif RELEASE
-        linkBuilder.androidParameters = DynamicLinkAndroidParameters(packageName: AppInfo.bundleID)
-        #endif
-        linkBuilder.androidParameters?.fallbackURL = link
-
         return linkBuilder.url
     }
 }

diff --git a/Boolti/Boolti/Sources/UILayer/MyPage/Profile/EditLink/EditLinkViewController.swift b/Boolti/Boolti/Sources/UILayer/MyPage/Profile/EditLink/EditLinkViewController.swift
@@ -134,6 +134,13 @@ final class EditLinkViewController: BooltiViewController {
             }
             .disposed(by: self.disposeBag)
 
+        self.linkNameTextField.rx.controlEvent([.editingDidBegin])
+            .bind(with: self) { owner, _ in
+                guard let nameText = owner.linkNameTextField.text else { return }
+                owner.linkNameTextField.isButtonHidden = nameText.isEmpty
+            }
+            .disposed(by: self.disposeBag)
+
         // URL 설정
         let URLTextFieldObservable = self.URLTextField.rx.text.orEmpty
 
@@ -153,6 +160,14 @@ final class EditLinkViewController: BooltiViewController {
             }
             .disposed(by: self.disposeBag)
 
+        // textField를 선택하면 empty인 지 판단하여 button을 보여줄 지 말지 결정한다.
+        self.URLTextField.rx.controlEvent([.editingDidBegin])
+            .bind(with: self) { owner, _ in
+                guard let urlText = owner.URLTextField.text else { return }
+                owner.URLTextField.isButtonHidden = urlText.isEmpty
+            }
+            .disposed(by: self.disposeBag)
+
         Observable.combineLatest(
             linkNameTextFieldObservable.distinctUntilChanged(),
             URLTextFieldObservable.distinctUntilChanged()
@@ -196,20 +211,13 @@ final class EditLinkViewController: BooltiViewController {
         self.bindPopUpViewComponents()
 
         // 키보드
+        /// 키보드가 내려갈 때는 무조건 button을 숨긴다.
         RxKeyboard.instance.isHidden
             .skip(1)
             .drive(with: self) { owner, isHidden in
-                print("isHidden = \(isHidden)")
                 if isHidden {
                     owner.linkNameTextField.isButtonHidden = true
                     owner.URLTextField.isButtonHidden = true
-                } else {
-                    if let nameText = owner.linkNameTextField.text {
-                        owner.linkNameTextField.isButtonHidden = nameText.isEmpty
-                    }
-                    if let urlText = owner.URLTextField.text {
-                        owner.URLTextField.isButtonHidden = urlText.isEmpty
-                    }
                 }
             }
             .disposed(by: self.disposeBag)

diff --git a/Boolti/Boolti/Sources/UILayer/MyPage/Profile/EditProfile/Views/EditIntroductionView.swift b/Boolti/Boolti/Sources/UILayer/MyPage/Profile/EditProfile/Views/EditIntroductionView.swift
@@ -32,7 +32,7 @@ final class EditIntroductionView: UIView {
         textView.font = .body3
         textView.text = "예) 재즈와 펑크락을 좋아해요"
         textView.textColor = .grey70
-        textView.isScrollEnabled = false
+        textView.isScrollEnabled = true
         return textView
     }()
 
@@ -140,26 +140,25 @@ extension EditIntroductionView {
             make.top.leading.equalToSuperview().inset(20)
         }
 
-        self.introductionTextView.snp.makeConstraints { make in
-            make.horizontalEdges.equalToSuperview().inset(32)
-            make.top.equalToSuperview().inset(74)
-            make.bottom.equalToSuperview().inset(58)
-            make.height.greaterThanOrEqualTo(72)
-        }
-
         self.backgroundView.snp.makeConstraints { make in
-            make.height.greaterThanOrEqualTo(122)
+            make.height.equalTo(122)
             make.horizontalEdges.equalToSuperview().inset(20)
             make.top.equalTo(self.introductionLabel.snp.bottom).offset(16)
-            make.bottom.equalTo(self.introductionTextView.snp.bottom).offset(38)
+        }
+
+        self.introductionTextView.snp.makeConstraints { make in
+            make.horizontalEdges.equalTo(self.backgroundView.snp.horizontalEdges).inset(12)
+            make.top.equalTo(self.backgroundView.snp.top).inset(12)
+            make.height.equalTo(72)
         }
 
         self.textCountLabel.snp.makeConstraints { make in
-            make.bottom.trailing.equalTo(self.backgroundView).inset(12)
+            make.top.equalTo(self.introductionTextView.snp.bottom).offset(8)
+            make.trailing.equalTo(self.backgroundView).inset(12)
         }
 
         self.snp.makeConstraints { make in
-            make.bottom.equalTo(self.backgroundView.snp.bottom).offset(20)
+            make.height.equalTo(204)
         }
     }
 }