feat(series-list-all): 완결시리즈 전체보기 페이지 추가
This commit is contained in:
@@ -32,6 +32,10 @@ struct SeriesMainHomeView: View {
|
||||
Text("전체보기")
|
||||
.font(.custom(Font.preRegular.rawValue, size: 14))
|
||||
.foregroundColor(.init(hex: "78909C"))
|
||||
.onTapGesture {
|
||||
AppState.shared
|
||||
.setAppStep(step: .seriesAll(isCompleted: true))
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 24)
|
||||
|
||||
|
||||
@@ -92,6 +92,7 @@ struct SeriesMainItemView: View {
|
||||
.font(.custom(Font.preRegular.rawValue, size: 18))
|
||||
.foregroundColor(Color(hex: "B0BEC5"))
|
||||
.lineLimit(1)
|
||||
.multilineTextAlignment(.leading)
|
||||
.padding(.horizontal, 8)
|
||||
|
||||
Text(item.creator.nickname)
|
||||
|
||||
@@ -9,7 +9,7 @@ import Foundation
|
||||
import Moya
|
||||
|
||||
enum SeriesApi {
|
||||
case getSeriesList(creatorId: Int?, isOriginal: Bool, sortType: SeriesListAllViewModel.SeriesSortType, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int)
|
||||
case getSeriesList(creatorId: Int?, isOriginal: Bool, isCompleted: Bool, sortType: SeriesListAllViewModel.SeriesSortType, isAdultContentVisible: Bool, contentType: ContentType, page: Int, size: Int)
|
||||
case getSeriesDetail(seriesId: Int, isAdultContentVisible: Bool)
|
||||
case getSeriesContentList(seriesId: Int, isAdultContentVisible: Bool, page: Int, size: Int, sortType: SeriesListAllViewModel.SeriesSortType)
|
||||
case getRecommendSeriesList(isAdultContentVisible: Bool, contentType: ContentType)
|
||||
@@ -45,12 +45,13 @@ extension SeriesApi: TargetType {
|
||||
|
||||
var task: Moya.Task {
|
||||
switch self {
|
||||
case .getSeriesList(let creatorId, let isOriginal, let sortType, let isAdultContentVisible, let contentType, let page, let size):
|
||||
case .getSeriesList(let creatorId, let isOriginal, let isCompleted, let sortType, let isAdultContentVisible, let contentType, let page, let size):
|
||||
var parameters = [
|
||||
"sortType": sortType,
|
||||
"isAdultContentVisible": isAdultContentVisible,
|
||||
"contentType": contentType,
|
||||
"isOriginal": isOriginal,
|
||||
"isCompleted": isCompleted,
|
||||
"page": page - 1,
|
||||
"size": size
|
||||
] as [String : Any]
|
||||
|
||||
@@ -15,12 +15,15 @@ struct SeriesListAllView: View {
|
||||
var creatorNickname: String? = nil
|
||||
|
||||
var isOriginal = false
|
||||
var isCompleted = false
|
||||
|
||||
var body: some View {
|
||||
NavigationView {
|
||||
BaseView(isLoading: $viewModel.isLoading) {
|
||||
VStack(spacing: 0) {
|
||||
if isOriginal {
|
||||
if isCompleted {
|
||||
DetailNavigationBar(title: "완결 시리즈")
|
||||
} else if isOriginal {
|
||||
DetailNavigationBar(title: "오직 보이스온에서만")
|
||||
} else {
|
||||
DetailNavigationBar(title: "\(creatorNickname ?? "") 님의 시리즈 전체보기")
|
||||
@@ -66,6 +69,7 @@ struct SeriesListAllView: View {
|
||||
.onAppear {
|
||||
viewModel.creatorId = creatorId
|
||||
viewModel.isOriginal = isOriginal
|
||||
viewModel.isCompleted = isCompleted
|
||||
viewModel.getSeriesList()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@ final class SeriesListAllViewModel: ObservableObject {
|
||||
|
||||
var creatorId: Int? = nil
|
||||
var isOriginal: Bool = false
|
||||
var isCompleted: Bool = false
|
||||
|
||||
@Published var isLoading = false
|
||||
@Published var errorMessage = ""
|
||||
@@ -26,13 +27,13 @@ final class SeriesListAllViewModel: ObservableObject {
|
||||
|
||||
var page = 1
|
||||
var isLast = false
|
||||
private let pageSize = 10
|
||||
private let pageSize = 20
|
||||
|
||||
func getSeriesList() {
|
||||
if !isLoading && !isLast {
|
||||
isLoading = true
|
||||
repository
|
||||
.getSeriesList(creatorId: creatorId, isOriginal: isOriginal, sortType: .NEWEST, page: page, size: pageSize)
|
||||
.getSeriesList(creatorId: creatorId, isOriginal: isOriginal, isCompleted: isCompleted, sortType: .NEWEST, page: page, size: pageSize)
|
||||
.sink { result in
|
||||
switch result {
|
||||
case .finished:
|
||||
|
||||
@@ -13,11 +13,12 @@ import Moya
|
||||
class SeriesRepository {
|
||||
private let api = MoyaProvider<SeriesApi>()
|
||||
|
||||
func getSeriesList(creatorId: Int?, isOriginal: Bool, sortType: SeriesListAllViewModel.SeriesSortType, page: Int, size: Int) -> AnyPublisher<Response, MoyaError> {
|
||||
func getSeriesList(creatorId: Int?, isOriginal: Bool, isCompleted: Bool, sortType: SeriesListAllViewModel.SeriesSortType, page: Int, size: Int) -> AnyPublisher<Response, MoyaError> {
|
||||
return api.requestPublisher(
|
||||
.getSeriesList(
|
||||
creatorId: creatorId,
|
||||
isOriginal: isOriginal,
|
||||
isCompleted: isCompleted,
|
||||
sortType: sortType,
|
||||
isAdultContentVisible: UserDefaults.isAdultContentVisible(),
|
||||
contentType: ContentType(rawValue: UserDefaults.string(forKey: .contentPreference)) ?? ContentType.ALL,
|
||||
|
||||
Reference in New Issue
Block a user