diff --git a/Sources/Classes/DataLoading/PaginationDataLoading/PaginationDataLoadingModel.swift b/Sources/Classes/DataLoading/PaginationDataLoading/PaginationDataLoadingModel.swift index 053dc7c2..dc513b07 100644 --- a/Sources/Classes/DataLoading/PaginationDataLoading/PaginationDataLoadingModel.swift +++ b/Sources/Classes/DataLoading/PaginationDataLoading/PaginationDataLoadingModel.swift @@ -63,7 +63,7 @@ public final class PaginationDataLoadingModel: DataLoadingModel private let stateVariable = Variable(.initialState) var currentRequestDisposable: Disposable? - let scheduler = SerialDispatchQueueScheduler(qos: .default) var dataSource: DataSourceType let emptyResultChecker: EmptyResultChecker @@ -64,7 +63,7 @@ open class RxDataLoadingModel: DataLoadingModel state = .initialState } - state = .loadingState(after: state) + state = .initialLoadingState(after: state) requestResult(from: dataSource) } @@ -89,7 +88,6 @@ open class RxDataLoadingModel: DataLoadingModel func requestResult(from dataSource: DataSourceType) { currentRequestDisposable = dataSource .resultSingle() - .observeOn(scheduler) .subscribe(onSuccess: { [weak self] result in self?.onGot(result: result, from: dataSource) }, onError: { [weak self] error in diff --git a/Sources/Enums/DataLoading/GeneralDataLoading/GeneralDataLoadingState.swift b/Sources/Enums/DataLoading/GeneralDataLoading/GeneralDataLoadingState.swift index 3c895a07..0b550995 100644 --- a/Sources/Enums/DataLoading/GeneralDataLoading/GeneralDataLoadingState.swift +++ b/Sources/Enums/DataLoading/GeneralDataLoading/GeneralDataLoadingState.swift @@ -38,7 +38,7 @@ public enum GeneralDataLoadingState: DataLoadingState { return .empty } - public static func loadingState(after: GeneralDataLoadingState) -> GeneralDataLoadingState { + public static func initialLoadingState(after: GeneralDataLoadingState) -> GeneralDataLoadingState { return .loading } diff --git a/Sources/Enums/DataLoading/PaginationDataLoading/PaginationDataLoadingState.swift b/Sources/Enums/DataLoading/PaginationDataLoading/PaginationDataLoadingState.swift index 42effe47..a995f774 100644 --- a/Sources/Enums/DataLoading/PaginationDataLoading/PaginationDataLoadingState.swift +++ b/Sources/Enums/DataLoading/PaginationDataLoading/PaginationDataLoadingState.swift @@ -23,7 +23,7 @@ public indirect enum PaginationDataLoadingState: DataLoadingState { case initial - case loading(after: PaginationDataLoadingState) + case initialLoading(after: PaginationDataLoadingState) case loadingMore(after: PaginationDataLoadingState) case results(newItems: DS.ResultType, from: DS, after: PaginationDataLoadingState) case error(error: Error, after: PaginationDataLoadingState) @@ -40,8 +40,8 @@ public indirect enum PaginationDataLoadingState: DataLoadingStat return .empty } - public static func loadingState(after: PaginationDataLoadingState) -> PaginationDataLoadingState { - return .loading(after: after) + public static func initialLoadingState(after: PaginationDataLoadingState) -> PaginationDataLoadingState { + return .initialLoading(after: after) } public static func resultState(result: DS.ResultType, diff --git a/Sources/Protocols/DataLoading/DataLoadingState.swift b/Sources/Protocols/DataLoading/DataLoadingState.swift index f0e6899d..29a02f72 100644 --- a/Sources/Protocols/DataLoading/DataLoadingState.swift +++ b/Sources/Protocols/DataLoading/DataLoadingState.swift @@ -35,7 +35,7 @@ public protocol DataLoadingState { /// /// - Parameter after: Previous state of data loading process. /// - Returns: Instance of loading state with given argument. - static func loadingState(after: Self) -> Self + static func initialLoadingState(after: Self) -> Self /// Method that returns result state from a specific data source after a given state. ///