mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-22 04:55:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix to be able to enter open conversation name

Browse source 
without this change the continue button was broken (no room token -> response 404 for getRoom. But for creating an open conversation getRoom should not be executed at all) and the emoji button was missing

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2023-07-07 15:46:57 +02:00
parent edd2ce7805
commit f2a89de624
1 changed files with 37 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/EntryMenuController.kt
View file

@ -105,6 +105,28 @@ class EntryMenuController(args: Bundle) :
binding?.okButton?.alpha = OPACITY_BUTTON_DISABLED binding?.okButton?.alpha = OPACITY_BUTTON_DISABLED
} }
} }
emojiPopup = binding?.let {
EmojiPopup(
rootView = view,
editText = it.textEdit,
onEmojiPopupShownListener = {
viewThemeUtils.platform.colorImageView(it.smileyButton, ColorRole.PRIMARY)
},
onEmojiPopupDismissListener = {
it.smileyButton.imageTintList = ColorStateList.valueOf(
ResourcesCompat.getColor(
resources!!,
R.color.medium_emphasis_text,
context.theme
)
)
},
onEmojiClickListener = {
binding?.textEdit?.editableText?.append(" ")
}
)
}
} }
override fun onViewBound(view: View) { override fun onViewBound(view: View) {
@ -113,8 +135,6 @@ class EntryMenuController(args: Bundle) :
currentUser = userManager.currentUser.blockingGet() currentUser = userManager.currentUser.blockingGet()
if (operation == ConversationOperationEnum.OPS_CODE_GET_AND_JOIN_ROOM) { if (operation == ConversationOperationEnum.OPS_CODE_GET_AND_JOIN_ROOM) {
var labelText = ""
labelText = resources!!.getString(R.string.nc_conversation_link)
binding?.textEdit?.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_URI binding?.textEdit?.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_URI
textEditAddChangedListener() textEditAddChangedListener()
@ -122,7 +142,21 @@ class EntryMenuController(args: Bundle) :
binding?.textInputLayout?.let { viewThemeUtils.material.colorTextInputLayout(it) } binding?.textInputLayout?.let { viewThemeUtils.material.colorTextInputLayout(it) }
binding?.okButton?.let { viewThemeUtils.material.colorMaterialButtonText(it) } binding?.okButton?.let { viewThemeUtils.material.colorMaterialButtonText(it) }
binding?.textInputLayout?.hint = labelText binding?.textInputLayout?.hint = resources!!.getString(R.string.nc_conversation_link)
binding?.textInputLayout?.requestFocus()
binding?.smileyButton?.setOnClickListener { onSmileyClick() }
binding?.okButton?.setOnClickListener { onOkButtonClick() }
} else if (operation == ConversationOperationEnum.OPS_CODE_INVITE_USERS) {
binding?.textEdit?.inputType = InputType.TYPE_CLASS_TEXT
textEditAddChangedListener()
binding?.smileyButton?.visibility = View.VISIBLE
binding?.textInputLayout?.let { viewThemeUtils.material.colorTextInputLayout(it) }
binding?.okButton?.let { viewThemeUtils.material.colorMaterialButtonText(it) }
binding?.textInputLayout?.requestFocus() binding?.textInputLayout?.requestFocus()
binding?.smileyButton?.setOnClickListener { onSmileyClick() } binding?.smileyButton?.setOnClickListener { onSmileyClick() }
@ -162,32 +196,10 @@ class EntryMenuController(args: Bundle) :
var labelText = "" var labelText = ""
when (operation) { when (operation) {
ConversationOperationEnum.OPS_CODE_INVITE_USERS,
ConversationOperationEnum.OPS_CODE_RENAME_ROOM -> { ConversationOperationEnum.OPS_CODE_RENAME_ROOM -> {
labelText = resources!!.getString(R.string.nc_call_name) labelText = resources!!.getString(R.string.nc_call_name)
binding?.textEdit?.inputType = InputType.TYPE_CLASS_TEXT binding?.textEdit?.inputType = InputType.TYPE_CLASS_TEXT
binding?.smileyButton?.visibility = View.VISIBLE binding?.smileyButton?.visibility = View.VISIBLE
emojiPopup = binding?.let {
EmojiPopup(
rootView = view,
editText = it.textEdit,
onEmojiPopupShownListener = {
viewThemeUtils.platform.colorImageView(it.smileyButton, ColorRole.PRIMARY)
},
onEmojiPopupDismissListener = {
it.smileyButton.imageTintList = ColorStateList.valueOf(
ResourcesCompat.getColor(
resources!!,
R.color.medium_emphasis_text,
context.theme
)
)
},
onEmojiClickListener = {
binding?.textEdit?.editableText?.append(" ")
}
)
}
} }
ConversationOperationEnum.OPS_CODE_JOIN_ROOM -> { ConversationOperationEnum.OPS_CODE_JOIN_ROOM -> {