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

MESSENGER-3671 Merge FOSS 1.9.8

Browse Source 
Conflicts:
 - CommonConfiguration.swift
 - BuildSettings.swift
 - Generated/images.Swift
 - RoomMemberDetailsViewController.m
 - LiveLocationSharingViewModell
-  PinCodeEnterViewController.m
This commit is contained in:
Frank Rotermund
2022-10-05 15:47:27 +02:00
parent a06e1c000f 18f227b132
commit a561249ad6
744 changed files with 6999 additions and 3819 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/LocationSharing/StaticLocationSharingViewer/StaticLocationViewingModels.swift
+3 -4
View File
@@ -1,4 +1,4 @@
//
//
// Copyright 2021 New Vector Ltd
//
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,9 +14,9 @@
// limitations under the License.
//
import Foundation
import Combine
import CoreLocation
import Foundation
// MARK: View model
@@ -33,7 +33,6 @@ enum StaticLocationViewingViewModelResult {
// MARK: View
struct StaticLocationViewingViewState: BindableState {
/// Map style URL
let mapStyleURL: URL
@@ -43,7 +42,7 @@ struct StaticLocationViewingViewState: BindableState {
/// Shared annotation to display existing location
let sharedAnnotation: LocationAnnotation
var showLoadingIndicator: Bool = false
var showLoadingIndicator = false
var shareButtonEnabled: Bool {
!showLoadingIndicator