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

chore: FOSS Merge 1.27.11 (MESSENGER-7276)

Browse Source 
Merge commit 'af0b6d4be985d9f26e5111d3fa01389c7321949f' into feature/7276_FOSS_Merge_1_27_11

# Conflicts:
#	Config/AppVersion.xcconfig
#	Gemfile.lock
#	IDETemplateMacros.plist
#	Podfile
#	Podfile.lock
#	README.md
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Room/CellData/RoomBubbleCellData.m
#	Riot/target.yml
#	RiotNSE/NotificationService.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionModels.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionViewModel.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/Coordinator/AuthenticationServerSelectionCoordinator.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/View/AuthenticationServerSelectionScreen.swift
#	RiotSwiftUI/Modules/Room/CompletionSuggestion/Service/CompletionSuggestionService.swift
#	fastlane/Fastfile
This commit is contained in:
Frank Rotermund
2025-05-16 14:06:20 +02:00
parent 66f0fcb9ae 17ceee7628
commit 67df1a3e95
1482 changed files with 6390 additions and 3080 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionModels.swift
+15 -4
View File
@@ -1,8 +1,8 @@
//
// Copyright 2021-2024 New Vector Ltd.
//
// SPDX-License-Identifier: AGPL-3.0-only
// Please see LICENSE in the repository root for full details.
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
// Please see LICENSE files in the repository root for full details.
//
import Foundation
@@ -14,15 +14,22 @@ enum AuthenticationServerSelectionViewModelResult {
case confirm(homeserverAddress: String)
/// Dismiss the view without using the entered address.
case dismiss
/// Show the app store page for the replacement app.
case downloadReplacementApp(BuildSettings.ReplacementApp)
}
// MARK: View
struct AuthenticationServerSelectionViewState: BindableState {
enum FooterError: Equatable {
case message(String)
case sunsetBanner
}
/// View state that can be bound to from SwiftUI.
var bindings: AuthenticationServerSelectionBindings
/// An error message to be shown in the text field footer.
var footerErrorMessage: String?
var footerError: FooterError?
/// The flow that the screen is being used for.
let flow: AuthenticationFlow
/// Whether the screen is presented modally or within a navigation stack.
@@ -48,7 +55,7 @@ struct AuthenticationServerSelectionViewState: BindableState {
/// The text field is showing an error.
var isShowingFooterError: Bool {
footerErrorMessage != nil
footerError != nil
}
/// Whether it is possible to continue when tapping the confirmation button.
@@ -76,6 +83,8 @@ enum AuthenticationServerSelectionViewAction {
case dismiss
/// Clear any errors shown in the text field footer.
case clearFooterError
/// Show the app store page for the replacement app.
case downloadReplacementApp(BuildSettings.ReplacementApp)
}
enum AuthenticationServerSelectionErrorType: Hashable {
@@ -85,4 +94,6 @@ enum AuthenticationServerSelectionErrorType: Hashable {
case openURLAlert
/// bwi: When an invalid or nonexisting server is selected at login an info message is displayed
case openInvalidServerInfo
/// An error message shown alongside a marketing banner to download the replacement app.
case requiresReplacementApp
}