fix: BBAnimatable, BBTextToolTipView, BBThumbnailToolTipView, BBToolT…

…IpView 코드리뷰 반영 - ManagementTableHeaderView ToolTipView 추가
depromeet · Dec 19, 2024 · 2ce2660 · 2ce2660
1 parent d873e2a
commit 2ce2660
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 20 deletions.
diff --git a/14th-team5-iOS/App/Sources/Presentation/Calendar/View/MemoriesCalendarPageTitleView.swift b/14th-team5-iOS/App/Sources/Presentation/Calendar/View/MemoriesCalendarPageTitleView.swift
@@ -47,10 +47,7 @@ final public class MemoriesCalendarPageTitleView: BaseView<MemoriesCalendarTitle
 
     private func bindOutput(reactor: Reactor) {
         reactor.pulse(\.$hiddenTooltipView)
-            .bind(with: self) {
-                $1 ? $0.toolTipView.hide()
-                : $0.toolTipView.show()
-            }
+            .bind(to: toolTipView.rx.isHidden)
             .disposed(by: disposeBag)
     }
 
@@ -100,7 +97,6 @@ final public class MemoriesCalendarPageTitleView: BaseView<MemoriesCalendarTitle
 
         toolTipView.do {
             $0.superview = tipButton
-            $0.hide()
         }
     }
 

diff --git a/...-team5-iOS/App/Sources/Presentation/Management/Reactor/ManagementTableHeaderReactor.swift b/...-team5-iOS/App/Sources/Presentation/Management/Reactor/ManagementTableHeaderReactor.swift
@@ -15,17 +15,23 @@ public final class ManagementTableHeaderReactor {
 
     // MARK: - Action
 
-    public enum Action { }
+    public enum Action {
+        case didTappedToolTipButton
+    }
 
 
     // MARK: - Mutation
 
-    public enum Mutation { }
+    public enum Mutation {
+        case setToolTipHidden(Bool)
+    }
 
 
     // MARK: - State
 
-    public struct State { }
+    public struct State {
+        @Pulse var isHidden: Bool = false
+    }
 
 
     // MARK: - Properties
@@ -39,4 +45,19 @@ public final class ManagementTableHeaderReactor {
         self.initialState = State()
     }
 
+    public func mutate(action: Action) -> Observable<Mutation> {
+        switch action {
+        case .didTappedToolTipButton:
+            return .just(.setToolTipHidden(!currentState.isHidden))
+        }
+    }
+
+    public func reduce(state: State, mutation: Mutation) -> State {
+        var newState = state
+        switch mutation {
+        case let .setToolTipHidden(isHidden):
+            newState.isHidden = isHidden
+        }
+        return newState
+    }
 }
diff --git a/14th-team5-iOS/App/Sources/Presentation/Management/View/ManagementTableHeaderView.swift b/14th-team5-iOS/App/Sources/Presentation/Management/View/ManagementTableHeaderView.swift
@@ -20,7 +20,7 @@ public final class ManagementTableHeaderView: BaseView<ManagementTableHeaderReac
     private let familyNameLabel: BBLabel = BBLabel(.head1, textColor: .gray200)
     private let memberCountLabel: BBLabel = BBLabel(.body1Regular, textColor: .gray400)
     private let familyNameEditButton: BBButton = BBButton()
-
+    private let familyNameToolTipeView: BBToolTip = BBToolTip(.familyNameEdit)
 
     // MARK: - Properties
 
@@ -58,6 +58,9 @@ public final class ManagementTableHeaderView: BaseView<ManagementTableHeaderReac
             $0.setImage(DesignSystemAsset.edit.image, for: .normal)
             $0.addTarget(self, action: #selector(didTapFamilyNameEditButton(_:event:)), for: .touchUpInside)
         }
+        familyNameToolTipeView.do {
+            $0.superview  = familyNameEditButton
+        }
     }
 
     public override func setupAutoLayout() {
@@ -75,6 +78,18 @@ public final class ManagementTableHeaderView: BaseView<ManagementTableHeaderReac
         }
     }
 
+    public override func bind(reactor: Reactor) {
+        familyNameEditButton.rx.tap
+            .throttle(RxInterval._300milliseconds, scheduler: RxScheduler.main)
+            .map { Reactor.Action.didTappedToolTipButton }
+            .bind(to: reactor.action)
+            .disposed(by: disposeBag)
+
+        reactor.pulse(\.$isHidden)
+            .bind(to: familyNameToolTipeView.rx.isHidden)
+            .disposed(by: disposeBag)
+    }
+
 }
 
 

