Merge branch 'develop'

Author: cmtrounce

README.md

@@ -82,6 +82,23 @@ struct LandmarkRow: View {
 | placeholderImage | _(optional)_<br />`Image` to display whilst remote image data is being fetched and decoded. | `nil` |
 | transition | _(optional)_<br />transition to occur when showing the loaded image. | `nil` |
 
+## Progress / Loading Indicators
+
+Using function `.progress` . 
+Display a loading indicator on top of the placeholder as the image loads.
+Once the image has finished downloading, the supplied loading indicator will hide
+Call `progress` on your `RemoteImageView` and return `some View` 
+
+### Example
+
+```swift
+
+).progress({ progress in    
+    return MyProgressBarView(progress: progress)
+})
+
+```
+
 ## Image Processing
 
 Using function `.imageProcessing` . 

Sources/SwURL/RemoteImage/ProgressBar.swift

@@ -19,6 +19,7 @@ public struct RemoteImageView: View {
     var url: URL
     var placeholderImage: Image?
 	fileprivate var _imageProcessing: ((Image) -> AnyView)
+	fileprivate var _loadingIndicator: ((CGFloat) -> AnyView)?
 
     let transitionType: ImageTransitionType
 
@@ -29,7 +30,7 @@ public struct RemoteImageView: View {
         TransitioningImage(
 			placeholder: placeholderImage.process(with: _imageProcessing),
 			finalImage: remoteImage.image.process(with: _imageProcessing),
-			percentageComplete: CGFloat(remoteImage.progress),
+			loadingIndicator: _loadingIndicator?(CGFloat(remoteImage.progress)),
 			transitionType: transitionType
 		).onAppear {
 			// bug in swift ui when onAppear called multiple times
@@ -67,6 +68,14 @@ public extension RemoteImageView {
 
 		return mut
 	}
+	
+	func progress<T: View>(_ progress: @escaping (CGFloat) -> T) -> some View {
+		var mut = self
+		mut._loadingIndicator = { percentageComplete in
+			return AnyView(progress(percentageComplete))
+		}
+		return mut
+	}
 }
 
 fileprivate extension Optional where Wrapped == Image {

Sources/SwURL/RemoteImage/RemoteImageView.swift

@@ -11,8 +11,8 @@ import SwiftUI
 struct TransitioningImage: View {
     var placeholder: AnyView?
     var finalImage: AnyView?
+	var loadingIndicator: AnyView?
 
-	let percentageComplete: CGFloat
     let transitionType: ImageTransitionType
 
 	public var body: some View {
@@ -21,6 +21,8 @@ struct TransitioningImage: View {
 				self.placeholder
 					.transition(self.transitionType.t)
 					.animation(self.transitionType.animation)
+				
+				loadingIndicator
 			}
 
 			self.finalImage?

Sources/SwURL/RemoteImage/TransitioningImage.swift

@@ -21,7 +21,6 @@
 /* End PBXAggregateTarget section */
 
 /* Begin PBXBuildFile section */
-		475F3D282345449100CB5714 /* ProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475F3D272345449100CB5714 /* ProgressBar.swift */; };
 		OBJ_38 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_10 /* Logger.swift */; };
 		OBJ_39 /* CGImage+Data.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_12 /* CGImage+Data.swift */; };
 		OBJ_40 /* FileManager+Paths.swift in Sources */ = {isa = PBXBuildFile; fileRef = OBJ_14 /* FileManager+Paths.swift */; };
@@ -58,7 +57,6 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		475F3D272345449100CB5714 /* ProgressBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressBar.swift; sourceTree = "<group>"; };
 		OBJ_10 /* Logger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = "<group>"; };
 		OBJ_12 /* CGImage+Data.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGImage+Data.swift"; sourceTree = "<group>"; };
 		OBJ_14 /* FileManager+Paths.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FileManager+Paths.swift"; sourceTree = "<group>"; };
@@ -109,7 +107,6 @@
 				OBJ_20 /* RemoteImage.swift */,
 				OBJ_21 /* RemoteImageView.swift */,
 				OBJ_22 /* TransitioningImage.swift */,
-				475F3D272345449100CB5714 /* ProgressBar.swift */,
 			);
 			path = RemoteImage;
 			sourceTree = "<group>";
@@ -286,7 +283,6 @@
 				OBJ_45 /* Downloader.swift in Sources */,
 				OBJ_46 /* RemoteImage.swift in Sources */,
 				OBJ_47 /* RemoteImageView.swift in Sources */,
-				475F3D282345449100CB5714 /* ProgressBar.swift in Sources */,
 				OBJ_48 /* TransitioningImage.swift in Sources */,
 				OBJ_49 /* SwURL.swift in Sources */,
 			);