mirror of https://github.com/NekoX-Dev/NekoX.git
fix view in chat clickable
This commit is contained in:
parent
e3fcc75eca
commit
23952a1dd5
|
@ -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();
|
||||
}
|
||||
|
|
|
@ -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));
|
||||
|
|
Loading…
Reference in New Issue