Skip to content

Commit d475c30

Browse files
pixlwavepixlwave
committed
Remove unused Bindings in RoundedBorderTextField/Editor.
1 parent 70d39ef commit d475c30

File tree

6 files changed

+31
-70
lines changed

6 files changed

+31
-70
lines changed

‎RiotSwiftUI/Modules/Common/Util/RoundedBorderTextEditor.swift

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ struct RoundedBorderTextEditor: View {
2121

2222
// MARK: - Properties
2323

24-
var title: String?
25-
var placeHolder: String
24+
var title: String? = nil
25+
let placeHolder: String
2626
@Binding var text: String
27-
var textMaxHeight: CGFloat?
28-
@Binding var error: String?
27+
var textMaxHeight: CGFloat? = nil
28+
var error: String? = nil
2929

30-
var onTextChanged: ((String) -> Void)?
31-
var onEditingChanged: ((Bool) -> Void)?
30+
var onTextChanged: ((String) -> Void)? = nil
31+
var onEditingChanged: ((Bool) -> Void)? = nil
3232

3333
@State private var editing = false
3434

@@ -37,24 +37,6 @@ struct RoundedBorderTextEditor: View {
3737
@Environment(\.theme) private var theme: ThemeSwiftUI
3838
@Environment(\.isEnabled) private var isEnabled
3939

40-
// MARK: Setup
41-
42-
init(title: String? = nil,
43-
placeHolder: String,
44-
text: Binding<String>,
45-
textMaxHeight: CGFloat? = nil,
46-
error: Binding<String?> = .constant(nil),
47-
onTextChanged: ((String) -> Void)? = nil,
48-
onEditingChanged: ((Bool) -> Void)? = nil) {
49-
self.title = title
50-
self.placeHolder = placeHolder
51-
self._text = text
52-
self.textMaxHeight = textMaxHeight
53-
self._error = error
54-
self.onTextChanged = onTextChanged
55-
self.onEditingChanged = onEditingChanged
56-
}
57-
5840
// MARK: Public
5941

6042
var body: some View {
@@ -131,10 +113,10 @@ struct ThemableTextEditor_Previews: PreviewProvider {
131113

132114
static var sampleView: some View {
133115
VStack(alignment: .center, spacing: 40) {
134-
RoundedBorderTextEditor(title: "A title", placeHolder: "A placeholder", text: .constant(""), error: .constant(nil))
135-
RoundedBorderTextEditor(placeHolder: "A placeholder", text: .constant("Some text"), error: .constant(nil))
136-
RoundedBorderTextEditor(title: "A title", placeHolder: "A placeholder", text: .constant("Some very long text used to check overlapping with the delete button"), error: .constant("Some error text"))
137-
RoundedBorderTextEditor(title: "A title", placeHolder: "A placeholder", text: .constant("Some very long text used to check overlapping with the delete button"), error: .constant("Some error text"))
116+
RoundedBorderTextEditor(title: "A title", placeHolder: "A placeholder", text: .constant(""), error: nil)
117+
RoundedBorderTextEditor(placeHolder: "A placeholder", text: .constant("Some text"), error: nil)
118+
RoundedBorderTextEditor(title: "A title", placeHolder: "A placeholder", text: .constant("Some very long text used to check overlapping with the delete button"), error: "Some error text")
119+
RoundedBorderTextEditor(title: "A title", placeHolder: "A placeholder", text: .constant("Some very long text used to check overlapping with the delete button"), error: "Some error text")
138120
.disabled(true)
139121
}
140122
}

‎RiotSwiftUI/Modules/Common/Util/RoundedBorderTextField.swift

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -22,46 +22,24 @@ struct RoundedBorderTextField: View {
2222

2323
// MARK: - Properties
2424

25-
var title: String?
26-
var placeHolder: String
25+
var title: String? = nil
26+
let placeHolder: String
2727
@Binding var text: String
28-
@Binding var footerText: String?
29-
@Binding var isError: Bool
28+
var footerText: String? = nil
29+
var isError: Bool = false
3030
var isFirstResponder = false
3131

3232
var configuration: UIKitTextInputConfiguration = UIKitTextInputConfiguration()
3333

34-
var onTextChanged: ((String) -> Void)?
35-
var onEditingChanged: ((Bool) -> Void)?
34+
var onTextChanged: ((String) -> Void)? = nil
35+
var onEditingChanged: ((Bool) -> Void)? = nil
3636

3737
// MARK: Private
3838

3939
@State private var editing = false
4040

4141
@Environment(\.theme) private var theme: ThemeSwiftUI
4242
@Environment(\.isEnabled) private var isEnabled
43-
44-
// MARK: Setup
45-
46-
init(title: String? = nil,
47-
placeHolder: String,
48-
text: Binding<String>,
49-
footerText: Binding<String?> = .constant(nil),
50-
isError: Binding<Bool> = .constant(false),
51-
isFirstResponder: Bool = false,
52-
configuration: UIKitTextInputConfiguration = UIKitTextInputConfiguration(),
53-
onTextChanged: ((String) -> Void)? = nil,
54-
onEditingChanged: ((Bool) -> Void)? = nil) {
55-
self.title = title
56-
self.placeHolder = placeHolder
57-
self._text = text
58-
self._footerText = footerText
59-
self._isError = isError
60-
self.isFirstResponder = isFirstResponder
61-
self.configuration = configuration
62-
self.onTextChanged = onTextChanged
63-
self.onEditingChanged = onEditingChanged
64-
}
6543

6644
// MARK: Public
6745

@@ -139,11 +117,11 @@ struct TextFieldWithError_Previews: PreviewProvider {
139117

140118
static var sampleView: some View {
141119
VStack(alignment: .center, spacing: 20) {
142-
RoundedBorderTextField(title: "A title", placeHolder: "A placeholder", text: .constant(""), footerText: .constant(nil), isError: .constant(false))
143-
RoundedBorderTextField(placeHolder: "A placeholder", text: .constant("Some text"), footerText: .constant(nil), isError: .constant(false))
144-
RoundedBorderTextField(title: "A title", placeHolder: "A placeholder", text: .constant("Some very long text used to check overlapping with the delete button"), footerText: .constant("Some error text"), isError: .constant(true))
145-
RoundedBorderTextField(title: "A title", placeHolder: "A placeholder", text: .constant("Some very long text used to check overlapping with the delete button"), footerText: .constant("Some normal text"), isError: .constant(false))
146-
RoundedBorderTextField(title: "A title", placeHolder: "A placeholder", text: .constant("Some very long text used to check overlapping with the delete button"), footerText: .constant("Some normal text"), isError: .constant(false))
120+
RoundedBorderTextField(title: "A title", placeHolder: "A placeholder", text: .constant(""), footerText: nil, isError: false)
121+
RoundedBorderTextField(placeHolder: "A placeholder", text: .constant("Some text"), footerText: nil, isError: false)
122+
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)
123+
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)
124+
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)
147125
.disabled(true)
148126
}
149127
}

‎RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationEmailInvites/View/SpaceCreationEmailInvites.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ struct SpaceCreationEmailInvites: View {
8787
VStack {
8888
VStack(spacing: 20) {
8989
ForEach(viewModel.emailInvites.indices) { index in
90-
RoundedBorderTextField(title: VectorL10n.spacesCreationEmailInvitesEmailTitle, placeHolder: VectorL10n.spacesCreationEmailInvitesEmailTitle, text: $viewModel.emailInvites[index], footerText: .constant(viewModel.viewState.emailAddressesValid[index] ? nil : VectorL10n.authInvalidEmail), isError: .constant(!viewModel.viewState.emailAddressesValid[index]), configuration: UIKitTextInputConfiguration(keyboardType: .emailAddress, returnKeyType: index < viewModel.emailInvites.endIndex - 1 ? .next : .done, autocapitalizationType: .none, autocorrectionType: .no))
90+
RoundedBorderTextField(title: VectorL10n.spacesCreationEmailInvitesEmailTitle, placeHolder: VectorL10n.spacesCreationEmailInvitesEmailTitle, text: $viewModel.emailInvites[index], footerText: viewModel.viewState.emailAddressesValid[index] ? nil : VectorL10n.authInvalidEmail, isError: !viewModel.viewState.emailAddressesValid[index], configuration: UIKitTextInputConfiguration(keyboardType: .emailAddress, returnKeyType: index < viewModel.emailInvites.endIndex - 1 ? .next : .done, autocapitalizationType: .none, autocorrectionType: .no))
9191
.accessibility(identifier: "emailTextField")
9292
}
9393
}

‎RiotSwiftUI/Modules/Spaces/SpaceCreation/SpaceCreationSettings/View/SpaceCreationSettings.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ struct SpaceCreationSettings: View {
104104
Spacer()
105105
avatarView
106106
Spacer().frame(height:40)
107-
RoundedBorderTextField(title: VectorL10n.createRoomPlaceholderName, placeHolder: "", text: $viewModel.roomName, footerText: .constant(viewModel.viewState.roomNameError), isError: .constant(true), isFirstResponder: false, configuration: UIKitTextInputConfiguration( returnKeyType: .next), onTextChanged: { newText in
107+
RoundedBorderTextField(title: VectorL10n.createRoomPlaceholderName, placeHolder: "", text: $viewModel.roomName, footerText: viewModel.viewState.roomNameError, isError: true, isFirstResponder: false, configuration: UIKitTextInputConfiguration( returnKeyType: .next), onTextChanged: { newText in
108108
viewModel.send(viewAction: .nameChanged(newText))
109109
})
110110
.id("nameTextField")
111111
.padding(.horizontal, 2)
112112
.padding(.bottom, 20)
113-
RoundedBorderTextEditor(title: nil, placeHolder: VectorL10n.spaceTopic, text: $viewModel.topic, textMaxHeight: 72, error: .constant(nil), onTextChanged: {
113+
RoundedBorderTextEditor(title: nil, placeHolder: VectorL10n.spaceTopic, text: $viewModel.topic, textMaxHeight: 72, error: nil, onTextChanged: {
114114
newText in
115115
viewModel.send(viewAction: .topicChanged(newText))
116116
}, onEditingChanged: { editing in
@@ -122,7 +122,7 @@ struct SpaceCreationSettings: View {
122122
.padding(.horizontal, 2)
123123
.padding(.bottom, viewModel.viewState.showRoomAddress ? 20 : 3)
124124
if viewModel.viewState.showRoomAddress {
125-
RoundedBorderTextField(title: VectorL10n.spacesCreationAddress, placeHolder: "# \(viewModel.viewState.defaultAddress)", text: $viewModel.address, footerText: .constant(viewModel.viewState.addressMessage), isError: .constant(!viewModel.viewState.isAddressValid), configuration: UIKitTextInputConfiguration(keyboardType: .URL, returnKeyType: .done, autocapitalizationType: .none), onTextChanged: {
125+
RoundedBorderTextField(title: VectorL10n.spacesCreationAddress, placeHolder: "# \(viewModel.viewState.defaultAddress)", text: $viewModel.address, footerText: viewModel.viewState.addressMessage, isError: !viewModel.viewState.isAddressValid, configuration: UIKitTextInputConfiguration(keyboardType: .URL, returnKeyType: .done, autocapitalizationType: .none), onTextChanged: {
126126
newText in
127127
viewModel.send(viewAction: .addressChanged(newText))
128128
})

‎RiotSwiftUI/Modules/Spaces/SpaceSettings/SpaceSettings/View/SpaceSettings.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ struct SpaceSettings: View {
116116
title: VectorL10n.createRoomPlaceholderName,
117117
placeHolder: "",
118118
text: $viewModel.name,
119-
footerText: .constant(viewModel.viewState.roomNameError),
120-
isError: .constant(true),
119+
footerText: viewModel.viewState.roomNameError,
120+
isError: true,
121121
configuration: UIKitTextInputConfiguration( returnKeyType: .next))
122122
.padding(.horizontal, 2)
123123
.padding(.bottom, 20)
@@ -127,7 +127,7 @@ struct SpaceSettings: View {
127127
placeHolder: VectorL10n.spaceTopic,
128128
text: $viewModel.topic,
129129
textMaxHeight: 72,
130-
error: .constant(nil))
130+
error: nil)
131131
.padding(.horizontal, 2)
132132
.padding(.bottom, viewModel.viewState.showRoomAddress ? 20 : 3)
133133
.disabled(viewModel.viewState.roomProperties?.isTopicEditable != true)
@@ -136,8 +136,8 @@ struct SpaceSettings: View {
136136
title: VectorL10n.spacesCreationAddress,
137137
placeHolder: "# \(viewModel.viewState.defaultAddress)",
138138
text: $viewModel.address,
139-
footerText: .constant(viewModel.viewState.addressMessage),
140-
isError: .constant(!viewModel.viewState.isAddressValid),
139+
footerText: viewModel.viewState.addressMessage,
140+
isError: !viewModel.viewState.isAddressValid,
141141
configuration: UIKitTextInputConfiguration(keyboardType: .URL, returnKeyType: .done, autocapitalizationType: .none), onTextChanged: {
142142
newText in
143143
viewModel.send(viewAction: .addressChanged(newText))

‎changelog.d/pr-5910.api

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove unused Bindings in RoundedBorderTextField/Editor

0 commit comments

Comments
 (0)