mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-23 01:52:44 +02:00
b298dedc22
Merge commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1' into feature/foss_update_1_11_19 * commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1': finish version++ version++ comments update submodule remove obsolete tests removed unused code update submodule fix Libolm removal update license macro update license Prepare for new sprint # Conflicts: # Config/AppVersion.xcconfig # IDETemplateMacros.plist # LICENSE # README.md # Riot/Categories/MXSession+Riot.m # Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift # Riot/Managers/KeyValueStorage/Extensions/Keychain.swift # Riot/Managers/KeyValueStorage/KeyValueStore.swift # Riot/Managers/KeyValueStorage/KeychainStore.swift # Riot/Managers/KeyValueStorage/MemoryStore.swift # Riot/Managers/PushNotification/PushNotificationService.m # Riot/Managers/Settings/RiotSettings.swift # Riot/Managers/Settings/Shared/RiotSharedSettings.swift # Riot/Modules/Analytics/AnalyticsUIElement.swift # Riot/Modules/Application/AppCoordinator.swift # Riot/Modules/Application/LegacyAppDelegate.h # Riot/Modules/Application/LegacyAppDelegate.m # Riot/Modules/Authentication/Legacy/AuthenticationViewController.h # Riot/Modules/Authentication/Legacy/AuthenticationViewController.m # Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h # Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m # Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m # Riot/Modules/Common/Recents/RecentsViewController.m # Riot/Modules/Common/WebViewController/WebViewViewController.m # Riot/Modules/Contacts/Details/ContactDetailsViewController.m # Riot/Modules/Contacts/Views/ContactTableViewCell.m # Riot/Modules/Favorites/FavouritesViewController.h # Riot/Modules/Favorites/FavouritesViewController.m # Riot/Modules/GlobalSearch/UnifiedSearchViewController.m # Riot/Modules/People/PeopleViewController.h # Riot/Modules/People/PeopleViewController.m # Riot/Modules/Room/ContextualMenu/ReactionsMenu/ReactionsMenuViewModel.swift # Riot/Modules/Room/DataSources/RoomDataSource.m # Riot/Modules/Room/Files/RoomFilesViewController.m # Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m # Riot/Modules/Room/Members/RoomParticipantsViewController.m # Riot/Modules/Room/RoomViewController.m # Riot/Modules/Room/Settings/RoomSettingsViewController.m # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCell.swift # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCellContentView.swift # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroViewData.swift # Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h # Riot/Modules/Rooms/RoomsViewController.h # Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.swift # Riot/Modules/Rooms/ShowDirectory/Cells/Room/DirectoryRoomTableViewCell.swift # Riot/Modules/Rooms/ShowDirectory/PublicRoomsDirectoryViewModel.swift # Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyCoordinator.swift # Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyViewController.swift # Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseCoordinator.swift # Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseViewController.swift # Riot/Modules/Secrets/Recover/SecretsRecoveryCoordinator.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModel.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModelType.swift # Riot/Modules/SetPinCode/PinCodePreferences.swift # Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift # Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m # Riot/Modules/Settings/Security/SecurityViewController.m # Riot/Modules/Settings/SettingsViewController.m # Riot/Modules/SplitView/SplitViewCoordinator.swift # Riot/Modules/SplitView/SplitViewCoordinatorType.swift # Riot/Modules/StartChat/StartChatViewController.m # Riot/Modules/TabBar/MasterTabBarController.h # Riot/Modules/TabBar/MasterTabBarController.m # Riot/Utils/EventFormatter.m # Riot/Utils/HTMLFormatter.swift # Riot/Utils/Tools.m # RiotNSE/NotificationService.swift
108 lines
3.4 KiB
Swift
108 lines
3.4 KiB
Swift
//
|
|
// Copyright 2021-2024 New Vector Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only
|
|
// Please see LICENSE in the repository root for full details.
|
|
//
|
|
|
|
import Foundation
|
|
import Mapbox
|
|
import SwiftUI
|
|
|
|
class LocationAnnotationView: MGLUserLocationAnnotationView {
|
|
// MARK: - Constants
|
|
|
|
private enum Constants {
|
|
static let defaultFrame = CGRect(x: 0, y: 0, width: 46, height: 46)
|
|
}
|
|
|
|
// MARK: Private
|
|
|
|
@Environment(\.theme) private var theme: ThemeSwiftUI
|
|
|
|
// MARK: - Setup
|
|
|
|
override init(annotation: MGLAnnotation?, reuseIdentifier: String?) {
|
|
super.init(annotation: annotation, reuseIdentifier:
|
|
reuseIdentifier)
|
|
frame = Constants.defaultFrame
|
|
}
|
|
|
|
convenience init(avatarData: AvatarInputProtocol) {
|
|
self.init(annotation: nil, reuseIdentifier: nil)
|
|
addUserMarkerView(with: avatarData)
|
|
}
|
|
|
|
convenience init(userLocationAnnotation: UserLocationAnnotation) {
|
|
// TODO: Use a reuseIdentifier
|
|
self.init(annotation: userLocationAnnotation, reuseIdentifier: nil)
|
|
|
|
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)
|
|
|
|
addPinMarkerView()
|
|
}
|
|
|
|
@available(*, unavailable)
|
|
required init?(coder: NSCoder) {
|
|
fatalError()
|
|
}
|
|
|
|
// MARK: - Private
|
|
|
|
private func addUserMarkerView(with avatarData: AvatarInputProtocol) {
|
|
guard let avatarMarkerView = UIHostingController(rootView: LocationSharingMarkerView(backgroundColor: theme.userColor(for: avatarData.matrixItemId)) {
|
|
AvatarImage(avatarData: avatarData, size: .medium)
|
|
.border()
|
|
}).view else {
|
|
return
|
|
}
|
|
|
|
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 {
|
|
Image(uiImage: Asset.Images.locationPinIconBum.image)
|
|
.resizable()
|
|
.shapedBorder(color: Color(ThemeService.shared().theme.tintColor), borderWidth: 3, shape: Circle())
|
|
} else {
|
|
Image(uiImage: Asset.Images.locationPinIcon.image)
|
|
.resizable()
|
|
.shapedBorder(color: Color(ThemeService.shared().theme.tintColor), borderWidth: 3, shape: Circle())
|
|
}
|
|
}).view else {
|
|
return
|
|
}
|
|
|
|
addMarkerView(pinMarkerView)
|
|
}
|
|
|
|
private func addMarkerView(_ markerView: UIView) {
|
|
markerView.backgroundColor = .clear
|
|
|
|
addSubview(markerView)
|
|
|
|
markerView.frame = bounds
|
|
}
|
|
}
|