Several adjusts

rafaelhziliao · Aug 3, 2020 · 1264f49 · 1264f49
1 parent 9433464
commit 1264f49
Show file tree

Hide file tree

Showing 36 changed files with 538 additions and 92 deletions.
diff --git a/Modules/Commons/Extensions/NSLayoutConstraint+Extensions.swift b/Modules/Commons/Extensions/NSLayoutConstraint+Extensions.swift
@@ -271,16 +271,16 @@ public extension NSLayoutConstraint {
     static func centerX(
         firstView: UIView,
         secondView: UIView,
-        constant: Float = 0)
-        -> NSLayoutConstraint {
-            return NSLayoutConstraint(
-                item: firstView,
-                attribute: NSLayoutConstraint.Attribute.centerX,
-                relatedBy: NSLayoutConstraint.Relation.equal,
-                toItem: secondView,
-                attribute: NSLayoutConstraint.Attribute.centerX,
-                multiplier: 1,
-                constant: CGFloat(constant)
-            )
+        constant: Float = 0
+    ) -> NSLayoutConstraint {
+        return NSLayoutConstraint(
+            item: firstView,
+            attribute: NSLayoutConstraint.Attribute.centerX,
+            relatedBy: NSLayoutConstraint.Relation.equal,
+            toItem: secondView,
+            attribute: NSLayoutConstraint.Attribute.centerX,
+            multiplier: 1,
+            constant: CGFloat(constant)
+        )
     }
 }
