Merge pull request #1290 from wakmusic/1289-fix-fruit-storage-button

🔀 :: (#1289) 누락된 열매함 바로가기 기능 추가
wakmusic · Sep 5, 2024 · 32d0e6c · 32d0e6c
2 parents 554b4ba + 51a7901
commit 32d0e6c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/Projects/Features/MyInfoFeature/Sources/ViewControllers/MyInfo/MyInfoViewController.swift b/Projects/Features/MyInfoFeature/Sources/ViewControllers/MyInfo/MyInfoViewController.swift
@@ -242,10 +242,14 @@ final class MyInfoViewController: BaseReactorViewController<MyInfoReactor>, Edit
             .bind(to: reactor.action)
             .disposed(by: disposeBag)
 
+        myInfoView.rx.fruitStorageButtonDidTap
+            .do(onNext: { LogManager.analytics(MyInfoAnalyticsLog.clickFruitStorageButton) })
+            .map { MyInfoReactor.Action.fruitNavigationDidTap }
+            .bind(to: reactor.action)
+            .disposed(by: disposeBag)
+
         myInfoView.rx.drawButtonDidTap
-            .do(onNext: {
-                LogManager.analytics(MyInfoAnalyticsLog.clickFruitDrawEntryButton(location: .myPage))
-            })
+            .do(onNext: { LogManager.analytics(MyInfoAnalyticsLog.clickFruitDrawEntryButton(location: .myPage)) })
             .map { MyInfoReactor.Action.drawButtonDidTap }
             .bind(to: reactor.action)
             .disposed(by: disposeBag)

diff --git a/Projects/Features/MyInfoFeature/Sources/Views/FruitDrawButtonView.swift b/Projects/Features/MyInfoFeature/Sources/Views/FruitDrawButtonView.swift
@@ -10,6 +10,7 @@ private protocol FruitDrawStateProtocol {
 }
 
 private protocol FruitDrawActionProtocol {
+    var fruitStorageButtonDidTap: Observable<Void> { get }
     var drawButtonDidTap: Observable<Void> { get }
 }
 
@@ -40,6 +41,8 @@ final class FruitDrawButtonView: UIView {
         kernValue: -0.5
     )
 
+    let fruitStorageButton = UIButton()
+
     let drawButton = UIButton().then {
         $0.titleLabel?.font = DesignSystemFontFamily.Pretendard.medium.font(size: 14)
         $0.setTitle("뽑기", for: .normal)
@@ -66,6 +69,7 @@ extension FruitDrawButtonView {
             backgroundView,
             titleLabel,
             countLabel,
+            fruitStorageButton,
             drawButton
         )
     }
@@ -85,6 +89,12 @@ extension FruitDrawButtonView {
             $0.left.equalTo(titleLabel.snp.right).offset(8)
         }
 
+        fruitStorageButton.snp.makeConstraints {
+            $0.verticalEdges.equalTo(backgroundView.snp.verticalEdges)
+            $0.leading.equalTo(backgroundView.snp.leading)
+            $0.trailing.equalTo(drawButton.snp.leading)
+        }
+
         drawButton.snp.makeConstraints {
             $0.verticalEdges.equalTo(backgroundView.snp.verticalEdges)
             $0.trailing.equalTo(backgroundView.snp.trailing)
@@ -100,5 +110,6 @@ extension FruitDrawButtonView: FruitDrawStateProtocol {
 }
 
 extension Reactive: FruitDrawActionProtocol where Base: FruitDrawButtonView {
+    var fruitStorageButtonDidTap: Observable<Void> { base.fruitStorageButton.rx.tap.asObservable() }
     var drawButtonDidTap: Observable<Void> { base.drawButton.rx.tap.asObservable() }
 }
diff --git a/Projects/Features/MyInfoFeature/Sources/Views/MyInfoView.swift b/Projects/Features/MyInfoFeature/Sources/Views/MyInfoView.swift
@@ -17,6 +17,7 @@ private protocol MyInfoActionProtocol {
     var scrollViewDidTap: Observable<Void> { get }
     var loginButtonDidTap: Observable<Void> { get }
     var profileImageDidTap: Observable<Void> { get }
+    var fruitStorageButtonDidTap: Observable<Void> { get }
     var drawButtonDidTap: Observable<Void> { get }
     var fruitNavigationButtonDidTap: Observable<Void> { get }
     var qnaNavigationButtonDidTap: Observable<Void> { get }
@@ -204,6 +205,7 @@ extension Reactive: MyInfoActionProtocol where Base: MyInfoView {
 
     var loginButtonDidTap: Observable<Void> { base.loginWarningView.rx.loginButtonDidTap }
     var profileImageDidTap: Observable<Void> { base.profileView.rx.profileImageDidTap }
+    var fruitStorageButtonDidTap: Observable<Void> { base.fruitDrawButtonView.rx.fruitStorageButtonDidTap }
     var drawButtonDidTap: Observable<Void> { base.fruitDrawButtonView.rx.drawButtonDidTap }
     var fruitNavigationButtonDidTap: Observable<Void> { base.fruitNavigationButton.rx.tap.asObservable() }
     var qnaNavigationButtonDidTap: Observable<Void> { base.qnaNavigationButton.rx.tap.asObservable() }