Extracts a new control from the Favorites section of the OriginDestin…

…ationSheetView This change DRYs up the Favorites section a bit
OneBusAway · Jul 31, 2024 · 007e48f · 007e48f
1 parent fafc43b
commit 007e48f
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 32 deletions.
diff --git a/OTPKit/Controls/SectionHeaderView.swift b/OTPKit/Controls/SectionHeaderView.swift
@@ -7,8 +7,6 @@
 
 import SwiftUI
 
-typealias VoidBlock = () -> Void
-
 /// The view that appears above a section on the `OriginDestinationSheetView`.
 /// For instance, the header for the Recents and Favorites sections.
 struct SectionHeaderView: View {

diff --git a/OTPKit/Features/OriginDestination/FavoriteView.swift b/OTPKit/Features/OriginDestination/FavoriteView.swift
@@ -0,0 +1,45 @@
+//
+//  FavoriteView.swift
+//  OTPKit
+//
+//  Created by Aaron Brethorst on 7/31/24.
+//
+
+import SwiftUI
+
+/// A button that wraps a circle with an icon above a line of text.
+struct FavoriteView: View {
+    private let title: String
+    private let imageName: String
+    private let action: VoidBlock?
+
+    init(title: String, imageName: String, action: VoidBlock? = nil) {
+        self.title = title
+        self.imageName = imageName
+        self.action = action
+    }
+    var body: some View {
+        Button(action: {
+            action?()
+        }, label: {
+            VStack(alignment: .center) {
+                Image(systemName: imageName)
+                    .frame(width: 48, height: 48)
+                    .background(Color.gray.opacity(0.5))
+                    .clipShape(Circle())
+
+                Text(title)
+                    .font(.caption)
+                    .frame(width: 64)
+                    .lineLimit(1)
+                    .truncationMode(.tail)
+            }
+            .padding(.all, 4)
+            .foregroundStyle(.black)
+        })
+    }
+}
+
+#Preview {
+    FavoriteView(title: "Hello, world!", imageName: "mappin")
+}
diff --git a/OTPKit/Features/OriginDestination/Sheets/OriginDestinationSheetView.swift b/OTPKit/Features/OriginDestination/Sheets/OriginDestinationSheetView.swift
@@ -61,41 +61,15 @@ public struct OriginDestinationSheetView: View {
             ScrollView(.horizontal) {
                 HStack {
                     ForEach(sheetEnvironment.favoriteLocations, content: { location in
-                        Button(action: {
+                        FavoriteView(title: location.title, imageName: "mappin") {
                             sheetEnvironment.selectedDetailFavoriteLocation = location
                             isFavoriteLocationDetailSheetOpen.toggle()
-                        }, label: {
-                            VStack(alignment: .center) {
-                                Image(systemName: "mappin")
-                                    .frame(width: 48, height: 48)
-                                    .background(Color.gray.opacity(0.5))
-                                    .clipShape(Circle())
-
-                                Text(location.title)
-                                    .frame(width: 64)
-                                    .lineLimit(1)
-                                    .truncationMode(.tail)
-                            }
-                            .padding(.all, 4)
-                            .foregroundStyle(Color.black)
-                        })
-
+                        }
                     })
 
-                    Button(action: {
+                    FavoriteView(title: "Add", imageName: "plus") {
                         isAddSavedLocationsSheetOpen.toggle()
-                    }, label: {
-                        VStack {
-                            Image(systemName: "plus")
-                                .frame(width: 48, height: 48)
-                                .background(Color.gray.opacity(0.5))
-                                .clipShape(Circle())
-
-                            Text("Add")
-                                .foregroundStyle(Color.black)
-                        }
-                        .padding(.all, 4)
-                    })
+                    }
                 }
             }
         }, header: {

diff --git a/OTPKit/Miscellaneous/Utilities.swift b/OTPKit/Miscellaneous/Utilities.swift
@@ -0,0 +1,10 @@
+//
+//  Utilities.swift
+//  OTPKit
+//
+//  Created by Aaron Brethorst on 7/31/24.
+//
+
+import Foundation
+
+typealias VoidBlock = () -> Void