Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

fix image transition from timeline to ViewMediaActivity (#1348)

This commit is contained in:
Konrad Pozniak 2019-06-24 20:52:38 +02:00 committed by GitHub
parent ffb6c9a7a7
commit ac2e16e08c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
View File

@ -421,7 +421,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
mediaOverlays[i].setVisibility(View.GONE); mediaOverlays[i].setVisibility(View.GONE);
} }
setAttachmentClickListeners(mediaPreviews[i], listener, i, attachments.get(i)); setAttachmentClickListener(mediaPreviews[i], listener, i, attachments.get(i), true);
if (n <= 2) { if (n <= 2) {
mediaPreviews[0].getLayoutParams().height = getMediaPreviewHeight(context) * 2; mediaPreviews[0].getLayoutParams().height = getMediaPreviewHeight(context) * 2;
@ -504,18 +504,18 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
ThemeUtils.setDrawableTint(context, drawable, android.R.attr.textColorTertiary); ThemeUtils.setDrawableTint(context, drawable, android.R.attr.textColorTertiary);
mediaLabel.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null); mediaLabel.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
setAttachmentClickListeners(mediaLabel, listener, i, attachment); setAttachmentClickListener(mediaLabel, listener, i, attachment, false);
} else { } else {
mediaLabel.setVisibility(View.GONE); mediaLabel.setVisibility(View.GONE);
} }
} }
} }
private void setAttachmentClickListeners(View view, StatusActionListener listener, private void setAttachmentClickListener(View view, StatusActionListener listener,
int index, Attachment attachment) { int index, Attachment attachment, boolean animateTransition) {
view.setOnClickListener(v -> { view.setOnClickListener(v -> {
if (getAdapterPosition() != RecyclerView.NO_POSITION) { if (getAdapterPosition() != RecyclerView.NO_POSITION) {
listener.onViewMedia(getAdapterPosition(), index, null); listener.onViewMedia(getAdapterPosition(), index, animateTransition ? v : null);
} }
}); });
view.setOnLongClickListener(v -> { view.setOnLongClickListener(v -> {