fix: 가족방 이름 설정화면 레이아웃 및 카메라 텍스트 정렬 이슈 수정해요 (#672)

* fix: FamilyNameSettingViewController debounce Operator 제거 및 Layout 수정 - WebContentViewController NavigationBar Title 설정 구문 제거 - CameraDisplayViewReactor BBToast offsetY 값 수정 - CameraDisplayViewController 문구 입력시 텍스트 사라지는 이슈 수정 * fix: FamilyNameSettingViewController TextFiled AutoLayout 코드 수정 * fix: BibbMissionView, BibbInquireBannerView, BibbiProfileView, BibbiCheckBoxView 파일 위치 변겅 - BibbiFeedType 코드 위치 변경
depromeet · Oct 8, 2024 · e50bba3 · e50bba3
1 parent 82eb755
commit e50bba3
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 55 deletions.
diff --git a/14th-team5-iOS/App/Sources/Presentation/Camera/CameraDisplayViewController.swift b/14th-team5-iOS/App/Sources/Presentation/Camera/CameraDisplayViewController.swift
@@ -256,9 +256,9 @@ public final class CameraDisplayViewController: BaseViewController<CameraDisplay
         displayEditTextField.rx
             .text.changed
             .compactMap { $0 }
-            .filter { $0.contains(" ") }
-            .debug("카메라 상세 공백 체크")
+            .filter { $0.contains(" ") || $0.count > 8 }
             .distinctUntilChanged()
+            .debounce(RxInterval._600milliseconds, scheduler: RxScheduler.main)
             .map { _ in Reactor.Action.showInputTextError }
             .bind(to: reactor.action)
             .disposed(by: disposeBag)
@@ -269,18 +269,9 @@ public final class CameraDisplayViewController: BaseViewController<CameraDisplay
             .bind(onNext: { $0.0.makeActionBibbiToastView(text: "사진 업로드 실패", transtionText: "홈으로 이동", duration: 1, offset: 50, direction: .up)})
             .disposed(by: disposeBag)
 
-        displayEditTextField.rx
-            .text.orEmpty
-            .filter{ $0.count > 8 }
-            .debounce(RxInterval._600milliseconds, scheduler: RxScheduler.main)
-            .map { _ in Reactor.Action.showInputTextError }
-            .bind(to: reactor.action)
-            .disposed(by: disposeBag)
-
         displayEditTextField.rx
             .text.orEmpty
             .filter { !$0.contains(" ")}
-            .debounce(RxInterval._600milliseconds, scheduler: RxScheduler.main)
             .scan("") { previous, new -> String in
                 if new.count > 8 {
                   return previous

diff --git a/14th-team5-iOS/App/Sources/Presentation/Camera/Reactor/CameraDisplayViewReactor.swift b/14th-team5-iOS/App/Sources/Presentation/Camera/Reactor/CameraDisplayViewReactor.swift
@@ -141,7 +141,7 @@ public final class CameraDisplayViewReactor: Reactor {
                     }
             )
         case .didTapArchiveButton:
-            let config = BBToastConfiguration(direction: .bottom(yOffset: -360), animationTime: 1.0)
+            let config = BBToastConfiguration(direction: .bottom(yOffset: -20), animationTime: 1.0)
             let viewConfig = BBToastViewConfiguration(minWidth: 207)
             provider.bbToastService.show(
                 image:DesignSystemAsset.camera.image.withTintColor(DesignSystemAsset.gray300.color),

diff --git a/...BCommons/ShareView/BibbiMissionView.swift → ...tation/Camera/View/BibbiMissionView.swift b/...BCommons/ShareView/BibbiMissionView.swift → ...tation/Camera/View/BibbiMissionView.swift
@@ -1,17 +1,18 @@
 //
 //  BibbiMissionView.swift
-//  Core
+//  App
 //
-//  Created by Kim dohyun on 5/1/24.
+//  Created by Kim dohyun on 10/9/24.
 //
 
 import UIKit
 
+import Core
 import DesignSystem
 import SnapKit
 
 
-public final class BibbiMissionView: UIView {
+final class BibbiMissionView: UIView {
 
     public let missionBadgeView: UIImageView = UIImageView()
     public let missionTitleView: BBLabel = BBLabel(.body2Bold, textAlignment: .center, textColor: .mainYellow)

diff --git a/14th-team5-iOS/App/Sources/Presentation/Content/WebContentViewController.swift b/14th-team5-iOS/App/Sources/Presentation/Content/WebContentViewController.swift
@@ -71,13 +71,6 @@ public class WebContentViewController: BaseViewController<WebContentReactor> {
             .bind(to: webView.rx.loadURL)
             .disposed(by: disposeBag)
 
-        reactor.state
-            .compactMap { $0.url?.lastPathComponent == "privacy" ? "개인정보처리방침" : "이용 약관" }
-            .distinctUntilChanged()
-            .withUnretained(self)
-            .bind(onNext: { $0.0.navigationBarView.setNavigationTitle(title: $0.1) })
-            .disposed(by: disposeBag)
-
         reactor.state
             .map { $0.isLoading }
             .distinctUntilChanged()

diff --git a/.../App/Sources/Presentation/Management/ViewController/FamilyNameSettingViewController.swift b/.../App/Sources/Presentation/Management/ViewController/FamilyNameSettingViewController.swift
@@ -36,12 +36,12 @@ final class FamilyNameSettingViewController: BBNavigationViewController<FamilyNa
         groupNameLabel.snp.makeConstraints {
             $0.top.equalTo(view.safeAreaLayoutGuide).offset(130)
             $0.height.equalTo(25)
-            $0.centerX.equalToSuperview().inset(20)
+            $0.centerX.equalToSuperview()
         }
 
         groupTextField.snp.makeConstraints {
             $0.top.equalTo(groupNameLabel.snp.bottom).offset(8)
-            $0.centerX.equalToSuperview().inset(20)
+            $0.centerX.equalToSuperview()
         }
 
         groupErrorStackView.snp.makeConstraints {
@@ -61,7 +61,6 @@ final class FamilyNameSettingViewController: BBNavigationViewController<FamilyNa
         }
 
         groupEditerView.snp.makeConstraints {
-            $0.width.equalTo(171)
             $0.height.equalTo(24)
             $0.bottom.equalTo(groupConfirmButton.snp.top).offset(-14)
             $0.centerX.equalToSuperview()
@@ -142,7 +141,6 @@ final class FamilyNameSettingViewController: BBNavigationViewController<FamilyNa
         groupTextField.rx.text
             .orEmpty
             .skip(1)
-            .debounce(RxInterval._100milliseconds, scheduler: RxScheduler.main)
             .map { Reactor.Action.didChangeFamilyGroupNickname($0)}
             .bind(to: reactor.action)
             .disposed(by: disposeBag)

diff --git a/...ns/ShareView/BibbiInquireBannerView.swift → ...Privacy/View/BibbiInquireBannerView.swift b/...ns/ShareView/BibbiInquireBannerView.swift → ...Privacy/View/BibbiInquireBannerView.swift
@@ -1,17 +1,18 @@
 //
 //  BibbiInquireBannerView.swift
-//  Core
+//  App
 //
-//  Created by Kim dohyun on 3/20/24.
+//  Created by Kim dohyun on 10/9/24.
 //
 
 import UIKit
 
+import Core
 import DesignSystem
 import SnapKit
 import Then
 
-public final class BibbiInquireBannerView: UIView {
+final class BibbiInquireBannerView: UIView {
 
 
     private let mainLogoView: UIImageView = UIImageView()
@@ -115,3 +116,5 @@ public final class BibbiInquireBannerView: UIView {
 }
 
 
+
+
diff --git a/...BCommons/ShareView/BibbiProfileView.swift → ...ation/Profile/View/BibbiProfileView.swift b/...BCommons/ShareView/BibbiProfileView.swift → ...ation/Profile/View/BibbiProfileView.swift
@@ -1,38 +1,36 @@
 //
 //  BibbiProfileView.swift
-//  Core
+//  App
 //
-//  Created by Kim dohyun on 12/17/23.
+//  Created by Kim dohyun on 10/9/24.
 //
 
 import UIKit
 
+import Core
 import DesignSystem
-import RxSwift
-import RxCocoa
-import ReactorKit
 import SnapKit
 import Then
 
 
 
 
-public class BibbiProfileView: UIView {
-    public let profileImageView: UIImageView = UIImageView()
-    public let profileDefaultLabel: BBLabel = BBLabel(.head1, textAlignment: .center, textColor: .gray200)
-    public let circleButton: UIButton = UIButton.createCircleButton(radius: 15)
-    public let birthDayView: UIImageView = UIImageView()
-    public let profileNickNameButton: UIButton = UIButton()
-    public let profileCreateLabel: UILabel = BBLabel(.caption, textAlignment: .center ,textColor: .gray400)
+final class BibbiProfileView: UIView {
+    let profileImageView: UIImageView = UIImageView()
+    let profileDefaultLabel: BBLabel = BBLabel(.head1, textAlignment: .center, textColor: .gray200)
+    let circleButton: UIButton = UIButton.createCircleButton(radius: 15)
+    let birthDayView: UIImageView = UIImageView()
+    let profileNickNameButton: UIButton = UIButton()
+    let profileCreateLabel: UILabel = BBLabel(.caption, textAlignment: .center ,textColor: .gray400)
 
 
-    public var isSetting: Bool = false {
+    var isSetting: Bool = false {
         didSet {
             setupUserProfile(isUser: isSetting)
         }
     }
 
-    public var isBirthDay: Bool = false {
+    var isBirthDay: Bool = false {
         didSet {
             setupBirtyDay(isBirtyDay: isBirthDay)
         }
@@ -175,3 +173,4 @@ public class BibbiProfileView: UIView {
         birthDayView.isHidden = !isBirtyDay
     }
 }
+
diff --git a/.../BBCommons/ShareView/BibbiTermsView.swift → ...ation/Resign/View/BibbiCheckBoxView.swift b/.../BBCommons/ShareView/BibbiTermsView.swift → ...ation/Resign/View/BibbiCheckBoxView.swift
@@ -1,8 +1,8 @@
 //
-//  BibbiTermsView.swift
-//  Core
+//  BibbiCheckBoxView.swift
+//  App
 //
-//  Created by Kim dohyun on 1/2/24.
+//  Created by Kim dohyun on 10/9/24.
 //
 
 import UIKit
@@ -20,9 +20,9 @@ enum ReasonTypes: String, CaseIterable {
 }
 
 
-public final class BibbiCheckBoxView: UIView {
+final class BibbiCheckBoxView: UIView {
     private let checkStackView: UIStackView = UIStackView()
-    public var checkButtons: [UIButton] = []
+    var checkButtons: [UIButton] = []
 
 
 
@@ -85,3 +85,4 @@ public final class BibbiCheckBoxView: UIView {
     }
 
 }
+
diff --git a/14th-team5-iOS/Core/Sources/Bibbi/BBServices/ProfileFeedGlobalState.swift b/14th-team5-iOS/Core/Sources/Bibbi/BBServices/ProfileFeedGlobalState.swift
@@ -9,6 +9,11 @@ import Foundation
 
 import RxSwift
 
+public enum BibbiFeedType: Int {
+    case survival = 0
+    case mission = 1
+}
+
 public enum ProfileFeedEvent {
     case didTapSegmentedPage(BibbiFeedType)
     case didReceiveMemberId(BibbiFeedType)

diff --git a/14th-team5-iOS/Core/Sources/URLTypes.swift b/14th-team5-iOS/Core/Sources/URLTypes.swift
@@ -7,13 +7,6 @@
 
 import UIKit
 
-// TODO: - 요거 옮겨주세요~
-public enum BibbiFeedType: Int {
-    case survival = 0
-    case mission = 1
-}
-
-
 public enum URLTypes {
     case settings
     case appStore