feat(join by alias) : add TextFieldValidity.None instead of nullable
This commit is contained in:
@@ -107,7 +107,7 @@ private fun RoomAddressField(
|
||||
RoomAddressState.Unknown, RoomAddressState.Resolving -> stringResource(R.string.screen_start_chat_join_room_by_address_supporting_text)
|
||||
},
|
||||
validity = when (addressState) {
|
||||
RoomAddressState.Unknown, RoomAddressState.Resolving -> null
|
||||
RoomAddressState.Unknown, RoomAddressState.Resolving -> TextFieldValidity.None
|
||||
RoomAddressState.Invalid, RoomAddressState.RoomNotFound -> TextFieldValidity.Invalid
|
||||
is RoomAddressState.RoomFound -> TextFieldValidity.Valid
|
||||
},
|
||||
|
||||
@@ -91,7 +91,7 @@ fun BugReportView(
|
||||
keyboardController?.hide()
|
||||
}),
|
||||
minLines = 3,
|
||||
validity = if (state.isDescriptionInError) TextFieldValidity.Invalid else null,
|
||||
validity = if (state.isDescriptionInError) TextFieldValidity.Invalid else TextFieldValidity.None,
|
||||
)
|
||||
}
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
|
||||
@@ -100,7 +100,7 @@ private fun Content(text: String, onTextChange: (String) -> Unit, hasError: Bool
|
||||
Icon(imageVector = image, description)
|
||||
}
|
||||
},
|
||||
validity = if (hasError) TextFieldValidity.Invalid else null,
|
||||
validity = if (hasError) TextFieldValidity.Invalid else TextFieldValidity.None,
|
||||
supportingText = if (hasError) {
|
||||
stringResource(R.string.screen_reset_encryption_password_error)
|
||||
} else {
|
||||
|
||||
@@ -58,7 +58,7 @@ fun TextField(
|
||||
placeholder: String? = null,
|
||||
leadingIcon: @Composable (() -> Unit)? = null,
|
||||
trailingIcon: @Composable (() -> Unit)? = null,
|
||||
validity: TextFieldValidity? = null,
|
||||
validity: TextFieldValidity = TextFieldValidity.None,
|
||||
enabled: Boolean = true,
|
||||
readOnly: Boolean = false,
|
||||
singleLine: Boolean = false,
|
||||
@@ -288,6 +288,7 @@ private fun SupportingTextLayout(validity: TextFieldValidity?, supportingText: S
|
||||
}
|
||||
|
||||
enum class TextFieldValidity {
|
||||
None,
|
||||
Invalid,
|
||||
Valid
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ fun RoomAddressField(
|
||||
},
|
||||
validity = when (addressValidity) {
|
||||
RoomAddressValidity.InvalidSymbols, RoomAddressValidity.NotAvailable -> TextFieldValidity.Invalid
|
||||
else -> null
|
||||
else -> TextFieldValidity.None
|
||||
},
|
||||
onValueChange = onAddressChange,
|
||||
singleLine = true,
|
||||
|
||||
Reference in New Issue
Block a user