[FEAT/#72] 스티커 바텀 시트 추가 및 스티커 선택 추가 기능 구현

PhotoGether/PresentationLayer/EditPhotoRoomFeature/EditPhotoRoomFeature/Source/EditPhotoRoomGuestViewController.swift

@@ -1,24 +1,31 @@
-import UIKit
-import PhotoGetherDomainInterface
 import Combine
+import UIKit
+
 import BaseFeature
 import DesignSystem
+import PhotoGetherData
+import PhotoGetherDomain
+import PhotoGetherDomainInterface
 
 public class EditPhotoRoomGuestViewController: BaseViewController, ViewControllerConfigure {
     private let navigationView = UIView()
     private let canvasScrollView = CanvasScrollView()
     private let bottomView = EditPhotoGuestBottomView()
+    private let bottomSheetViewController: StickerBottomSheetViewController
 
     private let input = PassthroughSubject<EditPhotoRoomGuestViewModel.Input, Never>()
 
     private let viewModel: EditPhotoRoomGuestViewModel
     private var stickerIdDictionary: [UUID: Int] = [:]
 
     public init(
-        viewModel: EditPhotoRoomGuestViewModel
+        viewModel: EditPhotoRoomGuestViewModel,
+        bottomSheetViewController: StickerBottomSheetViewController
     ) {
         self.viewModel = viewModel
+        self.bottomSheetViewController = bottomSheetViewController
         super.init(nibName: nil, bundle: nil)
+        self.bottomSheetViewController.delegate = self
     }
 
     @available(*, unavailable)
@@ -100,12 +107,12 @@ public class EditPhotoRoomGuestViewController: BaseViewController, ViewControlle
             .receive(on: RunLoop.main)
             .sink { [weak self] event in
             switch event {
-            case .emojiEntity(let emojiEntity):
-                self?.createStickerObject(by: emojiEntity)
             case .stickerObjectList(let stickerList):
                 self?.updateCanvas(with: stickerList)
             case .frameImage(let image):
                 self?.updateFrameImage(to: image)
+            case .stickerBottomSheetPresent:
+                self?.presentStickerBottomSheet()
             }
         }
         .store(in: &cancellables)
@@ -186,6 +193,19 @@ public class EditPhotoRoomGuestViewController: BaseViewController, ViewControlle
         let newIndex = canvasScrollView.imageView.subviews.count
         stickerIdDictionary[sticker.id] = newIndex
     }
+
+    private func presentStickerBottomSheet() {
+        self.present(bottomSheetViewController, animated: true)
+    }
+}
+
+extension EditPhotoRoomGuestViewController: StickerBottomSheetViewControllerDelegate {
+    func stickerBottomSheetViewController(
+        _ viewController: StickerBottomSheetViewController,
+        didTap emoji: EmojiEntity
+    ) {
+        self.createStickerObject(by: emoji)
+    }
 }
 
 extension EditPhotoRoomGuestViewController: StickerViewActionDelegate {

PhotoGether/PresentationLayer/EditPhotoRoomFeature/EditPhotoRoomFeature/Source/EditPhotoRoomGuestViewModel.swift

@@ -12,17 +12,16 @@ public final class EditPhotoRoomGuestViewModel {
     }
 
     enum Output {
-        case emojiEntity(entity: EmojiEntity)
         case stickerObjectList([StickerEntity])
         case frameImage(image: UIImage)
+        case stickerBottomSheetPresent
     }
 
     private let frameImageGenerator: FrameImageGenerator
-    private let fetchEmojiListUseCase: FetchEmojiListUseCase
     private let receiveStickerListUseCase: ReceiveStickerListUseCase
     private let sendStickerToRepositoryUseCase: SendStickerToRepositoryUseCase
 
-    private var emojiList: [EmojiEntity] = [] // MARK: 추후 삭제 예정
+
     private let owner = "GUEST" + UUID().uuidString.prefix(4) // MARK: 임시 값(추후 ConnectionClient에서 받아옴)
 
     private let stickerObjectListSubject = CurrentValueSubject<[StickerEntity], Never>([])
@@ -32,20 +31,17 @@ public final class EditPhotoRoomGuestViewModel {
 
     public init(
         frameImageGenerator: FrameImageGenerator,
-        fetchEmojiListUseCase: FetchEmojiListUseCase,
         receiveStickerListUseCase: ReceiveStickerListUseCase,
         sendStickerToRepositoryUseCase: SendStickerToRepositoryUseCase
     ) {
         self.frameImageGenerator = frameImageGenerator
-        self.fetchEmojiListUseCase = fetchEmojiListUseCase
         self.receiveStickerListUseCase = receiveStickerListUseCase
         self.sendStickerToRepositoryUseCase = sendStickerToRepositoryUseCase
+
         bind()
     }
 
     private func bind() {
-        fetchEmojiList()
-
         stickerObjectListSubject
             .sink { [weak self] list in
                 self?.output.send(.stickerObjectList(list))
@@ -63,7 +59,7 @@ public final class EditPhotoRoomGuestViewModel {
         input.sink { [weak self] event in
             switch event {
             case .stickerButtonDidTap:
-                self?.sendEmoji()
+                self?.presentStickerBottomSheet()
             case .createSticker(let sticker):
                 self?.appendSticker(with: sticker)
                 self?.sendToRepository(type: .create, with: sticker)
@@ -134,18 +130,6 @@ public final class EditPhotoRoomGuestViewModel {
         stickerObjectListSubject.send(currentStickerObjectList)
     }
 
-    private func fetchEmojiList() {
-        fetchEmojiListUseCase.execute()
-            .sink { [weak self] emojiEntities in
-                self?.emojiList = emojiEntities
-            }
-            .store(in: &cancellables)
-    }
-
-    private func sendEmoji() {
-        output.send(.emojiEntity(entity: emojiList.randomElement()!))
-    }
-
     private func sendToRepository(type: EventType, with sticker: StickerEntity) {
         sendStickerToRepositoryUseCase.execute(type: type, sticker: sticker)
     }
@@ -154,4 +138,8 @@ public final class EditPhotoRoomGuestViewModel {
         let frameImage = frameImageGenerator.generate()
         output.send(.frameImage(image: frameImage))
     }
+
+    private func presentStickerBottomSheet() {
+        output.send(.stickerBottomSheetPresent)
+    }
 }

PhotoGether/PresentationLayer/EditPhotoRoomFeature/EditPhotoRoomFeature/Source/EditPhotoRoomHostViewController.swift

@@ -1,24 +1,32 @@
-import UIKit
 import Combine
+import UIKit
+
 import BaseFeature
+import DesignSystem
+import PhotoGetherData
+import PhotoGetherDomain
 import PhotoGetherDomainInterface
 import SharePhotoFeature
 
 public class EditPhotoRoomHostViewController: BaseViewController, ViewControllerConfigure {
     private let navigationView = UIView()
     private let canvasScrollView = CanvasScrollView()
     private let bottomView = EditPhotoHostBottomView()
+    private let bottomSheetViewController: StickerBottomSheetViewController
 
     private let input = PassthroughSubject<EditPhotoRoomHostViewModel.Input, Never>()
 
     private let viewModel: EditPhotoRoomHostViewModel
     private var stickerIdDictionary: [UUID: Int] = [:]
 
     public init(
-        viewModel: EditPhotoRoomHostViewModel
+        viewModel: EditPhotoRoomHostViewModel,
+        bottomSheetViewController: StickerBottomSheetViewController
     ) {
         self.viewModel = viewModel
+        self.bottomSheetViewController = bottomSheetViewController
         super.init(nibName: nil, bundle: nil)
+        self.bottomSheetViewController.delegate = self
     }
 
     required init?(coder: NSCoder) {
@@ -127,12 +135,12 @@ public class EditPhotoRoomHostViewController: BaseViewController, ViewController
             .receive(on: RunLoop.main)
             .sink { [weak self] event in
                 switch event {
-                case .emojiEntity(let emojiEntity):
-                    self?.createStickerObject(by: emojiEntity)
                 case .stickerObjectList(let stickerList):
                     self?.updateCanvas(with: stickerList)
                 case .frameImage(let image):
                     self?.updateFrameImage(to: image)
+                case .presentStickerBottomSheet:
+                    self?.presentStickerBottomSheet()
                 }
             }
             .store(in: &cancellables)
@@ -213,6 +221,19 @@ public class EditPhotoRoomHostViewController: BaseViewController, ViewController
         let newIndex = canvasScrollView.imageView.subviews.count
         stickerIdDictionary[sticker.id] = newIndex
     }
+
+    private func presentStickerBottomSheet() {
+        self.present(bottomSheetViewController, animated: true)
+    }
+}
+
+extension EditPhotoRoomHostViewController: StickerBottomSheetViewControllerDelegate {
+    func stickerBottomSheetViewController(
+        _ viewController: StickerBottomSheetViewController,
+        didTap emoji: EmojiEntity
+    ) {
+        self.createStickerObject(by: emoji)
+    }
 }
 
 extension EditPhotoRoomHostViewController: StickerViewActionDelegate {

PhotoGether/PresentationLayer/EditPhotoRoomFeature/EditPhotoRoomFeature/Source/EditPhotoRoomHostViewModel.swift

@@ -12,17 +12,15 @@ public final class EditPhotoRoomHostViewModel {
     }
 
     enum Output {
-        case emojiEntity(entity: EmojiEntity)
         case stickerObjectList([StickerEntity])
         case frameImage(image: UIImage)
+        case presentStickerBottomSheet
     }
 
     private let frameImageGenerator: FrameImageGenerator
-    private let fetchEmojiListUseCase: FetchEmojiListUseCase
     private let receiveStickerListUseCase: ReceiveStickerListUseCase
     private let sendStickerToRepositoryUseCase: SendStickerToRepositoryUseCase
 
-    private var emojiList: [EmojiEntity] = [] // MARK: 추후 삭제 예정
     private let owner = "Host" + UUID().uuidString.prefix(4) // MARK: 임시 값(추후 ConnectionClient에서 받아옴)
 
     private let stickerObjectListSubject = CurrentValueSubject<[StickerEntity], Never>([])
@@ -32,20 +30,17 @@ public final class EditPhotoRoomHostViewModel {
 
     public init(
         frameImageGenerator: FrameImageGenerator,
-        fetchEmojiListUseCase: FetchEmojiListUseCase,
         receiveStickerListUseCase: ReceiveStickerListUseCase,
         sendStickerToRepositoryUseCase: SendStickerToRepositoryUseCase
     ) {
         self.frameImageGenerator = frameImageGenerator
-        self.fetchEmojiListUseCase = fetchEmojiListUseCase
         self.receiveStickerListUseCase = receiveStickerListUseCase
         self.sendStickerToRepositoryUseCase = sendStickerToRepositoryUseCase
+
         bind()
     }
 
     private func bind() {
-        fetchEmojiList()
-
         stickerObjectListSubject
             .sink { [weak self] list in
                 self?.output.send(.stickerObjectList(list))
@@ -63,7 +58,7 @@ public final class EditPhotoRoomHostViewModel {
         input.sink { [weak self] event in
             switch event {
             case .stickerButtonDidTap:
-                self?.sendEmoji()
+                self?.presentStickerBottomSheet()
             case .createSticker(let sticker):
                 self?.appendSticker(with: sticker)
                 self?.sendToRepository(type: .create, with: sticker)
@@ -133,19 +128,7 @@ public final class EditPhotoRoomHostViewModel {
         currentStickerObjectList.append(sticker)
         stickerObjectListSubject.send(currentStickerObjectList)
     }
-
-    private func fetchEmojiList() {
-        fetchEmojiListUseCase.execute()
-            .sink { [weak self] emojiEntities in
-                self?.emojiList = emojiEntities
-            }
-            .store(in: &cancellables)
-    }
-
-    private func sendEmoji() {
-        output.send(.emojiEntity(entity: emojiList.randomElement()!))
-    }
-
+
     private func sendToRepository(type: EventType, with sticker: StickerEntity) {
         sendStickerToRepositoryUseCase.execute(type: type, sticker: sticker)
     }
@@ -154,4 +137,8 @@ public final class EditPhotoRoomHostViewModel {
         let frameImage = frameImageGenerator.generate()
         output.send(.frameImage(image: frameImage))
     }
+
+    private func presentStickerBottomSheet() {
+        output.send(.presentStickerBottomSheet)
+    }
 }