minor changes

scalybee · May 12, 2022 · fdbb2c4 · fdbb2c4
1 parent c9c8dcf
commit fdbb2c4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 10 deletions.
diff --git a/Sources/ACImage/ACImage.swift b/Sources/ACImage/ACImage.swift
@@ -39,6 +39,20 @@ public struct ACImage: View {
     }
 
     public var body: some View {
+        if #available(iOS 15.0, *) {
+            makeBody()
+        }
+        else {
+            if viewModel.forcedUpdate {
+                makeBody()
+            }
+            else {
+                makeBody()
+            }
+        }
+    }
+
+    @ViewBuilder func makeBody() -> some View {
         switch viewModel.currentImageState {
 
         case .nameIntials(let nameInitials):
@@ -81,7 +95,6 @@ public struct ACImage: View {
                 }
         }
     }
-
 }
 
 extension ACImage {

diff --git a/Sources/ACImage/ViewModel/ACImageViewModel.swift b/Sources/ACImage/ViewModel/ACImageViewModel.swift
@@ -20,7 +20,16 @@ class ACImageViewModel: ObservableObject {
     var imageURL: String?
     var nameInitials: String?
 
-    @Published private(set) var currentImageState : ImageStateValue! = .loading
+    @Published private(set) var currentImageState : ImageStateValue! = .loading {
+        didSet {
+            forcedUpdate.toggle()
+        }
+    }
+    @Published private(set) var forcedUpdate: Bool = false {
+        didSet {
+            objectWillChange.send()
+        }
+    }
 
     init(imageURL: String? = nil, nameInitials: String?) {
         self.imageURL = imageURL
@@ -34,37 +43,31 @@ extension ACImageViewModel {
     func setupState(isLocalImage: Bool = false) {
         if isLocalImage {
             self.currentImageState = .localImage(path: nil)
-            objectWillChange.send()
         }
         else if let imgString = imageURL, let imgURL = URL(string: imgString) {
             if FileManager.default.fileExists(atPath: imgURL.path) {
                 if imgURL.pathExtension.lowercased().contains("gif") {
                     self.currentImageState = .animated(url: URL(fileURLWithPath: imgURL.path))
-                    objectWillChange.send()
                 }
                 else {
                     self.currentImageState = .localImage(path: imgURL.path)
-                    objectWillChange.send()
                 }
             }
             else {
                 self.currentImageState = .webImage(url: imgURL)
-                objectWillChange.send()
             }
         }
         else if let nameInitials = nameInitials {
             self.currentImageState = .nameIntials(nameInitials: nameInitials)
-            objectWillChange.send()
         }
         else {
             self.currentImageState = .failure
-            objectWillChange.send()
         }
-        objectWillChange.send()
+//        objectWillChange.send()
     }
 
     func setFailure() {
         self.currentImageState = .failure
-        objectWillChange.send()
+//        objectWillChange.send()
     }
 }