ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

LocationSharingScreen: fix indefinite loading on the center to location button in non picker mode (#5469)

Browse Source
This commit is contained in:
Mauro
2026-04-22 18:36:15 +02:00
committed by GitHub
parent 6dc6eed9e3
commit 5e2210f1e8
15 changed files with 101 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Screens/LocationSharing/LocationSharingScreenModels.swift
+10 -2
View File
@@ -117,10 +117,18 @@ struct LocationSharingScreenViewState: BindableState {
}
}
/// Returns true if the user's location has not yet been determined, while location permissions are given or not yet set
/// Displays a loader if the user's location has not yet been determined
/// Does not work as intended on simulator.
var isLocationLoading: Bool {
!bindings.hasLoadedUserLocation && bindings.isLocationAuthorized != false
if case .picker = interactionMode {
// In picker mode permissions are requested immediately so returns true
// if the user's location has not yet been determined while location permissions are given or not yet set
!bindings.hasLoadedUserLocation && bindings.isLocationAuthorized != false
} else {
// In other modes permissions are requested only if the center to user button is tapped
// So we only display the loader if the user's location has not yet been determined while location permissions are given.
!bindings.hasLoadedUserLocation && bindings.isLocationAuthorized == true
}
}
var zoomLevel: Double {
ElementX/Sources/Screens/LocationSharing/View/LocationSharingScreen.swift
+7
View File
@@ -133,6 +133,8 @@ struct LocationSharingScreen_Previews: PreviewProvider, TestablePreview {
static let pickerViewModel = LocationSharingScreenViewModel.mock(type: .picker)
static let liveLocationViewModel = LocationSharingScreenViewModel.mock(type: .viewLive)
static var previews: some View {
ElementNavigationStack {
LocationSharingScreen(context: pickerViewModel.context)
@@ -153,5 +155,10 @@ struct LocationSharingScreen_Previews: PreviewProvider, TestablePreview {
LocationSharingScreen(context: pinViewModel.context)
}
.previewDisplayName("Pin Static Location")
ElementNavigationStack {
LocationSharingScreen(context: liveLocationViewModel.context)
}
.previewDisplayName("Live Location")
}
}