diff --git a/14th-team5-iOS/Core/Sources/Bibbi/BBCommons/BBToolTip/BBAnimatable.swift b/14th-team5-iOS/Core/Sources/Bibbi/BBCommons/BBToolTip/BBAnimatable.swift
@@ -39,8 +39,7 @@ public extension BBComponentShowable where Self: BBToolTip {
         superview?.addSubview(contentView)
         updateLayout()
 
-        UIView.animate(withDuration: duration, delay: 0, options: options) { [weak self] in
-            guard let self else { return }
+        UIView.animate(withDuration: duration, delay: 0, options: options) {
             self.contentView?.transform = CGAffineTransform.identity
             self.contentView?.alpha = 1
         }
@@ -55,13 +54,12 @@ public extension BBComponentClosable where Self: BBToolTip {
         alpha: CGFloat = 0
     ) {
 
-        UIView.animate(withDuration: duration, delay: 0, options: options, animations: { [weak self] in
-            guard let self = self else { return }
+        UIView.animate(withDuration: duration, delay: 0, options: options, animations: {
             self.contentView?.transform = transform
             self.contentView?.alpha = 0
-        }, completion: { [weak self] _ in
-            self?.contentView?.removeFromSuperview()
-            self?.contentView?.transform = .identity
+        }, completion: { _ in 
+            self.contentView?.removeFromSuperview()
+            self.contentView?.transform = .identity
         })
 
         self.contentView?.layoutIfNeeded()

diff --git a/14th-team5-iOS/Core/Sources/Bibbi/BBCommons/BBToolTip/BBTextToolTipView.swift b/14th-team5-iOS/Core/Sources/Bibbi/BBCommons/BBToolTip/BBTextToolTipView.swift
@@ -27,7 +27,7 @@ public class BBTextToolTipView: BBBaseToolTipView {
         super.init(toolTipType: toolTipType)
         setupToolTipUI()
         setupToolTipContent()
-        setupAutoLayount()
+        setupAutoLayout()
     }
 
     required init?(coder: NSCoder) {
@@ -54,7 +54,7 @@ public class BBTextToolTipView: BBBaseToolTipView {
         }
     }
 
-    private func setupAutoLayount() {
+    private func setupAutoLayout() {
         let position = toolTipType.configure.yPosition
         let arrowHeight: CGFloat = toolTipType.configure.arrowHeight
         let textPadding: CGFloat = 10

diff --git a/14th-team5-iOS/Core/Sources/Bibbi/BBCommons/BBToolTip/BBThumbnailToolTipView.swift b/14th-team5-iOS/Core/Sources/Bibbi/BBCommons/BBToolTip/BBThumbnailToolTipView.swift
@@ -36,7 +36,7 @@ public class BBThumbnailToolTipView: BBBaseToolTipView {
         }
         setupToolTipUI()
         setupToolTipContent()
-        setupAutoLayount()
+        setupAutoLayout()
         setupThumbnailImageView(imageURL: imageURLs)
     }
 
@@ -51,7 +51,7 @@ public class BBThumbnailToolTipView: BBBaseToolTipView {
     }
 
 
-    public func setupAutoLayount() {
+    public func setupAutoLayout() {
         let arrowHeight: CGFloat = toolTipType.configure.arrowHeight
         let textPadding: CGFloat = 10
         guard case let .waitingSurvivalImage(_, imageURLs) = toolTipType else {

diff --git a/14th-team5-iOS/Core/Sources/Bibbi/BBCommons/BBToolTip/BBToolTip.swift b/14th-team5-iOS/Core/Sources/Bibbi/BBCommons/BBToolTip/BBToolTip.swift
@@ -14,6 +14,10 @@ public final class BBToolTip: NSObject, BBComponentPresentable {
     // MARK: - Properties
     public var contentView: BBBaseToolTipView?
     public var superview: UIView?
+    public var isHidden: Bool = true {
+        didSet { isHidden ? self.hide() : self.show() }
+    }
+
     public var toolTipStyle: BBToolTipType {
         didSet {
             contentView?.removeFromSuperview()