ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-02 21:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve LocationRoomTimelineView layout (#1212)

Browse Source 
* Improve LocationRoomTimelineView

* Cleanup
This commit is contained in:
Alfonso Grillo
2023-06-29 12:22:43 +02:00
committed by GitHub
parent 98cec5672c
commit edd12b02af
2 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/MapLibre/MapLibreStaticMapView.swift
+25 -23
View File
@@ -24,48 +24,51 @@ struct MapLibreStaticMapView<PinAnnotation: View>: View {
private let mapTilerAttributionPlacement: MapTilerAttributionPlacement
private let pinAnnotationView: PinAnnotation
@Environment(\.colorScheme) private var colorScheme
private let imageSize: CGSize
@State private var fetchAttempt = 0
init(coordinates: CLLocationCoordinate2D,
zoomLevel: Double,
imageSize: CGSize,
attributionPlacement: MapTilerAttributionPlacement,
mapTilerStatic: MapTilerStaticMapProtocol,
@ViewBuilder pinAnnotationView: () -> PinAnnotation) {
self.coordinates = coordinates
self.zoomLevel = zoomLevel
self.mapTilerStatic = mapTilerStatic
self.imageSize = imageSize
mapTilerAttributionPlacement = attributionPlacement
self.pinAnnotationView = pinAnnotationView()
}
var body: some View {
if let url = mapTilerStatic.staticMapURL(for: colorScheme.mapStyle, coordinates: coordinates, zoomLevel: zoomLevel, size: imageSize, attribution: mapTilerAttributionPlacement) {
AsyncImage(url: url) { phase in
switch phase {
case .empty:
Image("mapBlurred")
.resizable()
.aspectRatio(contentMode: .fill)
case .success(let image):
ZStack {
image
GeometryReader { geometry in
if let url = mapTilerStatic.staticMapURL(for: colorScheme.mapStyle,
coordinates: coordinates,
zoomLevel: zoomLevel,
size: geometry.size,
attribution: mapTilerAttributionPlacement) {
AsyncImage(url: url) { phase in
switch phase {
case .empty:
Image("mapBlurred")
.resizable()
.aspectRatio(contentMode: .fill)
pinAnnotationView
case .success(let image):
ZStack {
image
.resizable()
.aspectRatio(contentMode: .fill)
pinAnnotationView
}
case .failure:
errorView
@unknown default:
EmptyView()
}
case .failure:
errorView
@unknown default:
EmptyView()
}
.id(fetchAttempt)
.clipped()
} else {
Image("mapBlurred")
}
.id(fetchAttempt)
.clipped()
} else {
Image("mapBlurred")
}
}
@@ -101,7 +104,6 @@ struct MapLibreStaticMapView_Previews: PreviewProvider {
static var previews: some View {
MapLibreStaticMapView(coordinates: CLLocationCoordinate2D(),
zoomLevel: 15,
imageSize: .init(width: 300, height: 200),
attributionPlacement: .bottomLeft,
mapTilerStatic: MapTilerStaticMapMock()) {
Image(systemName: "mappin.circle.fill")