[Release] v1.7.0 업데이트

WSSiOS.xcodeproj/project.pbxproj

@@ -338,7 +338,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2026040801;
+				CURRENT_PROJECT_VERSION = 2026051101;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 9SVDHQS4M3;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -356,7 +356,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.0;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = kr.websoso.debug2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -383,7 +383,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2026040801;
+				CURRENT_PROJECT_VERSION = 2026051101;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 9SVDHQS4M3;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -401,7 +401,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.6.0;
+				MARKETING_VERSION = 1.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = kr.websoso;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

WSSiOS/Network/Search/SearchService.swift

@@ -14,7 +14,8 @@ protocol SearchService {
     func searchNormalNovels(query: String, page: Int, size: Int) -> Single<NormalSearchNovels>
     func searchDetailNovels(genres: [String],
                             isCompleted: Bool?,
-                            novelRating: Float?,
+                            lowerNovelRating: Float,
+                            upperNovelRating: Float,
                             keywordIds: [Int],
                             page: Int,
                             size: Int) -> Single<DetailSearchNovels>
@@ -70,7 +71,8 @@ extension DefaultSearchService: SearchService {
 
     func searchDetailNovels(genres: [String],
                             isCompleted: Bool?,
-                            novelRating: Float?,
+                            lowerNovelRating: Float,
+                            upperNovelRating: Float,
                             keywordIds: [Int],
                             page: Int,
                             size: Int) -> Single<DetailSearchNovels> {
@@ -79,17 +81,15 @@ extension DefaultSearchService: SearchService {
             URLQueryItem(name: "genres", value: genres.joined(separator: ",")),
             URLQueryItem(name: "keywordIds", value: keywordIds.map { String($0) }.joined(separator: ",")),
             URLQueryItem(name: "page", value: String(page)),
-            URLQueryItem(name: "size", value: String(size))
+            URLQueryItem(name: "size", value: String(size)),
+            URLQueryItem(name: "novelRatingStart", value: String(lowerNovelRating)),
+            URLQueryItem(name: "novelRatingEnd", value: String(upperNovelRating))
         ]
 
         if let isCompleted = isCompleted {
             detailSearchQueryItems.append(URLQueryItem(name: "isCompleted", value: String(isCompleted)))
         }
-
-        if let novelRating = novelRating {
-            detailSearchQueryItems.append(URLQueryItem(name: "novelRating", value: String(novelRating)))
-        }
-
+
         do {
             let request = try makeHTTPRequest(method: .get,
                                               path: URLs.Search.detailSearch,

WSSiOS/Resource/Assets.xcassets/Image/imgHomeDetailSearch.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "imgHomeDetailSearch.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "imgHomeDetailSearch@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "imgHomeDetailSearch@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

WSSiOS/Resource/Assets.xcassets/icon/AttractivePoint/icAttractiveWritingSkill.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "icAttractiveWritingSkill.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

WSSiOS/Resource/Assets.xcassets/icon/icBookPlus.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "mdi_book-plus-outline.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

@@ -15,11 +15,13 @@ extension StringLiterals {
             static let interest = "님의 관심글"
             static let notLoggedInInterest = "･ :*관심글*: ･"
             static let recommend = "이 웹소설은 어때요? (´ヮ`)ﾉ📚"
+            static let detailSearchBanner = "뭐 읽을지 고민될 때"
         }
 
         enum SubTitle {
             static let interest = "관심 등록한 작품의 최신 글이에요"
             static let recommend = "선호 장르를 기반으로 추천해드려요"
+            static let detailSearchBanner = "장르, 연재상태, 별점, 키워드로 작품 찾기"
         }
 
         enum Login {

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

@@ -100,7 +100,7 @@ extension StringLiterals {
         }
 
         enum Date {
-            static let addDate = "날짜 추가"
+            static let addDate = "본 날짜 추가"
             static let complete = "완료"
             static let removeDate = "날짜 삭제"
             static let startDate = "시작 날짜"

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

@@ -51,5 +51,7 @@ extension StringLiterals {
         static let placeHolder = "키워드를 검색하세요"
 
         static let empty = "해당하는 작품이 없어요\n검색의 범위를 더 넓혀보세요"
+
+        static let applyOption = "장르, 연재상태, 별점, 키워드 적용"
     }
 }

WSSiOS/Resource/Extensions/UIViewController+.swift

@@ -56,6 +56,10 @@ extension UIViewController {
         self.navigationItem.title = title
         self.navigationItem.leftBarButtonItem = left != nil ? UIBarButtonItem(customView: left!) : nil
         self.navigationItem.rightBarButtonItem = right != nil ? UIBarButtonItem(customView: right!) : nil
+        if #available(iOS 26.0, *) {
+            self.navigationItem.leftBarButtonItem?.hidesSharedBackground = true
+            self.navigationItem.rightBarButtonItem?.hidesSharedBackground = true
+        }
         setNavigationBarVisibleBeforeScroll(isVisible: isVisibleBeforeScroll)
     }
 
@@ -69,7 +73,7 @@ extension UIViewController {
             ]
             $0.shadowColor = .clear
         }
-        
+
         let whiteAppearance = UINavigationBarAppearance().then {
             $0.configureWithOpaqueBackground()
             $0.backgroundColor = .white
@@ -80,7 +84,7 @@ extension UIViewController {
             ]
             $0.shadowColor = .clear
         }
-        
+
         navigationItem.standardAppearance = whiteAppearance
         navigationItem.scrollEdgeAppearance = isVisible ? whiteAppearance : clearAppearance
     }
@@ -306,17 +310,32 @@ extension UIViewController {
         self.navigationController?.pushViewController(viewController, animated: true)
     }
 
-    func presentToDetailSearchViewController(selectedKeywordList: [KeywordData],
-                                             previousViewInfo: PreviousViewType,
-                                             selectedFilteredQuery: SearchFilterQuery) {
+    func pushToDetailSearchViewController() {
         let detailSearchViewController = DetailSearchViewController(
             viewModel: DetailSearchViewModel(
                 keywordRepository: DefaultKeywordRepository(
-                    keywordService: DefaultKeywordService()),
-                selectedKeywordList: selectedKeywordList,
-                previousViewInfo: previousViewInfo,
-                selectedFilteredQuery: selectedFilteredQuery))
-        self.presentModalViewController(detailSearchViewController)
+                    keywordService: DefaultKeywordService()
+                )
+            )
+        )
+        detailSearchViewController.navigationController?.isNavigationBarHidden = true
+        detailSearchViewController.hidesBottomBarWhenPushed = true
+        self.navigationController?.pushViewController(detailSearchViewController,
+                                                      animated: true)
+    }
+
+    func pushToDetailSearchResultViewController(option: SearchFilterQuery) {
+        let detailSearchResultViewController = DetailSearchResultViewController(
+            viewModel: DetailSearchResultViewModel(
+                searchRepository: DefaultSearchRepository(
+                    searchService: DefaultSearchService()),
+                option: option
+            )
+        )
+        detailSearchResultViewController.navigationController?.isNavigationBarHidden = true
+        detailSearchResultViewController.hidesBottomBarWhenPushed = true
+        self.navigationController?.pushViewController(detailSearchResultViewController,
+                                                      animated: true)
     }
 
     func presentInduceLoginViewController() {
@@ -363,8 +382,8 @@ extension UIViewController {
 
     func pushToChangeUserInfoViewController() {
         let viewController = MyPageChangeUserInfoViewController(
-                userRepository: DefaultUserInfoRepository(
-                    userService: DefaultUserService()
+            userRepository: DefaultUserInfoRepository(
+                userService: DefaultUserService()
             )
         )
         viewController.hidesBottomBarWhenPushed = true
@@ -373,7 +392,7 @@ extension UIViewController {
 
     func pushToLibraryViewController(userId: Int, pageIndex: Int = 0) {
         let viewController = UserLibraryViewController(userId: userId)
-
+        
         viewController.setPageIndex(target: pageIndex)
         viewController.hidesBottomBarWhenPushed = true
         self.navigationController?.pushViewController(viewController, animated: true)

WSSiOS/Source/Data/Base/AttractivePoint.swift

@@ -10,6 +10,7 @@ import UIKit
 enum AttractivePoint: String, CaseIterable, Codable {
     case worldview = "worldview"
     case material = "material"
+    case writingSkill = "writingskill"
     case character = "character"
     case relationship = "relationship"
     case vibe = "vibe"
@@ -18,6 +19,7 @@ enum AttractivePoint: String, CaseIterable, Codable {
         switch self {
         case .worldview: "세계관"
         case .material: "소재"
+        case .writingSkill: "필력"
         case .character: "캐릭터"
         case .relationship: "관계"
         case .vibe: "분위기"
@@ -28,6 +30,7 @@ enum AttractivePoint: String, CaseIterable, Codable {
         switch self {
         case .worldview: .icAttractiveWorldview
         case .material: .icAttractiveMaterial
+        case .writingSkill: .icAttractiveWritingSkill
         case .character: .icAttractiveCharacter
         case .relationship: .icAttractiveRelationship
         case .vibe: .icAttractiveVibe

WSSiOS/Source/Data/Base/NovelGenre.swift

@@ -8,33 +8,6 @@
 import UIKit
 
 enum NovelGenre: String, CaseIterable {
-    case romance, romanceFantasy, fantasy, modernFantasy, wuxia, BL, lightNovel, mystery, drama
-
-    var toKorean: String {
-        switch self {
-        case .romanceFantasy:
-            return "로판"
-        case .romance:
-            return "로맨스"
-        case .fantasy:
-            return "판타지"
-        case .modernFantasy:
-            return "현판"
-        case .drama:
-            return "드라마"
-        case .lightNovel:
-            return "라노벨"
-        case .wuxia:
-            return "무협"
-        case .mystery:
-            return "미스터리"
-        case .BL:
-            return "BL"
-        }
-    }
-}
-
-enum NewNovelGenre: String, CaseIterable {
     case all = "all"
     case fantasy = "fantasy"
     case modernFantasy = "modernFantasy"
@@ -77,7 +50,7 @@ enum NewNovelGenre: String, CaseIterable {
         }
     }
 
-    static func withKoreanRawValue(from genre: String) -> NewNovelGenre {
+    static func withKoreanRawValue(from genre: String) -> NovelGenre {
         switch genre {
         case "전체":
             return .all
@@ -236,9 +209,11 @@ enum NewNovelGenre: String, CaseIterable {
     }
 }
 
-extension NewNovelGenre {
-    static let onboardingGenres: [NewNovelGenre] = [.romance, .romanceFantasy, .bl, .fantasy, .modernFantasy, .wuxia, .lightNovel, .drama, .mystery]
-    static let feedMaleGenres: [NewNovelGenre] = [.all, .fantasy, .modernFantasy, .wuxia, .drama, .mystery, .lightNovel, .romance, .romanceFantasy, .bl, .etc]
-    static let feedFemaleGenres: [NewNovelGenre] = [.all, .romance, .romanceFantasy, .bl, .fantasy, .modernFantasy, .wuxia, .drama, .mystery, .lightNovel, .etc]
-    static let feedFilterGenres: [NewNovelGenre] = [.fantasy, .modernFantasy, .romance, .romanceFantasy, .wuxia, .mystery, .drama, .lightNovel, .bl, .etc]
+extension NovelGenre {
+    static let onboardingGenres: [NovelGenre] = [.romance, .romanceFantasy, .bl, .fantasy, .modernFantasy, .wuxia, .lightNovel, .drama, .mystery]
+    static let feedMaleGenres: [NovelGenre] = [.all, .fantasy, .modernFantasy, .wuxia, .drama, .mystery, .lightNovel, .romance, .romanceFantasy, .bl, .etc]
+    static let feedFemaleGenres: [NovelGenre] = [.all, .romance, .romanceFantasy, .bl, .fantasy, .modernFantasy, .wuxia, .drama, .mystery, .lightNovel, .etc]
+    static let feedFilterGenres: [NovelGenre] = [.fantasy, .modernFantasy, .romance, .romanceFantasy, .wuxia, .mystery, .drama, .lightNovel, .bl, .etc]
+    static let detailSearchGenres: [NovelGenre] = [.fantasy, .modernFantasy, .romance, .romanceFantasy, .wuxia, .mystery, .drama, .lightNovel, .bl]
+    static let myPageEditGenres: [NovelGenre] = [.romance, .romanceFantasy, .fantasy, .modernFantasy, .wuxia, .bl, .lightNovel, .mystery, .drama]
 }

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

@@ -7,25 +7,25 @@
 
 import Foundation
 
-enum CompletedStatus: String, CaseIterable {
+enum PublicationStatus: String, CaseIterable {
+    case onGoing
     case completed
-    case notCompleted
 
     var description: String {
         switch self {
+        case .onGoing: return "연재중"
         case .completed: return "완결작"
-        case .notCompleted: return "연재중"
         }
     }
 
     var isCompleted: Bool {
         switch self {
+        case .onGoing: return false
         case .completed: return true
-        case .notCompleted: return false
         }
     }
 
     init(isCompleted: Bool) {
-        self = isCompleted ? .completed : .notCompleted
+        self = isCompleted ? .completed : .onGoing
     }
 }

WSSiOS/Source/Data/Entity/Feed/FeedEntity.swift

@@ -74,7 +74,7 @@ extension FeedResponse {
                   let title = self.title,
                   let rating = self.novelRating,
                   let genreRaw = self.novelGenre,
-                  let genre = NewNovelGenre(rawValue: genreRaw),
+                  let genre = NovelGenre(rawValue: genreRaw),
                   let description = self.novelDescription,
                   let thumbnailPath = self.novelThumbnailImage,
                   let thumbnailURL = KingFisherRxHelper.makeImageURLString(path: thumbnailPath)

WSSiOS/Source/Data/Entity/Feed/FeedFilter.swift

@@ -33,6 +33,6 @@ enum FeedVisibilityOption: CaseIterable {
 }
 
 struct FeedFilterOption: Equatable {
-    var genres: [NewNovelGenre] = NewNovelGenre.feedFilterGenres
+    var genres: [NovelGenre] = NovelGenre.feedFilterGenres
     var visibilityOptions: [FeedVisibilityOption] = [.public, .private]
 }