Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

feat(join by alias) : add TextFieldValidity.None instead of nullable

Browse source
This commit is contained in:
ganfra 2025-02-25 20:27:54 +01:00
parent 3bb61757ca
commit 30fbb124a5
5 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -107,7 +107,7 @@ private fun RoomAddressField(
RoomAddressState.Unknown, RoomAddressState.Resolving -> stringResource(R.string.screen_start_chat_join_room_by_address_supporting_text) RoomAddressState.Unknown, RoomAddressState.Resolving -> stringResource(R.string.screen_start_chat_join_room_by_address_supporting_text)
}, },
validity = when (addressState) { validity = when (addressState) {
RoomAddressState.Unknown, RoomAddressState.Resolving -> null RoomAddressState.Unknown, RoomAddressState.Resolving -> TextFieldValidity.None
RoomAddressState.Invalid, RoomAddressState.RoomNotFound -> TextFieldValidity.Invalid RoomAddressState.Invalid, RoomAddressState.RoomNotFound -> TextFieldValidity.Invalid
is RoomAddressState.RoomFound -> TextFieldValidity.Valid is RoomAddressState.RoomFound -> TextFieldValidity.Valid
}, },

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

@ -91,7 +91,7 @@ fun BugReportView(
keyboardController?.hide() keyboardController?.hide()
}), }),
minLines = 3, 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)) Spacer(modifier = Modifier.height(16.dp))

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

@ -100,7 +100,7 @@ private fun Content(text: String, onTextChange: (String) -> Unit, hasError: Bool
Icon(imageVector = image, description) Icon(imageVector = image, description)
} }
}, },
validity = if (hasError) TextFieldValidity.Invalid else null, validity = if (hasError) TextFieldValidity.Invalid else TextFieldValidity.None,
supportingText = if (hasError) { supportingText = if (hasError) {
stringResource(R.string.screen_reset_encryption_password_error) stringResource(R.string.screen_reset_encryption_password_error)
} else { } else {

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

@ -58,7 +58,7 @@ fun TextField(
placeholder: String? = null, placeholder: String? = null,
leadingIcon: @Composable (() -> Unit)? = null, leadingIcon: @Composable (() -> Unit)? = null,
trailingIcon: @Composable (() -> Unit)? = null, trailingIcon: @Composable (() -> Unit)? = null,
validity: TextFieldValidity? = null, validity: TextFieldValidity = TextFieldValidity.None,
enabled: Boolean = true, enabled: Boolean = true,
readOnly: Boolean = false, readOnly: Boolean = false,
singleLine: Boolean = false, singleLine: Boolean = false,
@ -288,6 +288,7 @@ private fun SupportingTextLayout(validity: TextFieldValidity?, supportingText: S
} }
enum class TextFieldValidity { enum class TextFieldValidity {
None,
Invalid, Invalid,
Valid Valid
} }

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

@ -59,7 +59,7 @@ fun RoomAddressField(
}, },
validity = when (addressValidity) { validity = when (addressValidity) {
RoomAddressValidity.InvalidSymbols, RoomAddressValidity.NotAvailable -> TextFieldValidity.Invalid RoomAddressValidity.InvalidSymbols, RoomAddressValidity.NotAvailable -> TextFieldValidity.Invalid
else -> null else -> TextFieldValidity.None
}, },
onValueChange = onAddressChange, onValueChange = onAddressChange,
singleLine = true, singleLine = true,