BER-80: Converting MapMarkerDetailView into SwiftUI [WIP] by Chhumbucket · Pull Request #341 · asuc-octo/berkeley-mobile-ios

Chhumbucket · 2025-03-13T00:35:59Z

Converted the MapMarkerDetailView into SwiftUI.

Currently placed templates for the buttons and used static data just to represent the view.

Future updates,

I want to connect the title of the place and the description in the same place to make sure that the padding is aligned. I feel that there is redundancy in the code, I want some feedback if there is.

… if I have the right amount of newlines

…se need transition will add

Chhumbucket · 2025-03-29T06:13:17Z

Screen.Recording.2025-03-28.at.11.04.52.PM.mov

justinwongeecs

Resolve merge conflicts and for the past comments in the conversation, please resolve them if they have been implemented.

Fixed the conflicts

baeuke · 2025-05-03T21:25:22Z

Search is breaking in your branch:

baeuke · 2025-05-03T21:28:55Z

-        searchResultsView = UIHostingController(rootView: SearchResultsView().environmentObject(searchViewModel)).view
+        let resultsView = SearchResultsView().environmentObject(searchViewModel)
+        searchResultsHostingController = UIHostingController(rootView: AnyView(resultsView))
+        searchResultsView = searchResultsHostingController.view


@Chhumbucket You didn't resolve this one. I think we had a consistent way with the hostingController;
you better make markerDetail work same way too than changing how search components are made (don't change search).
Justin did in the same way with mapUserLocationButton.

baeuke · 2025-05-03T21:34:35Z

    private var searchBar: UIView!
    private var searchResultsView: UIView!
+    private var searchResultsHostingController: UIHostingController<AnyView>!
    private var searchViewModel: SearchViewModel!


We don't need to store UIHostingController variables. The reason previously we added searchBarViewController (which is a hosting controller) is because we needed to add it as a child to mapViewController to share environment and focus state (which was specific to how search works and the whole setup here). in this case there is no need for that.

baeuke · 2025-05-03T21:36:21Z

    private var mapMarkers: [[MapMarker]] = []
-    private var markerDetail: MapMarkerDetailView!
+    private var markerDetail: UIHostingController<MapMarkerDetailSwiftView>!



Same here. You don't need markerDetail: UIHostingController<MapMarkerDetailSwiftView>!
just make markerDetail: UIView, and follow same setup process as for mapUserLocationBtn, mapMarkersDropdown, and Search components

baeuke · 2025-05-03T21:37:50Z


-        self.view.addSubViews([mapView, mapUserLocationButton, mapMarkersDropdownButton, markerDetail, searchResultsView, searchBar])
+        self.view.addSubViews([mapView, mapUserLocationButton, mapMarkersDropdownButton, markerDetail.view, searchResultsView, searchBar])
        setupSubviews()


when consistent, here you add just markerDetail, not markerDetail.view

justinwongeecs · 2025-05-10T03:29:26Z

+import MapKit
+import SwiftUI
+
+// MARK: - MapMarkerDetailSwiftView


Remove MARK

justinwongeecs · 2025-05-10T03:29:43Z

+    var onClose: (() -> Void)?
+    var body: some View {


Add newline between onClose and body

justinwongeecs · 2025-05-10T03:30:08Z

+    var marker: MapMarker?
+    var onClose: (() -> Void)?
+    var body: some View {
+        ZStack {


Is this ZStack necessary?

justinwongeecs · 2025-05-10T03:30:56Z

+        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)
+            }
+        }()


Maybe make this is a private helper function?

justinwongeecs · 2025-05-10T03:31:36Z

+            Button {
+                onClose?()
+            } label: {
+                Image(systemName: "xmark")
+                    .font(.system(size: 16))
+                    .foregroundStyle(Color.secondary)
+                    .padding(.trailing, 4)
+            }


Use trailing closure syntax:

Button(action: { }) { ... }

justinwongeecs · 2025-05-10T03:32:28Z

+        HStack {
+            HStack(spacing: 8) {
+                Image(systemName: "clock")
+                    .font(.system(size: 12))
+                    .foregroundColor(.secondary)
+                    .rotationEffect(.init(degrees: 90))
+                openStatusButton
+            }
+
+            Spacer()
+
+            locationInfoView
+
+            Spacer()
+
+            categoryView
+        }


Is the outer HStack necessary? Could we put lines 100-106 within the nested HStack?

justinwongeecs · 2025-05-10T03:33:00Z

+
+    private var openStatusButton: some View {
+            Capsule()
+                .fill(marker?.isOpen ?? false ? Color.blue : Color(red: 0.4, green: 0.5, blue: 0.9))


Color.blue → .blue?

justinwongeecs · 2025-05-10T03:34:54Z

+            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)
+                }
+            }


Bring .font(Font(BMFont.regular(12))) and .foregroundColor(.primary) out and apply it to Group?

justinwongeecs · 2025-05-10T03:36:56Z

+    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"
+        }
+    }


Don't we have a icon() method on a MapMarker that returns a UIImage? maybe use that?

Chhumbucket · 2025-05-30T22:28:09Z

Let me know how you like the UI

Screen.Recording.2025-05-30.at.3.23.57.PM.mov

justinwongeecs · 2025-06-08T05:20:51Z

