From 2974409c93faac9ead6a3722bc56c2c590ad4404 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 28 Feb 2019 16:47:24 +0100
Subject: [PATCH] bump up emoji size. Fixes #1065

---
 .../res/layout/activity_challenge_detail.xml   |  4 ++--
 Habitica/res/layout/activity_maintenance.xml   |  2 +-
 Habitica/res/layout/autocomplete_emoji.xml     |  2 +-
 Habitica/res/layout/challenge_item.xml         |  4 ++--
 Habitica/res/layout/checklist_item_row.xml     |  2 +-
 .../res/layout/dialog_challenge_detail.xml     |  4 ++--
 .../layout/dialog_challenge_detail_daily.xml   |  2 +-
 .../layout/dialog_challenge_detail_habit.xml   |  2 +-
 .../layout/dialog_challenge_detail_reward.xml  |  2 +-
 .../layout/dialog_challenge_detail_todo.xml    |  2 +-
 .../res/layout/dialog_yesterdaily_task.xml     |  2 +-
 .../res/layout/fragment_challenge_detail.xml   |  4 ++--
 Habitica/res/layout/fragment_group_info.xml    |  4 ++--
 Habitica/res/layout/skill_task_item_card.xml   |  4 ++--
 Habitica/res/layout/tavern_chat_item.xml       |  2 +-
 .../habitica/ui/views/EllipsisTextView.kt      |  4 ++--
 .../habitica/ui/views/HabiticaEmojiTextView.kt | 18 ++++++++++++++++++
 17 files changed, 41 insertions(+), 23 deletions(-)
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt

diff --git a/Habitica/res/layout/activity_challenge_detail.xml b/Habitica/res/layout/activity_challenge_detail.xml
index fc7a8c8c1..be6a29233 100644
--- a/Habitica/res/layout/activity_challenge_detail.xml
+++ b/Habitica/res/layout/activity_challenge_detail.xml
@@ -67,7 +67,7 @@
                             android:layout_marginStart="26dp"
                             android:orientation="vertical">
 
-                            <net.pherth.android.emoji_library.EmojiTextView
+                            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                                 android:id="@+id/challenge_name"
                                 style="@style/Headline"
                                 android:layout_width="match_parent"
@@ -75,7 +75,7 @@
                                 android:maxLines="2"
                                 android:textColor="@color/textColorDark" />
 
-                            <net.pherth.android.emoji_library.EmojiTextView
+                            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                                 android:id="@+id/challenge_description"
                                 style="@style/Body2"
                                 android:layout_width="match_parent"
diff --git a/Habitica/res/layout/activity_maintenance.xml b/Habitica/res/layout/activity_maintenance.xml
index 0b2259d00..4e8786645 100644
--- a/Habitica/res/layout/activity_maintenance.xml
+++ b/Habitica/res/layout/activity_maintenance.xml
@@ -19,7 +19,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="180dp"
                 android:scaleType="centerInside"/>
-        <net.pherth.android.emoji_library.EmojiTextView
+        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                 android:id="@+id/descriptionTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
diff --git a/Habitica/res/layout/autocomplete_emoji.xml b/Habitica/res/layout/autocomplete_emoji.xml
index 292a486d0..0eef15c18 100644
--- a/Habitica/res/layout/autocomplete_emoji.xml
+++ b/Habitica/res/layout/autocomplete_emoji.xml
@@ -6,7 +6,7 @@
     android:paddingBottom="@dimen/spacing_medium"
     android:paddingStart="@dimen/spacing_large"
     android:paddingEnd="@dimen/spacing_large">
-    <net.pherth.android.emoji_library.EmojiTextView
+    <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
         android:id="@+id/emoji_textview"
         android:layout_width="wrap_content"
         android:layout_height="30dp"
diff --git a/Habitica/res/layout/challenge_item.xml b/Habitica/res/layout/challenge_item.xml
index df6022c6e..3ca151d4a 100644
--- a/Habitica/res/layout/challenge_item.xml
+++ b/Habitica/res/layout/challenge_item.xml
@@ -50,7 +50,7 @@
         android:orientation="vertical">
 
 
