mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-22 09:32:52 +02:00
b298dedc22
Merge commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1' into feature/foss_update_1_11_19 * commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1': finish version++ version++ comments update submodule remove obsolete tests removed unused code update submodule fix Libolm removal update license macro update license Prepare for new sprint # Conflicts: # Config/AppVersion.xcconfig # IDETemplateMacros.plist # LICENSE # README.md # Riot/Categories/MXSession+Riot.m # Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift # Riot/Managers/KeyValueStorage/Extensions/Keychain.swift # Riot/Managers/KeyValueStorage/KeyValueStore.swift # Riot/Managers/KeyValueStorage/KeychainStore.swift # Riot/Managers/KeyValueStorage/MemoryStore.swift # Riot/Managers/PushNotification/PushNotificationService.m # Riot/Managers/Settings/RiotSettings.swift # Riot/Managers/Settings/Shared/RiotSharedSettings.swift # Riot/Modules/Analytics/AnalyticsUIElement.swift # Riot/Modules/Application/AppCoordinator.swift # Riot/Modules/Application/LegacyAppDelegate.h # Riot/Modules/Application/LegacyAppDelegate.m # Riot/Modules/Authentication/Legacy/AuthenticationViewController.h # Riot/Modules/Authentication/Legacy/AuthenticationViewController.m # Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h # Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m # Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m # Riot/Modules/Common/Recents/RecentsViewController.m # Riot/Modules/Common/WebViewController/WebViewViewController.m # Riot/Modules/Contacts/Details/ContactDetailsViewController.m # Riot/Modules/Contacts/Views/ContactTableViewCell.m # Riot/Modules/Favorites/FavouritesViewController.h # Riot/Modules/Favorites/FavouritesViewController.m # Riot/Modules/GlobalSearch/UnifiedSearchViewController.m # Riot/Modules/People/PeopleViewController.h # Riot/Modules/People/PeopleViewController.m # Riot/Modules/Room/ContextualMenu/ReactionsMenu/ReactionsMenuViewModel.swift # Riot/Modules/Room/DataSources/RoomDataSource.m # Riot/Modules/Room/Files/RoomFilesViewController.m # Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m # Riot/Modules/Room/Members/RoomParticipantsViewController.m # Riot/Modules/Room/RoomViewController.m # Riot/Modules/Room/Settings/RoomSettingsViewController.m # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCell.swift # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCellContentView.swift # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroViewData.swift # Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h # Riot/Modules/Rooms/RoomsViewController.h # Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.swift # Riot/Modules/Rooms/ShowDirectory/Cells/Room/DirectoryRoomTableViewCell.swift # Riot/Modules/Rooms/ShowDirectory/PublicRoomsDirectoryViewModel.swift # Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyCoordinator.swift # Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyViewController.swift # Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseCoordinator.swift # Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseViewController.swift # Riot/Modules/Secrets/Recover/SecretsRecoveryCoordinator.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModel.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModelType.swift # Riot/Modules/SetPinCode/PinCodePreferences.swift # Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift # Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m # Riot/Modules/Settings/Security/SecurityViewController.m # Riot/Modules/Settings/SettingsViewController.m # Riot/Modules/SplitView/SplitViewCoordinator.swift # Riot/Modules/SplitView/SplitViewCoordinatorType.swift # Riot/Modules/StartChat/StartChatViewController.m # Riot/Modules/TabBar/MasterTabBarController.h # Riot/Modules/TabBar/MasterTabBarController.m # Riot/Utils/EventFormatter.m # Riot/Utils/HTMLFormatter.swift # Riot/Utils/Tools.m # RiotNSE/NotificationService.swift
175 lines
5.8 KiB
Swift
175 lines
5.8 KiB
Swift
//
|
|
// Copyright 2021-2024 New Vector Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only
|
|
// Please see LICENSE in the repository root for full details.
|
|
//
|
|
|
|
import SwiftUI
|
|
|
|
struct UIKitTextInputConfiguration {
|
|
var keyboardType: UIKeyboardType = .default
|
|
var returnKeyType: UIReturnKeyType = .default
|
|
var isSecureTextEntry = false
|
|
var autocapitalizationType: UITextAutocapitalizationType = .sentences
|
|
var autocorrectionType: UITextAutocorrectionType = .default
|
|
}
|
|
|
|
struct ThemableTextField: UIViewRepresentable {
|
|
// MARK: Properties
|
|
|
|
@State var placeholder: String?
|
|
@Binding var text: String
|
|
@State var configuration = UIKitTextInputConfiguration()
|
|
@Binding var isSecureTextVisible: Bool
|
|
var onEditingChanged: ((_ edit: Bool) -> Void)?
|
|
var onCommit: (() -> Void)?
|
|
|
|
// MARK: Private
|
|
|
|
@Environment(\.theme) private var theme: ThemeSwiftUI
|
|
|
|
private let textField = UITextField()
|
|
private let internalParams = InternalParams()
|
|
|
|
// MARK: Setup
|
|
|
|
init(placeholder: String? = nil,
|
|
text: Binding<String>,
|
|
configuration: UIKitTextInputConfiguration = UIKitTextInputConfiguration(),
|
|
isSecureTextVisible: Binding<Bool> = .constant(false),
|
|
onEditingChanged: ((_ edit: Bool) -> Void)? = nil,
|
|
onCommit: (() -> Void)? = nil) {
|
|
_text = text
|
|
_placeholder = State(initialValue: placeholder)
|
|
_configuration = State(initialValue: configuration)
|
|
_isSecureTextVisible = isSecureTextVisible
|
|
self.onEditingChanged = onEditingChanged
|
|
self.onCommit = onCommit
|
|
|
|
ResponderManager.register(view: textField)
|
|
}
|
|
|
|
// MARK: UIViewRepresentable
|
|
|
|
func makeUIView(context: Context) -> UITextField {
|
|
textField.delegate = context.coordinator
|
|
textField.setContentHuggingPriority(.defaultHigh, for: .vertical)
|
|
textField.setContentHuggingPriority(.defaultLow, for: .horizontal)
|
|
textField.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
|
|
textField.text = text
|
|
|
|
textField.addTarget(context.coordinator, action: #selector(Coordinator.textFieldEditingChanged(sender:)), for: .editingChanged)
|
|
|
|
if internalParams.isFirstResponder {
|
|
textField.becomeFirstResponder()
|
|
}
|
|
|
|
return textField
|
|
}
|
|
|
|
func updateUIView(_ uiView: UITextField, context: Context) {
|
|
uiView.backgroundColor = .clear
|
|
uiView.font = UIFont.preferredFont(forTextStyle: .callout)
|
|
uiView.textColor = UIColor(theme.colors.primaryContent)
|
|
uiView.tintColor = UIColor(theme.colors.accent)
|
|
|
|
if uiView.text != text {
|
|
uiView.text = text
|
|
}
|
|
uiView.placeholder = placeholder
|
|
|
|
uiView.keyboardType = configuration.keyboardType
|
|
uiView.returnKeyType = configuration.returnKeyType
|
|
uiView.isSecureTextEntry = configuration.isSecureTextEntry ? !isSecureTextVisible : false
|
|
uiView.autocapitalizationType = configuration.autocapitalizationType
|
|
uiView.autocorrectionType = configuration.autocorrectionType
|
|
}
|
|
|
|
static func dismantleUIView(_ uiView: UITextField, coordinator: Coordinator) {
|
|
ResponderManager.unregister(view: uiView)
|
|
}
|
|
|
|
// MARK: - Private
|
|
|
|
private func replaceText(with newText: String) {
|
|
text = newText
|
|
}
|
|
|
|
// MARK: - Coordinator
|
|
|
|
func makeCoordinator() -> Coordinator {
|
|
Coordinator(self)
|
|
}
|
|
|
|
class Coordinator: NSObject, UITextFieldDelegate {
|
|
var parent: ThemableTextField
|
|
|
|
init(_ parent: ThemableTextField) {
|
|
self.parent = parent
|
|
}
|
|
|
|
func textFieldDidBeginEditing(_ textField: UITextField) {
|
|
parent.onEditingChanged?(true)
|
|
}
|
|
|
|
func textFieldDidEndEditing(_ textField: UITextField) {
|
|
parent.onEditingChanged?(false)
|
|
}
|
|
|
|
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
|
|
if parent.configuration.returnKeyType != .next || !ResponderManager.makeActiveNextResponder(of: textField) {
|
|
textField.resignFirstResponder()
|
|
}
|
|
|
|
parent.onCommit?()
|
|
|
|
return true
|
|
}
|
|
|
|
@objc func textFieldEditingChanged(sender: UITextField) {
|
|
parent.replaceText(with: sender.text ?? "")
|
|
if let text = sender.text, !text.isEmpty {
|
|
sender.accessibilityLabel = text
|
|
} else {
|
|
sender.accessibilityLabel = sender.placeholder ?? ""
|
|
}
|
|
}
|
|
}
|
|
|
|
private class InternalParams {
|
|
var isFirstResponder = false
|
|
}
|
|
}
|
|
|
|
// MARK: - modifiers
|
|
|
|
extension ThemableTextField {
|
|
func makeFirstResponder() -> ThemableTextField {
|
|
makeFirstResponder(true)
|
|
}
|
|
|
|
func makeFirstResponder(_ isFirstResponder: Bool) -> ThemableTextField {
|
|
internalParams.isFirstResponder = isFirstResponder
|
|
return self
|
|
}
|
|
|
|
/// Adds a button button to the text field
|
|
/// - Parameters:
|
|
/// - show: A boolean that can be used to dynamically show/hide the button. Defaults to `true`.
|
|
/// - alignment: The vertical alignment of the button in the text field. Default to `center`
|
|
@ViewBuilder
|
|
func addButton(_ show: Bool, alignment: VerticalAlignment = .center) -> some View {
|
|
if show, configuration.isSecureTextEntry {
|
|
modifier(PasswordButtonModifier(text: text,
|
|
isSecureTextVisible: $isSecureTextVisible,
|
|
alignment: alignment))
|
|
} else if show {
|
|
modifier(ClearViewModifier(alignment: alignment,
|
|
text: $text))
|
|
} else {
|
|
self
|
|
}
|
|
}
|
|
}
|