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
194 lines
5.8 KiB
Swift
194 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 MultilineTextField: View {
|
|
@Environment(\.theme) private var theme: ThemeSwiftUI
|
|
|
|
@Binding private var text: String
|
|
@State private var dynamicHeight: CGFloat = 100
|
|
@State private var isEditing = false
|
|
|
|
private var placeholder = ""
|
|
|
|
private var showingPlaceholder: Bool {
|
|
text.isEmpty
|
|
}
|
|
|
|
init(_ placeholder: String, text: Binding<String>) {
|
|
self.placeholder = placeholder
|
|
_text = text
|
|
}
|
|
|
|
private var textColor: Color {
|
|
if theme.identifier == ThemeIdentifier.dark {
|
|
return theme.colors.primaryContent
|
|
} else {
|
|
return theme.colors.primaryContent
|
|
}
|
|
}
|
|
|
|
private var backgroundColor: Color {
|
|
theme.colors.background
|
|
}
|
|
|
|
private var placeholderColor: Color {
|
|
theme.colors.tertiaryContent
|
|
}
|
|
|
|
private var borderColor: Color {
|
|
if isEditing {
|
|
return Color(ThemeService.shared().theme.tintColor)
|
|
}
|
|
|
|
return theme.colors.quarterlyContent
|
|
}
|
|
|
|
private var borderWidth: CGFloat {
|
|
isEditing ? 2.0 : 1.5
|
|
}
|
|
|
|
var body: some View {
|
|
let rect = RoundedRectangle(cornerRadius: 8.0)
|
|
return UITextViewWrapper(text: $text, calculatedHeight: $dynamicHeight, isEditing: $isEditing)
|
|
.frame(minHeight: dynamicHeight, maxHeight: dynamicHeight)
|
|
.padding(4.0)
|
|
.background(placeholderView, alignment: .topLeading)
|
|
.animation(.none)
|
|
.background(backgroundColor)
|
|
.clipShape(rect)
|
|
.overlay(rect.stroke(borderColor, lineWidth: borderWidth))
|
|
.introspectTextView { textView in
|
|
textView.textColor = UIColor(textColor)
|
|
textView.font = theme.fonts.uiFonts.callout
|
|
}
|
|
}
|
|
|
|
@ViewBuilder
|
|
private var placeholderView: some View {
|
|
if showingPlaceholder {
|
|
Text(placeholder)
|
|
.foregroundColor(placeholderColor)
|
|
.font(theme.fonts.callout)
|
|
.padding(.leading, 8.0)
|
|
.padding(.top, 12.0)
|
|
}
|
|
}
|
|
}
|
|
|
|
private struct UITextViewWrapper: UIViewRepresentable {
|
|
typealias UIViewType = UITextView
|
|
|
|
@Binding var text: String
|
|
@Binding var calculatedHeight: CGFloat
|
|
@Binding var isEditing: Bool
|
|
|
|
func makeUIView(context: UIViewRepresentableContext<UITextViewWrapper>) -> UITextView {
|
|
let textView = UITextView()
|
|
textView.delegate = context.coordinator
|
|
|
|
textView.isEditable = true
|
|
textView.font = UIFont.preferredFont(forTextStyle: .body)
|
|
textView.isSelectable = true
|
|
textView.isUserInteractionEnabled = true
|
|
textView.isScrollEnabled = false
|
|
textView.backgroundColor = UIColor.clear
|
|
textView.returnKeyType = .done
|
|
|
|
textView.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
|
|
return textView
|
|
}
|
|
|
|
func updateUIView(_ uiView: UITextView, context: UIViewRepresentableContext<UITextViewWrapper>) {
|
|
if uiView.text != text {
|
|
uiView.text = text
|
|
}
|
|
|
|
UITextViewWrapper.recalculateHeight(view: uiView, result: $calculatedHeight)
|
|
}
|
|
|
|
fileprivate static func recalculateHeight(view: UIView, result: Binding<CGFloat>) {
|
|
let newSize = view.sizeThatFits(CGSize(width: view.frame.size.width, height: CGFloat.greatestFiniteMagnitude))
|
|
if result.wrappedValue != newSize.height {
|
|
DispatchQueue.main.async {
|
|
result.wrappedValue = newSize.height // !! must be called asynchronously
|
|
}
|
|
}
|
|
}
|
|
|
|
func makeCoordinator() -> Coordinator {
|
|
Coordinator(text: $text, height: $calculatedHeight, isEditing: $isEditing)
|
|
}
|
|
|
|
final class Coordinator: NSObject, UITextViewDelegate {
|
|
var text: Binding<String>
|
|
var calculatedHeight: Binding<CGFloat>
|
|
var isEditing: Binding<Bool>
|
|
|
|
init(text: Binding<String>, height: Binding<CGFloat>, isEditing: Binding<Bool>) {
|
|
self.text = text
|
|
calculatedHeight = height
|
|
self.isEditing = isEditing
|
|
}
|
|
|
|
func textViewDidChange(_ uiView: UITextView) {
|
|
text.wrappedValue = uiView.text
|
|
UITextViewWrapper.recalculateHeight(view: uiView, result: calculatedHeight)
|
|
}
|
|
|
|
func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
|
|
if text == "\n" {
|
|
textView.resignFirstResponder()
|
|
return false
|
|
}
|
|
|
|
return true
|
|
}
|
|
|
|
func textViewDidBeginEditing(_ textView: UITextView) {
|
|
isEditing.wrappedValue = true
|
|
}
|
|
|
|
func textViewDidEndEditing(_ textView: UITextView) {
|
|
isEditing.wrappedValue = false
|
|
}
|
|
}
|
|
}
|
|
|
|
struct MultilineTextField_Previews: PreviewProvider {
|
|
static var previews: some View {
|
|
Group {
|
|
VStack {
|
|
PreviewWrapper()
|
|
PlaceholderPreviewWrapper()
|
|
PreviewWrapper()
|
|
.theme(ThemeIdentifier.dark)
|
|
PlaceholderPreviewWrapper()
|
|
.theme(ThemeIdentifier.dark)
|
|
}
|
|
}
|
|
.padding()
|
|
}
|
|
|
|
struct PreviewWrapper: View {
|
|
@State(initialValue: "123") var text: String
|
|
|
|
var body: some View {
|
|
MultilineTextField("Placeholder", text: $text)
|
|
}
|
|
}
|
|
|
|
struct PlaceholderPreviewWrapper: View {
|
|
@State(initialValue: "") var text: String
|
|
|
|
var body: some View {
|
|
MultilineTextField("Placeholder", text: $text)
|
|
}
|
|
}
|
|
}
|