From 23952a1dd54dfd464c2502cf26175b88313048b8 Mon Sep 17 00:00:00 2001 From: luvletter2333 Date: Tue, 21 Jun 2022 18:11:39 +0800 Subject: [PATCH] fix view in chat clickable --- .../src/main/java/org/telegram/ui/ChatActivity.java | 7 +++++-- .../org/telegram/ui/Components/ChatAvatarContainer.java | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index 2009f2ab0..1d72a05fc 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -370,6 +370,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not private ActionBarMenuItem editTextItem; private ActionBarMenuItem searchItem; private ActionBarMenuItem searchIconItem; + private ActionBarMenuItem viewInChatItem; private ActionBarMenuItem audioCallIconItem; private boolean searchItemVisible; private RadialProgressView progressBar; @@ -2718,8 +2719,8 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not ActionBarMenu menu = actionBar.createMenu(); - if (isThreadChat() && threadMessageId != 0 && isComments) { - menu.addItem(nkbtn_view_in_chat, R.drawable.baseline_forum_24); + if (isThreadChat() && threadMessageId != 0) { + viewInChatItem = menu.addItem(nkbtn_view_in_chat, R.drawable.baseline_forum_24, themeDelegate); } if (currentEncryptedChat == null && chatMode == 0 && reportType < 0) { @@ -2807,6 +2808,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not if (threadMessageId == 0 && !UserObject.isReplyUser(currentUser) || threadMessageObject != null && threadMessageObject.getRepliesCount() == 0) { searchItem.setVisibility(View.GONE); } + viewInChatItem.setVisibility(View.VISIBLE); searchItemVisible = false; getMediaDataController().clearFoundMessageObjects(); if (messagesSearchAdapter != null) { @@ -24714,6 +24716,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not audioCallIconItem.setVisibility(View.GONE); } searchItemVisible = true; + viewInChatItem.setVisibility(View.GONE); updateSearchButtons(0, 0, -1); updateBottomOverlay(); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java index c5256ba2f..0ca1353d2 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAvatarContainer.java @@ -304,6 +304,10 @@ public class ChatAvatarContainer extends FrameLayout implements NotificationCent @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { int width = MeasureSpec.getSize(widthMeasureSpec); + if (parentFragment != null && parentFragment.isThreadChat() && parentFragment.getThreadId() != 0) { + width -= AndroidUtilities.dp(48); + // leave some width for viewInChatItem + } int availableWidth = width - AndroidUtilities.dp((avatarImageView.getVisibility() == VISIBLE ? 54 : 0) + 16); avatarImageView.measure(MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(42), MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(42), MeasureSpec.EXACTLY)); titleTextView.measure(MeasureSpec.makeMeasureSpec(availableWidth, MeasureSpec.AT_MOST), MeasureSpec.makeMeasureSpec(AndroidUtilities.dp(24), MeasureSpec.AT_MOST));