-        <net.pherth.android.emoji_library.EmojiTextView
+        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
             android:id="@+id/challenge_name"
             style="@style/ChallengeName"
             android:layout_width="match_parent"
@@ -58,7 +58,7 @@
             android:maxLines="3"
             tools:text="Name" />
 
-        <net.pherth.android.emoji_library.EmojiTextView
+        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
             android:id="@+id/challenge_shorttext"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/checklist_item_row.xml b/Habitica/res/layout/checklist_item_row.xml
index 968616171..afa37008e 100644
--- a/Habitica/res/layout/checklist_item_row.xml
+++ b/Habitica/res/layout/checklist_item_row.xml
@@ -18,7 +18,7 @@
             android:button="@drawable/checklist_checkbox"
             android:layout_gravity="center" />
         </FrameLayout>
-        <net.pherth.android.emoji_library.EmojiTextView
+        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
             android:id="@+id/checkedTextView"
             style="@style/Body2"
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/dialog_challenge_detail.xml b/Habitica/res/layout/dialog_challenge_detail.xml
index cf04c01f7..b5a2ed112 100644
--- a/Habitica/res/layout/dialog_challenge_detail.xml
+++ b/Habitica/res/layout/dialog_challenge_detail.xml
@@ -76,7 +76,7 @@
             android:scrollbars="vertical">
 
 
-            <net.pherth.android.emoji_library.EmojiTextView
+            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                 android:id="@+id/challenge_name"
                 style="@style/Title2"
                 android:layout_width="wrap_content"
@@ -84,7 +84,7 @@
                 android:layout_marginTop="9dp"
                 tools:text="Read a book by or about a person in your field of study" />
 
-            <net.pherth.android.emoji_library.EmojiTextView
+            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                 android:id="@+id/challenge_description"
                 style="@style/Body2"
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/dialog_challenge_detail_daily.xml b/Habitica/res/layout/dialog_challenge_detail_daily.xml
index 18b0b5459..39422ee17 100644
--- a/Habitica/res/layout/dialog_challenge_detail_daily.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_daily.xml
@@ -31,7 +31,7 @@
         android:layout_gravity="center"
         android:layout_weight="3">
 
-        <net.pherth.android.emoji_library.EmojiTextView
+        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
             android:id="@+id/daily_title"
             style="@style/Body1"
             android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/dialog_challenge_detail_habit.xml b/Habitica/res/layout/dialog_challenge_detail_habit.xml
index 6f79a4a7e..609a82ed9 100644
--- a/Habitica/res/layout/dialog_challenge_detail_habit.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_habit.xml
@@ -32,7 +32,7 @@
         android:layout_gravity="center"
         android:layout_weight="3">
 
-        <net.pherth.android.emoji_library.EmojiTextView
+        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
             android:id="@+id/habit_title"
             style="@style/Body1"
             android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/dialog_challenge_detail_reward.xml b/Habitica/res/layout/dialog_challenge_detail_reward.xml
index fdf376c03..d5b591980 100644
--- a/Habitica/res/layout/dialog_challenge_detail_reward.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_reward.xml
@@ -18,7 +18,7 @@
             android:layout_marginRight="15.5dp"
             android:layout_marginStart="14.5dp"
             android:layout_marginTop="18dp"  />
-        <net.pherth.android.emoji_library.EmojiTextView
+        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
             android:id="@+id/reward_title"
             style="@style/Body1"
             android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/dialog_challenge_detail_todo.xml b/Habitica/res/layout/dialog_challenge_detail_todo.xml
index 86ca6f1ba..790a38b4c 100644
--- a/Habitica/res/layout/dialog_challenge_detail_todo.xml
+++ b/Habitica/res/layout/dialog_challenge_detail_todo.xml
@@ -31,7 +31,7 @@
         android:layout_gravity="center"
         android:layout_weight="3">
 
-        <net.pherth.android.emoji_library.EmojiTextView
+        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
             android:id="@+id/todo_title"
             style="@style/Body1"
             android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/dialog_yesterdaily_task.xml b/Habitica/res/layout/dialog_yesterdaily_task.xml
