[Feat] #300 - DetailSearchView 상세탐색 기능 2차 구현

WSSiOS/WSSiOS.xcodeproj/project.pbxproj

@@ -269,6 +269,7 @@
 		B92A06672C49858800E27652 /* DetailSearchHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B92A06662C49858800E27652 /* DetailSearchHeaderView.swift */; };
 		B92A06692C49877700E27652 /* DetailSearchBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B92A06682C49877700E27652 /* DetailSearchBottomView.swift */; };
 		B933BED32C4916DC00365077 /* KeywordBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = B933BED22C4916DC00365077 /* KeywordBox.swift */; };
+		B948BDB92CCD8DD500A7C771 /* DetailSearchResultEmptyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B948BDB82CCD8DD500A7C771 /* DetailSearchResultEmptyView.swift */; };
 		B96098802C27201B0084F697 /* NormalSearchResultCountView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B960987F2C27201B0084F697 /* NormalSearchResultCountView.swift */; };
 		B96098882C27421F0084F697 /* FeedDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B96098872C27421F0084F697 /* FeedDetailViewController.swift */; };
 		B960988A2C2742680084F697 /* FeedDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B96098892C2742680084F697 /* FeedDetailViewModel.swift */; };
@@ -687,6 +688,7 @@
 		B92A06662C49858800E27652 /* DetailSearchHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailSearchHeaderView.swift; sourceTree = "<group>"; };
 		B92A06682C49877700E27652 /* DetailSearchBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailSearchBottomView.swift; sourceTree = "<group>"; };
 		B933BED22C4916DC00365077 /* KeywordBox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeywordBox.swift; sourceTree = "<group>"; };
+		B948BDB82CCD8DD500A7C771 /* DetailSearchResultEmptyView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailSearchResultEmptyView.swift; sourceTree = "<group>"; };
 		B960987F2C27201B0084F697 /* NormalSearchResultCountView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NormalSearchResultCountView.swift; sourceTree = "<group>"; };
 		B96098872C27421F0084F697 /* FeedDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedDetailViewController.swift; sourceTree = "<group>"; };
 		B96098892C2742680084F697 /* FeedDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedDetailViewModel.swift; sourceTree = "<group>"; };
@@ -2117,6 +2119,7 @@
 				B974EA422CC8E57100169639 /* DetailSearchNovelRatingStatusButton.swift */,
 				B974EA462CC902E800169639 /* DetailSearchResultHeaderView.swift */,
 				B9DC62012CC9391A00E87DD7 /* DetailSearchResultNovelView.swift */,
+				B948BDB82CCD8DD500A7C771 /* DetailSearchResultEmptyView.swift */,
 			);
 			path = DetailSearchAssistantView;
 			sourceTree = "<group>";
@@ -3188,6 +3191,7 @@
 				39ABD5A02B54D0A900DEA94E /* RegisterNormalDatePicker.swift in Sources */,
 				39D4A5C92BDA4C5A004FC834 /* NovelDetailViewController.swift in Sources */,
 				CD2D0AB92C7F0279007CF1F1 /* NovelReviewStatusCollectionViewCell.swift in Sources */,
+				B948BDB92CCD8DD500A7C771 /* DetailSearchResultEmptyView.swift in Sources */,
 				2CCBFA042B4DD73D00D787C2 /* MyPageTallyView.swift in Sources */,
 				2C2491812B4ADC000096F255 /* StringLiterals.swift in Sources */,
 				39DFB0EF2CABE47B00F87951 /* OnboardingGenreButtonView.swift in Sources */,

WSSiOS/WSSiOS/Resource/Constants/Strings/StringLiterals.swift

@@ -495,6 +495,8 @@ enum StringLiterals {
         static let vibe = "분위기/전개"
 
         static let placeHolder = "키워드를 검색하세요"
+
+        static let empty = "해당하는 작품이 없어요\n검색의 범위를 더 넓혀보세요"
     }
 
     enum Memo {

WSSiOS/WSSiOS/Resource/Extensions/UIViewController+.swift

@@ -358,6 +358,19 @@ extension UIViewController {
         viewController.hidesBottomBarWhenPushed = true
         self.navigationController?.pushViewController(viewController, animated: true)
     }
+
+    func presentToDetailSearchViewController(selectedKeywordList: [KeywordData],
+                                             previousViewInfo: PreviousViewType,
+                                             selectedFilteredQuery: SearchFilterQuery) {
+        let detailSearchViewController = DetailSearchViewController(
+            viewModel: DetailSearchViewModel(
+                keywordRepository: DefaultKeywordRepository(
+                    keywordService: DefaultKeywordService()),
+                selectedKeywordList: selectedKeywordList,
+                previousViewInfo: previousViewInfo,
+                selectedFilteredQuery: selectedFilteredQuery))
+        self.presentModalViewController(detailSearchViewController)
+    }
 }
 
 extension UIViewController: UIGestureRecognizerDelegate {

WSSiOS/WSSiOS/Source/Data/Base/CompletedStatus.swift

@@ -24,4 +24,8 @@ enum CompletedStatus: String, CaseIterable {
         case .notCompleted: return false
         }
     }
