Skip to content
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.

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

Location sharing: Live location sharing viewer screen #5994

Merged
merged 32 commits into from
Apr 22, 2022

Conversation

SBiOSoftWhare
Copy link
Contributor

#5723

Light Dark
Simulator Screen Shot - iPhone 13 Pro - 2022-04-06 at 10 18 07 Simulator Screen Shot - iPhone 13 Pro - 2022-04-06 at 10 16 27

@SBiOSoftWhare SBiOSoftWhare marked this pull request as ready for review April 22, 2022 10:08
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/ShareLocationActivityController.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/MapViewErrorAlertInfoBuilder.swift
@SBiOSoftWhare SBiOSoftWhare requested review from a team and MaximeEvrard42 and removed request for a team April 22, 2022 11:01
@github-actions
Copy link

github-actions bot commented Apr 22, 2022

📱 Scan the QR code below to install the build for this PR.
🔒 This build is for internal testing purpose. Only devices listed in the ad-hoc provisioning profile can install Element Alpha.

QR code

If you can't scan the QR code you can install the build via this link: https://i.diawi.com/pRSPnb


let alertInfo: AlertInfo<LocationSharingAlertType>?

switch error {
case .failedLoadingMap:
alertInfo = AlertInfo(id: .mapLoadingError,
title: VectorL10n.locationSharingLoadingMapErrorTitle(AppInfo.current.displayName),
primaryButton: (VectorL10n.ok, dimissalCallback))
primaryButton: (VectorL10n.ok, primaryButtonCompletion))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think "dismissalCallBack" is more generic as this action is used whenever it's a primaryButton or not

@SBiOSoftWhare SBiOSoftWhare merged commit cc8ae93 into develop Apr 22, 2022
@SBiOSoftWhare SBiOSoftWhare deleted the steve/5723_lls_screen branch April 22, 2022 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants