Compare commits
1 Commits
master
...
fix/swift5
| Author | SHA1 | Date |
|---|---|---|
|
|
ffc653a678 |
|
|
@ -1,6 +1,6 @@
|
|||
binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/Alamofire/Alamofire.json" "4.8.1"
|
||||
binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/RxAlamofire/RxAlamofire.json" "4.3.0"
|
||||
binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/RxSwift/RxSwift.json" "4.4.2"
|
||||
binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/SwiftDate/SwiftDate.json" "6.0.1"
|
||||
binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/RxSwift/RxSwift.json" "4.5.0"
|
||||
binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/SwiftDate/SwiftDate.json" "6.0.3"
|
||||
binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/TableKit/TableKit.json" "2.10008.1"
|
||||
binary "https://raw.github.com/TouchInstinct/CarthageBinaries/master/UIScrollView_InfiniteScroll/UIScrollView_InfiniteScroll.json" "1.1.0"
|
||||
|
|
|
|||
|
|
@ -22,9 +22,10 @@
|
|||
|
||||
import RxSwift
|
||||
|
||||
//swiftlint:disable all
|
||||
|
||||
/// Data loading model for PaginationDataLoadingState with ResettableRxDataSourceCursor as data source.
|
||||
public final class PaginationDataLoadingModel<Cursor: ResettableRxDataSourceCursor>:
|
||||
RxDataLoadingModel<PaginationDataLoadingState<Cursor>> {
|
||||
public final class PaginationDataLoadingModel<Cursor: ResettableRxDataSourceCursor>: RxDataLoadingModel<PaginationDataLoadingState<Cursor>> {
|
||||
|
||||
private enum LoadType {
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ import UIKit
|
|||
public typealias SearchResultsController = UIViewController & SearchResultsViewController
|
||||
|
||||
/// Class that allows to enter text for search and then displays search results in table view
|
||||
open class BaseSearchViewController<Item,
|
||||
open class BaseSearchViewController < Item,
|
||||
ItemViewModel,
|
||||
ViewModel,
|
||||
CustomView: UIView & TableViewHolder>: BaseCustomViewController<ViewModel, CustomView>
|
||||
|
|
|
|||
|
|
@ -86,7 +86,6 @@ public extension ObservableType where E == DataRequest {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
private extension ObservableType where E == ServerResponse {
|
||||
|
||||
func tryMapResult<R>(_ transform: @escaping (E) throws -> R) -> Observable<R> {
|
||||
|
|
@ -137,7 +136,7 @@ private extension ObservableType {
|
|||
switch afError {
|
||||
case .responseSerializationFailed, .responseValidationFailed:
|
||||
resultError = .invalidResponse(error: afError, response: response)
|
||||
|
||||
|
||||
default:
|
||||
resultError = .network(error: afError, response: response)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ enum UploadParametersError: Error {
|
|||
case unableGetMimeType
|
||||
}
|
||||
|
||||
|
||||
/// Struct which keeps base parameters required for upload api request
|
||||
public struct ApiUploadRequestParameters {
|
||||
|
||||
|
|
@ -90,7 +89,7 @@ private extension ApiUploadRequestParameters {
|
|||
var requestHeaders = headers
|
||||
|
||||
let boundary = "\(Constants.boundaryKey)=\(formData.boundary)"
|
||||
|
||||
|
||||
requestHeaders[Constants.contentTypeKey] = Constants.contentTypeValue + boundary
|
||||
|
||||
return requestHeaders
|
||||
|
|
|
|||
Loading…
Reference in New Issue