Skip to content

fix: Keep location from search from changing #1069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mpanuszewska merged 3 commits into from
Sep 30, 2025
Merged

fix: Keep location from search from changing #1069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc3f20e
fix: Keep location from search from changing
mpanuszewska Sep 30, 2025
dda36cb
REmove all comments and logs
mpanuszewska Sep 30, 2025
894623d
This was actually unnecessary I think
mpanuszewska Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
177 changes: 174 additions & 3 deletions AirCasting.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions AirCasting/CreateSessionViews/ChooseCustomLocationView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ struct ChooseCustomLocationView: View {
@Binding var creatingSessionFlowContinues: Bool
@StateObject private var locationTracker = BindableLocationTracker()
var sessionName: String
@State private var locationChangedProgramatically: Bool = false
@Injected private var AppLocationTracker: LocationTracker

@EnvironmentObject private var sessionContext: CreateSessionContext
Expand All @@ -38,6 +39,8 @@ struct ChooseCustomLocationView: View {
.background(confirmCreatingSessionLink)
.sheet(isPresented: $isLocationPopupPresented, onDismiss: {
guard let newLocation = location else { return }

locationChangedProgramatically = true
locationTracker.ovverridenLocation = newLocation
}, content: {
PlacePicker(service: ChooseLocationPickerService(address: $locationName,
Expand All @@ -58,8 +61,11 @@ struct ChooseCustomLocationView: View {
locationTracker: locationTracker,
stickHardToTheUser: true)
.indicateMapLocationChange { newLocation in
location = .init(latitude: newLocation.coordinate.latitude,
longitude: newLocation.coordinate.longitude)
if !locationChangedProgramatically {
locationChangedProgramatically = false
location = .init(latitude: newLocation.coordinate.latitude,
longitude: newLocation.coordinate.longitude)
}
}
.onMyLocationButtonTapped {
locationTracker.ovverridenLocation = nil
Expand Down
Loading