Merge branch 'main' of github.com:cuappdev/uplift-ios-swiftui

JiwonJeong414 · JiwonJeong414 · commit 0d5851e76918 · 2026-04-22T17:30:45.000-04:00
diff --git a/Uplift/Views/Home/HomeGymCell.swift b/Uplift/Views/Home/HomeGymCell.swift
@@ -188,10 +188,17 @@ struct HomeGymCell: View {
         }
     }
 
+    @ViewBuilder
     private var distanceText: some View {
-        Text("\(locationManager.distanceToCoordinates(latitude: gym.latitude, longitude: gym.longitude)) mi")
-            .font(Constants.Fonts.labelMedium)
-            .foregroundStyle(Constants.Colors.gray03)
+        if locationManager.userLocation != nil {
+            Text("\(locationManager.distanceToCoordinates(latitude: gym.latitude, longitude: gym.longitude)) mi")
+                .font(Constants.Fonts.labelMedium)
+                .foregroundStyle(Constants.Colors.gray03)
+        } else {
+            Text("")
+                .font(Constants.Fonts.labelMedium)
+                .foregroundStyle(Constants.Colors.gray03)
+        }
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -188,10 +188,17 @@ struct HomeGymCell: View {`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`
	`191`	`+ @ViewBuilder`
`191`	`192`	`private var distanceText: some View {`
`192`		`- Text("\(locationManager.distanceToCoordinates(latitude: gym.latitude, longitude: gym.longitude)) mi")`
`193`		`- .font(Constants.Fonts.labelMedium)`
`194`		`- .foregroundStyle(Constants.Colors.gray03)`
	`193`	`+ if locationManager.userLocation != nil {`
	`194`	`+ Text("\(locationManager.distanceToCoordinates(latitude: gym.latitude, longitude: gym.longitude)) mi")`
	`195`	`+ .font(Constants.Fonts.labelMedium)`
	`196`	`+ .foregroundStyle(Constants.Colors.gray03)`
	`197`	`+ } else {`
	`198`	`+ Text("")`
	`199`	`+ .font(Constants.Fonts.labelMedium)`
	`200`	`+ .foregroundStyle(Constants.Colors.gray03)`
	`201`	`+ }`
`195`	`202`	`}`
`196`	`203`
`197`	`204`	`}`