From a5c4c1e0a6ac41047ab66b3ce3706bc97bed2806 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 8 Jan 2020 15:27:55 -0500
Subject: [PATCH] Converted outlines from 1px to 1dp.

---
 .../thoughtcrime/securesms/components/AvatarImageView.java   | 5 +++--
 .../java/org/thoughtcrime/securesms/components/Outliner.java | 5 +++--
 .../main/java/org/thoughtcrime/securesms/util/ViewUtil.java  | 5 +++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
index 407539f247..14bb60fdf7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -23,6 +23,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientExporter;
 import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.util.Objects;
 
@@ -40,12 +41,12 @@ public final class AvatarImageView extends AppCompatImageView {
   static {
     LIGHT_THEME_OUTLINE_PAINT.setColor(Color.argb((int) (255 * 0.2), 0, 0, 0));
     LIGHT_THEME_OUTLINE_PAINT.setStyle(Paint.Style.STROKE);
-    LIGHT_THEME_OUTLINE_PAINT.setStrokeWidth(1f);
+    LIGHT_THEME_OUTLINE_PAINT.setStrokeWidth(ViewUtil.dpToPx(1));
     LIGHT_THEME_OUTLINE_PAINT.setAntiAlias(true);
 
     DARK_THEME_OUTLINE_PAINT.setColor(Color.argb((int) (255 * 0.2), 255, 255, 255));
     DARK_THEME_OUTLINE_PAINT.setStyle(Paint.Style.STROKE);
-    DARK_THEME_OUTLINE_PAINT.setStrokeWidth(1f);
+    DARK_THEME_OUTLINE_PAINT.setStrokeWidth(ViewUtil.dpToPx(1));
     DARK_THEME_OUTLINE_PAINT.setAntiAlias(true);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/Outliner.java b/app/src/main/java/org/thoughtcrime/securesms/components/Outliner.java
index 1702612852..9a4566245b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/Outliner.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/Outliner.java
@@ -6,7 +6,8 @@ import android.graphics.Path;
 import android.graphics.RectF;
 
 import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
+
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 public class Outliner {
 
@@ -16,7 +17,7 @@ public class Outliner {
   private final Paint   outlinePaint = new Paint();
   {
     outlinePaint.setStyle(Paint.Style.STROKE);
-    outlinePaint.setStrokeWidth(1f);
+    outlinePaint.setStrokeWidth(ViewUtil.dpToPx(1));
     outlinePaint.setAntiAlias(true);
   }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java
index 81f49c5104..dbebbf022c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtil.java
@@ -19,6 +19,7 @@ package org.thoughtcrime.securesms.util;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
@@ -198,6 +199,10 @@ public class ViewUtil {
     return (int)((dp * context.getResources().getDisplayMetrics().density) + 0.5);
   }
 
+  public static int dpToPx(int dp) {
+    return Math.round(dp * Resources.getSystem().getDisplayMetrics().density);
+  }
+
   public static void updateLayoutParams(@NonNull View view, int width, int height) {
     view.getLayoutParams().width  = width;
     view.getLayoutParams().height = height;