felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-02 06:06:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into steve/5723_lls_screen

Browse Source 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/ShareLocationActivityController.swift
#	RiotSwiftUI/Modules/Room/LocationSharing/MapViewErrorAlertInfoBuilder.swift
This commit is contained in:
SBiOSoftWhare
2022-04-22 12:15:34 +02:00
parent 1d8611b397 d23ac4e7c5
commit b14b74e81b
227 changed files with 2982 additions and 1131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMapView.swift
+4 -4
View File
@@ -1,4 +1,4 @@
//
//
// Copyright 2021 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -123,12 +123,12 @@ extension LocationSharingMapView {
func mapView(_ mapView: MGLMapView, viewFor annotation: MGLAnnotation) -> MGLAnnotationView? {
if let userLocationAnnotation = annotation as? UserLocationAnnotation {
return LocationAnnotatonView(userLocationAnnotation: userLocationAnnotation)
return LocationAnnotationView(userLocationAnnotation: userLocationAnnotation)
} else if let pinLocationAnnotation = annotation as? PinLocationAnnotation {
return LocationAnnotatonView(pinLocationAnnotation: pinLocationAnnotation)
return LocationAnnotationView(pinLocationAnnotation: pinLocationAnnotation)
} else if annotation is MGLUserLocation && locationSharingMapView.mapCenterCoordinate == nil, let currentUserAvatarData = locationSharingMapView.userAvatarData {
// Replace default current location annotation view with a UserLocationAnnotatonView when the map is center on user location
return LocationAnnotatonView(avatarData: currentUserAvatarData)
return LocationAnnotationView(avatarData: currentUserAvatarData)
}
return nil
RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift
+4 -17
View File
@@ -36,11 +36,9 @@ struct LocationSharingView: View {
mapView
VStack(spacing: 0) {
MapCreditsView()
if context.viewState.shareButtonVisible {
buttonsView
.background(theme.colors.background)
.clipShape(RoundedCornerShape(radius: 8, corners: [.topLeft, .topRight]))
}
buttonsView
.background(theme.colors.background)
.clipShape(RoundedCornerShape(radius: 8, corners: [.topLeft, .topRight]))
}
}
.toolbar {
@@ -54,17 +52,6 @@ struct LocationSharingView: View {
.font(.headline)
.foregroundColor(theme.colors.primaryContent)
}
ToolbarItem(placement: .navigationBarTrailing) {
if context.viewState.displayExistingLocation {
Button {
context.send(viewAction: .share)
} label: {
Image(uiImage: Asset.Images.locationShareIcon.image)
.accessibilityIdentifier("LocationSharingView.shareButton")
}
.disabled(!context.viewState.shareButtonEnabled)
}
}
}
.navigationBarTitleDisplayMode(.inline)
.introspectNavigationController { navigationController in
@@ -125,7 +112,7 @@ struct LocationSharingView: View {
// Hide for now until live location sharing is finished
if context.viewState.isLiveLocationSharingEnabled {
LocationSharingOptionButton(text: VectorL10n.locationSharingLiveShareTitle) {
// TODO: - Start live location sharing
context.send(viewAction: .shareLiveLocation)
} buttonIcon: {
Image(uiImage: Asset.Images.locationLiveIcon.image)
.resizable()
RiotSwiftUI/Modules/Room/LocationSharing/View/UserLocationAnnotatonView.swift → RiotSwiftUI/Modules/Room/LocationSharing/View/UserLocationAnnotationView.swift
+1 -1
View File
@@ -19,7 +19,7 @@ import SwiftUI
import Mapbox
@available(iOS 14, *)
class LocationAnnotatonView: MGLUserLocationAnnotationView {
class LocationAnnotationView: MGLUserLocationAnnotationView {
// MARK: - Constants