Merge branch 'master' into feature/pretty_timer
# Conflicts: # LeadKit.podspec # TIFoundationUtils/TIFoundationUtils.podspec # TIKeychainUtils/TIKeychainUtils.podspec # TISwiftUtils/TISwiftUtils.podspec # TITableKitUtils/TITableKitUtils.podspec # TITransitions/TITransitions.podspec # TIUIElements/TIUIElements.podspec # TIUIKitCore/TIUIKitCore.podspec
This commit is contained in:
commit
c25dd3656d
2
Cartfile
2
Cartfile
|
|
@ -3,5 +3,5 @@ github "Alamofire/Alamofire"
|
|||
github "RxSwiftCommunity/RxAlamofire" ~> 6.1
|
||||
github "TouchInstinct/TableKit"
|
||||
github "ReactiveX/RxSwift" ~> 6.2
|
||||
github "pronebird/UIScrollView-InfiniteScroll"
|
||||
github "pronebird/UIScrollView-InfiniteScroll" "1.1.0"
|
||||
github "SnapKit/SnapKit" ~> 5.0
|
||||
|
|
@ -4,4 +4,4 @@ github "RxSwiftCommunity/RxAlamofire" "v6.1.2"
|
|||
github "SnapKit/SnapKit" "5.0.1"
|
||||
github "TouchInstinct/TableKit" "2.10008.1"
|
||||
github "malcommac/SwiftDate" "6.3.1"
|
||||
github "pronebird/UIScrollView-InfiniteScroll" "1.2.0"
|
||||
github "pronebird/UIScrollView-InfiniteScroll" "1.1.0"
|
||||
|
|
|
|||
|
|
@ -22,6 +22,6 @@
|
|||
|
||||
import Foundation
|
||||
|
||||
public protocol BaseViewModel: class {
|
||||
public protocol BaseViewModel: AnyObject {
|
||||
// Nothing
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
// THE SOFTWARE.
|
||||
//
|
||||
|
||||
public protocol GeneralDataLoadingController: class, ConfigurableController, GeneralDataLoadingHandler
|
||||
public protocol GeneralDataLoadingController: AnyObject, ConfigurableController, GeneralDataLoadingHandler
|
||||
where ViewModelT: GeneralDataLoadingViewModel<ResultType> {
|
||||
|
||||
/// The loading view is shown when the `onLoadingState` method gets called
|
||||
|
|
|
|||
|
|
@ -24,6 +24,6 @@ import RxSwift
|
|||
|
||||
/// Protocol that requests class to conform RxDataSource and ResettableType
|
||||
/// with constraint ResultType to TotalCountCursorListingResult.
|
||||
public protocol TotalCountCursorConfiguration: class, RxDataSource, ResettableType
|
||||
public protocol TotalCountCursorConfiguration: AnyObject, RxDataSource, ResettableType
|
||||
where ResultType: TotalCountCursorListingResult {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
import UIKit
|
||||
|
||||
/// Protocol that describes placeholder view, containing loading indicator.
|
||||
public protocol LoadingIndicatorHolder: class {
|
||||
public protocol LoadingIndicatorHolder: AnyObject {
|
||||
var loadingIndicator: Animatable { get }
|
||||
var indicatorOwner: UIView { get }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ import UIKit.UIFont
|
|||
import UIKit.UIColor
|
||||
|
||||
/// Protocol that represents text object with appearance attributes.
|
||||
public protocol ViewTextConfigurable: class {
|
||||
public protocol ViewTextConfigurable: AnyObject {
|
||||
|
||||
/// Font of text object.
|
||||
var textFont: UIFont? { get set }
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
//
|
||||
|
||||
/// PaginationWrapper delegate used for pagination results handling
|
||||
public protocol PaginationWrapperDelegate: class {
|
||||
public protocol PaginationWrapperDelegate: AnyObject {
|
||||
|
||||
associatedtype DataSourceType: DataSource
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
/// PaginationWrapper UI delegate used for customization
|
||||
/// of bound states (loading, empty, error, etc.).
|
||||
public protocol PaginationWrapperUIDelegate: class {
|
||||
public protocol PaginationWrapperUIDelegate: AnyObject {
|
||||
|
||||
/// Returns placeholder view for empty state.
|
||||
///
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
import UIKit
|
||||
import TISwiftUtils
|
||||
|
||||
public protocol InfiniteScrollDelegate: class {
|
||||
public protocol InfiniteScrollDelegate: AnyObject {
|
||||
|
||||
func beginInfiniteScroll(_ forceScroll: Bool)
|
||||
func addInfiniteScroll(handler: @escaping ParameterClosure<UITableView>)
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
//
|
||||
|
||||
/// PaginationWrapper delegate used for pagination results handling
|
||||
public protocol PaginatorDelegate: class {
|
||||
public protocol PaginatorDelegate: AnyObject {
|
||||
|
||||
associatedtype Page
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
// THE SOFTWARE.
|
||||
//
|
||||
|
||||
public protocol PaginatorUIDelegate: class {
|
||||
public protocol PaginatorUIDelegate: AnyObject {
|
||||
|
||||
associatedtype ErrorType
|
||||
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
import UIKit
|
||||
|
||||
/// Protocol that describes placeholder view, containing activity indicator.
|
||||
public protocol ActivityIndicatorHolder: class {
|
||||
public protocol ActivityIndicatorHolder: AnyObject {
|
||||
var activityIndicator: Animatable { get }
|
||||
var indicatorOwner: UIView { get }
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue