ArchiveSharableToolbarContent now generic for ArchiveSharable (#963)

bolsinga · Oct 11, 2024 · 33c52e9 · 33c52e9
1 parent b07e451
commit 33c52e9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/Sources/Site/Music/UI/ArchiveSharableModifier.swift b/Sources/Site/Music/UI/ArchiveSharableModifier.swift
@@ -11,12 +11,8 @@ struct ArchiveSharableModifier<T: ArchiveSharable>: ViewModifier {
   let item: T?
 
   func body(content: Content) -> some View {
-    if let item, let url = item.url {
-      content
-        .toolbar { ArchiveSharableToolbarContent(item: item, url: url) }
-    } else {
-      content
-    }
+    content
+      .toolbar { ArchiveSharableToolbarContent(item: item) }
   }
 }
 

diff --git a/Sources/Site/Music/UI/ArchiveSharableToolbarContent.swift b/Sources/Site/Music/UI/ArchiveSharableToolbarContent.swift
@@ -7,26 +7,26 @@
 
 import SwiftUI
 
-struct ArchiveSharableToolbarContent: ToolbarContent {
+struct ArchiveSharableToolbarContent<T: ArchiveSharable>: ToolbarContent {
   let placement: ToolbarItemPlacement
-  let item: ArchiveSharable
-  let url: URL
+  let item: T?
 
-  internal init(placement: ToolbarItemPlacement = .primaryAction, item: ArchiveSharable, url: URL) {
+  internal init(placement: ToolbarItemPlacement = .primaryAction, item: T?) {
     self.placement = placement
     self.item = item
-    self.url = url
   }
 
   var body: some ToolbarContent {
-    ToolbarItem(placement: placement) {
-      #if !os(tvOS)
-        ShareLink(
-          item: url, subject: Text(item.subject), message: Text(item.message),
-          preview: SharePreview(Text(item.subject), image: Bundle.main.appIcon))
-      #else
-        EmptyView()
-      #endif
+    if let item, let url = item.url {
+      ToolbarItem(placement: placement) {
+        #if !os(tvOS)
+          ShareLink(
+            item: url, subject: Text(item.subject), message: Text(item.message),
+            preview: SharePreview(Text(item.subject), image: Bundle.main.appIcon))
+        #else
+          EmptyView()
+        #endif
+      }
     }
   }
 }