feat: 카메라 화면 BBToast 기능 추가 (depromeet#661)

bibbi-team · Sep 27, 2024 · 84a5665 · 84a5665
1 parent 0e94bcd
commit 84a5665
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 49 deletions.
diff --git a/14th-team5-iOS/App/Sources/Application/DIContainer/NavigatorDIContainer.swift b/14th-team5-iOS/App/Sources/Application/DIContainer/NavigatorDIContainer.swift
@@ -77,6 +77,12 @@ final class NavigatorDIContainer: BaseContainer {
             )
         }
 
+        container.register(type: CameraDisplayNavigatorProtocol.self) { _ in
+            CameraDisplayNavigator(
+                navigationController: makeUINavigationController()
+            )
+        }
+
         container.register(type: ManagementNavigatorProtocol.self) { _ in
             ManagementNavigator(
                 navigationController: makeUINavigationController()

diff --git a/14th-team5-iOS/App/Sources/Application/Navigator/CameraDisplayNavigator.swift b/14th-team5-iOS/App/Sources/Application/Navigator/CameraDisplayNavigator.swift
@@ -0,0 +1,32 @@
+//
+//  CameraDisplayNavigator.swift
+//  App
+//
+//  Created by Kim dohyun on 9/26/24.
+//
+
+import Core
+import DesignSystem
+import UIKit
+
+protocol CameraDisplayNavigatorProtocol: BaseNavigator {
+    func toHome()
+}
+
+final class CameraDisplayNavigator: CameraDisplayNavigatorProtocol {
+
+    //MARK: - Properties
+    var navigationController: UINavigationController
+
+
+    //MARK: - Intializer
+    init(navigationController: UINavigationController) {
+        self.navigationController = navigationController
+    }
+
+    //MARK: - Configure
+    func toHome() {
+        let vc = MainViewControllerWrapper().viewController
+        navigationController.setViewControllers([vc], animated: true)
+    }
+}
diff --git a/14th-team5-iOS/App/Sources/Presentation/Camera/CameraDisplayViewController.swift b/14th-team5-iOS/App/Sources/Presentation/Camera/CameraDisplayViewController.swift
@@ -200,7 +200,7 @@ public final class CameraDisplayViewController: BaseViewController<CameraDisplay
 
         archiveButton
             .rx.tap
-            .throttle(.seconds(1), scheduler: MainScheduler.instance)
+            .throttle(RxInterval._600milliseconds, scheduler: RxScheduler.main)
             .map { Reactor.Action.didTapArchiveButton }
             .bind(to: reactor.action)
             .disposed(by: disposeBag)
@@ -245,21 +245,24 @@ public final class CameraDisplayViewController: BaseViewController<CameraDisplay
         displayEditTextField.rx
             .text.orEmpty
             .filter { $0.contains(" ")}
-            .map { $0.trimmingCharacters(in: .whitespaces)}
+            .map { Reactor.Action.showInputBlankTextError($0)}
+            .bind(to: reactor.action)
+            .disposed(by: disposeBag)
+
+        reactor.pulse(\.$displayText)
             .bind(to: displayEditTextField.rx.text)
             .disposed(by: disposeBag)
 
         displayEditTextField.rx
-            .text.orEmpty
-            .map { $0.contains(" ") }
+            .text.changed
+            .compactMap { $0 }
+            .filter { $0.contains(" ") }
+            .debug("카메라 상세 공백 체크")
             .distinctUntilChanged()
-            .debounce(.seconds(1), scheduler: MainScheduler.instance)
-            .withUnretained(self)
-            .bind { owner, isShow in
-                guard isShow == true else { return }
-                owner.makeBibbiToastView(text: "띄어쓰기는 할 수 없어요", image: DesignSystemAsset.warning.image, duration: 1, delay: 1, offset: 400)
-            }.disposed(by: disposeBag)
-
+            .map { _ in Reactor.Action.showInputTextError }
+            .bind(to: reactor.action)
+            .disposed(by: disposeBag)
+
         reactor.pulse(\.$isError)
             .filter { $0 }
             .withUnretained(self)
@@ -268,16 +271,16 @@ public final class CameraDisplayViewController: BaseViewController<CameraDisplay
 
         displayEditTextField.rx
             .text.orEmpty
-            .map { ($0.count > 8) }
-            .debounce(.milliseconds(300), scheduler: MainScheduler.instance)
-            .withUnretained(self)
-            .bind { owner, isShow in
-                guard isShow == true else { return }
-                owner.makeBibbiToastView(text: "8자까지 입력가능해요", image: DesignSystemAsset.warning.image, offset: 400)
-            }.disposed(by: disposeBag)
+            .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
@@ -290,7 +293,7 @@ public final class CameraDisplayViewController: BaseViewController<CameraDisplay
 
         confirmButton.rx
             .tap
-            .throttle(.seconds(1), scheduler: MainScheduler.instance)
+            .throttle(RxInterval._600milliseconds, scheduler: RxScheduler.main)
             .map { Reactor.Action.didTapConfirmButton}
             .bind(to: reactor.action)
             .disposed(by: disposeBag)
@@ -303,7 +306,7 @@ public final class CameraDisplayViewController: BaseViewController<CameraDisplay
 
         displayEditButton
             .rx.tap
-            .throttle(.milliseconds(300), scheduler: MainScheduler.instance)
+            .throttle(RxInterval._600milliseconds, scheduler: RxScheduler.main)
             .withLatestFrom(reactor.state.map{ $0.displayDescrption })
             .filter { $0.isValidation() }
             .withUnretained(self)
@@ -314,15 +317,14 @@ public final class CameraDisplayViewController: BaseViewController<CameraDisplay
         displayEditCollectionView
             .rx.tap
             .observe(on: MainScheduler.instance)
-            .throttle(.milliseconds(300), scheduler: MainScheduler.instance)
+            .throttle(RxInterval._300milliseconds, scheduler: RxScheduler.main)
             .withUnretained(self)
             .bind(onNext: { $0.0.didTapCollectionViewTransition()})
             .disposed(by: disposeBag)
 
         displayDimView
             .rx.tap
-            .throttle(.milliseconds(300), scheduler: MainScheduler.instance)
-            .observe(on: MainScheduler.instance)
+            .throttle(RxInterval._300milliseconds, scheduler: RxScheduler.main)
             .withUnretained(self)
             .bind { owner, _ in
                 owner.view.endEditing(true)
@@ -388,12 +390,6 @@ public final class CameraDisplayViewController: BaseViewController<CameraDisplay
             .drive(displayIndicatorView.rx.isHidden)
             .disposed(by: disposeBag)
 
-        reactor.pulse(\.$displayData)
-            .skip(until: rx.methodInvoked(#selector(viewWillAppear(_:))))
-            .withUnretained(self)
-            .bind(onNext: { $0.0.setupCameraDisplayPermission($0.1) })
-            .disposed(by: disposeBag)
-
         displayEditCollectionView.rx
             .setDelegate(self)
             .disposed(by: disposeBag)
@@ -403,14 +399,6 @@ public final class CameraDisplayViewController: BaseViewController<CameraDisplay
             .asDriver(onErrorJustReturn: [])
             .drive(displayEditCollectionView.rx.items(dataSource: displayEditDataSources))
             .disposed(by: disposeBag)
-
-        reactor.state
-            .compactMap { $0.displayPostEntity?.postId }
-            .filter { !$0.isEmpty }
-            .withUnretained(self)
-            .bind(onNext: { $0.0.transitionToHomeViewController()})
-            .disposed(by: disposeBag)
-
     }
 }
 
@@ -423,10 +411,6 @@ extension CameraDisplayViewController {
                 guard let `self` = self else { return }
                 let creationRequest = PHAssetCreationRequest.forAsset()
                 creationRequest.addResource(with: .photo, data: originalData, options: nil)
-                self.makeBibbiToastView(
-                    text: "사진이 저장되었습니다.",
-                    image: DesignSystemAsset.camera.image.withTintColor(DesignSystemAsset.gray300.color)
-                )
             }
         } else {
             PHPhotoLibrary.requestAuthorization(for: .addOnly) { stauts in
@@ -506,9 +490,6 @@ extension CameraDisplayViewController {
         present(permissionAlertController, animated: true)
     }
 
-    private func transitionToHomeViewController() {
-        self.navigationController?.popToRootViewController(animated: true)
-    }
 }
 
 extension CameraDisplayViewController: UICollectionViewDelegateFlowLayout {

diff --git a/14th-team5-iOS/App/Sources/Presentation/Camera/Reactor/CameraDisplayViewReactor.swift b/14th-team5-iOS/App/Sources/Presentation/Camera/Reactor/CameraDisplayViewReactor.swift
@@ -9,6 +9,7 @@ import Foundation
 
 import Data
 import Domain
+import DesignSystem
 import ReactorKit
 import Core
 
@@ -19,13 +20,16 @@ public final class CameraDisplayViewReactor: Reactor {
     @Injected private var createPresignedCameraUseCase: CreateCameraUseCaseProtocol
     @Injected private var uploadImageUseCase: FetchCameraUploadImageUseCaseProtocol
     @Injected private var fetchCameraImageUseCase: CreateCameraImageUseCaseProtocol
+    @Navigator private var cameraDisplayNavigator: CameraDisplayNavigatorProtocol
 
     public enum Action {
         case viewDidLoad
         case didTapArchiveButton
         case fetchDisplayImage(String)
         case didTapConfirmButton
         case hideDisplayEditCell
+        case showInputTextError
+        case showInputBlankTextError(String)
     }
 
     public enum Mutation {
@@ -35,6 +39,7 @@ public final class CameraDisplayViewReactor: Reactor {
         case setRenderImage(Data)
         case saveDeviceimage(Data)
         case setDescription(String)
+        case setTrimedText(String)
         case setDisplayEntity(CameraPreSignedEntity?)
         case setDisplayOriginalEntity(Bool)
         case setPostEntity(CameraPostEntity?)
@@ -51,6 +56,7 @@ public final class CameraDisplayViewReactor: Reactor {
         @Pulse var displayEntity: CameraPreSignedEntity?
         @Pulse var displayOringalEntity: Bool
         @Pulse var displayPostEntity: CameraPostEntity?
+        @Pulse var displayText: String
     }
 
 
@@ -70,7 +76,8 @@ public final class CameraDisplayViewReactor: Reactor {
             displaySection: [.displayKeyword([])],
             displayEntity: nil,
             displayOringalEntity: false,
-            displayPostEntity: nil
+            displayPostEntity: nil,
+            displayText: ""
         )
     }
 
@@ -134,6 +141,14 @@ public final class CameraDisplayViewReactor: Reactor {
                     }
             )
         case .didTapArchiveButton:
+            let config = BBToastConfiguration(direction: .bottom(yOffset: -360), animationTime: 1.0)
+            let viewConfig = BBToastViewConfiguration(minWidth: 207)
+            provider.bbToastService.show(
+                image:DesignSystemAsset.camera.image.withTintColor(DesignSystemAsset.gray300.color),
+                title: "사진이 저장되었습니다.",
+                viewConfig: viewConfig,
+                config: config
+                )
             return .concat(
                 .just(.setLoading(false)),
                 .just(.saveDeviceimage(currentState.displayData)),
@@ -157,16 +172,18 @@ public final class CameraDisplayViewReactor: Reactor {
             return fetchCameraImageUseCase.execute(parameter: parameters, query: cameraQuery)
                 .asObservable()
                 .catchAndReturn(nil)
-                .flatMap { entity -> Observable<CameraDisplayViewReactor.Mutation> in
+                .withUnretained(self)
+                .flatMap { owner, entity -> Observable<CameraDisplayViewReactor.Mutation> in
                     if entity == nil  {
                         return .just(.setError(true))
                     } else {
+                        owner.cameraDisplayNavigator.toHome()
                         return .concat(
                             .just(.setLoading(false)),
                             .just(.setPostEntity(entity)),
                             .just(.setLoading(true)),
                             .just(.setError(false)),
-                            self.provider.mainService.refreshMain()
+                            owner.provider.mainService.refreshMain()
                                 .flatMap { _ in Observable<Mutation>.empty() }
                         )
                     }
@@ -176,6 +193,28 @@ public final class CameraDisplayViewReactor: Reactor {
                 .just(.setDescription("")),
                 .just(.setDisplayEditSection([]))
             )
+        case .showInputTextError:
+            let config = BBToastConfiguration(direction: .bottom(yOffset: -360), animationTime: 1.0)
+            let viewConfig = BBToastViewConfiguration(minWidth: 207)
+            provider.bbToastService.show(
+                image: DesignSystemAsset.warning.image,
+                title: "8자까지 입력 가능해요",
+                viewConfig: viewConfig,
+                config: config
+            )
+            return .empty()
+
+        case let .showInputBlankTextError(displayText):
+            let config = BBToastConfiguration(direction: .bottom(yOffset: -360), animationTime: 1.0)
+            let viewConfig = BBToastViewConfiguration(minWidth: 207)
+            provider.bbToastService.show(
+                image: DesignSystemAsset.warning.image,
+                title: "띄어쓰기는 할 수 없어요",
+                viewConfig: viewConfig,
+                config: config
+            )
+            let generateText = displayText.trimmingCharacters(in: .whitespaces)
+            return .just(.setTrimedText(generateText))
         }
     }
 
@@ -202,6 +241,8 @@ public final class CameraDisplayViewReactor: Reactor {
             newState.displayPostEntity = entity
         case let .setError(isError):
             newState.isError = isError
+        case let .setTrimedText(displayText):
+            newState.displayText = displayText
         }
         return newState
     }

diff --git a/14th-team5-iOS/Core/Sources/Bibbi/BBCommons/BBToast/BBToastConfiguration.swift b/14th-team5-iOS/Core/Sources/Bibbi/BBCommons/BBToast/BBToastConfiguration.swift
@@ -84,12 +84,12 @@ private extension BBToastConfiguration {
         switch direction {
         case let .top(yOffset):
             return .custom(
-                transformation: CGAffineTransform(scaleX: 0.9, y: 0.9).translatedBy(x: 0, y: -yOffset - 100)
+                transformation: CGAffineTransform(scaleX: 0.9, y: 0.9).translatedBy(x: 0, y: -yOffset - 300)
             )
 
         case let .bottom(yOffset):
             return .custom(
-                transformation: CGAffineTransform(scaleX: 0.9, y: 0.9).translatedBy(x: 0, y: +yOffset + 100)
+                transformation: CGAffineTransform(scaleX: 0.9, y: 0.9).translatedBy(x: 0, y: -yOffset + 300)
             )
 
         case .center: