add associatedRankSectionHeader closure (#802)

- this makes ArtistList and VenueList nearly identical.
bolsinga · Jun 8, 2024 · ff28b32 · ff28b32
1 parent 5af9a0d
commit ff28b32
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/Sources/Site/Music/UI/ArchiveCategoryDetail.swift b/Sources/Site/Music/UI/ArchiveCategoryDetail.swift
@@ -43,6 +43,7 @@ struct ArchiveCategoryDetail: View {
             venueDigests: venueDigests, sectioner: vault.sectioner,
             title: String(localized: "Venues", bundle: .module),
             associatedRankName: String(localized: "Sort By Artist Count", bundle: .module),
+            associatedRankSectionHeader: { $0.artistsCountView },
             sort: $venueSort
           )
           .archiveSearchable(
@@ -57,6 +58,7 @@ struct ArchiveCategoryDetail: View {
             artistDigests: artistDigests, sectioner: vault.sectioner,
             title: String(localized: "Artists", bundle: .module),
             associatedRankName: String(localized: "Sort By Venue Count", bundle: .module),
+            associatedRankSectionHeader: { $0.venuesCountView },
             sort: $artistSort
           )
           .archiveSearchable(

diff --git a/Sources/Site/Music/UI/ArtistList.swift b/Sources/Site/Music/UI/ArtistList.swift
@@ -7,11 +7,12 @@
 
 import SwiftUI
 
-struct ArtistList: View {
+struct ArtistList<SectionHeaderContent: View>: View {
   let artistDigests: [ArtistDigest]
   let sectioner: LibrarySectioner
   let title: String
   let associatedRankName: String
+  @ViewBuilder let associatedRankSectionHeader: (Ranking) -> SectionHeaderContent
 
   @Binding var sort: RankingSort
 
@@ -45,7 +46,7 @@ struct ArtistList: View {
         sectionHeaderView: {
           switch sort {
           case .associatedRank:
-            $0.venuesCountView
+            associatedRankSectionHeader($0)
           default:
             $0.sectionHeader(for: sort)
           }
@@ -71,7 +72,8 @@ struct ArtistList: View {
   NavigationStack {
     ArtistList(
       artistDigests: vaultPreviewData.artistDigests, sectioner: vaultPreviewData.sectioner,
-      title: "Artists", associatedRankName: "Sort By Venue Count", sort: .constant(.alphabetical)
+      title: "Artists", associatedRankName: "Sort By Venue Count",
+      associatedRankSectionHeader: { $0.venuesCountView }, sort: .constant(.alphabetical)
     )
     .musicDestinations(vaultPreviewData)
   }

diff --git a/Sources/Site/Music/UI/VenueList.swift b/Sources/Site/Music/UI/VenueList.swift
@@ -7,11 +7,12 @@
 
 import SwiftUI
 
-struct VenueList: View {
+struct VenueList<SectionHeaderContent: View>: View {
   let venueDigests: [VenueDigest]
   let sectioner: LibrarySectioner
   let title: String
   let associatedRankName: String
+  @ViewBuilder let associatedRankSectionHeader: (Ranking) -> SectionHeaderContent
 
   @Binding var sort: RankingSort
 
@@ -41,7 +42,7 @@ struct VenueList: View {
         sectionHeaderView: {
           switch sort {
           case .associatedRank:
-            $0.artistsCountView
+            associatedRankSectionHeader($0)
           default:
             $0.sectionHeader(for: sort)
           }
@@ -67,7 +68,8 @@ struct VenueList: View {
   NavigationStack {
     VenueList(
       venueDigests: vaultPreviewData.venueDigests, sectioner: vaultPreviewData.sectioner,
-      title: "Venues", associatedRankName: "Sort By Artist Count", sort: .constant(.alphabetical)
+      title: "Venues", associatedRankName: "Sort By Artist Count",
+      associatedRankSectionHeader: { $0.artistsCountView }, sort: .constant(.alphabetical)
     )
     .musicDestinations(vaultPreviewData)
   }