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

5720: Update UI in location sharing View

Browse Source
This commit is contained in:
MaximeE
2022-03-17 16:52:22 +01:00
parent d5a878ccad
commit dedc558f44
16 changed files with 241 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift
+48 -15
View File
@@ -32,16 +32,22 @@ struct LocationSharingView: View {
var body: some View {
NavigationView {
ZStack(alignment: .bottom) {
LocationSharingMapView(tileServerMapURL: context.viewState.mapStyleURL,
annotations: context.viewState.annotations,
highlightedAnnotation: context.viewState.highlightedAnnotation,
userAvatarData: context.viewState.userAvatarData,
showsUserLocation: context.viewState.showsUserLocation,
userLocation: $context.userLocation,
errorSubject: context.viewState.errorSubject)
.ignoresSafeArea()
MapCreditsView()
VStack {
ZStack(alignment: .bottom) {
LocationSharingMapView(tileServerMapURL: context.viewState.mapStyleURL,
annotations: context.viewState.annotations,
highlightedAnnotation: context.viewState.highlightedAnnotation,
userAvatarData: context.viewState.userAvatarData,
showsUserLocation: context.viewState.showsUserLocation,
userLocation: $context.userLocation,
errorSubject: context.viewState.errorSubject)
.ignoresSafeArea()
MapCreditsView()
}
if context.viewState.shareButtonVisible {
buttonsView
.cornerRadius(5)
}
}
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
@@ -63,11 +69,6 @@ struct LocationSharingView: View {
.accessibilityIdentifier("LocationSharingView.shareButton")
}
.disabled(!context.viewState.shareButtonEnabled)
} else {
Button(VectorL10n.locationSharingShareAction, action: {
context.send(viewAction: .share)
})
.disabled(!context.viewState.shareButtonEnabled)
}
}
}
@@ -84,6 +85,38 @@ struct LocationSharingView: View {
.navigationViewStyle(StackNavigationViewStyle())
}
var buttonsView: some View {
VStack(alignment: .leading, spacing: 15) {
if !context.viewState.isPinDropSharing {
LocationSharingOptionButton(text: VectorL10n.locationSharingStaticShareTitle) {
context.send(viewAction: .share)
} content: {
LocationSharingUserMarkerView(isMarker: false, avatarData: context.viewState.userAvatarData)
}
.disabled(!context.viewState.shareButtonEnabled)
// Disable for now until live location sharing is done
if BuildSettings.liveLocationSharingEnabled {
LocationSharingOptionButton(text: VectorL10n.locationSharingLiveShareTitle) {
// TODO: - Start live location sharing
} content: {
LocationSharingOptionButtonIcon(fillColor: Color.purple, image: Asset.Images.locationLiveIcon.image)
}
.disabled(!context.viewState.shareButtonEnabled)
}
} else {
LocationSharingOptionButton(text: VectorL10n.locationSharingPinDropShareTitle) {
// TODO: - Pin drop sharing action
} content: {
LocationSharingOptionButtonIcon(fillColor:
theme.colors.primaryContent, image: Asset.Images.locationMarkerIcon.image)
}
.disabled(!context.viewState.shareButtonEnabled)
}
}
.frame(maxWidth: .infinity, alignment: .leading)
.padding()
}
@ViewBuilder
private var activityIndicator: some View {
if context.viewState.showLoadingIndicator {