Align interface with AsyncImage

leoz · Sep 10, 2023 · cfb4109 · cfb4109
1 parent 0d99529
commit cfb4109
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/Demo/CachedImageDemo/ContentView.swift b/Demo/CachedImageDemo/ContentView.swift
@@ -22,13 +22,18 @@ struct ContentView: View {
             List(posters, id: \.self) { url in
                 CachedImage(
                     url: url,
-                    placeholder: { Text("Loading ...") },
                     content: { image in
-                        image.resizable()
+                        image
+                            .resizable()
                             .aspectRatio(contentMode: .fit)
+                    },
+                    placeholder: {
+                        Text("Loading ...")
                     }
                 )
-                .frame(idealHeight: geometry.size.width / 2 * 3) // 2:3 aspect ratio
+                .frame(
+                    idealHeight: geometry.size.width / 2 * 3
+                ) // 2:3 aspect ratio
             }
         }
     }

diff --git a/Sources/CachedImage/CachedImage.swift b/Sources/CachedImage/CachedImage.swift
@@ -9,20 +9,25 @@
 import SwiftUI
 
 public struct CachedImage<Placeholder: View, Content: View>: View {
-    @StateObject private var loader: ImageLoader
-    private let placeholder: Placeholder
-    private let content: (Image) -> Content
     private let url: URL
+    private let content: (Image) -> Content
+    private let placeholder: Placeholder
+    @StateObject private var loader: ImageLoader
 
     public init(
         url: URL,
-        placeholder: @escaping () -> Placeholder,
-        content: @escaping (Image) -> Content
+        content: @escaping (Image) -> Content,
+        placeholder: @escaping () -> Placeholder
     ) {
-        self.placeholder = placeholder()
-        self.content = content
         self.url = url
-        _loader = StateObject(wrappedValue: ImageLoader(url: url, cache: Environment(\.imageCache).wrappedValue))
+        self.content = content
+        self.placeholder = placeholder()
+        _loader = StateObject(
+            wrappedValue: ImageLoader(
+                url: url,
+                cache: Environment(\.imageCache).wrappedValue
+            )
+        )
     }
 
     public var body: some View {