+
+    init(isCompleted: Bool) {
+        self = isCompleted ? .completed : .notCompleted
+    }
 }

WSSiOS/WSSiOS/Source/Data/Base/NovelRatingStatus.swift

@@ -30,4 +30,19 @@ enum NovelRatingStatus: String, CaseIterable {
         case .aboveFourPointEight: return "4.8이상"
         }
     }
+
+    init(toFloat: Float) {
+        switch toFloat {
+        case 3.5:
+            self = .aboveThreePointFive
+        case 4.0:
+            self = .aboveFourPointZero
+        case 4.5:
+            self = .aboveFourPointFive
+        case 4.8:
+            self = .aboveFourPointEight
+        default:
+            self = .aboveFourPointEight
+        }
+    }
 }

WSSiOS/WSSiOS/Source/Presentation/Search/DetailSearch/DetailSearchView/DetailSearchAssistantView/DetailSearchCompletedStatusButton.swift

@@ -15,9 +15,9 @@ final class DetailSearchCompletedStatusButton: UIButton {
     //MARK: - Properties
 
     let status: CompletedStatus
-
+    
     //MARK: - Components
-
+    
     private let buttonLabel = UILabel()
 
     //MARK: - Life Cycle
@@ -63,7 +63,7 @@ final class DetailSearchCompletedStatusButton: UIButton {
 
     // MARK: - Custom Method
 
-    func updateButton(selectedCompletedStatus: CompletedStatus) {
+    func updateButton(selectedCompletedStatus: CompletedStatus?) {
         let isSelected = selectedCompletedStatus == status
 
         self.do {

WSSiOS/WSSiOS/Source/Presentation/Search/DetailSearch/DetailSearchView/DetailSearchAssistantView/DetailSearchInfoView.swift

@@ -154,15 +154,21 @@ final class DetailSearchInfoView: UIView {
         }
     }
 
-    func updateCompletedKeyword(_ selectedCompletedStatus: CompletedStatus) {
+    func updateCompletedKeyword(_ selectedCompletedStatus: CompletedStatus?) {
         completedStatusButtons.forEach {
             $0.updateButton(selectedCompletedStatus: selectedCompletedStatus)
         }
     }
 
-    func updateNovelRatingKeyword(_ selectedNovelRatingStatus: NovelRatingStatus) {
+    func updateNovelRatingKeyword(_ selectedNovelRatingStatus: NovelRatingStatus?) {
         novelRatingStatusButtons.forEach {
             $0.updateButton(selectedNovelRatingStatus: selectedNovelRatingStatus)
         }
     }
+
+    func resetAllStates() {
+        genreCollectionView.indexPathsForSelectedItems?.forEach { indexPath in
+            genreCollectionView.deselectItem(at: indexPath, animated: false)
+        }
+    }
 }

WSSiOS/WSSiOS/Source/Presentation/Search/DetailSearch/DetailSearchView/DetailSearchAssistantView/DetailSearchNovelRatingStatusButton.swift

@@ -63,7 +63,7 @@ final class DetailSearchNovelRatingStatusButton: UIButton {
 
     // MARK: - Custom Method
 
-    func updateButton(selectedNovelRatingStatus: NovelRatingStatus) {
+    func updateButton(selectedNovelRatingStatus: NovelRatingStatus?) {
         let isSelected = selectedNovelRatingStatus == status
 
         self.do {

WSSiOS/WSSiOS/Source/Presentation/Search/DetailSearch/DetailSearchView/DetailSearchAssistantView/DetailSearchResultEmptyView.swift

@@ -0,0 +1,66 @@
+//
+//  DetailSearchResultEmptyView.swift
+//  WSSiOS
+//
+//  Created by Seoyeon Choi on 10/27/24.
+//
+
+import UIKit
+
+import SnapKit
+import Then
+
+final class DetailSearchResultEmptyView: UIView {
+
+    //MARK: - UI Components
+
+    private let stackView = UIStackView()
+    private let emptyImageView = UIImageView()
+    private let emptyDescriptionLabel = UILabel()
+
+    //MARK: - Life Cycle
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+
+        setUI()
+        setHierarchy()
+        setLayout()
+    }
+
+    @available(*, unavailable)
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    private func setUI() {
+        stackView.do {
+            $0.axis = .vertical
+            $0.spacing = 10
+            $0.alignment = .center
+        }
+
+        emptyImageView.do {
+            $0.image = .imgEmpty
+        }
+
+        emptyDescriptionLabel.do {
+            $0.applyWSSFont(.body1, with: StringLiterals.DetailSearch.empty)
+            $0.textColor = .wssGray200
+            $0.textAlignment = .center
+            $0.numberOfLines = 2
+        }
+    }
+
+    private func setHierarchy() {
+        self.addSubview(stackView)
+        stackView.addArrangedSubviews(emptyImageView,
+                                      emptyDescriptionLabel)
+    }
+
+    private func setLayout() {
+        stackView.snp.makeConstraints {
+            $0.center.equalToSuperview()
+        }
+    }
+}

WSSiOS/WSSiOS/Source/Presentation/Search/DetailSearch/DetailSearchView/DetailSearchAssistantView/DetailSearchResultHeaderView.swift

@@ -13,7 +13,7 @@ final class DetailSearchResultHeaderView: UIView {
 
     let backButton = UIButton()
 
-    private let backgroundView = UIView()
+    let backgroundView = UIView()
     private let headerLabel = UILabel()
     private let controllerImageView = UIImageView()
 

WSSiOS/WSSiOS/Source/Presentation/Search/DetailSearch/DetailSearchView/DetailSearchAssistantView/DetailSearchResultNovelView.swift

@@ -81,7 +81,6 @@ final class DetailSearchResultNovelView: UIView {
 
         contentView.snp.makeConstraints {
             $0.edges.equalTo(scrollView.contentLayoutGuide)
-            $0.height.greaterThanOrEqualTo(self.snp.height).priority(.low)
             $0.width.equalTo(scrollView.snp.width)
         }
 
@@ -97,9 +96,8 @@ final class DetailSearchResultNovelView: UIView {
 
         resultNovelCollectionView.snp.makeConstraints {
             $0.top.equalTo(novelTitleLabel.snp.bottom).offset(14)
-            $0.horizontalEdges.equalToSuperview()
+            $0.horizontalEdges.bottom.equalToSuperview()
             $0.height.equalTo(0)
-            $0.bottom.equalToSuperview()
         }
     }
 

WSSiOS/WSSiOS/Source/Presentation/Search/DetailSearch/DetailSearchView/DetailSearchResultView.swift

@@ -16,6 +16,7 @@ final class DetailSearchResultView: UIView {
 
     let headerView = DetailSearchResultHeaderView()
     let novelView = DetailSearchResultNovelView()
+    let emptyView = DetailSearchResultEmptyView()
 
     //MARK: - Life Cycle
 
@@ -34,11 +35,15 @@ final class DetailSearchResultView: UIView {
 
     private func setUI() {
         self.backgroundColor = .wssWhite
+
+        novelView.isHidden = true
+        emptyView.isHidden = true
     }
 
     private func setHierarchy() {
         self.addSubviews(headerView,
-                         novelView)
+                         novelView,
+                         emptyView)
     }
 
     private func setLayout() {
@@ -52,5 +57,17 @@ final class DetailSearchResultView: UIView {
             $0.horizontalEdges.equalToSuperview().inset(20)
             $0.bottom.equalToSuperview()
         }
+
+        emptyView.snp.makeConstraints {
+            $0.top.equalTo(headerView.snp.bottom)
+            $0.horizontalEdges.bottom.equalToSuperview()
+        }
+    }
+
+    //MARK: - Custom Method
+
+    func showEmptyView(show: Bool) {
+        emptyView.isHidden = !show
+        novelView.isHidden = show
     }
 }

WSSiOS/WSSiOS/Source/Presentation/Search/DetailSearch/DetailSearchViewController/DetailSearchResultViewController.swift

@@ -17,6 +17,8 @@ final class DetailSearchResultViewController: UIViewController, UIScrollViewDele
     private let viewModel: DetailSearchResultViewModel
     private let disposeBag = DisposeBag()
 
+    private let viewDidLoadEvent = PublishRelay<Void>()
+
     //MARK: - Components
 
     private let rootView = DetailSearchResultView()
@@ -39,6 +41,7 @@ final class DetailSearchResultViewController: UIViewController, UIScrollViewDele
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
 
+        setNavigationBar()
         swipeBackGesture()
     }
 
@@ -47,8 +50,14 @@ final class DetailSearchResultViewController: UIViewController, UIScrollViewDele
 
         registerCell()
         setDelegate()
-        
+
         bindViewModel()
+
+        viewDidLoadEvent.accept(())
+    }
+
+    private func setNavigationBar() {
+        self.navigationController?.isNavigationBarHidden = true
     }
 
     private func registerCell() {
@@ -68,7 +77,12 @@ final class DetailSearchResultViewController: UIViewController, UIScrollViewDele
     private func bindViewModel() {
         let input = DetailSearchResultViewModel.Input(
             backButtonDidTap: rootView.headerView.backButton.rx.tap,
-            novelCollectionViewContentSize: rootView.novelView.resultNovelCollectionView.rx.observe(CGSize.self, "contentSize")
+            novelCollectionViewContentSize: rootView.novelView.resultNovelCollectionView.rx.observe(CGSize.self, "contentSize"),
+            novelResultCellSelected: rootView.novelView.resultNovelCollectionView.rx.itemSelected,
+            searchHeaderViewDidTap: rootView.headerView.backgroundView.rx.tapGesture().when(.recognized).asObservable(),
+            viewDidLoadEvent: self.viewDidLoadEvent.asObservable(),
+            novelCollectionViewReachedBottom: observeReachedBottom(rootView.novelView.scrollView),
+            updateDetailSearchResultNotification: NotificationCenter.default.rx.notification(Notification.Name("PushToUpdateDetailSearchResult"))
         )
 
         let output = viewModel.transform(from: input, disposeBag: disposeBag)
@@ -79,8 +93,8 @@ final class DetailSearchResultViewController: UIViewController, UIScrollViewDele
             })
             .disposed(by: disposeBag)
 
-        viewModel.getDetailSearchNovelsObservable()
-            .map { $0.novels }
+        output.filteredNovelsData
+            .map { $0 }
             .bind(to: rootView.novelView.resultNovelCollectionView.rx.items(cellIdentifier: HomeTasteRecommendCollectionViewCell.cellIdentifier, cellType: HomeTasteRecommendCollectionViewCell.self)) { row, element, cell in
                 cell.bindData(data: element)
             }
@@ -92,12 +106,45 @@ final class DetailSearchResultViewController: UIViewController, UIScrollViewDele
             })
             .disposed(by: disposeBag)
 
-        viewModel.getDetailSearchNovelsObservable()
-            .map { $0.resultCount }
-            .observe(on: MainScheduler.instance)
-            .bind(with: self, onNext: { owner, count in
+        output.resultCount
+            .drive(with: self, onNext: { owner, count in
                 owner.rootView.novelView.updateNovelCountLabel(count: count)
             })
             .disposed(by: disposeBag)
+
+        output.pushToNovelDetailViewController
+            .subscribe(with: self, onNext: { owner, novelId in
+                owner.pushToDetailViewController(novelId: novelId)
+            })
+            .disposed(by: disposeBag)
+
+        output.presentDetailSearchModal
+            .subscribe(with: self, onNext: { owner, data in
+                owner.presentToDetailSearchViewController(selectedKeywordList: data.keywords,
+                                                          previousViewInfo: .resultSearchBar,
+                                                          selectedFilteredQuery: data)
+            })
+            .disposed(by: disposeBag)
+
+        output.showEmptyView
+            .observe(on: MainScheduler.instance)
+            .subscribe(with: self, onNext: { owner, show in
+                owner.rootView.showEmptyView(show: show)
+            })
+            .disposed(by: disposeBag)
+    }
+
+    // MARK: - Custom Method
+
+    private func observeReachedBottom(_ scrollView: UIScrollView) -> Observable<Bool> {
+        return scrollView.rx.contentOffset
+            .map { contentOffset in
+                let contentHeight = scrollView.contentSize.height
+                let viewHeight = scrollView.frame.size.height
+                let offsetY = contentOffset.y
+
+                return offsetY + viewHeight >= contentHeight
+            }
+            .distinctUntilChanged()
     }
 }