Skip to content

Commit 57e6e69

Browse files
author
Oleh
committed
Fixed minor lint warnings
1 parent 8ad43cc commit 57e6e69

File tree

11 files changed

+29
-28
lines changed

11 files changed

+29
-28
lines changed

ExampleMVVM/Data/PersistentStorages/CoreDataStorage/CoreDataStorage.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ final class CoreDataStorage {
2525
// MARK: - Core Data stack
2626
private lazy var persistentContainer: NSPersistentContainer = {
2727
let container = NSPersistentContainer(name: "CoreDataStorage")
28-
container.loadPersistentStores(completionHandler: { (_, error) in
28+
container.loadPersistentStores { _, error in
2929
if let error = error as NSError? {
3030
fatalError("Unresolved error \(error), \(error.userInfo)")
3131
}
32-
})
32+
}
3333
return container
3434
}()
3535

@@ -97,8 +97,8 @@ extension CoreDataStorage: MoviesQueriesStorage {
9797
ascending: false)]
9898
let resut = try context.fetch(request)
9999
resut.filter { $0.query == query.query }.forEach { context.delete($0) }
100-
if resut.count > maxStorageLimit-1 {
101-
Array(resut[maxStorageLimit-1..<resut.count]).forEach { context.delete($0) }
100+
if resut.count > maxStorageLimit - 1 {
101+
Array(resut[maxStorageLimit - 1..<resut.count]).forEach { context.delete($0) }
102102
}
103103
}
104104
}