index 2935567e7..85f60e087 100644
--- a/Habitica/res/layout/dialog_yesterdaily_task.xml
+++ b/Habitica/res/layout/dialog_yesterdaily_task.xml
@@ -34,7 +34,7 @@
                 android:button="@drawable/daily_checkbox"
                 android:gravity="center" />
         </FrameLayout>
-        <net.pherth.android.emoji_library.EmojiTextView
+        <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
             android:id="@+id/text_view"
             style="@style/Subheader3"
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/fragment_challenge_detail.xml b/Habitica/res/layout/fragment_challenge_detail.xml
index 0c7c6cf07..7f864b81f 100644
--- a/Habitica/res/layout/fragment_challenge_detail.xml
+++ b/Habitica/res/layout/fragment_challenge_detail.xml
@@ -20,7 +20,7 @@
             android:orientation="vertical"
             android:paddingLeft="16dp"
             android:paddingRight="16dp">
-            <net.pherth.android.emoji_library.EmojiTextView
+            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                 android:id="@+id/challenge_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -174,7 +174,7 @@
             android:layout_height="wrap_content"
             app:title="@string/challenge_categories"
             android:background="@color/white">
-            <net.pherth.android.emoji_library.EmojiTextView
+            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                 android:id="@+id/challenge_description"
                 style="@style/Body2"
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml
index bd4d183b4..5ae396d9d 100644
--- a/Habitica/res/layout/fragment_group_info.xml
+++ b/Habitica/res/layout/fragment_group_info.xml
@@ -177,13 +177,13 @@
                     android:showDividers="middle"
                     android:orientation="vertical">
 
-                    <net.pherth.android.emoji_library.EmojiTextView
+                    <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                         android:id="@+id/groupSummaryView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:padding="@dimen/spacing_medium" />
 
-                    <net.pherth.android.emoji_library.EmojiTextView
+                    <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                         android:id="@+id/groupDescriptionView"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/skill_task_item_card.xml b/Habitica/res/layout/skill_task_item_card.xml
index 5e9532561..413c473a5 100644
--- a/Habitica/res/layout/skill_task_item_card.xml
+++ b/Habitica/res/layout/skill_task_item_card.xml
@@ -21,13 +21,13 @@
                 android:paddingEnd="16dp"
                 android:paddingBottom="20dp"
                 android:paddingTop="20dp">
-                <net.pherth.android.emoji_library.EmojiTextView
+                <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                     android:id="@+id/titleTextView"
                     style="@style/CardTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />
 
-                <net.pherth.android.emoji_library.EmojiTextView
+                <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                     android:id="@+id/notesTextView"
                     style="@style/CardText"
                     android:layout_width="match_parent"
diff --git a/Habitica/res/layout/tavern_chat_item.xml b/Habitica/res/layout/tavern_chat_item.xml
index 3412740cf..139e50469 100644
--- a/Habitica/res/layout/tavern_chat_item.xml
+++ b/Habitica/res/layout/tavern_chat_item.xml
@@ -93,7 +93,7 @@
                 tools:text="2d ago"
                 android:textSize="12sp"
                 android:textColor="@color/gray_300"/>
-            <net.pherth.android.emoji_library.EmojiTextView
+            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
                 android:id="@+id/message_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt
index 953b1b81b..afbbb7a5b 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/EllipsisTextView.kt
@@ -16,9 +16,9 @@ package com.habitrpg.android.habitica.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
-import net.pherth.android.emoji_library.EmojiTextView
+import com.habitrpg.android.habitica.R
 
-class EllipsisTextView : EmojiTextView {
+class EllipsisTextView : HabiticaEmojiTextView {
 
     private val ellipsesListeners = ArrayList<EllipsisListener>()
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt
new file mode 100644
index 000000000..560a617ab
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt
@@ -0,0 +1,18 @@
+package com.habitrpg.android.habitica.ui.views
+
+import android.content.Context
+import android.util.AttributeSet
+import net.pherth.android.emoji_library.EmojiTextView
+
+open class HabiticaEmojiTextView : EmojiTextView {
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
+
+    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle)
+
+    init {
+        setEmojiconSize((textSize * 1.5).toInt())
+    }
+}
\ No newline at end of file