Merge pull request #39 from OlegEremenko991/develop/cachedAsyncImagePackage

Вынес CachedAsyncImage в отдельный пакет

Author: easydev991

SwiftUI-WorkoutApp.xcodeproj/project.pbxproj

@@ -0,0 +1,9 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/
+DerivedData/
+.swiftpm/config/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc

SwiftUI-WorkoutApp/CachedAcyncImage/.gitignore

@@ -0,0 +1,26 @@
+// swift-tools-version: 5.6
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "CachedAcyncImage",
+    platforms: [.iOS(.v15)],
+    products: [
+        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        .library(
+            name: "CachedAcyncImage",
+            targets: ["CachedAcyncImage"]),
+    ],
+    dependencies: [
+        // Dependencies declare other packages that this package depends on.
+        // .package(url: /* package url */, from: "1.0.0"),
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        .target(
+            name: "CachedAcyncImage",
+            dependencies: [])
+    ]
+)

SwiftUI-WorkoutApp/CachedAcyncImage/Package.swift

@@ -0,0 +1,3 @@
+# CachedAcyncImage
+
+Простое решение для кэширования картинок без дополнительных опций

SwiftUI-WorkoutApp/CachedAcyncImage/README.md

@@ -1,28 +1,28 @@
 import SwiftUI
 
 /// Картинка с возможностью кэширования
-struct CacheAsyncImage<Content: View>: View {
+public struct CachedAsyncImage<Content: View, Placeholder: View>: View {
     @StateObject private var loader: ImageLoader
-    private let placeholderSize: CGSize
+    private var placeholder: () -> Placeholder
     private let content: (UIImage) -> Content
 
-    init(
+    public init(
         url: URL?,
-        placeholderSize: CGSize = .init(width: 100, height: 100),
-        @ViewBuilder content: @escaping (UIImage) -> Content
+        @ViewBuilder content: @escaping (UIImage) -> Content,
+        @ViewBuilder placeholder: @escaping () -> Placeholder
     ) {
-        self.placeholderSize = placeholderSize
         self.content = content
+        self.placeholder = placeholder
         _loader = StateObject(wrappedValue: .init(url: url, cache: Environment(\.imageCache).wrappedValue))
     }
 
-    var body: some View {
+    public var body: some View {
         ZStack {
             if let result = loader.image {
                 content(result)
                     .transition(.opacity.combined(with: .scale).combined(with: .move(edge: .bottom)))
             } else {
-                RoundedDefaultImage(size: placeholderSize)
+                placeholder()
             }
         }
         .animation(.easeInOut, value: loader.image)

SwiftUI-WorkoutApp/Screens/Common/CacheImage/CacheAsyncImage.swift renamed to SwiftUI-WorkoutApp/CachedAcyncImage/Sources/CachedAcyncImage/CachedAsyncImage.swift

@@ -1,18 +1,23 @@
 import SwiftUI
+import CachedAcyncImage
 
-struct CacheImageView: View {
+struct CachedImage: View {
     let url: URL?
     var mode = Mode.userListItem
 
     var body: some View {
-        CacheAsyncImage(url: url, placeholderSize: mode.size) {
-            Image(uiImage: $0).resizable()
+        CachedAsyncImage(url: url) { uiImage in
+            Image(uiImage: uiImage).resizable()
+        } placeholder: {
+            RoundedDefaultImage(size: mode.size)
         }
-        .applySpecificSize(mode.size)
+        .scaledToFit()
+        .cornerRadius(8)
+        .frame(width: mode.size.width, height: mode.size.height)
     }
 }
 
-extension CacheImageView {
+extension CachedImage {
     enum Mode {
         case userListItem, groundListItem, eventListItem,
              dialogListItem, genericListItem, journalEntry,
@@ -36,8 +41,8 @@ extension CacheImageView {
 struct SmallProfileCacheImageView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            CacheImageView(url: .init(string: "https://workout.su/img/avatar_default.jpg")!)
-            CacheImageView(
+            CachedImage(url: .init(string: "https://workout.su/img/avatar_default.jpg")!)
+            CachedImage(
                 url: .init(string: "https://workout.su/img/avatar_default.jpg")!,
                 mode: .profileAvatar
             )