Merge branch 'master' into mvvm

Author: Alexey Naumov

CountriesSwiftUI.xcodeproj/project.pbxproj

@@ -1041,7 +1041,7 @@
 			repositoryURL = "https://github.com/nalexn/ViewInspector";
 			requirement = {
 				kind = exactVersion;
-				version = 0.8.1;
+				version = 0.9.0;
 			};
 		};
 		F6E7ACE023F5D1EC00AB48AB /* XCRemoteSwiftPackageReference "EnvironmentOverrides" */ = {

CountriesSwiftUI/Models/MockedData.swift

@@ -13,7 +13,7 @@ import Foundation
 extension Country {
     static let mockedData: [Country] = [
         Country(name: "United States", translations: [:], population: 125000000,
-                flag: URL(string: "https://restcountries.eu/data/usa.svg"), alpha3Code: "USA"),
+                flag: URL(string: "https://flagcdn.com/us.svg"), alpha3Code: "USA"),
         Country(name: "Georgia", translations: [:], population: 2340000, flag: nil, alpha3Code: "GEO"),
         Country(name: "Canada", translations: [:], population: 57600000, flag: nil, alpha3Code: "CAN")
     ]

CountriesSwiftUI/System/AppEnvironment.swift

@@ -64,7 +64,7 @@ extension AppEnvironment {
     private static func configuredWebRepositories(session: URLSession) -> DIContainer.WebRepositories {
         let countriesWebRepository = RealCountriesWebRepository(
             session: session,
-            baseURL: "https://restcountries.eu/rest/v2")
+            baseURL: "https://restcountries.com/v2")
         let imageWebRepository = RealImageWebRepository(
             session: session,
             baseURL: "https://ezgif.com")

CountriesSwiftUI/UI/Components/SVGImageView.swift

@@ -89,7 +89,7 @@ extension SVGImageView {
 struct SVGImageView_Previews: PreviewProvider {
     static var previews: some View {
         SVGImageView(viewModel: SVGImageView.ViewModel(
-            container: .preview, imageURL: URL(string: "https://restcountries.eu/data/usa.svg")!))
+            container: .preview, imageURL: URL(string: "https://flagcdn.com/us.svg")!))
     }
 }
 #endif

README.md

@@ -10,7 +10,7 @@
 
 A demo project showcasing the setup of the SwiftUI app with MVVM Architecture.
 
-The app uses the [restcountries.eu](https://restcountries.eu/) REST API to show the list of countries and details about them.
+The app uses the [restcountries.com](https://restcountries.com/) REST API to show the list of countries and details about them.
 
 **Check out [master branch](https://github.com/nalexn/clean-architecture-swiftui) for the Clean Architecture revision of the same app.**
 

UnitTests/Repositories/CountriesDBRepositoryTests.swift

@@ -142,7 +142,7 @@ private extension Country {
                 translations: ["fr": "United States in Frénch",
                                "ja": "Unitd States in Japaneese"],
                 population: 125000000,
-                flag: URL(string: "https://restcountries.eu/data/usa.svg"),
+                flag: URL(string: "https://flagcdn.com/us.svg"),
                 alpha3Code: "USA"),
         Country(name: "Canada",
                 translations: ["ja": "Canada not in French"],

UnitTests/System/SystemEventsHandlerTests.swift

@@ -117,15 +117,15 @@ final class SystemEventsHandlerTests: XCTestCase {
 
     #if os(iOS) && !targetEnvironment(macCatalyst)
     func test_keyboardHeight() throws {
-        let textFiled = UITextField(frame: .zero)
+        let textField = UITextField(frame: .zero)
         let window = try XCTUnwrap(UIApplication.shared.windows.first, "Cannot extract the host view")
         window.makeKeyAndVisible()
-        window.addSubview(textFiled)
+        window.addSubview(textField)
         setupSut()
         XCTAssertEqual(appState.system.keyboardHeight, 0)
-        textFiled.becomeFirstResponder()
+        textField.becomeFirstResponder()
         XCTAssertGreaterThan(appState.system.keyboardHeight, 0)
-        textFiled.removeFromSuperview()
+        textField.removeFromSuperview()
         verify()
     }
     #endif

UnitTests/UI/CountriesListTests.swift

@@ -146,7 +146,6 @@ final class LocalizationTests: XCTestCase {
 // MARK: - CountriesList inspection helper
 extension InspectableView where View == ViewType.View<CountriesList> {
     func content() throws -> InspectableView<ViewType.AnyView> {
-        return try geometryReader().navigationView()
-            .navigationBarItems(0).anyView()
+        return try find(ViewType.AnyView.self)
     }
 }

UnitTests/UI/CountryDetailsTests.swift

@@ -117,14 +117,7 @@ final class CountryDetailsTests: XCTestCase {
     }
 
     func test_sheetPresentation() {
-        let images: [MockedImagesService.Action]
-        if #available(iOS 14.0, *) {
-            // Image is requested by Details sheet only:
-            images = [.loadImage(country.flag)]
-        } else {
-            // Image is requested by CountryDetails and Details sheet:
-            images = [.loadImage(country.flag), .loadImage(country.flag)]
-        }
+        let images: [MockedImagesService.Action] = [.loadImage(country.flag), .loadImage(country.flag)]
         let services = DIContainer.Services.mocked(
             imagesService: images
         )