mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-22 01:22:46 +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
138 lines
5.4 KiB
Swift
138 lines
5.4 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 RoundedBorderTextField: View {
|
|
// MARK: - Properties
|
|
|
|
var title: String?
|
|
let placeHolder: String
|
|
@Binding var text: String
|
|
var footerText: String?
|
|
var isError = false
|
|
var isFirstResponder = false
|
|
|
|
var configuration = UIKitTextInputConfiguration()
|
|
@State var isSecureTextVisible = false
|
|
|
|
var onTextChanged: ((String) -> Void)?
|
|
var onEditingChanged: ((Bool) -> Void)?
|
|
var onCommit: (() -> Void)?
|
|
|
|
// MARK: Private
|
|
|
|
@State private var isEditing = false
|
|
|
|
@Environment(\.theme) private var theme: ThemeSwiftUI
|
|
@Environment(\.isEnabled) private var isEnabled
|
|
|
|
// MARK: Public
|
|
|
|
var body: some View {
|
|
VStack(alignment: .leading, spacing: -1) {
|
|
if let title = self.title {
|
|
Text(title)
|
|
.foregroundColor(theme.colors.primaryContent)
|
|
.font(theme.fonts.subheadline)
|
|
.multilineTextAlignment(.leading)
|
|
.padding(.bottom, 8)
|
|
}
|
|
|
|
ZStack(alignment: .leading) {
|
|
if text.isEmpty {
|
|
Text(placeHolder)
|
|
.font(theme.fonts.callout)
|
|
.foregroundColor(theme.colors.tertiaryContent)
|
|
.lineLimit(1)
|
|
.accessibilityHidden(true)
|
|
}
|
|
|
|
ThemableTextField(placeholder: "",
|
|
text: $text,
|
|
configuration: configuration,
|
|
isSecureTextVisible: $isSecureTextVisible) { isEditing in
|
|
self.isEditing = isEditing
|
|
onEditingChanged?(isEditing)
|
|
} onCommit: {
|
|
onCommit?()
|
|
}
|
|
.makeFirstResponder(isFirstResponder)
|
|
.addButton(isEnabled)
|
|
.onChange(of: text) { newText in
|
|
onTextChanged?(newText)
|
|
}
|
|
.frame(height: 30)
|
|
.allowsHitTesting(isEnabled)
|
|
.opacity(isEnabled ? 1 : 0.5)
|
|
}
|
|
.padding(EdgeInsets(top: 8, leading: 8, bottom: 8, trailing: text.isEmpty ? 8 : 0))
|
|
.background(RoundedRectangle(cornerRadius: 8).fill(theme.colors.background))
|
|
.overlay(RoundedRectangle(cornerRadius: 8).stroke(borderColor, lineWidth: borderWidth))
|
|
|
|
if let footerText = self.footerText {
|
|
Text(footerText)
|
|
.foregroundColor(isError ? theme.colors.alert : theme.colors.tertiaryContent)
|
|
.font(theme.fonts.footnote)
|
|
.multilineTextAlignment(.leading)
|
|
.padding(.top, 8)
|
|
.transition(.opacity)
|
|
}
|
|
}
|
|
.animation(.easeOut(duration: 0.2))
|
|
}
|
|
|
|
/// The text field's border color.
|
|
private var borderColor: Color {
|
|
if isEditing {
|
|
// bwi: 4769
|
|
if BWIBuildSettings.shared.useNewBumColors {
|
|
return Color(ThemeService.shared().theme.tintColor)
|
|
} else {
|
|
return Color(hex: 0x108194)
|
|
}
|
|
} else if footerText != nil, isError {
|
|
return theme.colors.alert
|
|
} else {
|
|
return theme.colors.quinaryContent
|
|
}
|
|
}
|
|
|
|
/// The text field's border width.
|
|
private var borderWidth: CGFloat {
|
|
isEditing || (footerText != nil && isError) ? 2 : 1
|
|
}
|
|
}
|
|
|
|
// MARK: - Previews
|
|
|
|
struct TextFieldWithError_Previews: PreviewProvider {
|
|
static var previews: some View {
|
|
Group {
|
|
sampleView.theme(.light).preferredColorScheme(.light)
|
|
sampleView.theme(.dark).preferredColorScheme(.dark)
|
|
}
|
|
.padding()
|
|
}
|
|
|
|
static var sampleView: some View {
|
|
VStack(alignment: .center, spacing: 20) {
|
|
RoundedBorderTextField(title: "A title", placeHolder: "A placeholder", text: .constant(""), footerText: nil, isError: false)
|
|
RoundedBorderTextField(placeHolder: "A placeholder", text: .constant("Some text"), footerText: nil, isError: false)
|
|
RoundedBorderTextField(title: "A title", placeHolder: "A placeholder", text: .constant("Some very long text used to check overlapping with the delete button"), footerText: "Some error text", isError: true)
|
|
RoundedBorderTextField(title: "A title", placeHolder: "A placeholder", text: .constant("Some very long text used to check overlapping with the delete button"), footerText: "Some normal text", isError: false)
|
|
RoundedBorderTextField(title: "A title", placeHolder: "A placeholder", text: .constant("Some very long text used to check overlapping with the delete button"), footerText: "Some normal text", isError: false)
|
|
.disabled(true)
|
|
|
|
Spacer().frame(height: 0)
|
|
|
|
RoundedBorderTextField(title: "Password", placeHolder: "Enter your password", text: .constant(""), configuration: UIKitTextInputConfiguration(isSecureTextEntry: true))
|
|
RoundedBorderTextField(title: "Password", placeHolder: "Enter your password", text: .constant("password"), configuration: UIKitTextInputConfiguration(isSecureTextEntry: true))
|
|
}
|
|
}
|
|
}
|