TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-24 16:00:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix attachment remove button alignment

Browse Source 
fixes #3597
Closes #4077
// FREEBIE
This commit is contained in:
Jake McGinty
2015-09-16 13:41:10 -07:00
committed by Moxie Marlinspike
parent 415a61a09b
commit 2d65464c04
10 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/thoughtcrime/securesms/components/ThumbnailView.java
View File

@@ -155,6 +155,8 @@ public class ThumbnailView extends FrameLayout {
public void setRemoveClickListener(OnClickListener listener) {
getRemoveButton().setOnClickListener(listener);
final int pad = getResources().getDimensionPixelSize(R.dimen.media_bubble_remove_button_size);
image.setPadding(pad, pad, pad, 0);
}
public void setDownloadClickListener(ThumbnailClickListener listener) {
@@ -324,11 +326,15 @@ public class ThumbnailView extends FrameLayout {
Log.w(TAG, "onResourceReady() for a Bitmap. Saving.");
part.setThumbnail(((GlideBitmapDrawable)resource).getBitmap());
}
if (resource.getIntrinsicWidth() < resource.getIntrinsicHeight()) {
getRemoveButton().setPadding(0, 0, (getWidth() - resource.getIntrinsicWidth()) / 2, 0);
LayoutParams layoutParams = (LayoutParams) getRemoveButton().getLayoutParams();
if (resource.getIntrinsicWidth() < getWidth()) {
layoutParams.topMargin = 0;
layoutParams.rightMargin = Math.max(0, (getWidth() - image.getPaddingRight() - resource.getIntrinsicWidth()) / 2);
} else {
getRemoveButton().setPadding(0, (getHeight() - resource.getIntrinsicHeight()) / 2, 0, 0);
layoutParams.topMargin = Math.max(0, (getHeight() - image.getPaddingTop() - resource.getIntrinsicHeight()) / 2);
layoutParams.rightMargin = 0;
}
getRemoveButton().setLayoutParams(layoutParams);
return false;
}
}