From 03cc92553c5d62380b04ba145da7afcb02c15802 Mon Sep 17 00:00:00 2001 From: Ivan Smolin Date: Wed, 8 Nov 2017 14:22:23 +0300 Subject: [PATCH] pagination fixes --- Sources/Protocols/Loading/LoadingViewModel.swift | 12 ++++++------ .../PaginationLoadingViewModel.swift | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Sources/Protocols/Loading/LoadingViewModel.swift b/Sources/Protocols/Loading/LoadingViewModel.swift index 1ddb904a..5fc2beb9 100644 --- a/Sources/Protocols/Loading/LoadingViewModel.swift +++ b/Sources/Protocols/Loading/LoadingViewModel.swift @@ -23,12 +23,12 @@ import RxSwift import RxCocoa -class LoadingViewModel: LoadingProtocol +public class LoadingViewModel: LoadingProtocol where VMC.DataSourceType == VMC.LoadingStateType.DataSourceType { - typealias DataSourceType = VMC.DataSourceType - typealias LoadingStateType = VMC.LoadingStateType - typealias LoadingConfigurationType = VMC + public typealias DataSourceType = VMC.DataSourceType + public typealias LoadingStateType = VMC.LoadingStateType + public typealias LoadingConfigurationType = VMC private let configuration: VMC @@ -40,11 +40,11 @@ class LoadingViewModel: LoadingProtocol self.configuration = configuration } - func reload() { + public func reload() { load(isRetry: false) } - func retry() { + public func retry() { load(isRetry: true) } diff --git a/Sources/Protocols/Loading/PaginationLoading/PaginationLoadingViewModel.swift b/Sources/Protocols/Loading/PaginationLoading/PaginationLoadingViewModel.swift index 0c49623d..289eef75 100644 --- a/Sources/Protocols/Loading/PaginationLoading/PaginationLoadingViewModel.swift +++ b/Sources/Protocols/Loading/PaginationLoading/PaginationLoadingViewModel.swift @@ -45,11 +45,11 @@ public final class PaginationLoadingViewModel: super.init(configuration: configuration) } - override func reload() { + override public func reload() { load(.reload) } - override func retry() { + override public func retry() { load(.retry) }