Fix broken build & refactoring

billp · billp · commit 04be331b0424 · 2020-12-28T17:44:13.000+02:00
diff --git a/Examples/Screens/City Explorer/CityExplorerDetails.swift b/Examples/Screens/City Explorer/CityExplorerDetails.swift
@@ -82,7 +82,7 @@ struct CityDetailsEntry: View {
                 Text(city.description ?? "")
                     .font(.body)
             }
-            .padding([.leading, .trailing, .bottom], 20)
+            .padding([.leading, .trailing, .bottom, .top], 20)
         }
     }
 
diff --git a/Examples/Screens/City Explorer/CityExplorerView.swift b/Examples/Screens/City Explorer/CityExplorerView.swift
@@ -92,8 +92,6 @@ struct CityRow: View {
     }
 
     var thumbView: AnyView {
-
-
         let request = Router<CityRoute>().request(for: .thumb(city: city))
         return AnyView(
             TermiNetwork.Image(withRequest: request, resize: CGSize(width: thumbWidth * UIScreen.main.scale,
diff --git a/Examples/Screens/ContentView.swift b/Examples/Screens/ContentView.swift
@@ -39,7 +39,12 @@ struct ContentView: View {
                     DemoAppRow(app: app)
                 }
             }
-            .navigationTitle(Text("TermiNetwork"))
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar(content: {
+                ToolbarItem(placement: .principal, content: {
+                    Text("Widget").bold()
+                })
+            })
         }
     }
 }
diff --git a/Examples/Screens/Encrypted Communication/EncryptedCommunicationView.swift b/Examples/Screens/Encrypted Communication/EncryptedCommunicationView.swift
@@ -58,7 +58,7 @@ struct EncryptedCommunicationView: View {
                 .padding(.bottom, 20)
 
         }
-        .padding([.leading, .trailing], 20)
+        .padding([.leading, .trailing, .top], 20)
         .navigationTitle("Encryption Layer")
     }
 
diff --git a/Examples/Screens/File Downloader/FileDownloader.swift b/Examples/Screens/File Downloader/FileDownloader.swift
@@ -68,7 +68,7 @@ struct FileDownloader: View {
                              action: downloadAction)
                 .padding(.bottom, 20)
         }
-        .padding([.leading, .trailing], 20)
+        .padding([.leading, .trailing, .top], 20)
         .navigationTitle("File Downloader")
         .onDisappear(perform: clearAndCancelDownload)
     }
diff --git a/Examples/Screens/File Uploader/FileUploader.swift b/Examples/Screens/File Uploader/FileUploader.swift
@@ -109,7 +109,7 @@ struct FileUploader: View {
                 .padding(.bottom, 20)
 
         }
-        .padding([.leading, .trailing], 20)
+        .padding([.leading, .trailing, .top], 20)
         .navigationTitle("File Uploader")
         .onDisappear(perform: clearAndCancelUpload)
     }
diff --git a/Examples/Screens/Pinning/CertificatePinningView.swift b/Examples/Screens/Pinning/CertificatePinningView.swift
@@ -46,7 +46,7 @@ struct CertificatePinningView: View {
             UIHelpers.button("Start Request", action: startRequest)
                 .padding(.bottom, 20)
         }
-        .padding([.leading, .trailing], 20)
+        .padding([.leading, .trailing, .top], 20)
         .navigationTitle("Certificate Pinning")
     }
 
diff --git a/TermiNetwork.xcodeproj/project.pbxproj b/TermiNetwork.xcodeproj/project.pbxproj
@@ -68,7 +68,7 @@
 		F383AEAD257ED51500DE43FA /* forums.swift.org.cer in Resources */ = {isa = PBXBuildFile; fileRef = F383AEAB257ED51500DE43FA /* forums.swift.org.cer */; };
 		F383AEAE257ED51500DE43FA /* herokuapp.com.cer in Resources */ = {isa = PBXBuildFile; fileRef = F383AEAC257ED51500DE43FA /* herokuapp.com.cer */; };
 		F3850C87243D103700F7CC13 /* TestExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3850C79243D103700F7CC13 /* TestExtensions.swift */; };
