Merge pull request #1997 from vector-im/feature/bma/sasEmojiSync

SAS emoji sync: fix issue on Emoji 30 (Smiley)

features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/emoji/EmojiResource.kt

@@ -26,69 +26,69 @@ internal data class EmojiResource(
 
 internal fun Int.toEmojiResource(): EmojiResource {
     return when (this % 64) {
-        0 -> EmojiResource(R.drawable.ic_verification_dog, R.string.verification_emoji_dog)
-        1 -> EmojiResource(R.drawable.ic_verification_cat, R.string.verification_emoji_cat)
-        2 -> EmojiResource(R.drawable.ic_verification_lion, R.string.verification_emoji_lion)
-        3 -> EmojiResource(R.drawable.ic_verification_horse, R.string.verification_emoji_horse)
-        4 -> EmojiResource(R.drawable.ic_verification_unicorn, R.string.verification_emoji_unicorn)
-        5 -> EmojiResource(R.drawable.ic_verification_pig, R.string.verification_emoji_pig)
-        6 -> EmojiResource(R.drawable.ic_verification_elephant, R.string.verification_emoji_elephant)
-        7 -> EmojiResource(R.drawable.ic_verification_rabbit, R.string.verification_emoji_rabbit)
-        8 -> EmojiResource(R.drawable.ic_verification_panda, R.string.verification_emoji_panda)
-        9 -> EmojiResource(R.drawable.ic_verification_rooster, R.string.verification_emoji_rooster)
-        10 -> EmojiResource(R.drawable.ic_verification_penguin, R.string.verification_emoji_penguin)
-        11 -> EmojiResource(R.drawable.ic_verification_turtle, R.string.verification_emoji_turtle)
-        12 -> EmojiResource(R.drawable.ic_verification_fish, R.string.verification_emoji_fish)
-        13 -> EmojiResource(R.drawable.ic_verification_octopus, R.string.verification_emoji_octopus)
-        14 -> EmojiResource(R.drawable.ic_verification_butterfly, R.string.verification_emoji_butterfly)
-        15 -> EmojiResource(R.drawable.ic_verification_flower, R.string.verification_emoji_flower)
-        16 -> EmojiResource(R.drawable.ic_verification_tree, R.string.verification_emoji_tree)
-        17 -> EmojiResource(R.drawable.ic_verification_cactus, R.string.verification_emoji_cactus)
-        18 -> EmojiResource(R.drawable.ic_verification_mushroom, R.string.verification_emoji_mushroom)
-        19 -> EmojiResource(R.drawable.ic_verification_globe, R.string.verification_emoji_globe)
-        20 -> EmojiResource(R.drawable.ic_verification_moon, R.string.verification_emoji_moon)
-        21 -> EmojiResource(R.drawable.ic_verification_cloud, R.string.verification_emoji_cloud)
-        22 -> EmojiResource(R.drawable.ic_verification_fire, R.string.verification_emoji_fire)
-        23 -> EmojiResource(R.drawable.ic_verification_banana, R.string.verification_emoji_banana)
-        24 -> EmojiResource(R.drawable.ic_verification_apple, R.string.verification_emoji_apple)
-        25 -> EmojiResource(R.drawable.ic_verification_strawberry, R.string.verification_emoji_strawberry)
-        26 -> EmojiResource(R.drawable.ic_verification_corn, R.string.verification_emoji_corn)
-        27 -> EmojiResource(R.drawable.ic_verification_pizza, R.string.verification_emoji_pizza)
-        28 -> EmojiResource(R.drawable.ic_verification_cake, R.string.verification_emoji_cake)
-        29 -> EmojiResource(R.drawable.ic_verification_heart, R.string.verification_emoji_heart)
-        30 -> EmojiResource(R.drawable.ic_verification_smiley, R.string.verification_emoji_smiley)
-        31 -> EmojiResource(R.drawable.ic_verification_robot, R.string.verification_emoji_robot)
-        32 -> EmojiResource(R.drawable.ic_verification_hat, R.string.verification_emoji_hat)
-        33 -> EmojiResource(R.drawable.ic_verification_glasses, R.string.verification_emoji_glasses)
-        34 -> EmojiResource(R.drawable.ic_verification_spanner, R.string.verification_emoji_spanner)
-        35 -> EmojiResource(R.drawable.ic_verification_santa, R.string.verification_emoji_santa)
-        36 -> EmojiResource(R.drawable.ic_verification_thumbs_up, R.string.verification_emoji_thumbs_up)
-        37 -> EmojiResource(R.drawable.ic_verification_umbrella, R.string.verification_emoji_umbrella)
-        38 -> EmojiResource(R.drawable.ic_verification_hourglass, R.string.verification_emoji_hourglass)
-        39 -> EmojiResource(R.drawable.ic_verification_clock, R.string.verification_emoji_clock)
-        40 -> EmojiResource(R.drawable.ic_verification_gift, R.string.verification_emoji_gift)
-        41 -> EmojiResource(R.drawable.ic_verification_light_bulb, R.string.verification_emoji_light_bulb)
-        42 -> EmojiResource(R.drawable.ic_verification_book, R.string.verification_emoji_book)
-        43 -> EmojiResource(R.drawable.ic_verification_pencil, R.string.verification_emoji_pencil)
-        44 -> EmojiResource(R.drawable.ic_verification_paperclip, R.string.verification_emoji_paperclip)
-        45 -> EmojiResource(R.drawable.ic_verification_scissors, R.string.verification_emoji_scissors)
-        46 -> EmojiResource(R.drawable.ic_verification_lock, R.string.verification_emoji_lock)
-        47 -> EmojiResource(R.drawable.ic_verification_key, R.string.verification_emoji_key)
-        48 -> EmojiResource(R.drawable.ic_verification_hammer, R.string.verification_emoji_hammer)
-        49 -> EmojiResource(R.drawable.ic_verification_phone, R.string.verification_emoji_telephone)
-        50 -> EmojiResource(R.drawable.ic_verification_flag, R.string.verification_emoji_flag)
-        51 -> EmojiResource(R.drawable.ic_verification_train, R.string.verification_emoji_train)
-        52 -> EmojiResource(R.drawable.ic_verification_bicycle, R.string.verification_emoji_bicycle)
-        53 -> EmojiResource(R.drawable.ic_verification_aeroplane, R.string.verification_emoji_aeroplane)
-        54 -> EmojiResource(R.drawable.ic_verification_rocket, R.string.verification_emoji_rocket)
-        55 -> EmojiResource(R.drawable.ic_verification_trophy, R.string.verification_emoji_trophy)
-        56 -> EmojiResource(R.drawable.ic_verification_ball, R.string.verification_emoji_ball)
-        57 -> EmojiResource(R.drawable.ic_verification_guitar, R.string.verification_emoji_guitar)
-        58 -> EmojiResource(R.drawable.ic_verification_trumpet, R.string.verification_emoji_trumpet)
-        59 -> EmojiResource(R.drawable.ic_verification_bell, R.string.verification_emoji_bell)
-        60 -> EmojiResource(R.drawable.ic_verification_anchor, R.string.verification_emoji_anchor)
-        61 -> EmojiResource(R.drawable.ic_verification_headphones, R.string.verification_emoji_headphones)
-        62 -> EmojiResource(R.drawable.ic_verification_folder, R.string.verification_emoji_folder)
-        /* 63 */ else -> EmojiResource(R.drawable.ic_verification_pin, R.string.verification_emoji_pin)
+        0 -> EmojiResource(R.drawable.ic_verification_00, R.string.verification_emoji_00)
+        1 -> EmojiResource(R.drawable.ic_verification_01, R.string.verification_emoji_01)
+        2 -> EmojiResource(R.drawable.ic_verification_02, R.string.verification_emoji_02)
+        3 -> EmojiResource(R.drawable.ic_verification_03, R.string.verification_emoji_03)
+        4 -> EmojiResource(R.drawable.ic_verification_04, R.string.verification_emoji_04)
+        5 -> EmojiResource(R.drawable.ic_verification_05, R.string.verification_emoji_05)
+        6 -> EmojiResource(R.drawable.ic_verification_06, R.string.verification_emoji_06)
+        7 -> EmojiResource(R.drawable.ic_verification_07, R.string.verification_emoji_07)
+        8 -> EmojiResource(R.drawable.ic_verification_08, R.string.verification_emoji_08)
+        9 -> EmojiResource(R.drawable.ic_verification_09, R.string.verification_emoji_09)
+        10 -> EmojiResource(R.drawable.ic_verification_10, R.string.verification_emoji_10)
+        11 -> EmojiResource(R.drawable.ic_verification_11, R.string.verification_emoji_11)
+        12 -> EmojiResource(R.drawable.ic_verification_12, R.string.verification_emoji_12)
+        13 -> EmojiResource(R.drawable.ic_verification_13, R.string.verification_emoji_13)
+        14 -> EmojiResource(R.drawable.ic_verification_14, R.string.verification_emoji_14)
+        15 -> EmojiResource(R.drawable.ic_verification_15, R.string.verification_emoji_15)
+        16 -> EmojiResource(R.drawable.ic_verification_16, R.string.verification_emoji_16)
+        17 -> EmojiResource(R.drawable.ic_verification_17, R.string.verification_emoji_17)
+        18 -> EmojiResource(R.drawable.ic_verification_18, R.string.verification_emoji_18)
+        19 -> EmojiResource(R.drawable.ic_verification_19, R.string.verification_emoji_19)
+        20 -> EmojiResource(R.drawable.ic_verification_20, R.string.verification_emoji_20)
+        21 -> EmojiResource(R.drawable.ic_verification_21, R.string.verification_emoji_21)
+        22 -> EmojiResource(R.drawable.ic_verification_22, R.string.verification_emoji_22)
+        23 -> EmojiResource(R.drawable.ic_verification_23, R.string.verification_emoji_23)
+        24 -> EmojiResource(R.drawable.ic_verification_24, R.string.verification_emoji_24)
+        25 -> EmojiResource(R.drawable.ic_verification_25, R.string.verification_emoji_25)
+        26 -> EmojiResource(R.drawable.ic_verification_26, R.string.verification_emoji_26)
+        27 -> EmojiResource(R.drawable.ic_verification_27, R.string.verification_emoji_27)
+        28 -> EmojiResource(R.drawable.ic_verification_28, R.string.verification_emoji_28)
+        29 -> EmojiResource(R.drawable.ic_verification_29, R.string.verification_emoji_29)
+        30 -> EmojiResource(R.drawable.ic_verification_30, R.string.verification_emoji_30)
+        31 -> EmojiResource(R.drawable.ic_verification_31, R.string.verification_emoji_31)
+        32 -> EmojiResource(R.drawable.ic_verification_32, R.string.verification_emoji_32)
+        33 -> EmojiResource(R.drawable.ic_verification_33, R.string.verification_emoji_33)
+        34 -> EmojiResource(R.drawable.ic_verification_34, R.string.verification_emoji_34)
+        35 -> EmojiResource(R.drawable.ic_verification_35, R.string.verification_emoji_35)
+        36 -> EmojiResource(R.drawable.ic_verification_36, R.string.verification_emoji_36)
+        37 -> EmojiResource(R.drawable.ic_verification_37, R.string.verification_emoji_37)
+        38 -> EmojiResource(R.drawable.ic_verification_38, R.string.verification_emoji_38)
+        39 -> EmojiResource(R.drawable.ic_verification_39, R.string.verification_emoji_39)
+        40 -> EmojiResource(R.drawable.ic_verification_40, R.string.verification_emoji_40)
+        41 -> EmojiResource(R.drawable.ic_verification_41, R.string.verification_emoji_41)
+        42 -> EmojiResource(R.drawable.ic_verification_42, R.string.verification_emoji_42)
+        43 -> EmojiResource(R.drawable.ic_verification_43, R.string.verification_emoji_43)
+        44 -> EmojiResource(R.drawable.ic_verification_44, R.string.verification_emoji_44)
+        45 -> EmojiResource(R.drawable.ic_verification_45, R.string.verification_emoji_45)
+        46 -> EmojiResource(R.drawable.ic_verification_46, R.string.verification_emoji_46)
+        47 -> EmojiResource(R.drawable.ic_verification_47, R.string.verification_emoji_47)
+        48 -> EmojiResource(R.drawable.ic_verification_48, R.string.verification_emoji_48)
+        49 -> EmojiResource(R.drawable.ic_verification_49, R.string.verification_emoji_49)
+        50 -> EmojiResource(R.drawable.ic_verification_50, R.string.verification_emoji_50)
+        51 -> EmojiResource(R.drawable.ic_verification_51, R.string.verification_emoji_51)
+        52 -> EmojiResource(R.drawable.ic_verification_52, R.string.verification_emoji_52)
+        53 -> EmojiResource(R.drawable.ic_verification_53, R.string.verification_emoji_53)
+        54 -> EmojiResource(R.drawable.ic_verification_54, R.string.verification_emoji_54)
+        55 -> EmojiResource(R.drawable.ic_verification_55, R.string.verification_emoji_55)
+        56 -> EmojiResource(R.drawable.ic_verification_56, R.string.verification_emoji_56)
+        57 -> EmojiResource(R.drawable.ic_verification_57, R.string.verification_emoji_57)
+        58 -> EmojiResource(R.drawable.ic_verification_58, R.string.verification_emoji_58)
+        59 -> EmojiResource(R.drawable.ic_verification_59, R.string.verification_emoji_59)
+        60 -> EmojiResource(R.drawable.ic_verification_60, R.string.verification_emoji_60)
+        61 -> EmojiResource(R.drawable.ic_verification_61, R.string.verification_emoji_61)
+        62 -> EmojiResource(R.drawable.ic_verification_62, R.string.verification_emoji_62)
+        /* 63 */ else -> EmojiResource(R.drawable.ic_verification_63, R.string.verification_emoji_63)
     }
 }

features/verifysession/impl/src/main/res/drawable/ic_verification_smiley.xml → features/verifysession/impl/src/main/res/drawable/ic_verification_30.xml

@@ -7,8 +7,11 @@
       android:pathData="M18,18m-18,0a18,18 0,1 1,36 0a18,18 0,1 1,-36 0"
       android:fillColor="#FFCC4D"/>
   <path
-      android:pathData="M10.515,23.621C10.56,23.8 11.683,28 18,28c6.318,0 7.44,-4.2 7.485,-4.379 0.055,-0.217 -0.043,-0.442 -0.237,-0.554 -0.195,-0.111 -0.439,-0.078 -0.6,0.077C24.629,23.163 22.694,25 18,25s-6.63,-1.837 -6.648,-1.855C11.256,23.05 11.128,23 11,23c-0.084,0 -0.169,0.021 -0.246,0.064 -0.196,0.112 -0.294,0.339 -0.239,0.557z"
+      android:pathData="M18,21c-3.623,0 -6.027,-0.422 -9,-1 -0.679,-0.131 -2,0 -2,2 0,4 4.595,9 11,9 6.404,0 11,-5 11,-9 0,-2 -1.321,-2.132 -2,-2 -2.973,0.578 -5.377,1 -9,1z"
       android:fillColor="#664500"/>
+  <path
+      android:pathData="M9,22s3,1 9,1 9,-1 9,-1 -2,4 -9,4 -9,-4 -9,-4z"
+      android:fillColor="#FFF"/>
   <path
       android:pathData="M9.5,13.5a2.5,3.5 0,1 0,5 0a2.5,3.5 0,1 0,-5 0z"
       android:fillColor="#664500"/>