BER-80: Converting MapMarkerDetailView into SwiftUI #341
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| { | ||
| "originHash" : "7ed1966e3e00f1cc30964015f9aca1372b03fa405ea9aca1300a7bf1d858ba6a", | ||
| "pins" : [ | ||
| { | ||
| "identity" : "swiftsoup", | ||
| "kind" : "remoteSourceControl", | ||
| "location" : "https://github.com/scinfu/SwiftSoup.git", | ||
| "state" : { | ||
| "revision" : "0837db354faf9c9deb710dc597046edaadf5360f", | ||
| "version" : "2.7.6" | ||
| } | ||
| } | ||
| ], | ||
| "version" : 3 | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,222 @@ | ||
| // | ||
| // MapMakerDetailSwiftView.swift | ||
| // berkeley-mobile | ||
| // | ||
| // Created by Dylan Chhum on 3/11/25. | ||
| // Copyright © 2025 ASUC OCTO. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
| import MapKit | ||
| import SwiftUI | ||
|
|
||
| // MARK: - MapMarkerDetailSwiftView | ||
|
|
||
| struct MapMarkerDetailSwiftView: View { | ||
| var marker: MapMarker? | ||
| var onClose: (() -> Void)? | ||
| var body: some View { | ||
|
Comment on lines
+17
to
+18
There was a problem hiding this comment. Add newline between |
||
| ZStack { | ||
|
There was a problem hiding this comment. Is this |
||
| HStack { | ||
| colorAccentBar | ||
|
|
||
| VStack(alignment: .leading, spacing: 4) { | ||
| headerView | ||
| Spacer() | ||
| descriptionView | ||
| Spacer() | ||
| infoRowView | ||
| } | ||
| .padding(.vertical, 8) | ||
| Spacer() | ||
| } | ||
| .background(Color(.systemBackground)) | ||
Chhumbucket marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .clipShape(RoundedRectangle(cornerRadius: 12)) | ||
| .frame(maxWidth: .infinity) | ||
| .frame(minWidth: 200, maxHeight: 140) | ||
| .shadow(color: .black.opacity(0.2), radius: 5, x: 0, y: 2) | ||
| .padding(.horizontal, 20) | ||
| } | ||
| } | ||
|
|
||
|
|
||
Chhumbucket marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // MARK: - Private Views | ||
|
|
||
| private var colorAccentBar: some View { | ||
| let markerColor: Color = { | ||
| guard let marker else { | ||
| return .purple | ||
| } | ||
|
|
||
| switch marker.type { | ||
| case .known(let type): | ||
| return Color(type.color()) | ||
| case .unknown: | ||
| return Color(BMColor.MapMarker.other) | ||
| } | ||
| }() | ||
|
Comment on lines
+46
to
+57
There was a problem hiding this comment. Maybe make this is a private helper function? |
||
|
|
||
| return Rectangle() | ||
| .fill(markerColor) | ||
| .frame(width: 12) | ||
| } | ||
|
|
||
| private var headerView: some View { | ||
| HStack(alignment: .top) { | ||
| Text((marker?.title ?? "Unknown").capitalized) | ||
| .font(Font(BMFont.bold(21))) | ||
| .foregroundColor(.primary) | ||
| .fixedSize(horizontal: false, vertical: true) | ||
| Spacer() | ||
|
|
||
| Button { | ||
| onClose?() | ||
| } label: { | ||
| Image(systemName: "xmark") | ||
| .font(.system(size: 16)) | ||
| .foregroundStyle(Color.secondary) | ||
| .padding(.trailing, 4) | ||
| } | ||
|
Comment on lines
+72
to
+79
There was a problem hiding this comment. Use trailing closure syntax: Button(action: {
}) {
...
} |
||
| } | ||
| } | ||
|
|
||
| private var descriptionView: some View { | ||
| Text(marker?.subtitle ?? "No description") | ||
| .font(Font(BMFont.regular(10))) | ||
| .fixedSize(horizontal: false, vertical: true) | ||
| .padding(.trailing, 8) | ||
| } | ||
|
|
||
| private var infoRowView: some View { | ||
| HStack { | ||
| HStack(spacing: 8) { | ||
| Image(systemName: "clock") | ||
| .font(.system(size: 12)) | ||
| .foregroundColor(.secondary) | ||
| .rotationEffect(.init(degrees: 90)) | ||
| openStatusButton | ||
| } | ||
|
|
||
| Spacer() | ||
|
|
||
| locationInfoView | ||
|
|
||
| Spacer() | ||
|
|
||
| categoryView | ||
| } | ||
|
Comment on lines
+91
to
+107
There was a problem hiding this comment. Is the outer |
||
| } | ||
|
|
||
| private var openStatusButton: some View { | ||
| Capsule() | ||
| .fill(marker?.isOpen ?? false ? Color.blue : Color(red: 0.4, green: 0.5, blue: 0.9)) | ||
|
There was a problem hiding this comment.
|
||
| .frame(width: 48, height: 18) | ||
| .overlay { | ||
| Text(marker?.isOpen ?? false ? "Open" : "Closed") | ||
| .font(Font(BMFont.medium(9))) | ||
| .foregroundStyle(.white) | ||
| } | ||
| } | ||
|
|
||
| private var locationInfoView: some View { | ||
| HStack(spacing: 8) { | ||
| Image(systemName: "mappin.and.ellipse") | ||
| .font(.system(size: 12)) | ||
| .foregroundColor(.secondary) | ||
| Text(marker?.address ?? "No Address") | ||
| .font(Font(BMFont.regular(12))) | ||
| .foregroundColor(.primary) | ||
| .lineLimit(1) | ||
| .truncationMode(.tail) | ||
| } | ||
| } | ||
|
|
||
| private var categoryView: some View { | ||
| HStack(spacing: 8){ | ||
| Image(systemName: getCategoryIcon()) | ||
| .font(.system(size: 12)) | ||
| .foregroundColor(.secondary) | ||
|
|
||
| Group { | ||
| if let marker, case .known(let type) = marker.type, type == .cafe, let mealPrice = marker.mealPrice { | ||
| Text(mealPrice) | ||
| .font(Font(BMFont.regular(12))) | ||
| .foregroundColor(.primary) | ||
| } else { | ||
| Text("<10") | ||
| .font(Font(BMFont.regular(12))) | ||
| .foregroundColor(.primary) | ||
| } | ||
| } | ||
|
Comment on lines
+140
to
+150
There was a problem hiding this comment. Bring |
||
| } | ||
| } | ||
|
|
||
| private func getCategoryIcon() -> String { | ||
| guard let marker else { | ||
| return "questionmark.circle" | ||
| } | ||
|
|
||
| switch marker.type { | ||
| case .known(let type): | ||
| switch type { | ||
| case .cafe: | ||
| return "fork.knife" | ||
| case .store: | ||
| return "bag" | ||
| case .mentalHealth: | ||
| return "brain" | ||
| case .genderInclusiveRestrooms: | ||
| return "toilet" | ||
| case .menstrualProductDispensers: | ||
| return "drop" | ||
| case .garden: | ||
| return "leaf" | ||
| case .bikes: | ||
| return "bicycle" | ||
| case .lactation: | ||
| return "heart" | ||
| case .rest: | ||
| return "bed.double" | ||
| case .microwave: | ||
| return "bolt" | ||
| case .printer: | ||
| return "printer" | ||
| case .water: | ||
| return "drop.fill" | ||
| case .waste: | ||
| return "trash" | ||
| case .none: | ||
| return "mappin" | ||
| } | ||
| case .unknown: | ||
| return "mappin" | ||
| } | ||
| } | ||
|
Comment on lines
+154
to
+194
There was a problem hiding this comment. Don't we have a |
||
| } | ||
|
|
||
|
|
||
| // MARK: - Preview | ||
Chhumbucket marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| #Preview { | ||
| MapMarkerDetailSwiftView( | ||
| marker: MapMarker( | ||
| type: "Cafe", | ||
| location: CLLocationCoordinate2D(latitude: 37.871684, longitude: -122.259934), | ||
| name: "Babette South Hall Coffee Bar", | ||
| description: "A retail Cal Dining location featuring a Peet Coffee & tea store, made- to-go order deli and bagels bar, smoothies, and grab-and-go items.", | ||
| address: "Lower Sproul Plaza", | ||
| onCampus: true, | ||
| phone: "510-123-4567", | ||
| email: "[email protected]", | ||
| weeklyHours: nil, | ||
| appointment: false, | ||
| mealPrice: "$5-10", | ||
| cal1Card: true, | ||
| eatWell: true, | ||
| mpdRooms: nil, | ||
| accessibleGIRs: nil, | ||
| nonAccesibleGIRs: nil | ||
| ), | ||
| onClose: {} | ||
| ) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove MARK