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

5720: Fix issue with cornered buttons view

Browse Source
This commit is contained in:
MaximeE
2022-03-23 17:25:30 +01:00
parent c2c7d0f35b
commit b0a8d94a43
4 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingModels.swift
+1 -1
View File
@@ -63,7 +63,7 @@ struct LocationSharingViewState: BindableState {
var showsUserLocation: Bool = false
/// Used to hide live location sharing features until is finished
var isLiveLocationSharingEnabled: Bool
var isLiveLocationSharingEnabled: Bool = false
var shareButtonVisible: Bool {
return self.displayExistingLocation == false
RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingViewModel.swift
+1 -1
View File
@@ -35,7 +35,7 @@ class LocationSharingViewModel: LocationSharingViewModelType, LocationSharingVie
// MARK: - Setup
init(mapStyleURL: URL, avatarData: AvatarInputProtocol, location: CLLocationCoordinate2D? = nil, isLiveLocationSharingEnabled: Bool) {
init(mapStyleURL: URL, avatarData: AvatarInputProtocol, location: CLLocationCoordinate2D? = nil, isLiveLocationSharingEnabled: Bool = false) {
var userAnnotation: UserLocationAnnotation?
var annotations: [UserLocationAnnotation] = []
RiotSwiftUI/Modules/Room/LocationSharing/Test/UI/LocationSharingUITests.swift
-1
View File
@@ -33,7 +33,6 @@ class LocationSharingUITests: XCTestCase {
goToScreenWithIdentifier(MockLocationSharingScreenState.shareUserLocation.title)
XCTAssertTrue(app.buttons["Cancel"].exists)
XCTAssertTrue(app.buttons["Share"].exists)
XCTAssertTrue(app.otherElements["Map"].exists)
}
RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingView.swift
+14 -14
View File
@@ -32,21 +32,21 @@ struct LocationSharingView: View {
var body: some View {
NavigationView {
VStack(spacing: 0) {
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()
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)
VStack(spacing: 0) {
MapCreditsView()
}
if context.viewState.shareButtonVisible {
buttonsView
.cornerRadius(10)
if context.viewState.shareButtonVisible {
buttonsView
.background(theme.colors.background)
.clipShape(RoundedCornerShape(radius: 8, corners: [.topLeft, .topRight]))
}
}
}
.toolbar {