diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java index dd46d8052..b677ccbe6 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java @@ -625,7 +625,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi .into(new SimpleTarget() { @Override public void onResourceReady(Bitmap resource, Transition transition) { - RoundedBitmapDrawable circularBitmapDrawable = RoundedBitmapDrawableFactory.create(getResources(), addBorder(resource, account_pp.getContext())); + RoundedBitmapDrawable circularBitmapDrawable = RoundedBitmapDrawableFactory.create(getResources(), Helper.addBorder(resource, account_pp.getContext())); circularBitmapDrawable.setCircular(true); account_pp.setImageDrawable(circularBitmapDrawable); } @@ -633,26 +633,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi } - private static Bitmap addBorder(Bitmap resource, Context context) { - int w = resource.getWidth(); - int h = resource.getHeight(); - int radius = Math.min(h / 2, w / 2); - Bitmap output = Bitmap.createBitmap(w + 8, h + 8, Bitmap.Config.ARGB_8888); - Paint p = new Paint(); - p.setAntiAlias(true); - Canvas c = new Canvas(output); - c.drawARGB(0, 0, 0, 0); - p.setStyle(Paint.Style.FILL); - c.drawCircle((w / 2) + 4, (h / 2) + 4, radius, p); - p.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN)); - c.drawBitmap(resource, 4, 4, p); - p.setXfermode(null); - p.setStyle(Paint.Style.STROKE); - p.setColor(ContextCompat.getColor(context, R.color.white)); - p.setStrokeWidth(3); - c.drawCircle((w / 2) + 4, (h / 2) + 4, radius, p); - return output; - } + @Override public void onRetrieveFeedsAccount(List statuses) { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index b660faf4d..2be5f65f5 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -1757,4 +1757,26 @@ public class Helper { "kMGTPE".charAt(exp-1)); } + + public static Bitmap addBorder(Bitmap resource, Context context) { + int w = resource.getWidth(); + int h = resource.getHeight(); + int radius = Math.min(h / 2, w / 2); + Bitmap output = Bitmap.createBitmap(w + 8, h + 8, Bitmap.Config.ARGB_8888); + Paint p = new Paint(); + p.setAntiAlias(true); + Canvas c = new Canvas(output); + c.drawARGB(0, 0, 0, 0); + p.setStyle(Paint.Style.FILL); + c.drawCircle((w / 2) + 4, (h / 2) + 4, radius, p); + p.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN)); + c.drawBitmap(resource, 4, 4, p); + p.setXfermode(null); + p.setStyle(Paint.Style.STROKE); + p.setColor(ContextCompat.getColor(context, R.color.white)); + p.setStrokeWidth(3); + c.drawCircle((w / 2) + 4, (h / 2) + 4, radius, p); + return output; + } + } diff --git a/app/src/main/res/layout/activity_media.xml b/app/src/main/res/layout/activity_media.xml index 81b1e539f..3b210aa93 100644 --- a/app/src/main/res/layout/activity_media.xml +++ b/app/src/main/res/layout/activity_media.xml @@ -45,7 +45,6 @@ tools:ignore="ContentDescription" />