improve

netreconlab · Jul 5, 2024 · 5132a32 · 5132a32
1 parent 3f55dca
commit 5132a32
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 31 deletions.
diff --git a/Sources/CareKitEssentials/Cards/Shared/CustomLabelView.swift b/Sources/CareKitEssentials/Cards/Shared/CustomLabelView.swift
@@ -41,7 +41,7 @@ public struct CustomLabelView<Header: View>: View {
 
                 HStack(spacing: style.dimension.directionalInsets2.trailing) {
 
-                    eventImage(viewModel.event)?
+                    viewModel.event.image()?
                         .resizable()
                         .renderingMode(.template)
                         .frame(width: 25, height: 30)
@@ -67,25 +67,6 @@ public struct CustomLabelView<Header: View>: View {
         }
         .padding(.vertical)
     }
-
-    func eventImage(_ event: OCKAnyEvent) -> Image? {
-        #if canImport(UIKit)
-        guard let asset = viewModel.event.asset else {
-            return nil
-        }
-        return Image(uiImage: asset)
-        #elseif canImport(AppKit)
-        guard let asset = viewModel.event.asset else {
-            return nil
-        }
-        return Image(nsImage: asset)
-        #else
-        guard let asset = viewModel.event.task.asset else {
-            return nil
-        }
-        return Image(name: asset)
-        #endif
-    }
 }
 
 public extension CustomLabelView {

diff --git a/Sources/CareKitEssentials/Cards/Shared/InformationHeaderView.swift b/Sources/CareKitEssentials/Cards/Shared/InformationHeaderView.swift
@@ -95,17 +95,12 @@ public struct InformationHeaderView: View {
 struct InformationHeaderView_Previews: PreviewProvider {
     static var previews: some View {
         if let event = try? Utility.createNauseaEvent() {
-            InformationHeaderView(title: Text(event.title),
-                                  information: Text(event.detail ?? ""),
-                                  image: imageFromEvent(event),
-                                  event: event)
+            InformationHeaderView(
+                title: Text(event.title),
+                information: Text(event.detail ?? ""),
+                image: event.image(),
+                event: event
+            )
         }
     }
-
-    static func imageFromEvent(_ event: OCKAnyEvent) -> Image? {
-        guard let asset = event.task.asset else {
-            return nil
-        }
-        return Image(asset)
-    }
 }
diff --git a/Sources/CareKitEssentials/Extensions/OCKAnyEvent.swift b/Sources/CareKitEssentials/Extensions/OCKAnyEvent.swift
@@ -150,4 +150,23 @@ public extension OCKAnyEvent {
         newOutcome.values = prependedValues
         return OCKAnyEvent(task: task, outcome: newOutcome, scheduleEvent: scheduleEvent)
     }
+
+    func image() -> Image? {
+        #if canImport(UIKit)
+        guard let asset = self.asset else {
+            return nil
+        }
+        return Image(uiImage: asset)
+        #elseif canImport(AppKit)
+        guard let asset = self.asset else {
+            return nil
+        }
+        return Image(nsImage: asset)
+        #else
+        guard let asset = self.task.asset else {
+            return nil
+        }
+        return Image(name: asset)
+        #endif
+    }
 }