Update the watchOS Example with latest Espera

Author: dreampiggy

Example/SDWebImageSwiftUIDemo/ContentView.swift

@@ -20,20 +20,47 @@ class UserSettings: ObservableObject {
 
 #if os(watchOS)
 // watchOS does not provide built-in indicator, use Espera's custom indicator
-extension Indicator where T == LoadingFlowerView {
+struct ActivityIndicator : View {
+    @Binding var isAnimating: Bool
+    var body: some View {
+        if isAnimating {
+            return AnyView(LoadingFlowerView()
+                .frame(width: 30, height: 30))
+        } else {
+            return AnyView(EmptyView()
+                .frame(width: 30, height: 30))
+        }
+    }
+}
+
+struct ProgressIndicator : View {
+    @Binding var isAnimating: Bool
+    @Binding var progress: Double
+    var body: some View {
+        if isAnimating {
+            return AnyView(StretchProgressView(progress: $progress)
+                .frame(width: 140, height: 10))
+        } else {
+            return AnyView(EmptyView()
+                .frame(width: 140, height: 10))
+        }
+    }
+}
+
+extension Indicator where T == ActivityIndicator {
     /// Activity Indicator
     static var activity: Indicator {
         Indicator { isAnimating, _ in
-            LoadingFlowerView()
+            ActivityIndicator(isAnimating: isAnimating)
         }
     }
 }
 
-extension Indicator where T == StretchProgressView {
+extension Indicator where T == ProgressIndicator {
     /// Progress Indicator
     static var progress: Indicator {
         Indicator { isAnimating, progress in
-            StretchProgressView(progress: progress)
+            ProgressIndicator(isAnimating: isAnimating, progress: progress)
         }
     }
 }

Example/SDWebImageSwiftUIDemo/Espera.swift

@@ -36,7 +36,7 @@ public struct RotatingCircleWithGap: View {
 private struct LoadingCircle: View {
     let circleColor: Color
     let scale: CGFloat
-    private let circleWidth: CGFloat = 8
+    let circleWidth: CGFloat
 
     var body: some View {
         Circle()
@@ -47,6 +47,7 @@ private struct LoadingCircle: View {
 }
 
 public struct LoadingFlowerView: View {
+
     private let animationDuration: Double = 0.6
     private var singleCircleAnimationDuration: Double {
         return animationDuration/3
@@ -56,37 +57,58 @@ public struct LoadingFlowerView: View {
             .repeatForever(autoreverses: true)
     }
 
-    @State private var color: Color = .init(white: 0.3)
-    @State private var scale: CGFloat = 0.98
+    private let originalColor: Color
+    public init(color: Color = .white) {
+        self.originalColor = color
+        self.color = color.opacity(0.3)
+    }
 
-    public init() { }
+    @State private var color = Color.white.opacity(0.3)
+    @State private var scale: CGFloat = 0.98
 
     public var body: some View {
-        HStack(spacing: 1) {
-            VStack(spacing: 2) {
-                LoadingCircle(circleColor: color, scale: scale)
-                    .animation(foreverAnimation.delay(singleCircleAnimationDuration*5))
-                LoadingCircle(circleColor: color, scale: scale)
-                    .animation(foreverAnimation.delay(singleCircleAnimationDuration*4))
-            }
-            VStack(alignment: .center, spacing: 1) {
-                LoadingCircle(circleColor: color, scale: scale)
-                    .animation(foreverAnimation)
-                LoadingCircle(circleColor: .clear, scale: 1)
-                LoadingCircle(circleColor: color, scale: scale)
-                    .animation(foreverAnimation.delay(singleCircleAnimationDuration*3))
-            }
-            VStack(alignment: .center, spacing: 2) {
-                LoadingCircle(circleColor: color, scale: scale)
-                    .animation(foreverAnimation.delay(singleCircleAnimationDuration*1))
-                LoadingCircle(circleColor: color, scale: scale)
-                    .animation(foreverAnimation.delay(singleCircleAnimationDuration*2))
-            }
+        GeometryReader { [color, scale, singleCircleAnimationDuration, foreverAnimation] reader -> AnyView in
+
+            let minLength = min(reader.size.width, reader.size.height)
+            let thirdOfMinLength = minLength / 3
+
+            let proportionalSpacing: CGFloat = 1 / 26
+            let spacing = minLength * proportionalSpacing
+
+            // THIS IS FINE :D
+            // Fix later, ok?
+            let leafDiameter = thirdOfMinLength - (spacing - proportionalSpacing * thirdOfMinLength)
+
+            return AnyView(
+                HStack(spacing: spacing) {
+                    VStack(spacing: spacing) {
+                        LoadingCircle(circleColor: color, scale: scale, circleWidth: leafDiameter)
+                            .animation(foreverAnimation.delay(singleCircleAnimationDuration*5))
+                        LoadingCircle(circleColor: color, scale: scale, circleWidth: leafDiameter)
+                            .animation(foreverAnimation.delay(singleCircleAnimationDuration*4))
+                    }
+                    VStack(alignment: .center, spacing: spacing) {
+                        LoadingCircle(circleColor: color, scale: scale, circleWidth: leafDiameter)
+                            .animation(foreverAnimation)
+                        LoadingCircle(circleColor: .clear, scale: 1, circleWidth: leafDiameter)
+                        LoadingCircle(circleColor: color, scale: scale, circleWidth: leafDiameter)
+                            .animation(foreverAnimation.delay(singleCircleAnimationDuration*3))
+                    }
+                    VStack(alignment: .center, spacing: spacing) {
+                        LoadingCircle(circleColor: color, scale: scale, circleWidth: leafDiameter)
+                            .animation(foreverAnimation.delay(singleCircleAnimationDuration*1))
+                        LoadingCircle(circleColor: color, scale: scale, circleWidth: leafDiameter)
+                            .animation(foreverAnimation.delay(singleCircleAnimationDuration*2))
+                    }
+                }
+            )
         }
         .onAppear {
-            self.color = .white
-            self.scale = 1.02
+            self.color = self.originalColor
+            self.scale = 1
         }
+        .aspectRatio(contentMode: .fit)
+        .frame(idealWidth: 26)
     }
 }
 
@@ -198,7 +220,6 @@ public struct StretchProgressView: View {
 
     public var body: some View {
         StretchyShape(progress: progress, mode: .stretchy)
-        .frame(width: 140, height: 10)
     }
 }