diff --git a/Modules/Commons/Protocols/Alertable.swift b/Modules/Commons/Protocols/Alertable.swift
@@ -99,7 +99,7 @@ extension Alertable {
 
     func alertWithError(_ error: NetworkError) -> UIAlertController {
         let title = R.string.localizable.errorAlertDefaultTitle()
-        let message = error.messageToPresentToUser()
+        let message = error.localizedDescription
         let actionButton = R.string.localizable.errorAlertDefaultAction()
 
         return alertWithActions(
@@ -120,7 +120,7 @@ extension Alertable {
         ]
         let alert = alertWithActions(
             title: R.string.localizable.somethingWrong(),
-            message: error.messageToPresentToUser(),
+            message: error.localizedDescription,
             actions: actions,
             handlers: [
                 retry,

diff --git a/Modules/Commons/Protocols/ViewCodable.swift → Modules/Commons/Protocols/ViewCoding.swift b/Modules/Commons/Protocols/ViewCodable.swift → Modules/Commons/Protocols/ViewCoding.swift
@@ -1,16 +1,18 @@
 import UIKit
 
-public protocol ViewCodable {
+public protocol ViewCoding {
     func buildViewHierarchy()
     func setupConstraints()
     func additionalSetup()
     func buildView()
 }
 
-extension ViewCodable {
+extension ViewCoding {
     public func buildView() {
         buildViewHierarchy()
         setupConstraints()
         additionalSetup()
     }
+
+    public func additionalSetup() {}
 }
diff --git a/Modules/ImageLoader/Protocols/ImageLoaderServiceProtocol.swift b/Modules/ImageLoader/Protocols/ImageLoaderServiceProtocol.swift
@@ -3,7 +3,8 @@ import UIKit
 public typealias ResulImageHandler = (Result<UIImage, Error>) -> Void
 
 public protocol ImageLoaderServiceProtocol {
-    func loadImage(with url: URL, result: @escaping ResulImageHandler)
+    func downloadImage(with url: URL, result: @escaping ResulImageHandler)
+    func cancelDownload()
     func starPrefetchDataSourceOperation(with urls: [URL])
     func cancelPrefethcDataSoucerOperation(with urls: [URL])
 }

diff --git a/Modules/ImageLoader/Providers/NukeImageLoaderProvider.swift b/Modules/ImageLoader/Providers/NukeImageLoaderProvider.swift
@@ -3,15 +3,17 @@ import Nuke
 
 public final class NukeImageLoaderProvider: ImageLoaderServiceProtocol {
     private let preheater = ImagePreheater()
+    private let pipeLine = ImagePipeline.shared
+    private var task: ImageTask!
 
     public init () {
         configure()
     }
 
-    public func loadImage(with url: URL, result: @escaping ResulImageHandler) {
+    public func downloadImage(with url: URL, result: @escaping ResulImageHandler) {
         let request = ImageRequest(url: url)
 
-        ImagePipeline.shared.loadImage(with: request, queue: nil, progress: nil) { response in
+        task = pipeLine.loadImage(with: request, queue: nil, progress: nil) { response in
             DispatchQueue.main.async {
                 switch response {
                 case let .success(imageResponse):
@@ -23,6 +25,10 @@ public final class NukeImageLoaderProvider: ImageLoaderServiceProtocol {
         }
     }
 
+    public func cancelDownload() {
+        task.cancel()
+    }
+
     private func configure() {
         let contentModes = ImageLoadingOptions.ContentModes(
             success: .scaleAspectFill,

diff --git a/Modules/Network/Enums/NetworkError.swift b/Modules/Network/Enums/NetworkError.swift
@@ -11,13 +11,7 @@ public enum NetworkError: Error {
     case badRequest
     case outDated
 
-    public init(description: String) {
-        self = .custom(description: description)
-    }
-}
-
-extension NetworkError {
-    func messageToPresentToUser() -> String {
+    var localizedDescription: String {
         switch self {
         case let .custom(description):
             return description
@@ -29,4 +23,8 @@ extension NetworkError {
             return R.string.localizable.invalidInput()
         }
     }
+
+    public init(description: String) {
+        self = .custom(description: description)
+    }
 }
diff --git a/Modules/Network/Extensions/URLComponents+Endpoint.swift b/Modules/Network/Extensions/URLComponents+Endpoint.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 extension URLComponents {
-    init?(endpoint: EndpointProtocol) {
+    init?(endpoint: EndpointDescriptor) {
         self.init()
         scheme = endpoint.scheme
         host = endpoint.host

diff --git a/Modules/Network/Extensions/URLRequest+Endpoint.swift b/Modules/Network/Extensions/URLRequest+Endpoint.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 extension URLRequest {
-    init?(endpoint: EndpointProtocol) {
+    init?(endpoint: EndpointDescriptor) {
         guard
             let urlComponents = URLComponents(endpoint: endpoint),
             let url = urlComponents.url

diff --git a/.../Network/Protocols/EndpointProtocol.swift → ...etwork/Protocols/EndpointDescriptor.swift b/.../Network/Protocols/EndpointProtocol.swift → ...etwork/Protocols/EndpointDescriptor.swift
@@ -4,7 +4,7 @@ public typealias Header = [String: String]
 public typealias Parameters = [String: Any]
 public typealias Body = [String: Any]
 
-public protocol EndpointProtocol {
+public protocol EndpointDescriptor {
     var scheme: String { get }
     var host: String { get }
     var path: String { get }

diff --git a/Modules/Network/Protocols/NetworkProviderProtocol.swift b/Modules/Network/Protocols/NetworkProviderProtocol.swift
@@ -3,5 +3,5 @@ import Foundation
 public typealias ResultHandler<T> = (Result<T, NetworkError>) -> Void
 
 public protocol NetworkProviderProtocol {
-    func performRequest<T: Decodable>(endpoint: EndpointProtocol, result: @escaping ResultHandler<T>)
+    func performRequest<T: Decodable>(endpoint: EndpointDescriptor, result: @escaping ResultHandler<T>)
 }
diff --git a/Modules/Network/Protocols/TreatJSONDecode.swift b/Modules/Network/Protocols/TreatJSONDecode.swift
@@ -11,22 +11,17 @@ public extension TreatJSONDecode {
             let decodable = try decoder.decode(T.self, from: data)
             result(.success(decodable))
         } catch DecodingError.keyNotFound(let key, let context) {
-            result(.failure(
-                NetworkError(description:
-                    "Failed to decode missing key '\(key.stringValue)' not found – \(context.debugDescription)")
-                )
-            )
+            let description = """
+                Failed to decode missing key '\(key.stringValue)'
+                not found – \(context.debugDescription)
+            """
+            result(.failure(NetworkError(description: description)))
         } catch DecodingError.typeMismatch(_, let context) {
-            result(.failure(
-                NetworkError(description: "Failed to decode to type mismatch – \(context.debugDescription)")
-                )
-            )
+            let description = "Failed to decode to type mismatch – \(context.debugDescription)"
+            result(.failure(NetworkError(description: description)))
         } catch DecodingError.valueNotFound(let type, let context) {
-            result(.failure(
-                NetworkError(
-                    description: "Failed to decode to missing \(type) value – \(context.debugDescription)")
-                )
-            )
+            let descritpion = "Failed to decode to missing \(type) value – \(context.debugDescription)"
+            result(.failure(NetworkError(description: descritpion)))
         } catch DecodingError.dataCorrupted(_) {
             result(.failure(.noJSONData))
         } catch {

diff --git a/Modules/Network/Providers/URLSessionProvider.swift b/Modules/Network/Providers/URLSessionProvider.swift
@@ -7,10 +7,7 @@ public final class URLSessionProvider: NetworkProviderProtocol, RequestHandleRes
         session = URLSession(configuration: URLSession.shared.configuration)
     }
 
-    public func performRequest<T: Decodable>(
-        endpoint: EndpointProtocol,
-        result: @escaping ResultHandler<T>
-    ) {
+    public func performRequest<T: Decodable>(endpoint: EndpointDescriptor, result: @escaping ResultHandler<T>) {
         guard let request = URLRequest(endpoint: endpoint) else { preconditionFailure("Fail on create request") }
 
         let task = session.dataTask(with: request) { data, response, error in