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

Show location's description when sharing to Apple Maps (#1253)

Browse Source 
* Add location description for Apple Maps

* Show location’s description on Apple maps

* Cleanup ShareToMapsAppActivity
This commit is contained in:
Alfonso Grillo
2023-07-05 18:12:57 +02:00
committed by GitHub
parent 6b8b5a75b3
commit bfd75a335d
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/ShareToMapsAppActivity.swift
+23 -9
View File
@@ -26,10 +26,12 @@ final class ShareToMapsAppActivity: UIActivity {
private let type: MapsAppType private let type: MapsAppType
private let location: CLLocationCoordinate2D private let location: CLLocationCoordinate2D
private let locationDescription: String?
init(type: MapsAppType, location: CLLocationCoordinate2D) { init(type: MapsAppType, location: CLLocationCoordinate2D, locationDescription: String?) {
self.type = type self.type = type
self.location = location self.location = location
self.locationDescription = locationDescription
super.init() super.init()
} }
@@ -54,24 +56,36 @@ final class ShareToMapsAppActivity: UIActivity {
} }
override func prepare(withActivityItems activityItems: [Any]) { override func prepare(withActivityItems activityItems: [Any]) {
UIApplication.shared.open(type.activityURL(for: location), options: [:]) { [weak self] result in UIApplication.shared.open(type.activityURL(for: location, locationDescription: locationDescription), options: [:]) { [weak self] result in
self?.activityDidFinish(result) self?.activityDidFinish(result)
} }
} }
} }
extension ShareToMapsAppActivity.MapsAppType { extension ShareToMapsAppActivity.MapsAppType {
func activityURL(for location: CLLocationCoordinate2D) -> URL { func activityURL(for location: CLLocationCoordinate2D, locationDescription: String?) -> URL {
switch self { switch self {
case .apple: case .apple:
// swiftlint:disable:next force_unwrapping var url: URL = "https://maps.apple.com/"
return URL(string: "https://maps.apple.com?ll=\(location.latitude),\(location.longitude)&q=Pin")! url.append(queryItems: [
.init(name: "ll", value: "\(location.latitude),\(location.longitude)"),
.init(name: "q", value: locationDescription ?? "Pin")
])
return url
case .google: case .google:
// swiftlint:disable:next force_unwrapping var url: URL = "https://www.google.com/maps/search/"
return URL(string: "https://www.google.com/maps/search/?api=1&query=\(location.latitude),\(location.longitude)")! url.append(queryItems: [
.init(name: "api", value: "1"),
.init(name: "query", value: "\(location.latitude),\(location.longitude)")
])
return url
case .osm: case .osm:
// swiftlint:disable:next force_unwrapping var url: URL = "https://www.openstreetmap.org/"
return URL(string: "https://www.openstreetmap.org/?mlat=\(location.latitude)&mlon=\(location.longitude)")! url.append(queryItems: [
.init(name: "mlat", value: "\(location.latitude)"),
.init(name: "mlon", value: "\(location.longitude)")
])
return url
} }
} }
ElementX/Sources/Screens/LocationSharing/View/StaticLocationScreen.swift
+3 -2
View File
@@ -128,8 +128,9 @@ struct StaticLocationScreen: View {
@ViewBuilder @ViewBuilder
private var shareSheet: some View { private var shareSheet: some View {
if let location = context.viewState.mapAnnotationCoordinate { if let location = context.viewState.mapAnnotationCoordinate {
AppActivityView(activityItems: [ShareToMapsAppActivity.MapsAppType.apple.activityURL(for: location)], let locationDescription = context.viewState.locationDescription
applicationActivities: ShareToMapsAppActivity.MapsAppType.allCases.map { ShareToMapsAppActivity(type: $0, location: location) }) AppActivityView(activityItems: [ShareToMapsAppActivity.MapsAppType.apple.activityURL(for: location, locationDescription: locationDescription)],
applicationActivities: ShareToMapsAppActivity.MapsAppType.allCases.map { ShareToMapsAppActivity(type: $0, location: location, locationDescription: locationDescription) })
.edgesIgnoringSafeArea(.bottom) .edgesIgnoringSafeArea(.bottom)
.presentationDetents([.medium, .large]) .presentationDetents([.medium, .large])
.presentationDragIndicator(.hidden) .presentationDragIndicator(.hidden)