From 88119a15bf5cab5cb9de6046f756ebed00d232f0 Mon Sep 17 00:00:00 2001 From: Valere Date: Tue, 15 Jun 2021 11:22:29 +0200 Subject: [PATCH] Core review rename input Suffix|Prefix --- .../java/im/vector/app/features/form/FormEditTextItem.kt | 8 ++++---- .../roomdirectory/createroom/CreateRoomController.kt | 4 ++-- .../app/features/roomprofile/alias/RoomAliasController.kt | 4 ++-- .../features/spaces/create/SpaceDetailEpoxyController.kt | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt index 5607ddcd5d..2b2fddd0c9 100644 --- a/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt +++ b/vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt @@ -72,10 +72,10 @@ abstract class FormEditTextItem : VectorEpoxyModel() { var onFocusChange: ((Boolean) -> Unit)? = null @EpoxyAttribute - var inputPrefix: String? = null + var prefixText: String? = null @EpoxyAttribute - var inputSuffix: String? = null + var suffixText: String? = null private val onTextChangeListener = object : SimpleTextWatcher() { override fun afterTextChanged(s: Editable) { @@ -92,8 +92,8 @@ abstract class FormEditTextItem : VectorEpoxyModel() { holder.textInputLayout.error = errorMessage holder.textInputLayout.endIconMode = endIconMode ?: TextInputLayout.END_ICON_NONE - holder.textInputLayout.prefixText = inputPrefix - holder.textInputLayout.suffixText = inputSuffix + holder.textInputLayout.prefixText = prefixText + holder.textInputLayout.suffixText = suffixText if (forceUpdateValue) { holder.textInputEditText.setText(value) diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt index 3ac61f1803..6c441c355c 100644 --- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt @@ -103,8 +103,8 @@ class CreateRoomController @Inject constructor( id("alias") enabled(enableFormElement) value(viewState.roomVisibilityType.aliasLocalPart) - inputSuffix(":" + viewState.homeServerName) - inputPrefix("#") + suffixText(":" + viewState.homeServerName) + prefixText("#") hint(host.stringProvider.getString(R.string.room_alias_address_hint)) errorMessage( host.roomAliasErrorFormatter.format( diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt index 50bc3d1e5c..4a683b6292 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt +++ b/vector/src/main/java/im/vector/app/features/roomprofile/alias/RoomAliasController.kt @@ -248,8 +248,8 @@ class RoomAliasController @Inject constructor( formEditTextItem { id("newLocalAlias") value(data.newLocalAliasState.value) - inputSuffix(":" + data.homeServerName) - inputPrefix("#") + suffixText(":" + data.homeServerName) + prefixText("#") hint(host.stringProvider.getString(R.string.room_alias_address_hint)) errorMessage(host.roomAliasErrorFormatter.format((data.newLocalAliasState.asyncRequest as? Fail)?.error as? RoomAliasError)) onTextChange { value -> diff --git a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt index ad544e2648..27c08d1f6f 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/create/SpaceDetailEpoxyController.kt @@ -92,8 +92,8 @@ class SpaceDetailEpoxyController @Inject constructor( forceUpdateValue(!data.aliasManuallyModified) value(data.aliasLocalPart) hint(host.stringProvider.getString(R.string.create_space_alias_hint)) - inputSuffix(":" + data.homeServerName) - inputPrefix("#") + suffixText(":" + data.homeServerName) + prefixText("#") onFocusChange { hasFocus -> host.aliasTextIsFocused = hasFocus }