Proper emojis for the new custom emoji selector

husky/app/src/main/java/com/keylesspalace/tusky/view/emojireactions/EmojiDialogFragment.kt

@@ -18,6 +18,7 @@ class EmojiDialogFragment(
 ) : DialogFragment() {
 
     companion object {
+        private const val EMOJI_DIALOG_ITEM_COUNT = 2
         const val DIALOG_TAG = "CUSTOM_EMOJI_DIALOG"
     }
 
@@ -45,10 +46,10 @@ class EmojiDialogFragment(
             tab.setIcon(
                 when (position) {
                     0 -> {
-                        R.drawable.arrows_clockwise
+                        R.drawable.neocat_aww
                     }
                     1 -> {
-                        R.drawable.ic_alert_circle
+                        R.drawable.neocat_confused
                     }
                     else -> {
                         throw Exception("It shouldn't be more than two items")
@@ -67,7 +68,7 @@ class EmojiDialogFragment(
     ) : FragmentStateAdapter(activity) {
 
         override fun getItemCount(): Int {
-            return 2
+            return EMOJI_DIALOG_ITEM_COUNT
         }
 
         override fun getItemId(position: Int): Long {

husky/app/src/main/res/drawable/neocat_aww.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="256dp" android:viewportHeight="256" android:viewportWidth="256" android:width="256dp">
+
+    <path android:fillColor="#000000" android:pathData="M44.4,41.2c-4.1,2 -4.4,4.4 -4.4,40.5 0,34.2 0,34.7 -2.5,41.8 -1.3,3.9 -3.1,11.1 -4,15.9 -1.6,9.2 -2.1,31.6 -0.7,31.6 0.4,-0 2.8,-2.1 5.2,-4.6 11.4,-11.6 25.3,-12.5 36.5,-2.3 6.6,6.1 9,12.2 8.2,20.9 -0.6,7.4 -2.6,10.9 -10.1,18.7 -5.8,5.9 -6.5,6.3 -10.7,6.3 -8,-0 -7.8,-1.5 1.5,-10.5 9.3,-8.8 11.4,-13.2 10.1,-20.1 -1,-5.4 -7.7,-11.9 -13,-12.8 -6.1,-1 -10.5,1.1 -19.1,9.3 -7.6,7.3 -7.6,7.3 -6.4,11.5 2.5,8.5 8.4,18 15.5,25.1 8.1,8 15.2,12.5 25.7,16.3 7.3,2.6 7.3,2.6 54.3,3 31,0.2 49.2,-0 53.5,-0.8 18.9,-3.1 35.5,-19.3 39,-37.9 0.5,-2.9 1,-15.8 1,-28.6 0,-24.8 -1.2,-35.6 -5.1,-46 -2.1,-5.6 -2.1,-5.6 1.6,-38.2 4,-35.8 3.9,-37.1 -1.6,-39.3 -3.5,-1.5 -3.3,-1.6 -33.6,11.5 -21.4,9.3 -21.4,9.3 -27.2,7.5 -14.9,-4.7 -32.8,-5 -49.9,-1 -9.2,2.2 -9.2,2.2 -34,-8.4 -13.7,-5.8 -25.5,-10.6 -26.3,-10.5 -0.8,-0 -2.4,0.5 -3.5,1.1zM89.5,95.1c6.3,3 12.3,9 15.5,15.4 3.5,7.2 3.5,19.8 0,27 -6.9,14.1 -22.6,21.4 -36,16.7 -5.5,-1.9 -5.5,-1.9 3.5,-1.8 7.3,-0 9.9,-0.4 14,-2.2 14.3,-6.5 20.9,-22 15.5,-36.4 -5.4,-14.5 -22.8,-21.5 -39,-15.8 -6.3,2.2 -7.4,2.4 -6.5,1 0.7,-1.2 7.7,-4.9 11.5,-6.1 4.6,-1.5 16.1,-0.4 21.5,2.2zM169.5,95.1c18.1,8.6 23.9,30.9 12.3,47.6 -4.4,6.4 -8.9,8.9 -19.6,10.9 -10,1.7 -16.6,1.5 -18.9,-0.9 -1.3,-1.2 -0.7,-1.3 4.4,-0.5 24,3.8 42.4,-16.8 34.3,-38.4 -5.4,-14.5 -22.8,-21.5 -39,-15.8 -6.3,2.2 -7.4,2.4 -6.5,1 0.7,-1.2 7.7,-4.9 11.5,-6.1 4.6,-1.5 16.1,-0.4 21.5,2.2zM84.8,104.3c15.4,9.9 14.4,32.8 -1.7,40.9 -15.2,7.7 -32.8,-1.5 -34.8,-18.2 -1.1,-9.5 4.2,-19 13,-23.5 7.2,-3.6 17.1,-3.3 23.5,0.8zM164.8,104.3c15.4,9.9 14.4,32.8 -1.7,40.9 -15.2,7.7 -32.8,-1.5 -34.8,-18.2 -1.1,-9.5 4.2,-19 13,-23.5 7.2,-3.6 17.1,-3.3 23.5,0.8zM177.1,159.5c4.2,2.1 19.7,17.2 21,20.4 1,2.5 -0.5,9.1 -2,9.1 -0.4,-0 -5.5,-4.7 -11.2,-10.6 -11.5,-11.5 -14.6,-13.1 -22.4,-11.4 -5.7,1.3 -11.1,7.3 -12,13.3 -1.1,7 1.9,12 13.2,22.6 5.5,5 9.3,9.3 8.9,9.9 -1.2,2 -7.2,2.5 -10.3,0.9 -3.6,-1.9 -16.6,-15.5 -18.8,-19.8 -2.3,-4.4 -3,-13 -1.5,-18.4 2.1,-7.4 9.7,-14.9 18,-17.6 3.7,-1.3 13.2,-0.4 17.1,1.6zM132.2,163.8c3.2,3.1 3.3,3.5 3.2,11 -0.2,11.8 -4.5,18.7 -14.8,23.3 -4,1.7 -6,2 -10.9,1.5 -13.5,-1.4 -22.7,-12.9 -21.5,-27.1 0.5,-5.7 3,-9.7 7.3,-11.6 1.1,-0.5 9.1,-0.7 17.7,-0.6 15.8,0.2 15.8,0.2 19,3.5z" android:strokeColor="#00000000"/>
+
+    <path android:fillColor="#000000" android:pathData="M65.5,107.7c-5.5,1.5 -10.5,7.8 -10.5,13.2 0,2.1 0.9,4.1 2.6,5.8 2.1,2.1 3.2,2.5 6.4,2 7.1,-0.9 12,-6.5 12,-13.4 0,-5.7 -4.7,-9.1 -10.5,-7.6z" android:strokeColor="#00000000"/>
+
+    <path android:fillColor="#000000" android:pathData="M78,131c-4.2,4.8 -4.5,5.6 -3,7.5 2,2.4 4.6,1.8 8.5,-1.9 2.8,-2.7 3.6,-4.1 3.3,-6.3 -0.5,-4.5 -4.5,-4.2 -8.8,0.7z" android:strokeColor="#00000000"/>
+
+    <path android:fillColor="#000000" android:pathData="M145.5,107.7c-5.5,1.5 -10.5,7.8 -10.5,13.2 0,2.1 0.9,4.1 2.6,5.8 2.1,2.1 3.2,2.5 6.4,2 7.1,-0.9 12,-6.5 12,-13.4 0,-5.7 -4.7,-9.1 -10.5,-7.6z" android:strokeColor="#00000000"/>
+
+    <path android:fillColor="#000000" android:pathData="M158,131c-4.2,4.8 -4.5,5.6 -3,7.5 2,2.4 4.6,1.8 8.5,-1.9 2.8,-2.7 3.6,-4.1 3.3,-6.3 -0.5,-4.5 -4.5,-4.2 -8.8,0.7z" android:strokeColor="#00000000"/>
+
+    <path android:fillColor="#000000" android:pathData="M118.5,178.6c-5.2,1.9 -11.3,7.9 -12.7,12.6 -0.6,2.1 -0.9,4 -0.7,4.2 1.1,1.2 14.2,-1.4 17.4,-3.4 2.8,-1.7 10.5,-12.4 10.5,-14.6 0,-1 -10.8,-0.1 -14.5,1.2z" android:strokeColor="#00000000"/>
+
+</vector>

husky/app/src/main/res/drawable/neocat_confused.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="256dp" android:viewportHeight="256" android:viewportWidth="256" android:width="256dp">
+
+    <path android:fillColor="#000000" android:pathData="M115.7,17c-2,0.6 -5.5,1.9 -7.6,3 -4,2 -11.1,9.4 -11.1,11.6 0,0.7 2.8,2.9 6.3,4.8 6.2,3.6 6.2,3.6 8.2,1.3 5.1,-5.7 10.8,-7.3 15.3,-4.1 1.5,1.1 2.2,2.5 2.2,5 0,2.8 -1.1,4.6 -7,10.7 -6.7,7.1 -9.6,11.9 -8.4,13.8 0.3,0.5 3.5,0.9 7.1,0.9 6.5,-0 6.5,-0 13.2,-7.1 8.5,-9.1 11.1,-13.8 11.1,-20.1 0,-11.4 -7.6,-18.9 -20.6,-20.2 -2.7,-0.3 -6.6,-0.1 -8.7,0.4z" android:strokeColor="#00000000"/>
+
+    <path android:fillColor="#000000" android:pathData="M34.5,74.5c-1.4,1.3 -2.5,3.4 -2.5,4.7 0,1.3 2.5,13.1 5.4,26.2 5.3,23.9 5.3,23.9 2.4,30.4 -8.9,19.6 -10.1,44.9 -2.9,60.2 8.8,18.6 23.4,30.6 42.1,34.6 8,1.7 100.4,2 109.1,0.4 16.8,-3.1 31.7,-18.1 34.9,-34.9 0.5,-2.9 1,-12.8 1,-22 0,-18 -1.9,-30.6 -5.9,-39.7 -2.2,-4.8 -2.2,-4.8 6.1,-29.5 9,-27 9.2,-28.7 3.6,-31.9 -2.6,-1.4 -4.4,-1.1 -30.3,5.4 -27.6,6.9 -27.6,6.9 -36.9,4.6 -5.1,-1.2 -11.6,-2.3 -14.6,-2.3 -5.4,-0.2 -5.4,-0.2 -6.2,4.1 -0.8,5 -3.6,9.2 -8.5,13 -3.1,2.3 -4.6,2.7 -10.3,2.7 -5.5,-0 -7.3,-0.5 -10.6,-2.6 -3.6,-2.4 -7.3,-7.9 -8.8,-13.1 -0.4,-1.4 -1.1,-1.5 -4.3,-0.6 -3.3,0.8 -7.4,-0 -30,-5.6 -14.5,-3.6 -27.2,-6.6 -28.3,-6.6 -1.2,-0 -3.2,1.1 -4.5,2.5zM96.4,131.6c2,2 2.1,6.8 0.1,8.7 -1.7,1.8 -2.9,2 -19.6,4.3 -14.3,1.9 -17.6,1.5 -18.5,-2.1 -0.9,-3.4 0.2,-7.1 2.3,-8 2.7,-1.1 24.1,-4.3 29.5,-4.4 3,-0.1 5.2,0.4 6.2,1.5zM158.5,131.9c8.3,1.1 15.8,2.2 16.8,2.6 2.1,0.9 3.2,4.6 2.3,8 -0.9,3.7 -4.1,4 -20.5,2.1 -18.4,-2.2 -19.8,-2.4 -21.6,-4.3 -2,-1.9 -1.9,-6.7 0.1,-8.7 2,-2 4.6,-2 22.9,0.3zM207.2,164.7c2.5,2.2 2.3,4.8 -0.6,7 -1.3,1 -7.8,4.5 -14.5,7.8 -12.6,6.2 -13.9,6.4 -16.5,2.2 -0.8,-1.2 -0.8,-2.2 0,-3.5 1.1,-1.8 25.9,-15.1 28.3,-15.2 0.8,-0 2.3,0.7 3.3,1.7zM54.4,171.8c9.7,5.1 11.8,7.1 10,9.9 -2.5,3.9 -4,3.9 -12.5,-0.2 -12.9,-6.3 -15,-8.6 -11.2,-12.7 2.3,-2.6 3.7,-2.3 13.7,3zM83.8,177.4c1,1.4 3.2,5 4.8,8 3.1,5.9 4.7,6.8 6.4,3.6 2.3,-4.3 11.2,-14 12.8,-14 1,-0 5.8,4 10.7,9 4.9,4.9 9.3,9 9.8,9 0.5,-0 5.6,-4.1 11.5,-9 5.8,-5 11.3,-9 12.1,-9 2.1,-0 5.1,3 5.1,5.1 0,2.1 -26.6,24.9 -28.9,24.9 -0.9,-0 -5.6,-4.1 -10.6,-9 -9.1,-9.1 -9.1,-9.1 -16.3,-0 -7.4,9.2 -9.6,10.5 -12.4,7.2 -2.5,-3 -13.8,-22 -13.8,-23.3 0,-1.9 3.1,-4.9 5.1,-4.9 1,-0 2.6,1.1 3.7,2.4zM63.2,192.7c4,3.6 1.9,6.5 -8.2,11.2 -7.3,3.5 -10,3.9 -10,1.5 0,-0.9 -0.7,-2.2 -1.7,-2.9 -2.4,-1.8 -1,-3.1 7.5,-7.5 8.7,-4.4 9.8,-4.6 12.4,-2.3zM194.4,197.8c13.5,7 15.9,9 14,11.9 -2.6,4.2 -3.9,4 -16.5,-2.2 -13.6,-6.7 -16.9,-8.9 -16.9,-11.2 0,-2.2 2.9,-5.3 4.9,-5.3 0.9,0.1 7.4,3.1 14.5,6.8z" android:strokeColor="#00000000"/>
+
+    <path android:fillColor="#000000" android:pathData="M117,73.3c-1.4,0.7 -3.3,2.8 -4.3,4.8 -4.4,9.1 6.4,16.9 14.2,10.3 5.1,-4.2 4.1,-11.8 -1.9,-14.9 -3.5,-1.8 -4.7,-1.8 -8,-0.2z" android:strokeColor="#00000000"/>
+
+</vector>