felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-22 09:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

merged element-ios 1.10.5 into 4409_basis_update_1_10_5

Browse Source
This commit is contained in:
Arnfried Griesert
2023-03-16 12:19:26 +01:00
parent a3c2375aa8 e9c58d1573
commit e5d97ed154
168 changed files with 2451 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/LocationSharing/MapView/View/UserLocationAnnotationView.swift
+15 -1
View File
@@ -48,7 +48,11 @@ class LocationAnnotationView: MGLUserLocationAnnotationView {
addUserMarkerView(with: userLocationAnnotation.avatarData)
}
convenience init(userPinLocationAnnotation: MGLAnnotation) {
self.init(annotation: userPinLocationAnnotation, reuseIdentifier: "userPinLocation")
addPinView()
}
convenience init(pinLocationAnnotation: PinLocationAnnotation) {
// TODO: Use a reuseIdentifier
self.init(annotation: pinLocationAnnotation, reuseIdentifier: nil)
@@ -74,6 +78,16 @@ class LocationAnnotationView: MGLUserLocationAnnotationView {
addMarkerView(avatarMarkerView)
}
private func addPinView() {
guard let pinView = UIHostingController(rootView: Image(uiImage: Asset.Images.locationMarkerIcon.image)
.resizable()
.foregroundColor(theme.colors.accent)).view else {
return
}
addMarkerView(pinView)
}
private func addPinMarkerView() {
guard let pinMarkerView = UIHostingController(rootView: LocationSharingMarkerView(backgroundColor: theme.colors.accent) {
if BWIBuildSettings.shared.bwiEnableBuMUI {