Add and use Ranking+RankingSort (#801)

- reuse more code
bolsinga · Jun 8, 2024 · 5af9a0d · 5af9a0d
1 parent 6d323b9
commit 5af9a0d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 28 deletions.
diff --git a/Sources/Site/Music/UI/ArtistList.swift b/Sources/Site/Music/UI/ArtistList.swift
@@ -19,19 +19,6 @@ struct ArtistList: View {
     Text("\(artistDigest.showRank.value) Show(s)", bundle: .module)
   }
 
-  @ViewBuilder private func sectionHeader(for ranking: Ranking) -> some View {
-    switch sort {
-    case .alphabetical, .firstSeen:
-      EmptyView()
-    case .showCount:
-      ranking.showsCountView
-    case .showYearRange:
-      ranking.yearsCountView
-    case .associatedRank:
-      ranking.venuesCountView
-    }
-  }
-
   @ViewBuilder private var listElement: some View {
     if sort.isAlphabetical {
       RankingList(
@@ -55,7 +42,14 @@ struct ArtistList: View {
             showCount(for: $0)
           }
         },
-        sectionHeaderView: { sectionHeader(for: $0) })
+        sectionHeaderView: {
+          switch sort {
+          case .associatedRank:
+            $0.venuesCountView
+          default:
+            $0.sectionHeader(for: sort)
+          }
+        })
     }
   }
 

diff --git a/Sources/Site/Music/UI/Ranking+RankingSort.swift b/Sources/Site/Music/UI/Ranking+RankingSort.swift
@@ -0,0 +1,21 @@
+//
+//  Ranking+RankingSort.swift
+//
+//
+//  Created by Greg Bolsinga on 6/7/24.
+//
+
+import SwiftUI
+
+extension Ranking {
+  @ViewBuilder func sectionHeader(for sort: RankingSort) -> some View {
+    switch sort {
+    case .alphabetical, .firstSeen, .associatedRank:
+      EmptyView()
+    case .showCount:
+      showsCountView
+    case .showYearRange:
+      yearsCountView
+    }
+  }
+}
diff --git a/Sources/Site/Music/UI/VenueList.swift b/Sources/Site/Music/UI/VenueList.swift
@@ -19,19 +19,6 @@ struct VenueList: View {
     Text("\(venueDigest.showRank.value) Show(s)", bundle: .module)
   }
 
-  @ViewBuilder private func sectionHeader(for ranking: Ranking) -> some View {
-    switch sort {
-    case .alphabetical, .firstSeen:
-      EmptyView()
-    case .showCount:
-      ranking.showsCountView
-    case .showYearRange:
-      ranking.yearsCountView
-    case .associatedRank:
-      ranking.artistsCountView
-    }
-  }
-
   @ViewBuilder private var listElement: some View {
     if sort.isAlphabetical {
       RankingList(
@@ -51,7 +38,14 @@ struct VenueList: View {
         items: venueDigests,
         rankingMapBuilder: { $0.ranked(by: sort) },
         itemContentView: { if sort.isShowYearRange { showCount(for: $0) } },
-        sectionHeaderView: { sectionHeader(for: $0) })
+        sectionHeaderView: {
+          switch sort {
+          case .associatedRank:
+            $0.artistsCountView
+          default:
+            $0.sectionHeader(for: sort)
+          }
+        })
     }
   }