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

Login/Registration screen tweaks

Browse Source 
Scale SSO button icon with dynamic type.
Add an onCommit parameter to RoundedBorderTextField and use to submit instead of onEditingChanged.
This commit is contained in:
Doug
2022-05-29 10:14:14 +01:00
parent 446ddf5aeb
commit 4a2ed35658
5 changed files with 93 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Common/Util/RoundedBorderTextField.swift
+17 -25
View File
@@ -33,6 +33,7 @@ struct RoundedBorderTextField: View {
var onTextChanged: ((String) -> Void)? = nil
var onEditingChanged: ((Bool) -> Void)? = nil
var onCommit: (() -> Void)? = nil
// MARK: Private
@@ -52,6 +53,7 @@ struct RoundedBorderTextField: View {
.multilineTextAlignment(.leading)
.padding(EdgeInsets(top: 0, leading: 0, bottom: 8, trailing: 0))
}
ZStack(alignment: .leading) {
if text.isEmpty {
Text(placeHolder)
@@ -60,32 +62,22 @@ struct RoundedBorderTextField: View {
.lineLimit(1)
.accessibilityHidden(true)
}
if isEnabled {
ThemableTextField(placeholder: "", text: $text, configuration: configuration, onEditingChanged: { edit in
self.editing = edit
onEditingChanged?(edit)
})
.makeFirstResponder(isFirstResponder)
.showClearButton(text: $text)
.onChange(of: text) { newText in
onTextChanged?(newText)
}
.frame(height: 30)
.accessibilityLabel(text.isEmpty ? placeHolder : "")
} else {
ThemableTextField(placeholder: "", text: $text, configuration: configuration, onEditingChanged: { edit in
self.editing = edit
onEditingChanged?(edit)
})
.makeFirstResponder(isFirstResponder)
.onChange(of: text) { newText in
onTextChanged?(newText)
}
.frame(height: 30)
.allowsHitTesting(false)
.opacity(0.5)
.accessibilityLabel(text.isEmpty ? placeHolder : "")
ThemableTextField(placeholder: "", text: $text, configuration: configuration, onEditingChanged: { edit in
self.editing = edit
onEditingChanged?(edit)
}, onCommit: {
onCommit?()
})
.makeFirstResponder(isFirstResponder)
.showClearButton(isEnabled, text: $text)
.onChange(of: text) { newText in
onTextChanged?(newText)
}
.frame(height: 30)
.allowsHitTesting(isEnabled)
.opacity(isEnabled ? 1 : 0.5)
.accessibilityLabel(text.isEmpty ? placeHolder : "")
}
.padding(EdgeInsets(top: 8, leading: 8, bottom: 8, trailing: text.isEmpty ? 8 : 0))
.background(RoundedRectangle(cornerRadius: 8).fill(theme.colors.background))