chore: FOSS Merge 1.27.11 (MESSENGER-7276)

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
1482 changed files with 6390 additions and 3080 deletions
@@ -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 SwiftUI
@@ -145,14 +145,10 @@ struct AuthenticationServerSelectionScreen: View {
var serverForm: some View {
VStack(alignment: .leading, spacing: 12) {
VStack(spacing: 8) {
if #available(iOS 15.0, *) {
textField
.onSubmit(submit)
} else {
textField
}
textField
.onSubmit(submit)
if let errorMessage = viewModel.viewState.footerErrorMessage {
if case let .message(errorMessage) = viewModel.viewState.footerError {
Text(errorMessage)
.font(theme.fonts.footnote)
.foregroundColor(textFieldFooterColor)
@@ -170,7 +166,6 @@ struct AuthenticationServerSelectionScreen: View {
}
}
/// The text field, extracted for iOS 15 modifiers to be applied.
var textField: some View {
TextField(BWIL10n.authenticationServerSelectionServerUrl, text: $viewModel.homeserverAddress) {
isEditingTextField = $0
@@ -184,6 +179,23 @@ struct AuthenticationServerSelectionScreen: View {
.accessibilityIdentifier("addressTextField")
}
@ViewBuilder
var sunsetBanners: some View {
if viewModel.viewState.footerError == .sunsetBanner, let replacementApp = BuildSettings.replacementApp {
VStack(spacing: 16) {
SunsetOIDCRegistrationBanner(homeserverAddress: viewModel.homeserverAddress,
replacementApp: replacementApp)
SunsetDownloadBanner(replacementApp: replacementApp) {
viewModel.send(viewAction: .downloadReplacementApp(replacementApp))
}
}
.padding(.vertical, 4)
.padding(.bottom, 16)
.accessibilityIdentifier("sunsetBanners")
}
}
@ToolbarContentBuilder
var toolbar: some ToolbarContent {
ToolbarItem(placement: .cancellationAction) {