Simulator.Screen.Recording.-.iPhone.16.Pro.-.2025-06-07.at.22.20.03.mp4

The MapMarkerDetailSwiftView is centered not aligned at the bottom.

justinwongeecs · 2025-06-08T05:24:07Z

+            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)
+        }


Don't need a Group. Apply view modifiers directly on the Text

Might be out of town

Chhumbucket added 3 commits March 11, 2025 17:13

something

6293188

Created SwiftUI view for MapMarkerDetail

72e7aec

Added Button templates

dff7222

Chhumbucket changed the title ~~Dylchhum/ber 80~~ Ber-80: Converting MapMarkerDetailView into SwiftUI Mar 13, 2025

Chhumbucket self-assigned this Mar 13, 2025

Chhumbucket changed the title ~~Ber-80: Converting MapMarkerDetailView into SwiftUI~~ BER-80: Converting MapMarkerDetailView into SwiftUI Mar 13, 2025

justinwongeecs self-requested a review March 14, 2025 08:11

justinwongeecs reviewed Mar 14, 2025

View reviewed changes

Added fixes and changes button to the formatting guide. Worried about…

a6500af

… if I have the right amount of newlines

justinwongeecs reviewed Mar 19, 2025

View reviewed changes

justinwongeecs added the UI label Mar 19, 2025

Chhumbucket added 3 commits March 19, 2025 17:10

merging

7afef88

Fixed Colors

0bdc698

message

77356ee

baeuke self-requested a review March 20, 2025 22:37

baeuke previously requested changes Mar 25, 2025

View reviewed changes

Comment thread berkeley-mobile/Map/MapMakerDetailSwiftView.swift Outdated

Comment thread berkeley-mobile/Map/MapMakerDetailSwiftView.swift Outdated

Implemented SwiftUI Map marker, bug when on menstrual category, onclo…

504bff5

…se need transition will add

Chhumbucket requested review from baeuke and justinwongeecs March 29, 2025 06:07

Chhumbucket added 2 commits March 28, 2025 23:57

Fixed padding

83d72c1

Save before Essa

bb79a60

justinwongeecs previously requested changes Mar 31, 2025

View reviewed changes

Chhumbucket added 2 commits March 31, 2025 13:34

Saving

7d1e11c

Merge branch 'master' of github.com:asuc-octo/berkeley-mobile-ios

d273278

Chhumbucket requested a review from justinwongeecs March 31, 2025 20:41

baeuke requested changes Apr 1, 2025

View reviewed changes

Comment thread berkeley-mobile.xcodeproj/project.pbxproj

BER-80: Fix project file structure after merge

b93720b

Chhumbucket added 2 commits May 2, 2025 20:02

Merge branch 'master' of github.com:asuc-octo/berkeley-mobile-ios

ffd7cb5

Merge branch 'master' into dylchhum/ber-80

b25e4c1

Chhumbucket requested review from baeuke and justinwongeecs May 3, 2025 03:07

baeuke requested changes May 3, 2025

View reviewed changes

baeuke previously requested changes May 3, 2025

View reviewed changes

justinwongeecs requested changes May 10, 2025

View reviewed changes

Chhumbucket changed the title ~~BER-80: Converting MapMarkerDetailView into SwiftUI~~ BER-80: Converting MapMarkerDetailView into SwiftUI [WIP] May 25, 2025

Chhumbucket added 2 commits May 27, 2025 03:13

Merge branch 'master' of github.com:asuc-octo/berkeley-mobile-ios

ae98773

Merge branch 'master' into dylchhum/ber-80

a7e0d43

Chhumbucket added the WIP 🚧 label May 30, 2025

Chhumbucket added 3 commits May 30, 2025 14:16

Fixed crashing lost info sheet

e0b442c

Fixed everything

9d09882

Added fixes

bf6a6bd

Chhumbucket requested a review from justinwongeecs May 30, 2025 22:24

Chhumbucket added 2 commits May 30, 2025 15:26

Merge branch 'master' of github.com:asuc-octo/berkeley-mobile-ios

49062fd

Merge branch 'master' into dylchhum/ber-80

81b6135

Chhumbucket requested a review from baeuke May 30, 2025 22:27

justinwongeecs requested changes Jun 8, 2025

View reviewed changes

Chhumbucket added 4 commits June 15, 2025 14:34

Merge branch 'master' of github.com:asuc-octo/berkeley-mobile-ios

2b3aae2

pushing

f363f0c

add merge fixes

f3c1a44

Added Justin Fixes

5c99411

Chhumbucket requested a review from justinwongeecs June 16, 2025 04:03

justinwongeecs linked an issue Dec 16, 2025 that may be closed by this pull request

Feedback Form Can Be Submitted In Invalid State #508

Closed

justinwongeecs removed a link to an issue Dec 16, 2025

Feedback Form Can Be Submitted In Invalid State #508

Closed

Uh oh!

Conversation

Chhumbucket commented Mar 13, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Chhumbucket commented Mar 29, 2025

Uh oh!

justinwongeecs left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

baeuke commented May 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

baeuke May 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

baeuke May 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Chhumbucket commented May 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

baeuke commented May 3, 2025 •

edited

Loading

baeuke May 3, 2025 •

edited

Loading

baeuke May 3, 2025 •

edited

Loading

Chhumbucket commented May 30, 2025 •

edited

Loading