Merge pull request #6383 from vector-im/steve/lls_design_review

Location sharing: Live location sharing UI polishing
This commit is contained in:
SBiOSoftWhare
2022-07-07 16:53:57 +02:00
committed by GitHub
7 changed files with 9 additions and 7 deletions
@@ -85,7 +85,7 @@ struct LiveLocationListItem: View {
Button(VectorL10n.locationSharingLiveListItemStopSharingAction) {
onStopSharingAction?()
}
.font(theme.fonts.caption1)
.font(theme.fonts.body)
.foregroundColor(theme.colors.alert)
}
}
@@ -57,7 +57,7 @@ struct LiveLocationSharingViewer: View {
.navigationTitle(VectorL10n.locationSharingLiveViewerTitle)
.toolbar {
ToolbarItem(placement: .cancellationAction) {
Button(VectorL10n.cancel) {
Button(VectorL10n.close) {
viewModel.send(viewAction: .done)
}
}
@@ -85,6 +85,7 @@ struct LiveLocationSharingViewer: View {
}
.padding()
}
.background(theme.colors.background.ignoresSafeArea())
}
}
@@ -158,7 +158,7 @@ class LocationSharingViewModel: LocationSharingViewModelType, LocationSharingVie
self.state.bindings.alertInfo = AlertInfo(id: .userLocatingError,
title: VectorL10n.locationSharingAllowBackgroundLocationTitle,
message: VectorL10n.locationSharingAllowBackgroundLocationMessage,
primaryButton: (VectorL10n.locationSharingAllowBackgroundLocationCancelAction, { [weak self] in self?.state.bindings.showingTimerSelector = true }),
primaryButton: (VectorL10n.locationSharingAllowBackgroundLocationCancelAction, {}),
secondaryButton: (VectorL10n.locationSharingAllowBackgroundLocationValidateAction, { UIApplication.shared.vc_openSettings() }))
case .authorizedAlways:
self.state.bindings.showingTimerSelector = true