mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-23 10:02:46 +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
213 lines
7.9 KiB
Swift
213 lines
7.9 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 DSBottomSheet
|
|
import SwiftUI
|
|
|
|
struct LiveLocationSharingViewer: View {
|
|
// MARK: - Properties
|
|
|
|
// MARK: Private
|
|
|
|
@Environment(\.theme) private var theme: ThemeSwiftUI
|
|
|
|
@Environment(\.openURL) var openURL
|
|
|
|
@State private var isBottomSheetExpanded = false
|
|
|
|
var bottomSheetCollapsedHeight: CGFloat = 150.0
|
|
|
|
// MARK: Public
|
|
|
|
@ObservedObject var viewModel: LiveLocationSharingViewerViewModel.Context
|
|
|
|
var mapView: LocationSharingMapView {
|
|
LocationSharingMapView(tileServerMapURL: viewModel.viewState.mapStyleURL,
|
|
annotations: viewModel.viewState.annotations,
|
|
highlightedAnnotation: viewModel.viewState.highlightedAnnotation,
|
|
userAvatarData: nil,
|
|
showsUserLocationMode: viewModel.viewState.showsUserLocationMode,
|
|
userAnnotationCanShowCallout: true,
|
|
userLocation: Binding.constant(nil),
|
|
mapCenterCoordinate: Binding.constant(nil),
|
|
onCalloutTap: { annotation in
|
|
if let userLocationAnnotation = annotation as? UserLocationAnnotation {
|
|
viewModel.send(viewAction: .share(userLocationAnnotation))
|
|
}
|
|
},
|
|
errorSubject: viewModel.viewState.errorSubject)
|
|
}
|
|
|
|
var body: some View {
|
|
ZStack(alignment: .bottom) {
|
|
if !viewModel.viewState.showMapLoadingError {
|
|
|
|
if !viewModel.viewState.isCurrentUserShared {
|
|
mapView
|
|
.overlay(CenterToUserLocationButton(action: {
|
|
viewModel.send(viewAction: .showUserLocation)
|
|
}).offset(x: -11.0, y: 52), alignment: .topTrailing)
|
|
} else {
|
|
mapView
|
|
}
|
|
|
|
// Show map credits above collapsed bottom sheet height if bottom sheet is visible
|
|
if viewModel.viewState.isBottomSheetVisible {
|
|
VStack(alignment: .center) {
|
|
Spacer()
|
|
// bwi #5379: we don't use live location sharing, if this changes we need to use attribution from viewmodel here
|
|
MapCreditsView(attributions: LocationSharingAttribution(),
|
|
action: {
|
|
viewModel.send(viewAction: .mapCreditsDidTap)
|
|
})
|
|
.offset(y: -bottomSheetCollapsedHeight) // Put the copyright action above the collapsed bottom sheet
|
|
.padding(.bottom, 10)
|
|
}
|
|
.ignoresSafeArea()
|
|
}
|
|
|
|
} else {
|
|
MapLoadingErrorView()
|
|
.padding(.bottom, viewModel.viewState.isBottomSheetVisible ? bottomSheetCollapsedHeight : 0)
|
|
}
|
|
|
|
if viewModel.viewState.isAllLocationSharingEnded {
|
|
VStack(alignment: .center) {
|
|
Spacer()
|
|
|
|
// Show map credits only if map is visible
|
|
if !viewModel.viewState.showMapLoadingError {
|
|
MapCreditsView(attributions:LocationSharingAttribution(),
|
|
action: {
|
|
viewModel.send(viewAction: .mapCreditsDidTap)
|
|
})
|
|
.padding(.bottom, 5)
|
|
}
|
|
|
|
HStack(spacing: 10) {
|
|
Image(uiImage: Asset.Images.locationLiveCellIcon.image)
|
|
.renderingMode(.template)
|
|
.foregroundColor(theme.colors.quarterlyContent)
|
|
.frame(width: 40, height: 40)
|
|
Text(VectorL10n.liveLocationSharingEnded)
|
|
.font(theme.fonts.body)
|
|
.foregroundColor(theme.colors.tertiaryContent)
|
|
}
|
|
.frame(maxWidth: .infinity, alignment: .leading)
|
|
.padding(.vertical, 10)
|
|
.padding(.horizontal, 15)
|
|
.background(theme.colors.background.ignoresSafeArea())
|
|
}
|
|
}
|
|
}
|
|
.navigationTitle(VectorL10n.locationSharingLiveViewerTitle)
|
|
.toolbar {
|
|
ToolbarItem(placement: .cancellationAction) {
|
|
Button(VectorL10n.close) {
|
|
viewModel.send(viewAction: .done)
|
|
}
|
|
}
|
|
}
|
|
.accentColor(theme.colors.accent)
|
|
.background(theme.colors.system.ignoresSafeArea())
|
|
.bottomSheet(sheet, if: viewModel.viewState.isBottomSheetVisible)
|
|
.actionSheet(isPresented: $viewModel.showMapCreditsSheet) {
|
|
MapCreditsActionSheet(
|
|
attribution: LocationSharingAttribution(),
|
|
openURL: { url in
|
|
UIApplication.shared.vc_open(url, completionHandler: nil)
|
|
}).sheet
|
|
}
|
|
.alert(item: $viewModel.alertInfo) { info in
|
|
info.alert
|
|
}
|
|
.activityIndicator(show: viewModel.viewState.showLoadingIndicator)
|
|
}
|
|
|
|
var userLocationList: some View {
|
|
ScrollView {
|
|
VStack(alignment: .leading, spacing: 14) {
|
|
ForEach(viewModel.viewState.listItemsViewData) { viewData in
|
|
LiveLocationListItem(viewData: viewData, onStopSharingAction: {
|
|
viewModel.send(viewAction: .stopSharing)
|
|
}, onBackgroundTap: { userId in
|
|
// Push bottom sheet down on item tap
|
|
isBottomSheetExpanded = false
|
|
viewModel.send(viewAction: .tapListItem(userId))
|
|
})
|
|
}
|
|
}
|
|
.padding()
|
|
}
|
|
.background(theme.colors.background.ignoresSafeArea())
|
|
}
|
|
}
|
|
|
|
// MARK: - Bottom sheet
|
|
|
|
extension LiveLocationSharingViewer {
|
|
var sheetStyle: BottomSheetStyle {
|
|
var bottomSheetStyle = BottomSheetStyle.standard
|
|
|
|
bottomSheetStyle.snapRatio = 0.16
|
|
|
|
let backgroundColor = theme.colors.background
|
|
|
|
let handleStyle = BottomSheetHandleStyle(backgroundColor: backgroundColor, dividerColor: backgroundColor)
|
|
bottomSheetStyle.handleStyle = handleStyle
|
|
|
|
return bottomSheetStyle
|
|
}
|
|
|
|
var sheet: some BottomSheetView {
|
|
BottomSheet(
|
|
isExpanded: $isBottomSheetExpanded,
|
|
minHeight: .points(bottomSheetCollapsedHeight),
|
|
maxHeight: .available,
|
|
style: sheetStyle
|
|
) {
|
|
userLocationList
|
|
}
|
|
}
|
|
}
|
|
|
|
// MARK: - Previews
|
|
|
|
struct LiveLocationSharingViewer_Previews: PreviewProvider {
|
|
static let stateRenderer = MockLiveLocationSharingViewerScreenState.stateRenderer
|
|
static var previews: some View {
|
|
Group {
|
|
stateRenderer.screenGroup().theme(.light).preferredColorScheme(.light)
|
|
stateRenderer.screenGroup().theme(.dark).preferredColorScheme(.dark)
|
|
}
|
|
}
|
|
}
|
|
|
|
struct CenterToUserLocationButton: View {
|
|
|
|
// MARK: Private
|
|
|
|
@Environment(\.theme) private var theme: ThemeSwiftUI
|
|
|
|
// MARK: Public
|
|
|
|
var action: () -> Void
|
|
|
|
var body: some View {
|
|
Button {
|
|
action()
|
|
} label: {
|
|
Image(uiImage: Asset.Images.locationCenterMapIcon.image)
|
|
.foregroundColor(theme.colors.accent)
|
|
}
|
|
.padding(8.0)
|
|
.background(theme.colors.background)
|
|
.clipShape(Circle())
|
|
.shadow(radius: 2.0)
|
|
}
|
|
}
|