Merge pull request #11 from crelies/dev

Swift 5.3, Make use of function builder enhancements

Author: Chris

.travis.yml

@@ -1,5 +1,5 @@
 language: swift
-osx_image: xcode11.3
+osx_image: xcode12
 script:
   - swift package generate-xcodeproj
   - xcodebuild clean test -destination 'name=iPhone 8' -scheme RemoteImage-Package -enableCodeCoverage YES -derivedDataPath .build/derivedData -quiet

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.1
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

README.md

@@ -1,6 +1,6 @@
 # RemoteImage
 
-[![Swift 5.1](https://img.shields.io/badge/swift-5.1-green.svg?longCache=true&style=flat-square)](https://developer.apple.com/swift)
+[![Swift 5.3](https://img.shields.io/badge/swift-5.3-green.svg?longCache=true&style=flat-square)](https://developer.apple.com/swift)
 [![Platforms](https://img.shields.io/badge/platforms-iOS%20%7C%20macOS%20%7C%20tvOS-lightgrey.svg?longCache=true&style=flat-square)](https://www.apple.com)
 [![Current Version](https://img.shields.io/github/v/tag/crelies/RemoteImage?longCache=true&style=flat-square)](https://github.com/crelies/RemoteImage)
 [![Build status](https://travis-ci.com/crelies/RemoteImage.svg?token=THnaziKxRFFz1nKcsPgz&branch=dev)](https://travis-ci.com/crelies/RemoteImage)

Sources/RemoteImage/public/Services/RemoteImageService.swift

@@ -40,8 +40,8 @@ public final class RemoteImageService: NSObject, ObservableObject, RemoteImageSe
     }
 }
 
-extension RemoteImageService {
-    private func fetchImage(atURL url: URL) {
+private extension RemoteImageService {
+    func fetchImage(atURL url: URL) {
         cancellable?.cancel()
 
         let cacheKey = Self.cacheKeyProvider(.url(url))
@@ -71,7 +71,7 @@ extension RemoteImageService {
             }
     }
 
-    private func fetchImage(withLocalIdentifier localIdentifier: String) {
+    func fetchImage(withLocalIdentifier localIdentifier: String) {
         let cacheKey = Self.cacheKeyProvider(.phAsset(localIdentifier: localIdentifier))
         if let image = Self.cache.object(forKey: cacheKey) {
             state = .image(image)

Sources/RemoteImage/public/Views/RemoteImage.swift

@@ -19,14 +19,13 @@ public struct RemoteImage<ErrorView: View, ImageView: View, LoadingView: View>:
     @ObservedObject private var service = RemoteImageServiceFactory.makeRemoteImageService()
 
     public var body: some View {
-        Group {
-            if service.state == .loading {
-                loadingView()
-            } else {
-                service.state.error.map { errorView($0) }
-
-                service.state.image.map { self.imageView(Image(uiImage: $0)) }
-            }
+        switch service.state {
+        case .loading:
+            loadingView()
+        case let .error(error):
+            errorView(error)
+        case let .image(uiImage):
+            imageView(Image(uiImage: uiImage))
         }
     }
 

Tests/RemoteImageTests/Views/RemoteImageTests.swift

@@ -27,8 +27,8 @@ final class RemoteImageTests: XCTestCase {
 
         do {
             let inspectableView = try view.body.inspect()
-            let group = try inspectableView.group().first
-            let textString = try group?.text().string()
+            let text = try inspectableView.text()
+            let textString = try text.string()
             XCTAssertEqual(textString, loadingStateViewString)
         } catch {
             XCTFail("\(error)")