-		F3850C88243D103700F7CC13 /* Environment.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3850C7A243D103700F7CC13 /* Environment.swift */; };
+		F3850C88243D103700F7CC13 /* Env.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3850C7A243D103700F7CC13 /* Env.swift */; };
 		F3850C89243D103700F7CC13 /* TestTNQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3850C7B243D103700F7CC13 /* TestTNQueue.swift */; };
 		F3850C8A243D103700F7CC13 /* TestTNEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3850C7C243D103700F7CC13 /* TestTNEnvironment.swift */; };
 		F3850C8B243D103700F7CC13 /* APIRoute.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3850C7D243D103700F7CC13 /* APIRoute.swift */; };
@@ -207,7 +207,7 @@
 		F383AEAB257ED51500DE43FA /* forums.swift.org.cer */ = {isa = PBXFileReference; lastKnownFileType = file; name = forums.swift.org.cer; path = Tests/forums.swift.org.cer; sourceTree = SOURCE_ROOT; };
 		F383AEAC257ED51500DE43FA /* herokuapp.com.cer */ = {isa = PBXFileReference; lastKnownFileType = file; name = herokuapp.com.cer; path = Tests/herokuapp.com.cer; sourceTree = SOURCE_ROOT; };
 		F3850C79243D103700F7CC13 /* TestExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestExtensions.swift; sourceTree = "<group>"; };
-		F3850C7A243D103700F7CC13 /* Environment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Environment.swift; sourceTree = "<group>"; };
+		F3850C7A243D103700F7CC13 /* Env.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Env.swift; sourceTree = "<group>"; };
 		F3850C7B243D103700F7CC13 /* TestTNQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestTNQueue.swift; sourceTree = "<group>"; };
 		F3850C7C243D103700F7CC13 /* TestTNEnvironment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestTNEnvironment.swift; sourceTree = "<group>"; };
 		F3850C7D243D103700F7CC13 /* APIRoute.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = APIRoute.swift; sourceTree = "<group>"; };
@@ -441,12 +441,12 @@
 			path = "Error Handlers";
 			sourceTree = "<group>";
 		};
-		F3211EC4258018E40085E873 /* Middlewares */ = {
+		F3211EC4258018E40085E873 /* Encrypted Communication */ = {
 			isa = PBXGroup;
 			children = (
 				F3211EC5258019280085E873 /* EncryptedCommunicationView.swift */,
 			);
-			path = Middlewares;
+			path = "Encrypted Communication";
 			sourceTree = "<group>";
 		};
 		F32195B625783EBB000941F1 /* ErrorHandlers */ = {
@@ -478,7 +478,7 @@
 			children = (
 				F363507E25894A77002AF5DE /* File Uploader */,
 				F33ACF52258809FB004DAC46 /* File Downloader */,
-				F3211EC4258018E40085E873 /* Middlewares */,
+				F3211EC4258018E40085E873 /* Encrypted Communication */,
 				F383AE99257ECBF900DE43FA /* Pinning */,
 				F37A17F0257D2927003EFB1F /* City Explorer */,
 				F33ACF5E25880ABD004DAC46 /* UIHelpers.swift */,
@@ -601,7 +601,7 @@
 		F387B0FA2579590C00A8C0C7 /* Communication */ = {
 			isa = PBXGroup;
 			children = (
-				F3850C7A243D103700F7CC13 /* Environment.swift */,
+				F3850C7A243D103700F7CC13 /* Env.swift */,
 				F3850C7D243D103700F7CC13 /* APIRoute.swift */,
 			);
 			name = Communication;
@@ -944,7 +944,7 @@
 				F3850C8C243D103700F7CC13 /* TestParams.swift in Sources */,
 				F387B0ED2579531200A8C0C7 /* TestTransformer.swift in Sources */,
 				F31126AD257A563600775D7E /* FileResponse.swift in Sources */,
-				F3850C88243D103700F7CC13 /* Environment.swift in Sources */,
+				F3850C88243D103700F7CC13 /* Env.swift in Sources */,
 				F32C3D13243E499E004497BC /* TestPinning.swift in Sources */,
 				F3AA5147256EF53000D64D31 /* TestHelpers.swift in Sources */,
 				F3850C8D243D103700F7CC13 /* TestJSONParams.swift in Sources */,
diff --git a/Tests/Env.swift b/Tests/Env.swift
@@ -1,4 +1,4 @@
-// TestsEnvironment.swift
+// Env.swift
 //
 // Copyright © 2018-2021 Vasilis Panagiotopoulos. All rights reserved.
 //
@@ -22,7 +22,7 @@ import TermiNetwork
 
 // swiftlint:disable function_body_length
 
-enum TestsEnvironment: EnvironmentProtocol {
+enum Env: EnvironmentProtocol {
     case httpHost
     case httpHostWithPort
     case httpHostWithPortAndSuffix
diff --git a/Tests/TestDownloadOperations.swift b/Tests/TestDownloadOperations.swift
@@ -27,14 +27,14 @@ class TestDownloadOperations: XCTestCase {
     }()
 
     lazy var router: Router<APIRoute> = {
-        return Router<APIRoute>(environment: TestsEnvironment.termiNetworkRemote,
+        return Router<APIRoute>(environment: Env.termiNetworkRemote,
                                 configuration: configuration)
     }()
 
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.
-        Environment.set(TestsEnvironment.termiNetworkLocal)
+        Environment.set(Env.termiNetworkLocal)
     }
 
     override func tearDown() {
diff --git a/Tests/TestExtensions.swift b/Tests/TestExtensions.swift
@@ -27,7 +27,7 @@ class TestExtensions: XCTestCase {
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.
-        Environment.set(TestsEnvironment.termiNetworkRemote)
+        Environment.set(Env.termiNetworkRemote)
     }
 
     override func tearDown() {
@@ -118,20 +118,20 @@ class TestExtensions: XCTestCase {
         var failed = true
         var tmp = 1
 
-        let image = Image(with: Request.init(method: .get, url: sampleImageURL),
-                    defaultImage: nil,
-                    resize: nil,
-                    preprocessImage: { image in
-                        tmp += 1
-                        if tmp != 2 {
-                            failed = true
-                            expectation.fulfill()
-                        }
-                        return image
-                    }, onFinish: { image, error in
-                        failed = !(tmp == 2 && image != nil && error == nil)
-                        expectation.fulfill()
-                    })
+        let image = Image(withRequest: Request.init(method: .get, url: sampleImageURL),
+                          defaultImage: nil,
+                          resize: nil,
+                          preprocessImage: { image in
+                              tmp += 1
+                              if tmp != 2 {
+                                  failed = true
+                                  expectation.fulfill()
+                              }
+                              return image
+                          }, onFinish: { image, error in
+                              failed = !(tmp == 2 && image != nil && error == nil)
+                              expectation.fulfill()
+                          })
         image.imageLoader.loadImage()
 
         wait(for: [expectation], timeout: 60)
@@ -145,20 +145,20 @@ class TestExtensions: XCTestCase {
         var failed = true
         var tmp = 1
 
-        let image = Image(with: sampleImageURL,
-                    defaultImage: nil,
-                    resize: nil,
-                    preprocessImage: { image in
-                        tmp += 1
-                        if tmp != 2 {
-                            failed = true
-                            expectation.fulfill()
-                        }
-                        return image
-                    }, onFinish: { image, error in
-                        failed = !(tmp == 2 && image != nil && error == nil)
-                        expectation.fulfill()
-                    })
+        let image = Image(withURL: sampleImageURL,
+                          defaultImage: nil,
+                          resize: nil,
+                          preprocessImage: { image in
+                              tmp += 1
+                              if tmp != 2 {
+                                  failed = true
+                                  expectation.fulfill()
+                              }
+                              return image
+                          }, onFinish: { image, error in
+                              failed = !(tmp == 2 && image != nil && error == nil)
+                              expectation.fulfill()
+                          })
         image.imageLoader.loadImage()
 
         wait(for: [expectation], timeout: 60)
diff --git a/Tests/TestPinning.swift b/Tests/TestPinning.swift
@@ -43,7 +43,7 @@ class TestPinning: XCTestCase {
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.
-        Environment.set(TestsEnvironment.termiNetworkRemote)
+        Environment.set(Env.termiNetworkRemote)
     }
 
     override func tearDown() {
diff --git a/Tests/TestTNEnvironment.swift b/Tests/TestTNEnvironment.swift
@@ -33,19 +33,19 @@ class TestEnvironment: XCTestCase {
     }
 
     func testEnvironments() {
-        Environment.set(TestsEnvironment.httpHost)
+        Environment.set(Env.httpHost)
         XCTAssert(Environment.current.stringURL == "http://localhost")
 
-        Environment.set(TestsEnvironment.httpHostWithPort)
+        Environment.set(Env.httpHostWithPort)
         XCTAssert(Environment.current.stringURL == "http://localhost:8080")
 
         Environment.set(environmentObject: Environment(url: "http://www.google.com:8009/test/2"))
         XCTAssert(Environment.current.stringURL == "http://www.google.com:8009/test/2")
 
-        Environment.set(TestsEnvironment.httpHostWithPortAndSuffix)
+        Environment.set(Env.httpHostWithPortAndSuffix)
         XCTAssert(Environment.current.stringURL == "http://localhost:8080/v1/json")
 
-        Environment.set(TestsEnvironment.httpsHostWithPortAndSuffix)
+        Environment.set(Env.httpsHostWithPortAndSuffix)
         XCTAssert(Environment.current.stringURL == "https://google.com:8080/v3/test/foo/bar")
     }
 }
diff --git a/Tests/TestTNErrors.swift b/Tests/TestTNErrors.swift
@@ -30,13 +30,13 @@ class TestTNErrors: XCTestCase {
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.
-        Environment.set(TestsEnvironment.termiNetworkRemote)
+        Environment.set(Env.termiNetworkRemote)
     }
 
     override func tearDown() {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
         super.tearDown()
-        Environment.set(TestsEnvironment.termiNetworkRemote)
+        Environment.set(Env.termiNetworkRemote)
     }
 
     func testEnvironmenotSetFullUrl() {
@@ -173,7 +173,7 @@ class TestTNErrors: XCTestCase {
     }
 
     func testResponseErrorHandlers() {
-        Environment.set(TestsEnvironment.invalidHost)
+        Environment.set(Env.invalidHost)
         GlobalErrorHandler.failed = false
         GlobalErrorHandler.skip = false
 
@@ -201,7 +201,7 @@ class TestTNErrors: XCTestCase {
     }
 
     func testResponseErrorHandlersSkip() {
-        Environment.set(TestsEnvironment.termiNetworkRemote)
+        Environment.set(Env.termiNetworkRemote)
         GlobalErrorHandler.failed = false
         GlobalErrorHandler.skip = true
 
@@ -278,7 +278,7 @@ class TestTNErrors: XCTestCase {
     }
 
     func tesetworkError() {
-        Environment.set(TestsEnvironment.invalidHost)
+        Environment.set(Env.invalidHost)
 
         let expectation = XCTestExpectation(description: "tesetworkError")
         var failed = true
diff --git a/Tests/TestTNQueue.swift b/Tests/TestTNQueue.swift
@@ -25,7 +25,7 @@ class TestQueue: XCTestCase {
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.
-        Environment.set(TestsEnvironment.termiNetworkRemote)
+        Environment.set(Env.termiNetworkRemote)
     }
 
     override func tearDown() {
diff --git a/Tests/TestTNRequest.swift b/Tests/TestTNRequest.swift
@@ -28,7 +28,7 @@ class TestRequest: XCTestCase {
     }()
 
     lazy var router2: Router<APIRoute> = {
-        return Router<APIRoute>(environment: TestsEnvironment.google)
+        return Router<APIRoute>(environment: Env.google)
     }()
 
     lazy var routerWithMiddleware: Router<APIRoute> = {
@@ -37,7 +37,7 @@ class TestRequest: XCTestCase {
         configuration.verbose = true
         configuration.requestBodyType = .JSON
 
-        let router = Router<APIRoute>(environment: TestsEnvironment.termiNetworkRemote,
+        let router = Router<APIRoute>(environment: Env.termiNetworkRemote,
                                         configuration: configuration)
 
         return router
@@ -46,7 +46,7 @@ class TestRequest: XCTestCase {
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.
-        Environment.set(TestsEnvironment.termiNetworkRemote)
+        Environment.set(Env.termiNetworkRemote)
     }
 
     override func tearDown() {
@@ -287,14 +287,14 @@ class TestRequest: XCTestCase {
         XCTAssert(request.configuration.cachePolicy == .useProtocolCachePolicy)
         XCTAssert(request.configuration.requestBodyType == .xWWWFormURLEncoded)
 
-        Environment.set(TestsEnvironment.termiNetworkLocal)
+        Environment.set(Env.termiNetworkLocal)
         request = Request(route: APIRoute.testHeaders)
         urlRequest = try? request.asRequest()
         XCTAssert(urlRequest?.timeoutInterval == 32)
         XCTAssert(request.configuration.cachePolicy == .returnCacheDataElseLoad)
         XCTAssert(request.configuration.requestBodyType == .JSON)
 
-        Environment.set(TestsEnvironment.termiNetworkRemote)
+        Environment.set(Env.termiNetworkRemote)
         request = Request(route: APIRoute.testConfiguration)
         urlRequest = try? request.asRequest()
         XCTAssert(urlRequest?.timeoutInterval == 12)
@@ -303,7 +303,7 @@ class TestRequest: XCTestCase {
     }
 
     func testOverrideEnvironment() {
-        Environment.set(TestsEnvironment.termiNetworkRemote)
+        Environment.set(Env.termiNetworkRemote)
 
         let expectation1 = XCTestExpectation(description: "testOverrideEnvironment1")
         let expectation2 = XCTestExpectation(description: "testOverrideEnvironment2")
diff --git a/Tests/TestTNTransformers.swift b/Tests/TestTNTransformers.swift
@@ -26,7 +26,7 @@ class TestTransformers: XCTestCase {
     }()
 
     override class func setUp() {
-        Environment.set(TestsEnvironment.termiNetworkRemote)
+        Environment.set(Env.termiNetworkRemote)
     }
 
     func testGetParamsWithTransformer() {
diff --git a/Tests/TestUploadOperations.swift b/Tests/TestUploadOperations.swift
@@ -27,7 +27,7 @@ class TestUploadOperations: XCTestCase {
     }()
 
     lazy var router: Router<APIRoute> = {
-        return Router<APIRoute>(environment: TestsEnvironment.termiNetworkRemote,
+        return Router<APIRoute>(environment: Env.termiNetworkRemote,
                                 configuration: configuration)
     }()
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ struct CityDetailsEntry: View {`
`82`	`82`	`Text(city.description ?? "")`
`83`	`83`	`.font(.body)`
`84`	`84`	`}`
`85`		`- .padding([.leading, .trailing, .bottom], 20)`
	`85`	`+ .padding([.leading, .trailing, .bottom, .top], 20)`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,6 @@ struct CityRow: View {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`var thumbView: AnyView {`
`95`		`-`
`96`		`-`
`97`	`95`	`let request = Router<CityRoute>().request(for: .thumb(city: city))`
`98`	`96`	`return AnyView(`
`99`	`97`	`TermiNetwork.Image(withRequest: request, resize: CGSize(width: thumbWidth * UIScreen.main.scale,`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,12 @@ struct ContentView: View {`
`39`	`39`	`DemoAppRow(app: app)`
`40`	`40`	`}`
`41`	`41`	`}`
`42`		`- .navigationTitle(Text("TermiNetwork"))`
	`42`	`+ .navigationBarTitleDisplayMode(.inline)`
	`43`	`+ .toolbar(content: {`
	`44`	`+ ToolbarItem(placement: .principal, content: {`
	`45`	`+ Text("Widget").bold()`
	`46`	`+ })`
	`47`	`+ })`
`43`	`48`	`}`
`44`	`49`	`}`
`45`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ struct EncryptedCommunicationView: View {`
`58`	`58`	`.padding(.bottom, 20)`
`59`	`59`
`60`	`60`	`}`
`61`		`- .padding([.leading, .trailing], 20)`
	`61`	`+ .padding([.leading, .trailing, .top], 20)`
`62`	`62`	`.navigationTitle("Encryption Layer")`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ struct FileDownloader: View {`
`68`	`68`	`action: downloadAction)`
`69`	`69`	`.padding(.bottom, 20)`
`70`	`70`	`}`
`71`		`- .padding([.leading, .trailing], 20)`
	`71`	`+ .padding([.leading, .trailing, .top], 20)`
`72`	`72`	`.navigationTitle("File Downloader")`
`73`	`73`	`.onDisappear(perform: clearAndCancelDownload)`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ struct FileUploader: View {`
`109`	`109`	`.padding(.bottom, 20)`
`110`	`110`
`111`	`111`	`}`
`112`		`- .padding([.leading, .trailing], 20)`
	`112`	`+ .padding([.leading, .trailing, .top], 20)`
`113`	`113`	`.navigationTitle("File Uploader")`
`114`	`114`	`.onDisappear(perform: clearAndCancelUpload)`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ struct CertificatePinningView: View {`
`46`	`46`	`UIHelpers.button("Start Request", action: startRequest)`
`47`	`47`	`.padding(.bottom, 20)`
`48`	`48`	`}`
`49`		`- .padding([.leading, .trailing], 20)`
	`49`	`+ .padding([.leading, .trailing, .top], 20)`
`50`	`50`	`.navigationTitle("Certificate Pinning")`
`51`	`51`	`}`
`52`	`52`