Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 15:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Location sharing: Live location sharing UI polishing
This commit is contained in:
SBiOSoftWhare 2022-07-07 16:53:57 +02:00 committed by GitHub
commit 611d1a1c9c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Riot/Assets/en.lproj/Vector.strings
View file

@ -2182,7 +2182,7 @@ To enable access, tap Settings> Location and select Always";
"location_sharing_live_list_item_last_update" = "Updated %@ ago";
"location_sharing_live_list_item_last_update_invalid" = "Unknown last update";
"location_sharing_live_list_item_current_user_display_name" = "You";
"location_sharing_live_list_item_stop_sharing_action" = "Stop sharing";
"location_sharing_live_list_item_stop_sharing_action" = "Stop";
"location_sharing_live_timer_incoming" = "Live until %@";
"location_sharing_live_loading" = "Loading Live location...";
"location_sharing_live_error" = "Live location error";

2
Riot/Generated/Strings.swift
View file

@ -2843,7 +2843,7 @@ public class VectorL10n: NSObject {
public static var locationSharingLiveListItemSharingExpired: String {
return VectorL10n.tr("Vector", "location_sharing_live_list_item_sharing_expired")
}
/// Stop sharing
/// Stop
public static var locationSharingLiveListItemStopSharingAction: String {
return VectorL10n.tr("Vector", "location_sharing_live_list_item_stop_sharing_action")
}

4
Riot/Modules/Room/Location/RoomTimelineLocationView.swift
View file

@ -49,7 +49,7 @@ struct TimelineLiveLocationViewData {
}
var showMap: Bool {
guard case .started(_, _) = status else {
guard case .started = status else {
return false
}
return true
@ -200,7 +200,7 @@ class RoomTimelineLocationView: UIView, NibLoadable, Themable, MGLMapViewDelegat
}
liveLocationContainerView.isHidden = false
liveLocationContainerView.backgroundColor = theme.colors.background.withAlphaComponent(0.75)
liveLocationContainerView.backgroundColor = theme.colors.background.withAlphaComponent(0.90)
liveLocationIcon.image = Asset.Images.locationLiveCellIcon.image
liveLocationIcon.tintColor = bannerViewData.iconTint

2
RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/View/LiveLocationListItem.swift
View file

@ -85,7 +85,7 @@ struct LiveLocationListItem: View {
Button(VectorL10n.locationSharingLiveListItemStopSharingAction) {
onStopSharingAction?()
}
.font(theme.fonts.caption1)
.font(theme.fonts.body)
.foregroundColor(theme.colors.alert)
}
}

3
RiotSwiftUI/Modules/Room/LiveLocationSharingViewer/View/LiveLocationSharingViewer.swift
View file

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

2
RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
View file

@ -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

1
changelog.d/6382.change Normal file
View file

@ -0,0 +1 @@
Location sharing: Live location sharing UI polishing.