From 6024db8670a3b503df66fa20c0aa178601e652b7 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 30 May 2019 16:47:51 +0200 Subject: [PATCH] Removed image size --- app/src/main/java/eu/faircode/email/AdapterImage.java | 8 +------- app/src/main/res/layout/item_image.xml | 11 ----------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/AdapterImage.java b/app/src/main/java/eu/faircode/email/AdapterImage.java index ffc7e15403..f249caf285 100644 --- a/app/src/main/java/eu/faircode/email/AdapterImage.java +++ b/app/src/main/java/eu/faircode/email/AdapterImage.java @@ -59,7 +59,6 @@ public class AdapterImage extends RecyclerView.Adapter private ImageView ivImage; private TextView tvCaption; private TextView tvType; - private TextView tvSize; ViewHolder(View itemView) { super(itemView); @@ -68,7 +67,6 @@ public class AdapterImage extends RecyclerView.Adapter ivImage = itemView.findViewById(R.id.ivImage); tvCaption = itemView.findViewById(R.id.tvCaption); tvType = itemView.findViewById(R.id.tvType); - tvSize = itemView.findViewById(R.id.tvSize); } private void wire() { @@ -80,9 +78,8 @@ public class AdapterImage extends RecyclerView.Adapter } private void bindTo(EntityAttachment attachment) { - Bitmap bm = null; if (attachment.available) { - bm = Helper.decodeImage(attachment.getFile(context), + Bitmap bm = Helper.decodeImage(attachment.getFile(context), context.getResources().getDisplayMetrics().widthPixels); if (bm == null) ivImage.setImageResource(R.drawable.baseline_broken_image_24); @@ -93,12 +90,9 @@ public class AdapterImage extends RecyclerView.Adapter ? R.drawable.baseline_image_24 : R.drawable.baseline_hourglass_empty_24); tvCaption.setVisibility(TextUtils.isEmpty(attachment.name) ? View.GONE : View.VISIBLE); - tvSize.setVisibility(bm == null ? View.GONE : View.VISIBLE); tvCaption.setText(attachment.name); tvType.setText(attachment.type); - if (bm != null) - tvSize.setText(bm.getWidth() + "x" + bm.getHeight()); } @Override diff --git a/app/src/main/res/layout/item_image.xml b/app/src/main/res/layout/item_image.xml index 343f2b14c3..0e11442309 100644 --- a/app/src/main/res/layout/item_image.xml +++ b/app/src/main/res/layout/item_image.xml @@ -45,16 +45,5 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tvCaption" /> - - \ No newline at end of file