From 1a99188b855e349689076c0b054946c6ddf92116 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 30 Dec 2018 16:17:22 +0000
Subject: [PATCH] Fixed text size scaling

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 7 ++++---
 app/src/main/java/eu/faircode/email/Helper.java         | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 18c248de7f..1cdd9ec905 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -52,6 +52,7 @@ import android.text.style.ImageSpan;
 import android.text.style.QuoteSpan;
 import android.text.style.StyleSpan;
 import android.text.style.URLSpan;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -471,8 +472,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvCount.setTypeface(null, typeface);
 
             if (textSize != 0) {
-                tvFrom.setTextSize(textSize);
-                tvSubject.setTextSize(textSize);
+                tvFrom.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
+                tvSubject.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
             }
 
             int colorUnseen = (message.unseen > 0 ? colorUnread : textColorSecondary);
@@ -545,7 +546,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 bnvActions.setVisibility(View.VISIBLE);
 
                 if (textSize != 0)
-                    tvBody.setTextSize(textSize);
+                    tvBody.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize);
 
                 Spanned body = properties.getBody(message.id);
                 tvBody.setText(body);
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 5d23ef0d28..963025494d 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -189,7 +189,7 @@ public class Helper {
             else
                 ta = context.obtainStyledAttributes(
                         R.style.TextAppearance_AppCompat_Medium, new int[]{android.R.attr.textSize});
-            return ta.getDimension(0, 0) / context.getResources().getDisplayMetrics().density;
+            return ta.getDimension(0, 0);
         } finally {
             if (ta != null)
                 ta.recycle();