Skip to content

Commit 25d39c2

Browse files
committed
feat(join by alias) : add TextFieldValidity.None instead of nullable
1 parent 6f8ca62 commit 25d39c2

File tree

5 files changed

+6
-5
lines changed
  • features
  • libraries
    • designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components
    • matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/address

5 files changed

+6
-5
lines changed

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinRoomByAddressView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private fun RoomAddressField(
107107
RoomAddressState.Unknown, RoomAddressState.Resolving -> stringResource(R.string.screen_start_chat_join_room_by_address_supporting_text)
108108
},
109109
validity = when (addressState) {
110-
RoomAddressState.Unknown, RoomAddressState.Resolving -> null
110+
RoomAddressState.Unknown, RoomAddressState.Resolving -> TextFieldValidity.None
111111
RoomAddressState.Invalid, RoomAddressState.RoomNotFound -> TextFieldValidity.Invalid
112112
is RoomAddressState.RoomFound -> TextFieldValidity.Valid
113113
},

features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ fun BugReportView(
9191
keyboardController?.hide()
9292
}),
9393
minLines = 3,
94-
validity = if (state.isDescriptionInError) TextFieldValidity.Invalid else null,
94+
validity = if (state.isDescriptionInError) TextFieldValidity.Invalid else TextFieldValidity.None,
9595
)
9696
}
9797
Spacer(modifier = Modifier.height(16.dp))

features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/reset/password/ResetIdentityPasswordView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private fun Content(text: String, onTextChange: (String) -> Unit, hasError: Bool
100100
Icon(imageVector = image, description)
101101
}
102102
},
103-
validity = if (hasError) TextFieldValidity.Invalid else null,
103+
validity = if (hasError) TextFieldValidity.Invalid else TextFieldValidity.None,
104104
supportingText = if (hasError) {
105105
stringResource(R.string.screen_reset_encryption_password_error)
106106
} else {

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/TextField.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fun TextField(
5858
placeholder: String? = null,
5959
leadingIcon: @Composable (() -> Unit)? = null,
6060
trailingIcon: @Composable (() -> Unit)? = null,
61-
validity: TextFieldValidity? = null,
61+
validity: TextFieldValidity = TextFieldValidity.None,
6262
enabled: Boolean = true,
6363
readOnly: Boolean = false,
6464
singleLine: Boolean = false,
@@ -288,6 +288,7 @@ private fun SupportingTextLayout(validity: TextFieldValidity?, supportingText: S
288288
}
289289

290290
enum class TextFieldValidity {
291+
None,
291292
Invalid,
292293
Valid
293294
}

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/address/RoomAddressField.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fun RoomAddressField(
5959
},
6060
validity = when (addressValidity) {
6161
RoomAddressValidity.InvalidSymbols, RoomAddressValidity.NotAvailable -> TextFieldValidity.Invalid
62-
else -> null
62+
else -> TextFieldValidity.None
6363
},
6464
onValueChange = onAddressChange,
6565
singleLine = true,

0 commit comments

Comments
 (0)