empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix avatar tap in conversation multi-select mode.

Browse source
This commit is contained in:
Alan Evans 2020-05-26 08:27:12 -03:00 • committed by Greyson Parrelli
parent d708984abd
commit 526afd539b
1 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
View file

@ -84,6 +84,7 @@ public class ConversationListItem extends RelativeLayout
private TextView unreadIndicator; private TextView unreadIndicator;
private long lastSeen; private long lastSeen;
private ThreadRecord thread; private ThreadRecord thread;
private boolean batchMode;
private int unreadCount; private int unreadCount;
private AvatarImageView contactPhotoImage; private AvatarImageView contactPhotoImage;
@ -203,10 +204,10 @@ public class ConversationListItem extends RelativeLayout
setStatusIcons(thread); setStatusIcons(thread);
setThumbnailSnippet(thread); setThumbnailSnippet(thread);
setBatchState(batchMode); setBatchMode(batchMode);
setRippleColor(recipient.get()); setRippleColor(recipient.get());
setUnreadIndicator(thread); setUnreadIndicator(thread);
this.contactPhotoImage.setAvatar(glideRequests, recipient.get(), true); this.contactPhotoImage.setAvatar(glideRequests, recipient.get(), !batchMode);
} }
public void bind(@NonNull Recipient contact, public void bind(@NonNull Recipient contact,
@ -233,9 +234,9 @@ public class ConversationListItem extends RelativeLayout
alertView.setNone(); alertView.setNone();
thumbnailView.setVisibility(GONE); thumbnailView.setVisibility(GONE);
setBatchState(false); setBatchMode(false);
setRippleColor(contact); setRippleColor(contact);
contactPhotoImage.setAvatar(glideRequests, recipient.get(), true); contactPhotoImage.setAvatar(glideRequests, recipient.get(), !batchMode);
} }
public void bind(@NonNull MessageResult messageResult, public void bind(@NonNull MessageResult messageResult,
@ -261,9 +262,9 @@ public class ConversationListItem extends RelativeLayout
alertView.setNone(); alertView.setNone();
thumbnailView.setVisibility(GONE); thumbnailView.setVisibility(GONE);
setBatchState(false); setBatchMode(false);
setRippleColor(recipient.get()); setRippleColor(recipient.get());
contactPhotoImage.setAvatar(glideRequests, recipient.get(), true); contactPhotoImage.setAvatar(glideRequests, recipient.get(), !batchMode);
} }
@Override @Override
@ -271,7 +272,9 @@ public class ConversationListItem extends RelativeLayout
if (this.recipient != null) { if (this.recipient != null) {
this.recipient.removeForeverObserver(this); this.recipient.removeForeverObserver(this);
this.recipient = null; this.recipient = null;
contactPhotoImage.setAvatar(glideRequests, null, true);
setBatchMode(false);
contactPhotoImage.setAvatar(glideRequests, null, !batchMode);
} }
if (this.groupAddedBy != null) { if (this.groupAddedBy != null) {
@ -280,8 +283,9 @@ public class ConversationListItem extends RelativeLayout
} }
} }
private void setBatchState(boolean batch) { private void setBatchMode(boolean batchMode) {
setSelected(batch && selectedThreads.contains(threadId)); this.batchMode = batchMode;
setSelected(batchMode && selectedThreads.contains(threadId));
} }
public Recipient getRecipient() { public Recipient getRecipient() {
@ -304,7 +308,7 @@ public class ConversationListItem extends RelativeLayout
return lastSeen; return lastSeen;
} }
private @NonNull CharSequence getTrimmedSnippet(@NonNull CharSequence snippet) { private static @NonNull CharSequence getTrimmedSnippet(@NonNull CharSequence snippet) {
return snippet.length() <= MAX_SNIPPET_LENGTH ? snippet return snippet.length() <= MAX_SNIPPET_LENGTH ? snippet
: snippet.subSequence(0, MAX_SNIPPET_LENGTH); : snippet.subSequence(0, MAX_SNIPPET_LENGTH);
} }
@ -316,9 +320,7 @@ public class ConversationListItem extends RelativeLayout
LayoutParams subjectParams = (RelativeLayout.LayoutParams)this.subjectContainer .getLayoutParams(); LayoutParams subjectParams = (RelativeLayout.LayoutParams)this.subjectContainer .getLayoutParams();
subjectParams.addRule(RelativeLayout.LEFT_OF, R.id.thumbnail); subjectParams.addRule(RelativeLayout.LEFT_OF, R.id.thumbnail);
if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) { subjectParams.addRule(RelativeLayout.START_OF, R.id.thumbnail);
subjectParams.addRule(RelativeLayout.START_OF, R.id.thumbnail);
}
this.subjectContainer.setLayoutParams(subjectParams); this.subjectContainer.setLayoutParams(subjectParams);
this.post(new ThumbnailPositioner(thumbnailView, archivedView, deliveryStatusIndicator, dateView)); this.post(new ThumbnailPositioner(thumbnailView, archivedView, deliveryStatusIndicator, dateView));
} else { } else {
@ -326,9 +328,7 @@ public class ConversationListItem extends RelativeLayout
LayoutParams subjectParams = (RelativeLayout.LayoutParams)this.subjectContainer.getLayoutParams(); LayoutParams subjectParams = (RelativeLayout.LayoutParams)this.subjectContainer.getLayoutParams();
subjectParams.addRule(RelativeLayout.LEFT_OF, R.id.status); subjectParams.addRule(RelativeLayout.LEFT_OF, R.id.status);
if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) { subjectParams.addRule(RelativeLayout.START_OF, R.id.status);
subjectParams.addRule(RelativeLayout.START_OF, R.id.status);
}
this.subjectContainer.setLayoutParams(subjectParams); this.subjectContainer.setLayoutParams(subjectParams);
} }
} }
@ -373,7 +373,7 @@ public class ConversationListItem extends RelativeLayout
@Override @Override
public void onRecipientChanged(@NonNull Recipient recipient) { public void onRecipientChanged(@NonNull Recipient recipient) {
fromView.setText(recipient, unreadCount == 0); fromView.setText(recipient, unreadCount == 0);
contactPhotoImage.setAvatar(glideRequests, recipient, true); contactPhotoImage.setAvatar(glideRequests, recipient, !batchMode);
setRippleColor(recipient); setRippleColor(recipient);
} }
@ -399,14 +399,10 @@ public class ConversationListItem extends RelativeLayout
(archivedView.getWidth() + deliveryStatusView.getWidth()) > dateView.getWidth()) (archivedView.getWidth() + deliveryStatusView.getWidth()) > dateView.getWidth())
{ {
thumbnailParams.addRule(RelativeLayout.LEFT_OF, R.id.status); thumbnailParams.addRule(RelativeLayout.LEFT_OF, R.id.status);
if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) { thumbnailParams.addRule(RelativeLayout.START_OF, R.id.status);
thumbnailParams.addRule(RelativeLayout.START_OF, R.id.status);
}
} else { } else {
thumbnailParams.addRule(RelativeLayout.LEFT_OF, R.id.date); thumbnailParams.addRule(RelativeLayout.LEFT_OF, R.id.date);
if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) { thumbnailParams.addRule(RelativeLayout.START_OF, R.id.date);
thumbnailParams.addRule(RelativeLayout.START_OF, R.id.date);
}
} }
thumbnailView.setLayoutParams(thumbnailParams); thumbnailView.setLayoutParams(thumbnailParams);