ExampleMVVM/Infrastructure/Network/Endpoint.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ extension Requestable {
6969
let baseURL = config.baseURL.absoluteString.last != "/" ? config.baseURL.absoluteString + "/" : config.baseURL.absoluteString
7070
let endpoint = isFullPath ? path : baseURL.appending(path)
7171

72-
guard var urlComponents = URLComponents(string: endpoint) else { throw RequestGenerationError.components}
72+
guard var urlComponents = URLComponents(string: endpoint) else { throw RequestGenerationError.components }
7373
var urlQueryItems = [URLQueryItem]()
7474

7575
queryParameters.forEach {
@@ -88,7 +88,7 @@ extension Requestable {
8888
let url = try self.url(with: config)
8989
var urlRequest = URLRequest(url: url)
9090
var allHeaders: [String: String] = config.headers
91-
headerParamaters.forEach({ allHeaders.updateValue($1, forKey: $0) })
91+
headerParamaters.forEach { allHeaders.updateValue($1, forKey: $0) }
9292

9393
if !bodyParamaters.isEmpty {
9494
urlRequest.httpBody = encodeBody(bodyParamaters: bodyParamaters, bodyEncoding: bodyEncoding)

ExampleMVVM/Infrastructure/Network/NetworkService.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ extension URLSessionTask: Cancellable { }
4242
extension URLSession: NetworkSession {
4343
public func loadData(from request: URLRequest,
4444
completionHandler: @escaping (Data?, URLResponse?, Error?) -> Void) -> Cancellable {
45-
let task = dataTask(with: request) { (data, response, error) in
45+
let task = dataTask(with: request) { data, response, error in
4646
completionHandler(data, response, error)
4747
}
4848
task.resume()
@@ -68,7 +68,7 @@ final public class DefaultNetworkService {
6868

6969
private func request(request: URLRequest, completion: @escaping (Result<Data?, NetworkError>) -> Void) -> Cancellable {
7070

71-
let sessionDataTask = session.loadData(from: request) { [weak self] (data, response, requestError) in
71+
let sessionDataTask = session.loadData(from: request) { [weak self] data, response, requestError in
7272
var error: NetworkError
7373
if let requestError = requestError {
7474

@@ -139,7 +139,7 @@ final public class DefaultNetworkErrorLogger: NetworkErrorLogger {
139139
public func log(responseData data: Data?, response: URLResponse?) {
140140
#if DEBUG
141141
guard let data = data else { return }
142-
if let dataDict = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
142+
if let dataDict = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
143143
print("responseData: \(String(describing: dataDict))")
144144
}
145145
#endif

ExampleMVVM/Presentation/MoviesScene/MovieDetails/View/MovieDetailsViewController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ final class MovieDetailsViewController: UIViewController, StoryboardInstantiable
1212

1313
private static let fadeTransitionDuration: CFTimeInterval = 0.4
1414

15-
@IBOutlet private weak var posterImageView: UIImageView!
16-
@IBOutlet private weak var overviewTextView: UITextView!
15+
@IBOutlet private var posterImageView: UIImageView!
16+
@IBOutlet private var overviewTextView: UITextView!
1717

1818
var viewModel: MovieDetailsViewModel!
1919

ExampleMVVM/Presentation/MoviesScene/MoviesList/View/MoviesListTableView/Cells/MoviesListItemCell.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ final class MoviesListItemCell: UITableViewCell {
1212
static let reuseIdentifier = String(describing: MoviesListItemCell.self)
1313
static let height = CGFloat(130)
1414

15-
@IBOutlet private weak var titleLabel: UILabel!
16-
@IBOutlet private weak var dateLabel: UILabel!
17-
@IBOutlet private weak var overviewLabel: UILabel!
18-
@IBOutlet private weak var posterImageView: UIImageView!
15+
@IBOutlet private var titleLabel: UILabel!
16+
@IBOutlet private var dateLabel: UILabel!
17+
@IBOutlet private var overviewLabel: UILabel!
18+
@IBOutlet private var posterImageView: UIImageView!
1919

2020
private var viewModel: MoviesListItemViewModel! { didSet { unbind(from: oldValue) } }
2121

ExampleMVVM/Presentation/MoviesScene/MoviesList/View/MoviesListViewController.swift

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import UIKit
99

1010
final class MoviesListViewController: UIViewController, StoryboardInstantiable, Alertable {
1111

12-
@IBOutlet private weak var contentView: UIView!
13-
@IBOutlet private weak var moviesListContainer: UIView!
14-
@IBOutlet private weak var suggestionsListContainer: UIView!
15-
@IBOutlet private weak var searchBarContainer: UIView!
16-
@IBOutlet private weak var loadingView: UIActivityIndicatorView!
17-
@IBOutlet private weak var emptyDataLabel: UILabel!
12+
@IBOutlet private var contentView: UIView!
13+
@IBOutlet private var moviesListContainer: UIView!
14+
@IBOutlet private var suggestionsListContainer: UIView!
15+
@IBOutlet private var searchBarContainer: UIView!
16+
@IBOutlet private var loadingView: UIActivityIndicatorView!
17+
@IBOutlet private var emptyDataLabel: UILabel!
1818

1919
private(set) var viewModel: MoviesListViewModel!
2020
private var moviesListViewControllersFactory: MoviesListViewControllersFactory!

ExampleMVVM/Presentation/MoviesScene/MoviesList/ViewModel/MoviesListViewModel.swift

+4-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,10 @@ final class DefaultMoviesListViewModel: MoviesListViewModel {
7777
private func appendPage(moviesPage: MoviesPage) {
7878
self.currentPage = moviesPage.page
7979
self.totalPageCount = moviesPage.totalPages
80-
self.items.value = items.value + moviesPage.movies.map { DefaultMoviesListItemViewModel(movie: $0,
81-
posterImagesRepository: posterImagesRepository) }
80+
self.items.value = items.value + moviesPage.movies.map {
81+
DefaultMoviesListItemViewModel(movie: $0,
82+
posterImagesRepository: posterImagesRepository)
83+
}
8284
}
8385

8486
private func resetPages() {

ExampleMVVM/Presentation/MoviesScene/MoviesQueriesList/View/UIKit/Cells/MoviesQueriesItemCell.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import UIKit
1010
final class MoviesQueriesItemCell: UITableViewCell {
1111

1212
static let reuseIdentifier = String(describing: MoviesQueriesItemCell.self)
13-
@IBOutlet private weak var titleLabel: UILabel!
13+
@IBOutlet private var titleLabel: UILabel!
1414

1515
func fill(with suggestion: MoviesQueryListItemViewModel) {
1616
self.titleLabel.text = suggestion.query

ExampleMVVM/Presentation/Utils/Observable.swift

-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,3 @@ public final class Observable<Value> {
3939
}
4040
}
4141
}
42-

ExampleMVVMTests/Infrastructure/Network/NetworkServiceTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ class NetworkServiceTests: XCTestCase {
230230

231231
//then
232232
wait(for: [expectation], timeout: 0.1)
233-
XCTAssertTrue(networkErrorLogger.loggedErrors.contains(where: {
233+
XCTAssertTrue(networkErrorLogger.loggedErrors.contains {
234234
($0 as NSError).code == NSURLErrorNotConnectedToInternet
235-
}))
235+
})
236236
}
237237
}

MVVM Templates/MVVMR/MVVMR.xctemplate/___VARIABLE_sceneIdentifier___ViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ___VARIABLE_sceneIdentifier___ViewController: UIViewController, Storyboard
2626
}
2727

2828
func bind(to viewModel: ___VARIABLE_sceneIdentifier___ViewModel) {
29-
viewModel.route.observe(on: self) { [weak self] route in
29+
viewModel.route.observe(on: self) { [weak self] route in
3030
self?.handle(route)
3131
}
3232
}

0 commit comments

Comments
 (0)