[Merge] #596 - 서재소소 QA 사항 반영

Naknakk · web-flow · commit 41b3d5382eb8 · 2025-07-11T14:35:24.000+09:00
[Fix] #596 - 서재소소 QA 사항 반영
diff --git a/WSSiOS/WSSiOS/Resource/Constants/Strings/StringLiterals+MyLibrary.swift b/WSSiOS/WSSiOS/Resource/Constants/Strings/StringLiterals+MyLibrary.swift
@@ -24,5 +24,11 @@ extension StringLiterals {
             static let attractivePoint = "매력포인트"
             static let rating = "별점"
         }
+        
+        enum Empty {
+            static let libraryEmpty = "서재가 비어있어요"
+            static let searchButton = "웹소설 찾으러 가기"
+            static let filterResultEmpty = "해당하는 작품이 없어요\n검색의 범위를 더 넓혀보세요"
+        }
     }
 }
diff --git a/WSSiOS/WSSiOS/Source/Data/Base/ReadStatus.swift b/WSSiOS/WSSiOS/Source/Data/Base/ReadStatus.swift
@@ -52,14 +52,6 @@ enum ReadStatus: String, CaseIterable {
         }
     }
     
-    var tagText: String {
-        switch self {
-        case .watching: return "보는중"
-        case .watched: return "봤어요"
-        case .quit: return "하차"
-        }
-    }
-    
     var tagBackgroundColor: UIColor {
         switch self {
         case .watching: return .wssPrimary100
diff --git a/WSSiOS/WSSiOS/Source/Presentation/Library/LibraryFilter/LibraryFilterViewController/LibraryFilterViewController.swift b/WSSiOS/WSSiOS/Source/Presentation/Library/LibraryFilter/LibraryFilterViewController/LibraryFilterViewController.swift
@@ -102,6 +102,13 @@ final class LibraryFilterViewController: UIViewController {
             .flatMap { button in
                 button.rx.tap.map { button.status }
             }
+            .withLatestFrom(ratingOption) { tappedButton, currentOption in
+                if tappedButton == currentOption {
+                    return nil
+                } else {
+                    return tappedButton
+                }
+            }
             .bind(to: ratingOption)
             .disposed(by: disposeBag)
         
diff --git a/WSSiOS/WSSiOS/Source/Presentation/Library/MyLibrary/MyLibraryView/MyLibraryAssistantView/MyLibraryEmptyView.swift b/WSSiOS/WSSiOS/Source/Presentation/Library/MyLibrary/MyLibraryView/MyLibraryAssistantView/MyLibraryEmptyView.swift
@@ -49,7 +49,7 @@ final class MyLibraryEmptyView: UIView {
         }
         
         descriptionLabel.do {
-            $0.applyWSSFont(.body1, with: StringLiterals.Library.empty)
+            $0.applyWSSFont(.body1, with: StringLiterals.MyLibrary.Empty.libraryEmpty)
             $0.textColor = .wssGray200
         }
         
@@ -59,7 +59,7 @@ final class MyLibraryEmptyView: UIView {
         }
         
         searchNovelButtonLabel.do {
-            $0.applyWSSFont(.title1, with: StringLiterals.Library.lookForNovel)
+            $0.applyWSSFont(.title1, with: StringLiterals.MyLibrary.Empty.searchButton)
             $0.textColor = .wssPrimary100
             $0.isUserInteractionEnabled = false
         }
diff --git a/WSSiOS/WSSiOS/Source/Presentation/Library/MyLibrary/MyLibraryView/MyLibraryAssistantView/MyLibraryFilterHeaderView.swift b/WSSiOS/WSSiOS/Source/Presentation/Library/MyLibrary/MyLibraryView/MyLibraryAssistantView/MyLibraryFilterHeaderView.swift
@@ -126,8 +126,8 @@ final class MyLibraryFilterHeaderView: UIView {
         let overCount = selectedOption.count - 1
         
         let text = switch (isSelected, isMoreThanOne) {
-        case (true, false): selectedOption.first?.tagText
-        case (true, true): "\(selectedOption.first?.tagText ?? "") 외\(overCount)"
+        case (true, false): selectedOption.first?.statusName
+        case (true, true): "\(selectedOption.first?.statusName ?? "") 외\(overCount)"
         case (false, _): StringLiterals.MyLibrary.FilterButton.readStatus
         }
         
diff --git a/WSSiOS/WSSiOS/Source/Presentation/Library/MyLibrary/MyLibraryView/MyLibraryAssistantView/MyLibraryFilterResultEmptyView.swift b/WSSiOS/WSSiOS/Source/Presentation/Library/MyLibrary/MyLibraryView/MyLibraryAssistantView/MyLibraryFilterResultEmptyView.swift
@@ -0,0 +1,77 @@
+//
+//  MyLibraryFilterResultEmptyView.swift
+//  WSSiOS
+//
+//  Created by YunhakLee on 6/25/25.
+//
+
+import UIKit
+
+import SnapKit
+import Then
+
+final class MyLibraryFilterResultEmptyView: UIView {
+    
+    //MARK: - Components
+    
+    private let stackView = UIStackView()
+    private let imageView = UIImageView()
+    private let descriptionLabel = UILabel()
+    
+    // MARK: - Life Cycle
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        
+        setUI()
+        setHierarchy()
+        setLayout()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    //MARK: - UI
+    
+    private func setUI() {
+        self.backgroundColor = .wssWhite
+        
+        stackView.do {
+            $0.axis = .vertical
+            $0.alignment = .center
+        }
+        
+        imageView.do {
+            $0.image = .imgEmpty
+        }
+        
+        descriptionLabel.do {
+            $0.applyWSSFont(.body1, with: StringLiterals.MyLibrary.Empty.filterResultEmpty)
+            $0.textColor = .wssGray200
+            $0.textAlignment = .center
+            $0.numberOfLines = 2
+        }
+    }
+
+    private func setHierarchy() {
+        self.addSubviews(stackView)
+        stackView.addArrangedSubviews(imageView,
+                                      descriptionLabel)
+    }
+    
+    private func setLayout() {
+        stackView.snp.makeConstraints() {
+            $0.centerY.equalToSuperview().offset(-47)
+            $0.horizontalEdges.equalToSuperview()
+        }
+        
+        stackView.do {
+            $0.spacing = 8
+        }
+        
+        imageView.snp.makeConstraints() {
+            $0.height.equalTo(48)
+        }
+    }
+}
diff --git a/WSSiOS/WSSiOS/Source/Presentation/Library/MyLibrary/MyLibraryView/MyLibraryAssistantView/MyLibraryReadStatusTagView.swift b/WSSiOS/WSSiOS/Source/Presentation/Library/MyLibrary/MyLibraryView/MyLibraryAssistantView/MyLibraryReadStatusTagView.swift
@@ -52,7 +52,7 @@ final class MyLibraryReadStatusTagView: UIView {
         self.backgroundColor = readStatus.tagBackgroundColor
         
         statusLabel.do {
-            $0.applyWSSFont(.label2, with: readStatus.tagText)
+            $0.applyWSSFont(.label2, with: readStatus.statusName)
         }
     }
 }
diff --git a/WSSiOS/WSSiOS/Source/Presentation/Library/MyLibrary/MyLibraryView/MyLibraryView.swift b/WSSiOS/WSSiOS/Source/Presentation/Library/MyLibrary/MyLibraryView/MyLibraryView.swift
@@ -19,6 +19,7 @@ final class MyLibraryView: UIView {
     let libraryCollectionView = UICollectionView(frame: .zero, collectionViewLayout: UICollectionViewLayout())
     let libraryTableView = UITableView(frame: .zero, style: .plain)
     let libraryEmptyView = MyLibraryEmptyView()
+    let libraryFilterResultEmptyView = MyLibraryFilterResultEmptyView()
     let loadingView = WSSLoadingView()
     let networkErrorView = WSSNetworkErrorView()
     
@@ -68,6 +69,7 @@ final class MyLibraryView: UIView {
                          libraryCollectionView,
                          libraryTableView,
                          libraryEmptyView,
+                         libraryFilterResultEmptyView,
                          loadingView,
                          networkErrorView)
     }
@@ -101,6 +103,12 @@ final class MyLibraryView: UIView {
             $0.bottom.equalToSuperview()
         }
         
+        libraryFilterResultEmptyView.snp.makeConstraints {
+            $0.top.equalTo(headerView.snp.bottom)
+            $0.horizontalEdges.equalToSuperview()
+            $0.bottom.equalToSuperview()
+        }
+        
         loadingView.snp.makeConstraints {
             $0.top.equalTo(headerView.snp.bottom)
             $0.horizontalEdges.equalToSuperview()
@@ -114,10 +122,14 @@ final class MyLibraryView: UIView {
         }
     }
     
-    func showEmptyLibraryView(isShowing: Bool) {
+    func showLibraryEmptyView(isShowing: Bool) {
         libraryEmptyView.isHidden = !isShowing
     }
     
+    func showFilterResultEmptyView(isShowing: Bool) {
+        libraryFilterResultEmptyView.isHidden = !isShowing
+    }
+    
     func showLibraryListView(selectedType: LayoutType) {
         libraryCollectionView.isHidden = selectedType == .list
         libraryTableView.isHidden = selectedType == .grid
diff --git a/WSSiOS/WSSiOS/Source/Presentation/Library/MyLibrary/MyLibraryViewController/MyLibraryViewController.swift b/WSSiOS/WSSiOS/Source/Presentation/Library/MyLibrary/MyLibraryViewController/MyLibraryViewController.swift
@@ -129,10 +129,15 @@ final class MyLibraryViewController: UIViewController {
             }
             .disposed(by: disposeBag)
         
-        output.showEmptyLibraryView
-            .observe(on: MainScheduler.instance)
-            .bind(with: self, onNext: { owner, isShowing in
-                owner.rootView.showEmptyLibraryView(isShowing: isShowing)
+        output.showLibraryEmptyView
+            .drive(with: self, onNext: { owner, isShowing in
+                owner.rootView.showLibraryEmptyView(isShowing: isShowing)
+            })
+            .disposed(by: disposeBag)
+        
+        output.showFilterResultEmptyView
+            .drive(with: self, onNext: { owner, isShowing in
+                owner.rootView.showFilterResultEmptyView(isShowing: isShowing)
             })
             .disposed(by: disposeBag)
         
diff --git a/WSSiOS/WSSiOS/Source/Presentation/Library/MyLibrary/MyLibraryViewModel/MyLibraryViewModel.swift b/WSSiOS/WSSiOS/Source/Presentation/Library/MyLibrary/MyLibraryViewModel/MyLibraryViewModel.swift
@@ -31,7 +31,9 @@ final class MyLibraryViewModel: ViewModelType {
     private let reloadNovelList = PublishRelay<Void>()
     private let refreshNovelList = PublishRelay<Void>()
     
-    private let showEmptyLibraryView = BehaviorRelay<Bool>(value: false)
+    private let isLibraryEmpty = BehaviorRelay<Bool>(value: false)
+    private let showLibraryEmptyView = BehaviorRelay<Bool>(value: false)
+    private let showFilterResultEmptyView = BehaviorRelay<Bool>(value: false)
     private let pushToNovelDetailViewController = PublishRelay<Int>()
     private let showLoadingView = BehaviorRelay<Bool>(value: false)
     private let showNetworkErrorView = BehaviorRelay<Bool>(value: false)
@@ -61,7 +63,8 @@ final class MyLibraryViewModel: ViewModelType {
         let selectedLayoutType: Driver<LayoutType>
         let novelCount: Driver<Int>
         let libraryNovelList: Observable<[MyLibraryNovel]>
-        let showEmptyLibraryView: Observable<Bool>
+        let showLibraryEmptyView: Driver<Bool>
+        let showFilterResultEmptyView: Driver<Bool>
         let pushToNovelDetailViewController: Observable<Int>
         let showLoadingView: Observable<Bool>
         let showNetworkErrorView: Observable<Bool>
@@ -164,13 +167,31 @@ final class MyLibraryViewModel: ViewModelType {
             .bind(to: pushToNovelDetailViewController)
             .disposed(by: disposeBag)
         
+        isLibraryEmpty
+            .withLatestFrom(filterOption) { isEmpty, filterOption in
+                return (isEmpty, filterOption != LibraryFilterOption())
+            }
+            .bind(with: self, onNext: { owner, data in
+                let (isLibraryEmpty, isFilterResult) = data
+                if isLibraryEmpty {
+                    owner.showFilterResultEmptyView.accept(isFilterResult)
+                    owner.showLibraryEmptyView.accept(!isFilterResult)
+                } else {
+                    owner.showFilterResultEmptyView.accept(false)
+                    owner.showLibraryEmptyView.accept(false)
+                }
+                
+            })
+            .disposed(by: disposeBag)
+        
         return Output(
             selectedFilterOption: filterOption.asDriver(),
             selectedSortType: sortType.asDriver(),
             selectedLayoutType: layoutType.asDriver(),
             novelCount: novelCount.asDriver(),
             libraryNovelList: libraryNovelList.asObservable(),
-            showEmptyLibraryView: showEmptyLibraryView.asObservable(),
+            showLibraryEmptyView: showLibraryEmptyView.asDriver(),
+            showFilterResultEmptyView: showFilterResultEmptyView.asDriver(),
             pushToNovelDetailViewController: pushToNovelDetailViewController.asObservable(),
             showLoadingView: showLoadingView.asObservable(),
             showNetworkErrorView: showNetworkErrorView.asObservable()
@@ -201,15 +222,15 @@ final class MyLibraryViewModel: ViewModelType {
         isLoadable.accept(true)
         novelCount.accept(0)
         lastUserNovelId.accept(0)
-        showEmptyLibraryView.accept(false)
+        isLibraryEmpty.accept(false)
     }
     
     private func updateLibraryState(with entity: MyLibraryEntity) {
         libraryNovelList.accept(entity.userNovels)
         isLoadable.accept(entity.isLoadable)
         novelCount.accept(entity.userNovelCount)
         lastUserNovelId.accept(entity.userNovels.last?.userNovelId ?? 0)
-        showEmptyLibraryView.accept(entity.userNovels.isEmpty)
+        isLibraryEmpty.accept(entity.userNovels.isEmpty)
     }
     
     private func updateRequestState(isStarting: Bool, isReloading: Bool = false, isError: Bool = false) {

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,11 @@ extension StringLiterals {`
`24`	`24`	`static let attractivePoint = "매력포인트"`
`25`	`25`	`static let rating = "별점"`
`26`	`26`	`}`
	`27`	`+`
	`28`	`+ enum Empty {`
	`29`	`+ static let libraryEmpty = "서재가 비어있어요"`
	`30`	`+ static let searchButton = "웹소설 찾으러 가기"`
	`31`	`+ static let filterResultEmpty = "해당하는 작품이 없어요\n검색의 범위를 더 넓혀보세요"`
	`32`	`+ }`
`27`	`33`	`}`
`28`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,14 +52,6 @@ enum ReadStatus: String, CaseIterable {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- var tagText: String {`
`56`		`- switch self {`
`57`		`- case .watching: return "보는중"`
`58`		`- case .watched: return "봤어요"`
`59`		`- case .quit: return "하차"`
`60`		`- }`
`61`		`- }`
`62`		`-`
`63`	`55`	`var tagBackgroundColor: UIColor {`
`64`	`56`	`switch self {`
`65`	`57`	`case .watching: return .wssPrimary100`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ final class MyLibraryEmptyView: UIView {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`descriptionLabel.do {`
`52`		`- $0.applyWSSFont(.body1, with: StringLiterals.Library.empty)`
	`52`	`+ $0.applyWSSFont(.body1, with: StringLiterals.MyLibrary.Empty.libraryEmpty)`
`53`	`53`	`$0.textColor = .wssGray200`
`54`	`54`	`}`
`55`	`55`
`@@ -59,7 +59,7 @@ final class MyLibraryEmptyView: UIView {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`searchNovelButtonLabel.do {`
`62`		`- $0.applyWSSFont(.title1, with: StringLiterals.Library.lookForNovel)`
	`62`	`+ $0.applyWSSFont(.title1, with: StringLiterals.MyLibrary.Empty.searchButton)`
`63`	`63`	`$0.textColor = .wssPrimary100`
`64`	`64`	`$0.isUserInteractionEnabled = false`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,8 @@ final class MyLibraryFilterHeaderView: UIView {`
`126`	`126`	`let overCount = selectedOption.count - 1`
`127`	`127`
`128`	`128`	`let text = switch (isSelected, isMoreThanOne) {`
`129`		`- case (true, false): selectedOption.first?.tagText`
`130`		`- case (true, true): "\(selectedOption.first?.tagText ?? "") 외\(overCount)"`
	`129`	`+ case (true, false): selectedOption.first?.statusName`
	`130`	`+ case (true, true): "\(selectedOption.first?.statusName ?? "") 외\(overCount)"`
`131`	`131`	`case (false, _): StringLiterals.MyLibrary.FilterButton.readStatus`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ final class MyLibraryReadStatusTagView: UIView {`
`52`	`52`	`self.backgroundColor = readStatus.tagBackgroundColor`
`53`	`53`
`54`	`54`	`statusLabel.do {`
`55`		`- $0.applyWSSFont(.label2, with: readStatus.tagText)`
	`55`	`+ $0.applyWSSFont(.label2, with: readStatus.statusName)`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`