mirror of
https://github.com/nextcloud/talk-android.git
synced 2024-11-28 01:24:03 +03:00
fix to show avatar, fix onClick listener
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
parent
5fc69201fe
commit
906c1f7529
1 changed files with 2 additions and 2 deletions
|
@ -352,7 +352,7 @@ class ChatActivity :
|
||||||
if (conversationUser?.userId != "?" &&
|
if (conversationUser?.userId != "?" &&
|
||||||
CapabilitiesUtilNew.hasSpreedFeatureCapability(conversationUser, "mention-flag")
|
CapabilitiesUtilNew.hasSpreedFeatureCapability(conversationUser, "mention-flag")
|
||||||
) {
|
) {
|
||||||
findViewById<View>(R.id.toolbar)?.setOnClickListener { v -> showConversationInfoScreen() }
|
binding.chatToolbar.setOnClickListener { v -> showConversationInfoScreen() }
|
||||||
}
|
}
|
||||||
|
|
||||||
val smileyButton = binding?.messageInputView?.findViewById<ImageButton>(R.id.smileyButton)
|
val smileyButton = binding?.messageInputView?.findViewById<ImageButton>(R.id.smileyButton)
|
||||||
|
@ -948,7 +948,7 @@ class ChatActivity :
|
||||||
val target = object : Target {
|
val target = object : Target {
|
||||||
|
|
||||||
private fun setIcon(drawable: Drawable?) {
|
private fun setIcon(drawable: Drawable?) {
|
||||||
actionBar?.let {
|
supportActionBar?.let {
|
||||||
val avatarSize = (it.height / TOOLBAR_AVATAR_RATIO).roundToInt()
|
val avatarSize = (it.height / TOOLBAR_AVATAR_RATIO).roundToInt()
|
||||||
|
|
||||||
if (drawable != null && avatarSize > 0) {
|
if (drawable != null && avatarSize > 0) {
|
||||||
|
|
Loading…
Reference in a new issue