From 0900aee1d3efd7a6de4b556f3951374d07a59a4d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 29 Dec 2018 07:40:12 +0000
Subject: [PATCH] Refactoring

---
 app/src/main/java/eu/faircode/email/AdapterFolder.java    | 2 +-
 app/src/main/java/eu/faircode/email/AdapterMessage.java   | 2 +-
 app/src/main/java/eu/faircode/email/FragmentCompose.java  | 3 +--
 app/src/main/java/eu/faircode/email/FragmentMessages.java | 2 +-
 app/src/main/java/eu/faircode/email/Helper.java           | 5 +++++
 app/src/main/java/eu/faircode/email/HtmlHelper.java       | 3 +--
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 044ccebf76..56df35aacc 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -327,7 +327,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         this.debug = prefs.getBoolean("debug", false);
 
-        this.dp12 = Math.round(12 * context.getResources().getDisplayMetrics().density);
+        this.dp12 = Helper.dp2pixels(12, context);
 
         setHasStableIds(true);
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b78378266c..4277f311d3 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1718,7 +1718,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         this.confirm = prefs.getBoolean("confirm", false);
         this.debug = prefs.getBoolean("debug", false);
 
-        this.dp24 = Math.round(24 * context.getResources().getDisplayMetrics().density);
+        this.dp24 = Helper.dp2pixels(24, context);
         this.colorPrimary = Helper.resolveColor(context, R.attr.colorPrimary);
         this.colorAccent = Helper.resolveColor(context, R.attr.colorAccent);
         this.textColorSecondary = Helper.resolveColor(context, android.R.attr.textColorSecondary);
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 6e2f6faa76..d732b4be9d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1834,8 +1834,7 @@ public class FragmentCompose extends FragmentEx {
                 }
             }
 
-            float scale = getContext().getResources().getDisplayMetrics().density;
-            int px = Math.round(12 * scale);
+            int px = Helper.dp2pixels(12, getContext());
             Drawable d = getContext().getResources().getDrawable(R.drawable.baseline_broken_image_24, getContext().getTheme());
             d.setBounds(0, 0, px, px);
             return d;
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 88049548fa..2118502dda 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -497,7 +497,7 @@ public class FragmentMessages extends FragmentEx {
                 boolean inbox = (EntityFolder.ARCHIVE.equals(message.folderType) || EntityFolder.TRASH.equals(message.folderType));
 
                 View itemView = viewHolder.itemView;
-                int margin = Math.round(12 * (getContext().getResources().getDisplayMetrics().density));
+                int margin = Helper.dp2pixels(12, getContext());
 
                 if (dX > margin) {
                     // Right swipe
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index dd3fae283b..97c8c2783a 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -176,6 +176,11 @@ public class Helper {
         return intent;
     }
 
+    static int dp2pixels(int dp, Context context) {
+        float scale = context.getResources().getDisplayMetrics().density;
+        return Math.round(dp * scale);
+    }
+
     static int resolveColor(Context context, int attr) {
         int[] attrs = new int[]{attr};
         TypedArray a = context.getTheme().obtainStyledAttributes(attrs);
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index fe83a32c83..a267c365bf 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -109,8 +109,7 @@ public class HtmlHelper {
     }
 
     static Drawable decodeImage(String source, Context context, long id, boolean show) {
-        float scale = context.getResources().getDisplayMetrics().density;
-        int px = Math.round(48 * scale);
+        int px = Helper.dp2pixels(48, context);
 
         if (TextUtils.isEmpty(source)) {
             Drawable d = context.getResources().getDrawable(R.drawable.baseline_broken_image_24, context.getTheme());