From 1eef035a9ec5e379887b867f3527e67d49d312c5 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <k.pozniak@gmx.at>
Date: Fri, 21 Feb 2020 18:21:47 +0100
Subject: [PATCH] fix default emoji font icon not rendering

---
 .../java/com/keylesspalace/tusky/util/EmojiCompatFont.java     | 3 ++-
 app/src/main/res/drawable/ic_emoji_34dp.xml                    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/util/EmojiCompatFont.java b/app/src/main/java/com/keylesspalace/tusky/util/EmojiCompatFont.java
index ea0479829..ca7899e7a 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/EmojiCompatFont.java
+++ b/app/src/main/java/com/keylesspalace/tusky/util/EmojiCompatFont.java
@@ -8,6 +8,7 @@ import android.util.Pair;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 
 import com.keylesspalace.tusky.R;
 
@@ -144,7 +145,7 @@ public class EmojiCompatFont {
     }
 
     public Drawable getThumb(Context context) {
-        return context.getResources().getDrawable(img);
+        return ContextCompat.getDrawable(context, img);
     }
 
     public String getVersion() {
diff --git a/app/src/main/res/drawable/ic_emoji_34dp.xml b/app/src/main/res/drawable/ic_emoji_34dp.xml
index d779af3bc..b00cb9684 100644
--- a/app/src/main/res/drawable/ic_emoji_34dp.xml
+++ b/app/src/main/res/drawable/ic_emoji_34dp.xml
@@ -4,6 +4,6 @@
     android:viewportHeight="24"
     android:viewportWidth="24">
     <path
-        android:fillColor="?android:attr/textColorSecondary"
+        android:fillColor="?attr/iconColor"
         android:pathData="M12,17.5C14.33,17.5 16.3,16.04 17.11,14H6.89C7.69,16.04 9.67,17.5 12,17.5M8.5,11A1.5,1.5 0 0,0 10,9.5A1.5,1.5 0 0,0 8.5,8A1.5,1.5 0 0,0 7,9.5A1.5,1.5 0 0,0 8.5,11M15.5,11A1.5,1.5 0 0,0 17,9.5A1.5,1.5 0 0,0 15.5,8A1.5,1.5 0 0,0 14,9.5A1.5,1.5 0 0,0 15.5,11M12,20A8,8 0 0,1 4,12A8,8 0 0,1 12,4A8,8 0 0,1 20,12A8,8 0 0,1 12,20M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z" />
 </vector>
\ No newline at end of file