diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a18d1ea039..780b595a0a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -402,11 +402,7 @@ android:theme="@style/TextSecure.LightTheme" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> - - - diff --git a/assets/stickers/animals/anteater.webp b/assets/stickers/animals/anteater.webp deleted file mode 100644 index fa1111aa93..0000000000 Binary files a/assets/stickers/animals/anteater.webp and /dev/null differ diff --git a/assets/stickers/animals/bat.webp b/assets/stickers/animals/bat.webp deleted file mode 100644 index 0b89112f9a..0000000000 Binary files a/assets/stickers/animals/bat.webp and /dev/null differ diff --git a/assets/stickers/animals/beetle.webp b/assets/stickers/animals/beetle.webp deleted file mode 100644 index 186034e66b..0000000000 Binary files a/assets/stickers/animals/beetle.webp and /dev/null differ diff --git a/assets/stickers/animals/bulldog.webp b/assets/stickers/animals/bulldog.webp deleted file mode 100644 index acf7a7ddd1..0000000000 Binary files a/assets/stickers/animals/bulldog.webp and /dev/null differ diff --git a/assets/stickers/animals/butterfly.webp b/assets/stickers/animals/butterfly.webp deleted file mode 100644 index 6a1b8397f3..0000000000 Binary files a/assets/stickers/animals/butterfly.webp and /dev/null differ diff --git a/assets/stickers/animals/camel.webp b/assets/stickers/animals/camel.webp deleted file mode 100644 index 0fc9f5acd8..0000000000 Binary files a/assets/stickers/animals/camel.webp and /dev/null differ diff --git a/assets/stickers/animals/cat.webp b/assets/stickers/animals/cat.webp deleted file mode 100644 index 0a99d760e5..0000000000 Binary files a/assets/stickers/animals/cat.webp and /dev/null differ diff --git a/assets/stickers/animals/chameleon.webp b/assets/stickers/animals/chameleon.webp deleted file mode 100644 index 1e99e98bda..0000000000 Binary files a/assets/stickers/animals/chameleon.webp and /dev/null differ diff --git a/assets/stickers/animals/clown-fish.webp b/assets/stickers/animals/clown-fish.webp deleted file mode 100644 index 05d698de2d..0000000000 Binary files a/assets/stickers/animals/clown-fish.webp and /dev/null differ diff --git a/assets/stickers/animals/cobra.webp b/assets/stickers/animals/cobra.webp deleted file mode 100644 index c0be9dfcb1..0000000000 Binary files a/assets/stickers/animals/cobra.webp and /dev/null differ diff --git a/assets/stickers/animals/cow.webp b/assets/stickers/animals/cow.webp deleted file mode 100644 index 1540da799d..0000000000 Binary files a/assets/stickers/animals/cow.webp and /dev/null differ diff --git a/assets/stickers/animals/crab.webp b/assets/stickers/animals/crab.webp deleted file mode 100644 index 16e13c83c6..0000000000 Binary files a/assets/stickers/animals/crab.webp and /dev/null differ diff --git a/assets/stickers/animals/crocodile.webp b/assets/stickers/animals/crocodile.webp deleted file mode 100644 index 4d9e6d21e1..0000000000 Binary files a/assets/stickers/animals/crocodile.webp and /dev/null differ diff --git a/assets/stickers/animals/duck.webp b/assets/stickers/animals/duck.webp deleted file mode 100644 index 889bcd174a..0000000000 Binary files a/assets/stickers/animals/duck.webp and /dev/null differ diff --git a/assets/stickers/animals/elephant.webp b/assets/stickers/animals/elephant.webp deleted file mode 100644 index 8a403406d0..0000000000 Binary files a/assets/stickers/animals/elephant.webp and /dev/null differ diff --git a/assets/stickers/animals/frog.webp b/assets/stickers/animals/frog.webp deleted file mode 100644 index c88fac0b99..0000000000 Binary files a/assets/stickers/animals/frog.webp and /dev/null differ diff --git a/assets/stickers/animals/giraffe.webp b/assets/stickers/animals/giraffe.webp deleted file mode 100644 index 514662263a..0000000000 Binary files a/assets/stickers/animals/giraffe.webp and /dev/null differ diff --git a/assets/stickers/animals/hen.webp b/assets/stickers/animals/hen.webp deleted file mode 100644 index d74fb90ee2..0000000000 Binary files a/assets/stickers/animals/hen.webp and /dev/null differ diff --git a/assets/stickers/animals/hippopotamus.webp b/assets/stickers/animals/hippopotamus.webp deleted file mode 100644 index a4e100ac16..0000000000 Binary files a/assets/stickers/animals/hippopotamus.webp and /dev/null differ diff --git a/assets/stickers/animals/kangaroo.webp b/assets/stickers/animals/kangaroo.webp deleted file mode 100644 index 104e9d2eaa..0000000000 Binary files a/assets/stickers/animals/kangaroo.webp and /dev/null differ diff --git a/assets/stickers/animals/lion.webp b/assets/stickers/animals/lion.webp deleted file mode 100644 index 45e651fc9f..0000000000 Binary files a/assets/stickers/animals/lion.webp and /dev/null differ diff --git a/assets/stickers/animals/llama.webp b/assets/stickers/animals/llama.webp deleted file mode 100644 index 6c50267dad..0000000000 Binary files a/assets/stickers/animals/llama.webp and /dev/null differ diff --git a/assets/stickers/animals/macaw.webp b/assets/stickers/animals/macaw.webp deleted file mode 100644 index 9c84a8e9d0..0000000000 Binary files a/assets/stickers/animals/macaw.webp and /dev/null differ diff --git a/assets/stickers/animals/monkey.webp b/assets/stickers/animals/monkey.webp deleted file mode 100644 index 64908fc174..0000000000 Binary files a/assets/stickers/animals/monkey.webp and /dev/null differ diff --git a/assets/stickers/animals/moose.webp b/assets/stickers/animals/moose.webp deleted file mode 100644 index f6875ab5d2..0000000000 Binary files a/assets/stickers/animals/moose.webp and /dev/null differ diff --git a/assets/stickers/animals/mouse.webp b/assets/stickers/animals/mouse.webp deleted file mode 100644 index 1e0424a94b..0000000000 Binary files a/assets/stickers/animals/mouse.webp and /dev/null differ diff --git a/assets/stickers/animals/octopus.webp b/assets/stickers/animals/octopus.webp deleted file mode 100644 index df08a5c611..0000000000 Binary files a/assets/stickers/animals/octopus.webp and /dev/null differ diff --git a/assets/stickers/animals/ostrich.webp b/assets/stickers/animals/ostrich.webp deleted file mode 100644 index 61d6eeae98..0000000000 Binary files a/assets/stickers/animals/ostrich.webp and /dev/null differ diff --git a/assets/stickers/animals/owl.webp b/assets/stickers/animals/owl.webp deleted file mode 100644 index ee0774509a..0000000000 Binary files a/assets/stickers/animals/owl.webp and /dev/null differ diff --git a/assets/stickers/animals/panda.webp b/assets/stickers/animals/panda.webp deleted file mode 100644 index 60daa18447..0000000000 Binary files a/assets/stickers/animals/panda.webp and /dev/null differ diff --git a/assets/stickers/animals/pelican.webp b/assets/stickers/animals/pelican.webp deleted file mode 100644 index 97370a4f74..0000000000 Binary files a/assets/stickers/animals/pelican.webp and /dev/null differ diff --git a/assets/stickers/animals/penguin.webp b/assets/stickers/animals/penguin.webp deleted file mode 100644 index 1943ea8ef7..0000000000 Binary files a/assets/stickers/animals/penguin.webp and /dev/null differ diff --git a/assets/stickers/animals/pig.webp b/assets/stickers/animals/pig.webp deleted file mode 100644 index 924e4129a9..0000000000 Binary files a/assets/stickers/animals/pig.webp and /dev/null differ diff --git a/assets/stickers/animals/rabbit.webp b/assets/stickers/animals/rabbit.webp deleted file mode 100644 index 90947aa2e1..0000000000 Binary files a/assets/stickers/animals/rabbit.webp and /dev/null differ diff --git a/assets/stickers/animals/racoon.webp b/assets/stickers/animals/racoon.webp deleted file mode 100644 index e5defbcb7b..0000000000 Binary files a/assets/stickers/animals/racoon.webp and /dev/null differ diff --git a/assets/stickers/animals/ray.webp b/assets/stickers/animals/ray.webp deleted file mode 100644 index c38295fc45..0000000000 Binary files a/assets/stickers/animals/ray.webp and /dev/null differ diff --git a/assets/stickers/animals/rhinoceros.webp b/assets/stickers/animals/rhinoceros.webp deleted file mode 100644 index 13655674a3..0000000000 Binary files a/assets/stickers/animals/rhinoceros.webp and /dev/null differ diff --git a/assets/stickers/animals/sea-cow.webp b/assets/stickers/animals/sea-cow.webp deleted file mode 100644 index 04e528902e..0000000000 Binary files a/assets/stickers/animals/sea-cow.webp and /dev/null differ diff --git a/assets/stickers/animals/shark.webp b/assets/stickers/animals/shark.webp deleted file mode 100644 index e6d13d747f..0000000000 Binary files a/assets/stickers/animals/shark.webp and /dev/null differ diff --git a/assets/stickers/animals/sheep.webp b/assets/stickers/animals/sheep.webp deleted file mode 100644 index 1deae2c0b0..0000000000 Binary files a/assets/stickers/animals/sheep.webp and /dev/null differ diff --git a/assets/stickers/animals/siberian-husky.webp b/assets/stickers/animals/siberian-husky.webp deleted file mode 100644 index 45ba7e2bff..0000000000 Binary files a/assets/stickers/animals/siberian-husky.webp and /dev/null differ diff --git a/assets/stickers/animals/sloth.webp b/assets/stickers/animals/sloth.webp deleted file mode 100644 index 8e0e0e066c..0000000000 Binary files a/assets/stickers/animals/sloth.webp and /dev/null differ diff --git a/assets/stickers/animals/snake.webp b/assets/stickers/animals/snake.webp deleted file mode 100644 index cc8da061a7..0000000000 Binary files a/assets/stickers/animals/snake.webp and /dev/null differ diff --git a/assets/stickers/animals/spider.webp b/assets/stickers/animals/spider.webp deleted file mode 100644 index 20ce4b32a2..0000000000 Binary files a/assets/stickers/animals/spider.webp and /dev/null differ diff --git a/assets/stickers/animals/squirrel.webp b/assets/stickers/animals/squirrel.webp deleted file mode 100644 index abef7c7252..0000000000 Binary files a/assets/stickers/animals/squirrel.webp and /dev/null differ diff --git a/assets/stickers/animals/swan.webp b/assets/stickers/animals/swan.webp deleted file mode 100644 index 2cf1ee3df5..0000000000 Binary files a/assets/stickers/animals/swan.webp and /dev/null differ diff --git a/assets/stickers/animals/tiger.webp b/assets/stickers/animals/tiger.webp deleted file mode 100644 index 432a87eff1..0000000000 Binary files a/assets/stickers/animals/tiger.webp and /dev/null differ diff --git a/assets/stickers/animals/toucan.webp b/assets/stickers/animals/toucan.webp deleted file mode 100644 index 5b573aea5f..0000000000 Binary files a/assets/stickers/animals/toucan.webp and /dev/null differ diff --git a/assets/stickers/animals/turtle.webp b/assets/stickers/animals/turtle.webp deleted file mode 100644 index 34ce506247..0000000000 Binary files a/assets/stickers/animals/turtle.webp and /dev/null differ diff --git a/assets/stickers/animals/whale.webp b/assets/stickers/animals/whale.webp deleted file mode 100644 index 071d59110d..0000000000 Binary files a/assets/stickers/animals/whale.webp and /dev/null differ diff --git a/assets/stickers/clothes/backpack.webp b/assets/stickers/clothes/backpack.webp deleted file mode 100644 index 7bd60faf76..0000000000 Binary files a/assets/stickers/clothes/backpack.webp and /dev/null differ diff --git a/assets/stickers/clothes/bathrobe.webp b/assets/stickers/clothes/bathrobe.webp deleted file mode 100644 index fd04cfbda9..0000000000 Binary files a/assets/stickers/clothes/bathrobe.webp and /dev/null differ diff --git a/assets/stickers/clothes/belt.webp b/assets/stickers/clothes/belt.webp deleted file mode 100644 index f9d974933d..0000000000 Binary files a/assets/stickers/clothes/belt.webp and /dev/null differ diff --git a/assets/stickers/clothes/boot.webp b/assets/stickers/clothes/boot.webp deleted file mode 100644 index 879b29aa23..0000000000 Binary files a/assets/stickers/clothes/boot.webp and /dev/null differ diff --git a/assets/stickers/clothes/bow-tie.webp b/assets/stickers/clothes/bow-tie.webp deleted file mode 100644 index 086042fdea..0000000000 Binary files a/assets/stickers/clothes/bow-tie.webp and /dev/null differ diff --git a/assets/stickers/clothes/bowler-hat.webp b/assets/stickers/clothes/bowler-hat.webp deleted file mode 100644 index a6c0bee1e8..0000000000 Binary files a/assets/stickers/clothes/bowler-hat.webp and /dev/null differ diff --git a/assets/stickers/clothes/boxers.webp b/assets/stickers/clothes/boxers.webp deleted file mode 100644 index ba4ff874b6..0000000000 Binary files a/assets/stickers/clothes/boxers.webp and /dev/null differ diff --git a/assets/stickers/clothes/bra.webp b/assets/stickers/clothes/bra.webp deleted file mode 100644 index 866ba04be0..0000000000 Binary files a/assets/stickers/clothes/bra.webp and /dev/null differ diff --git a/assets/stickers/clothes/cap.webp b/assets/stickers/clothes/cap.webp deleted file mode 100644 index 25d3363e00..0000000000 Binary files a/assets/stickers/clothes/cap.webp and /dev/null differ diff --git a/assets/stickers/clothes/dress-1.webp b/assets/stickers/clothes/dress-1.webp deleted file mode 100644 index a4e58e088a..0000000000 Binary files a/assets/stickers/clothes/dress-1.webp and /dev/null differ diff --git a/assets/stickers/clothes/dress-2.webp b/assets/stickers/clothes/dress-2.webp deleted file mode 100644 index 7a8c718027..0000000000 Binary files a/assets/stickers/clothes/dress-2.webp and /dev/null differ diff --git a/assets/stickers/clothes/dress-3.webp b/assets/stickers/clothes/dress-3.webp deleted file mode 100644 index 67970cdc49..0000000000 Binary files a/assets/stickers/clothes/dress-3.webp and /dev/null differ diff --git a/assets/stickers/clothes/dress.webp b/assets/stickers/clothes/dress.webp deleted file mode 100644 index b4e4b86f4d..0000000000 Binary files a/assets/stickers/clothes/dress.webp and /dev/null differ diff --git a/assets/stickers/clothes/glasses.webp b/assets/stickers/clothes/glasses.webp deleted file mode 100644 index 149e539c1c..0000000000 Binary files a/assets/stickers/clothes/glasses.webp and /dev/null differ diff --git a/assets/stickers/clothes/hat.webp b/assets/stickers/clothes/hat.webp deleted file mode 100644 index 453be7622e..0000000000 Binary files a/assets/stickers/clothes/hat.webp and /dev/null differ diff --git a/assets/stickers/clothes/high-heel.webp b/assets/stickers/clothes/high-heel.webp deleted file mode 100644 index bb60c52aa2..0000000000 Binary files a/assets/stickers/clothes/high-heel.webp and /dev/null differ diff --git a/assets/stickers/clothes/jacket-1.webp b/assets/stickers/clothes/jacket-1.webp deleted file mode 100644 index 913ae3eb7c..0000000000 Binary files a/assets/stickers/clothes/jacket-1.webp and /dev/null differ diff --git a/assets/stickers/clothes/jacket-2.webp b/assets/stickers/clothes/jacket-2.webp deleted file mode 100644 index d39f343103..0000000000 Binary files a/assets/stickers/clothes/jacket-2.webp and /dev/null differ diff --git a/assets/stickers/clothes/jacket-3.webp b/assets/stickers/clothes/jacket-3.webp deleted file mode 100644 index 75517dcce9..0000000000 Binary files a/assets/stickers/clothes/jacket-3.webp and /dev/null differ diff --git a/assets/stickers/clothes/jacket-4.webp b/assets/stickers/clothes/jacket-4.webp deleted file mode 100644 index bfeb6e92bf..0000000000 Binary files a/assets/stickers/clothes/jacket-4.webp and /dev/null differ diff --git a/assets/stickers/clothes/jacket.webp b/assets/stickers/clothes/jacket.webp deleted file mode 100644 index c6046228ba..0000000000 Binary files a/assets/stickers/clothes/jacket.webp and /dev/null differ diff --git a/assets/stickers/clothes/jeans.webp b/assets/stickers/clothes/jeans.webp deleted file mode 100644 index 74b329f3ff..0000000000 Binary files a/assets/stickers/clothes/jeans.webp and /dev/null differ diff --git a/assets/stickers/clothes/lingerie.webp b/assets/stickers/clothes/lingerie.webp deleted file mode 100644 index cd19470e38..0000000000 Binary files a/assets/stickers/clothes/lingerie.webp and /dev/null differ diff --git a/assets/stickers/clothes/overall.webp b/assets/stickers/clothes/overall.webp deleted file mode 100644 index e9ac7aef9a..0000000000 Binary files a/assets/stickers/clothes/overall.webp and /dev/null differ diff --git a/assets/stickers/clothes/polo.webp b/assets/stickers/clothes/polo.webp deleted file mode 100644 index 6b3e17f7e7..0000000000 Binary files a/assets/stickers/clothes/polo.webp and /dev/null differ diff --git a/assets/stickers/clothes/pullover.webp b/assets/stickers/clothes/pullover.webp deleted file mode 100644 index 0ae4ee24cd..0000000000 Binary files a/assets/stickers/clothes/pullover.webp and /dev/null differ diff --git a/assets/stickers/clothes/purse-1.webp b/assets/stickers/clothes/purse-1.webp deleted file mode 100644 index 20017dabc0..0000000000 Binary files a/assets/stickers/clothes/purse-1.webp and /dev/null differ diff --git a/assets/stickers/clothes/purse.webp b/assets/stickers/clothes/purse.webp deleted file mode 100644 index eab71e522d..0000000000 Binary files a/assets/stickers/clothes/purse.webp and /dev/null differ diff --git a/assets/stickers/clothes/scarf.webp b/assets/stickers/clothes/scarf.webp deleted file mode 100644 index 021d2b6a65..0000000000 Binary files a/assets/stickers/clothes/scarf.webp and /dev/null differ diff --git a/assets/stickers/clothes/shirt-1.webp b/assets/stickers/clothes/shirt-1.webp deleted file mode 100644 index a578f6b1bf..0000000000 Binary files a/assets/stickers/clothes/shirt-1.webp and /dev/null differ diff --git a/assets/stickers/clothes/shirt-2.webp b/assets/stickers/clothes/shirt-2.webp deleted file mode 100644 index eeaa5fd4bb..0000000000 Binary files a/assets/stickers/clothes/shirt-2.webp and /dev/null differ diff --git a/assets/stickers/clothes/shirt.webp b/assets/stickers/clothes/shirt.webp deleted file mode 100644 index 8a7c4c46c2..0000000000 Binary files a/assets/stickers/clothes/shirt.webp and /dev/null differ diff --git a/assets/stickers/clothes/shoe.webp b/assets/stickers/clothes/shoe.webp deleted file mode 100644 index 91455a058e..0000000000 Binary files a/assets/stickers/clothes/shoe.webp and /dev/null differ diff --git a/assets/stickers/clothes/shorts.webp b/assets/stickers/clothes/shorts.webp deleted file mode 100644 index 4ca8f31035..0000000000 Binary files a/assets/stickers/clothes/shorts.webp and /dev/null differ diff --git a/assets/stickers/clothes/skirt.webp b/assets/stickers/clothes/skirt.webp deleted file mode 100644 index daad8039f2..0000000000 Binary files a/assets/stickers/clothes/skirt.webp and /dev/null differ diff --git a/assets/stickers/clothes/sleeveless.webp b/assets/stickers/clothes/sleeveless.webp deleted file mode 100644 index c22236d9dc..0000000000 Binary files a/assets/stickers/clothes/sleeveless.webp and /dev/null differ diff --git a/assets/stickers/clothes/slippers.webp b/assets/stickers/clothes/slippers.webp deleted file mode 100644 index 4512959979..0000000000 Binary files a/assets/stickers/clothes/slippers.webp and /dev/null differ diff --git a/assets/stickers/clothes/sneakers-1.webp b/assets/stickers/clothes/sneakers-1.webp deleted file mode 100644 index 756c8fc115..0000000000 Binary files a/assets/stickers/clothes/sneakers-1.webp and /dev/null differ diff --git a/assets/stickers/clothes/sneakers.webp b/assets/stickers/clothes/sneakers.webp deleted file mode 100644 index 0e8a0da385..0000000000 Binary files a/assets/stickers/clothes/sneakers.webp and /dev/null differ diff --git a/assets/stickers/clothes/socks.webp b/assets/stickers/clothes/socks.webp deleted file mode 100644 index f4a92e8915..0000000000 Binary files a/assets/stickers/clothes/socks.webp and /dev/null differ diff --git a/assets/stickers/clothes/suitcase.webp b/assets/stickers/clothes/suitcase.webp deleted file mode 100644 index 16415facfb..0000000000 Binary files a/assets/stickers/clothes/suitcase.webp and /dev/null differ diff --git a/assets/stickers/clothes/sweatshirt.webp b/assets/stickers/clothes/sweatshirt.webp deleted file mode 100644 index 4176bd719e..0000000000 Binary files a/assets/stickers/clothes/sweatshirt.webp and /dev/null differ diff --git a/assets/stickers/clothes/swimsuit-1.webp b/assets/stickers/clothes/swimsuit-1.webp deleted file mode 100644 index 8b1e69fe5d..0000000000 Binary files a/assets/stickers/clothes/swimsuit-1.webp and /dev/null differ diff --git a/assets/stickers/clothes/swimsuit.webp b/assets/stickers/clothes/swimsuit.webp deleted file mode 100644 index 8d0922549d..0000000000 Binary files a/assets/stickers/clothes/swimsuit.webp and /dev/null differ diff --git a/assets/stickers/clothes/tie.webp b/assets/stickers/clothes/tie.webp deleted file mode 100644 index 0d0a8c7c12..0000000000 Binary files a/assets/stickers/clothes/tie.webp and /dev/null differ diff --git a/assets/stickers/clothes/trench-coat.webp b/assets/stickers/clothes/trench-coat.webp deleted file mode 100644 index 7f77472123..0000000000 Binary files a/assets/stickers/clothes/trench-coat.webp and /dev/null differ diff --git a/assets/stickers/clothes/trousers.webp b/assets/stickers/clothes/trousers.webp deleted file mode 100644 index 6146b2b9a7..0000000000 Binary files a/assets/stickers/clothes/trousers.webp and /dev/null differ diff --git a/assets/stickers/clothes/underpants.webp b/assets/stickers/clothes/underpants.webp deleted file mode 100644 index 1e59e2e9a5..0000000000 Binary files a/assets/stickers/clothes/underpants.webp and /dev/null differ diff --git a/assets/stickers/clothes/vest.webp b/assets/stickers/clothes/vest.webp deleted file mode 100644 index 5c811b6ffd..0000000000 Binary files a/assets/stickers/clothes/vest.webp and /dev/null differ diff --git a/assets/stickers/clothes/winter-hat.webp b/assets/stickers/clothes/winter-hat.webp deleted file mode 100644 index 91ffcc2056..0000000000 Binary files a/assets/stickers/clothes/winter-hat.webp and /dev/null differ diff --git a/assets/stickers/emoticons/angry-1.webp b/assets/stickers/emoticons/angry-1.webp deleted file mode 100644 index d002213371..0000000000 Binary files a/assets/stickers/emoticons/angry-1.webp and /dev/null differ diff --git a/assets/stickers/emoticons/angry.webp b/assets/stickers/emoticons/angry.webp deleted file mode 100644 index 0c041211b5..0000000000 Binary files a/assets/stickers/emoticons/angry.webp and /dev/null differ diff --git a/assets/stickers/emoticons/bored-1.webp b/assets/stickers/emoticons/bored-1.webp deleted file mode 100644 index 070b20da35..0000000000 Binary files a/assets/stickers/emoticons/bored-1.webp and /dev/null differ diff --git a/assets/stickers/emoticons/bored-2.webp b/assets/stickers/emoticons/bored-2.webp deleted file mode 100644 index 9e7e97b3ec..0000000000 Binary files a/assets/stickers/emoticons/bored-2.webp and /dev/null differ diff --git a/assets/stickers/emoticons/bored.webp b/assets/stickers/emoticons/bored.webp deleted file mode 100644 index 752a7ddbdf..0000000000 Binary files a/assets/stickers/emoticons/bored.webp and /dev/null differ diff --git a/assets/stickers/emoticons/confused-1.webp b/assets/stickers/emoticons/confused-1.webp deleted file mode 100644 index c490bec5f0..0000000000 Binary files a/assets/stickers/emoticons/confused-1.webp and /dev/null differ diff --git a/assets/stickers/emoticons/confused.webp b/assets/stickers/emoticons/confused.webp deleted file mode 100644 index 8eaa5b11e4..0000000000 Binary files a/assets/stickers/emoticons/confused.webp and /dev/null differ diff --git a/assets/stickers/emoticons/crying-1.webp b/assets/stickers/emoticons/crying-1.webp deleted file mode 100644 index 7e378587ec..0000000000 Binary files a/assets/stickers/emoticons/crying-1.webp and /dev/null differ diff --git a/assets/stickers/emoticons/crying.webp b/assets/stickers/emoticons/crying.webp deleted file mode 100644 index 35a3155e2b..0000000000 Binary files a/assets/stickers/emoticons/crying.webp and /dev/null differ diff --git a/assets/stickers/emoticons/embarrassed.webp b/assets/stickers/emoticons/embarrassed.webp deleted file mode 100644 index 678811f131..0000000000 Binary files a/assets/stickers/emoticons/embarrassed.webp and /dev/null differ diff --git a/assets/stickers/emoticons/emoticons.webp b/assets/stickers/emoticons/emoticons.webp deleted file mode 100644 index ad22f58639..0000000000 Binary files a/assets/stickers/emoticons/emoticons.webp and /dev/null differ diff --git a/assets/stickers/emoticons/happy-1.webp b/assets/stickers/emoticons/happy-1.webp deleted file mode 100644 index 7e8040d056..0000000000 Binary files a/assets/stickers/emoticons/happy-1.webp and /dev/null differ diff --git a/assets/stickers/emoticons/happy-2.webp b/assets/stickers/emoticons/happy-2.webp deleted file mode 100644 index 54b8fae445..0000000000 Binary files a/assets/stickers/emoticons/happy-2.webp and /dev/null differ diff --git a/assets/stickers/emoticons/happy-3.webp b/assets/stickers/emoticons/happy-3.webp deleted file mode 100644 index c1e86cb837..0000000000 Binary files a/assets/stickers/emoticons/happy-3.webp and /dev/null differ diff --git a/assets/stickers/emoticons/happy-4.webp b/assets/stickers/emoticons/happy-4.webp deleted file mode 100644 index b5894881c2..0000000000 Binary files a/assets/stickers/emoticons/happy-4.webp and /dev/null differ diff --git a/assets/stickers/emoticons/happy.webp b/assets/stickers/emoticons/happy.webp deleted file mode 100644 index 5054ab5915..0000000000 Binary files a/assets/stickers/emoticons/happy.webp and /dev/null differ diff --git a/assets/stickers/emoticons/ill.webp b/assets/stickers/emoticons/ill.webp deleted file mode 100644 index e5d536b497..0000000000 Binary files a/assets/stickers/emoticons/ill.webp and /dev/null differ diff --git a/assets/stickers/emoticons/in-love.webp b/assets/stickers/emoticons/in-love.webp deleted file mode 100644 index f525dadbc9..0000000000 Binary files a/assets/stickers/emoticons/in-love.webp and /dev/null differ diff --git a/assets/stickers/emoticons/kissing.webp b/assets/stickers/emoticons/kissing.webp deleted file mode 100644 index 74292d72cf..0000000000 Binary files a/assets/stickers/emoticons/kissing.webp and /dev/null differ diff --git a/assets/stickers/emoticons/mad.webp b/assets/stickers/emoticons/mad.webp deleted file mode 100644 index 3c8f80bc7d..0000000000 Binary files a/assets/stickers/emoticons/mad.webp and /dev/null differ diff --git a/assets/stickers/emoticons/nerd.webp b/assets/stickers/emoticons/nerd.webp deleted file mode 100644 index c4f6eba878..0000000000 Binary files a/assets/stickers/emoticons/nerd.webp and /dev/null differ diff --git a/assets/stickers/emoticons/ninja.webp b/assets/stickers/emoticons/ninja.webp deleted file mode 100644 index d1185293a5..0000000000 Binary files a/assets/stickers/emoticons/ninja.webp and /dev/null differ diff --git a/assets/stickers/emoticons/quiet.webp b/assets/stickers/emoticons/quiet.webp deleted file mode 100644 index 2c2ef30244..0000000000 Binary files a/assets/stickers/emoticons/quiet.webp and /dev/null differ diff --git a/assets/stickers/emoticons/sad.webp b/assets/stickers/emoticons/sad.webp deleted file mode 100644 index d66074b923..0000000000 Binary files a/assets/stickers/emoticons/sad.webp and /dev/null differ diff --git a/assets/stickers/emoticons/secret.webp b/assets/stickers/emoticons/secret.webp deleted file mode 100644 index f509faa9a6..0000000000 Binary files a/assets/stickers/emoticons/secret.webp and /dev/null differ diff --git a/assets/stickers/emoticons/smart.webp b/assets/stickers/emoticons/smart.webp deleted file mode 100644 index 5fc3c295c1..0000000000 Binary files a/assets/stickers/emoticons/smart.webp and /dev/null differ diff --git a/assets/stickers/emoticons/smile.webp b/assets/stickers/emoticons/smile.webp deleted file mode 100644 index 70d5126dfb..0000000000 Binary files a/assets/stickers/emoticons/smile.webp and /dev/null differ diff --git a/assets/stickers/emoticons/smiling.webp b/assets/stickers/emoticons/smiling.webp deleted file mode 100644 index dc7ccfab35..0000000000 Binary files a/assets/stickers/emoticons/smiling.webp and /dev/null differ diff --git a/assets/stickers/emoticons/surprised-1.webp b/assets/stickers/emoticons/surprised-1.webp deleted file mode 100644 index 3c7d76ea5b..0000000000 Binary files a/assets/stickers/emoticons/surprised-1.webp and /dev/null differ diff --git a/assets/stickers/emoticons/surprised.webp b/assets/stickers/emoticons/surprised.webp deleted file mode 100644 index 8ba8a4f9cb..0000000000 Binary files a/assets/stickers/emoticons/surprised.webp and /dev/null differ diff --git a/assets/stickers/emoticons/suspicious-1.webp b/assets/stickers/emoticons/suspicious-1.webp deleted file mode 100644 index dee39df6c0..0000000000 Binary files a/assets/stickers/emoticons/suspicious-1.webp and /dev/null differ diff --git a/assets/stickers/emoticons/suspicious.webp b/assets/stickers/emoticons/suspicious.webp deleted file mode 100644 index 34b6ad6d89..0000000000 Binary files a/assets/stickers/emoticons/suspicious.webp and /dev/null differ diff --git a/assets/stickers/emoticons/tongue-out-1.webp b/assets/stickers/emoticons/tongue-out-1.webp deleted file mode 100644 index 75a9a7e5c3..0000000000 Binary files a/assets/stickers/emoticons/tongue-out-1.webp and /dev/null differ diff --git a/assets/stickers/emoticons/tongue-out.webp b/assets/stickers/emoticons/tongue-out.webp deleted file mode 100644 index 7a9e23aec8..0000000000 Binary files a/assets/stickers/emoticons/tongue-out.webp and /dev/null differ diff --git a/assets/stickers/emoticons/unhappy.webp b/assets/stickers/emoticons/unhappy.webp deleted file mode 100644 index 47a2425d7f..0000000000 Binary files a/assets/stickers/emoticons/unhappy.webp and /dev/null differ diff --git a/assets/stickers/emoticons/wink.webp b/assets/stickers/emoticons/wink.webp deleted file mode 100644 index 5e8e7cae4f..0000000000 Binary files a/assets/stickers/emoticons/wink.webp and /dev/null differ diff --git a/assets/stickers/food/apple.webp b/assets/stickers/food/apple.webp deleted file mode 100644 index ceb7875867..0000000000 Binary files a/assets/stickers/food/apple.webp and /dev/null differ diff --git a/assets/stickers/food/artichoke.webp b/assets/stickers/food/artichoke.webp deleted file mode 100644 index 82082c2fa0..0000000000 Binary files a/assets/stickers/food/artichoke.webp and /dev/null differ diff --git a/assets/stickers/food/aubergine.webp b/assets/stickers/food/aubergine.webp deleted file mode 100644 index 35242ee237..0000000000 Binary files a/assets/stickers/food/aubergine.webp and /dev/null differ diff --git a/assets/stickers/food/avocado.webp b/assets/stickers/food/avocado.webp deleted file mode 100644 index cb51117c29..0000000000 Binary files a/assets/stickers/food/avocado.webp and /dev/null differ diff --git a/assets/stickers/food/bacon.webp b/assets/stickers/food/bacon.webp deleted file mode 100644 index a9a8b0a825..0000000000 Binary files a/assets/stickers/food/bacon.webp and /dev/null differ diff --git a/assets/stickers/food/banana.webp b/assets/stickers/food/banana.webp deleted file mode 100644 index e3f7c19926..0000000000 Binary files a/assets/stickers/food/banana.webp and /dev/null differ diff --git a/assets/stickers/food/beans.webp b/assets/stickers/food/beans.webp deleted file mode 100644 index ae2cf9c12f..0000000000 Binary files a/assets/stickers/food/beans.webp and /dev/null differ diff --git a/assets/stickers/food/bell-pepper.webp b/assets/stickers/food/bell-pepper.webp deleted file mode 100644 index 827790ad44..0000000000 Binary files a/assets/stickers/food/bell-pepper.webp and /dev/null differ diff --git a/assets/stickers/food/birthday-cake.webp b/assets/stickers/food/birthday-cake.webp deleted file mode 100644 index 34faf88411..0000000000 Binary files a/assets/stickers/food/birthday-cake.webp and /dev/null differ diff --git a/assets/stickers/food/biscuit.webp b/assets/stickers/food/biscuit.webp deleted file mode 100644 index d7e2ca46e4..0000000000 Binary files a/assets/stickers/food/biscuit.webp and /dev/null differ diff --git a/assets/stickers/food/boiled-egg.webp b/assets/stickers/food/boiled-egg.webp deleted file mode 100644 index 5ecb8989fd..0000000000 Binary files a/assets/stickers/food/boiled-egg.webp and /dev/null differ diff --git a/assets/stickers/food/bread.webp b/assets/stickers/food/bread.webp deleted file mode 100644 index d48caf86a9..0000000000 Binary files a/assets/stickers/food/bread.webp and /dev/null differ diff --git a/assets/stickers/food/broccoli.webp b/assets/stickers/food/broccoli.webp deleted file mode 100644 index fbf7a21acd..0000000000 Binary files a/assets/stickers/food/broccoli.webp and /dev/null differ diff --git a/assets/stickers/food/brochette.webp b/assets/stickers/food/brochette.webp deleted file mode 100644 index e9483c0d6d..0000000000 Binary files a/assets/stickers/food/brochette.webp and /dev/null differ diff --git a/assets/stickers/food/burger-1.webp b/assets/stickers/food/burger-1.webp deleted file mode 100644 index 4114f14731..0000000000 Binary files a/assets/stickers/food/burger-1.webp and /dev/null differ diff --git a/assets/stickers/food/burger.webp b/assets/stickers/food/burger.webp deleted file mode 100644 index 012e6119fb..0000000000 Binary files a/assets/stickers/food/burger.webp and /dev/null differ diff --git a/assets/stickers/food/burrito.webp b/assets/stickers/food/burrito.webp deleted file mode 100644 index 40c1d10425..0000000000 Binary files a/assets/stickers/food/burrito.webp and /dev/null differ diff --git a/assets/stickers/food/cake.webp b/assets/stickers/food/cake.webp deleted file mode 100644 index 5ab1a072b4..0000000000 Binary files a/assets/stickers/food/cake.webp and /dev/null differ diff --git a/assets/stickers/food/candy-cane.webp b/assets/stickers/food/candy-cane.webp deleted file mode 100644 index db9f3e508e..0000000000 Binary files a/assets/stickers/food/candy-cane.webp and /dev/null differ diff --git a/assets/stickers/food/candy.webp b/assets/stickers/food/candy.webp deleted file mode 100644 index 24378abd54..0000000000 Binary files a/assets/stickers/food/candy.webp and /dev/null differ diff --git a/assets/stickers/food/carrot.webp b/assets/stickers/food/carrot.webp deleted file mode 100644 index ae411849de..0000000000 Binary files a/assets/stickers/food/carrot.webp and /dev/null differ diff --git a/assets/stickers/food/cheese.webp b/assets/stickers/food/cheese.webp deleted file mode 100644 index f1548cbe1f..0000000000 Binary files a/assets/stickers/food/cheese.webp and /dev/null differ diff --git a/assets/stickers/food/cherry.webp b/assets/stickers/food/cherry.webp deleted file mode 100644 index a5305271ca..0000000000 Binary files a/assets/stickers/food/cherry.webp and /dev/null differ diff --git a/assets/stickers/food/chicken-leg.webp b/assets/stickers/food/chicken-leg.webp deleted file mode 100644 index 4ff7c32a0a..0000000000 Binary files a/assets/stickers/food/chicken-leg.webp and /dev/null differ diff --git a/assets/stickers/food/chili-pepper.webp b/assets/stickers/food/chili-pepper.webp deleted file mode 100644 index 55389211bf..0000000000 Binary files a/assets/stickers/food/chili-pepper.webp and /dev/null differ diff --git a/assets/stickers/food/chocolate.webp b/assets/stickers/food/chocolate.webp deleted file mode 100644 index 4b5d110a06..0000000000 Binary files a/assets/stickers/food/chocolate.webp and /dev/null differ diff --git a/assets/stickers/food/chorizo.webp b/assets/stickers/food/chorizo.webp deleted file mode 100644 index 53df60be09..0000000000 Binary files a/assets/stickers/food/chorizo.webp and /dev/null differ diff --git a/assets/stickers/food/corn.webp b/assets/stickers/food/corn.webp deleted file mode 100644 index 70ccffd104..0000000000 Binary files a/assets/stickers/food/corn.webp and /dev/null differ diff --git a/assets/stickers/food/cotton-candy.webp b/assets/stickers/food/cotton-candy.webp deleted file mode 100644 index 9015886fcb..0000000000 Binary files a/assets/stickers/food/cotton-candy.webp and /dev/null differ diff --git a/assets/stickers/food/crab.webp b/assets/stickers/food/crab.webp deleted file mode 100644 index 2dd25945b8..0000000000 Binary files a/assets/stickers/food/crab.webp and /dev/null differ diff --git a/assets/stickers/food/croissant.webp b/assets/stickers/food/croissant.webp deleted file mode 100644 index dab88c5a5a..0000000000 Binary files a/assets/stickers/food/croissant.webp and /dev/null differ diff --git a/assets/stickers/food/cupcake-1.webp b/assets/stickers/food/cupcake-1.webp deleted file mode 100644 index 051d7b77c3..0000000000 Binary files a/assets/stickers/food/cupcake-1.webp and /dev/null differ diff --git a/assets/stickers/food/cupcake.webp b/assets/stickers/food/cupcake.webp deleted file mode 100644 index c4d2156bec..0000000000 Binary files a/assets/stickers/food/cupcake.webp and /dev/null differ diff --git a/assets/stickers/food/doner-kebab.webp b/assets/stickers/food/doner-kebab.webp deleted file mode 100644 index 2a2ff5f4ed..0000000000 Binary files a/assets/stickers/food/doner-kebab.webp and /dev/null differ diff --git a/assets/stickers/food/donut.webp b/assets/stickers/food/donut.webp deleted file mode 100644 index abc0060e38..0000000000 Binary files a/assets/stickers/food/donut.webp and /dev/null differ diff --git a/assets/stickers/food/drink.webp b/assets/stickers/food/drink.webp deleted file mode 100644 index 29a5911a13..0000000000 Binary files a/assets/stickers/food/drink.webp and /dev/null differ diff --git a/assets/stickers/food/fish.webp b/assets/stickers/food/fish.webp deleted file mode 100644 index ed883359a5..0000000000 Binary files a/assets/stickers/food/fish.webp and /dev/null differ diff --git a/assets/stickers/food/french-fries.webp b/assets/stickers/food/french-fries.webp deleted file mode 100644 index aa51b48273..0000000000 Binary files a/assets/stickers/food/french-fries.webp and /dev/null differ diff --git a/assets/stickers/food/fried-egg.webp b/assets/stickers/food/fried-egg.webp deleted file mode 100644 index 80b4e6d7f1..0000000000 Binary files a/assets/stickers/food/fried-egg.webp and /dev/null differ diff --git a/assets/stickers/food/garlic.webp b/assets/stickers/food/garlic.webp deleted file mode 100644 index ab9912cc3d..0000000000 Binary files a/assets/stickers/food/garlic.webp and /dev/null differ diff --git a/assets/stickers/food/gingerbread-man.webp b/assets/stickers/food/gingerbread-man.webp deleted file mode 100644 index feb81471ad..0000000000 Binary files a/assets/stickers/food/gingerbread-man.webp and /dev/null differ diff --git a/assets/stickers/food/grapes.webp b/assets/stickers/food/grapes.webp deleted file mode 100644 index 9b6dacbe42..0000000000 Binary files a/assets/stickers/food/grapes.webp and /dev/null differ diff --git a/assets/stickers/food/honey.webp b/assets/stickers/food/honey.webp deleted file mode 100644 index 2e58ff102a..0000000000 Binary files a/assets/stickers/food/honey.webp and /dev/null differ diff --git a/assets/stickers/food/hot-dog.webp b/assets/stickers/food/hot-dog.webp deleted file mode 100644 index 3ba1c91b61..0000000000 Binary files a/assets/stickers/food/hot-dog.webp and /dev/null differ diff --git a/assets/stickers/food/ice-cream.webp b/assets/stickers/food/ice-cream.webp deleted file mode 100644 index 2207a30da9..0000000000 Binary files a/assets/stickers/food/ice-cream.webp and /dev/null differ diff --git a/assets/stickers/food/jam.webp b/assets/stickers/food/jam.webp deleted file mode 100644 index 1000fea3fe..0000000000 Binary files a/assets/stickers/food/jam.webp and /dev/null differ diff --git a/assets/stickers/food/jelly.webp b/assets/stickers/food/jelly.webp deleted file mode 100644 index c9db123471..0000000000 Binary files a/assets/stickers/food/jelly.webp and /dev/null differ diff --git a/assets/stickers/food/ketchup.webp b/assets/stickers/food/ketchup.webp deleted file mode 100644 index e7cfcab847..0000000000 Binary files a/assets/stickers/food/ketchup.webp and /dev/null differ diff --git a/assets/stickers/food/kiwi.webp b/assets/stickers/food/kiwi.webp deleted file mode 100644 index 0b0ac275e3..0000000000 Binary files a/assets/stickers/food/kiwi.webp and /dev/null differ diff --git a/assets/stickers/food/lemon.webp b/assets/stickers/food/lemon.webp deleted file mode 100644 index a7b6e5f644..0000000000 Binary files a/assets/stickers/food/lemon.webp and /dev/null differ diff --git a/assets/stickers/food/lettuce.webp b/assets/stickers/food/lettuce.webp deleted file mode 100644 index b33e2c939f..0000000000 Binary files a/assets/stickers/food/lettuce.webp and /dev/null differ diff --git a/assets/stickers/food/lobster.webp b/assets/stickers/food/lobster.webp deleted file mode 100644 index b90acdbd3e..0000000000 Binary files a/assets/stickers/food/lobster.webp and /dev/null differ diff --git a/assets/stickers/food/lollipop-1.webp b/assets/stickers/food/lollipop-1.webp deleted file mode 100644 index 84f9d4e11d..0000000000 Binary files a/assets/stickers/food/lollipop-1.webp and /dev/null differ diff --git a/assets/stickers/food/lollipop.webp b/assets/stickers/food/lollipop.webp deleted file mode 100644 index db61c9e000..0000000000 Binary files a/assets/stickers/food/lollipop.webp and /dev/null differ diff --git a/assets/stickers/food/macarons.webp b/assets/stickers/food/macarons.webp deleted file mode 100644 index 7f549170d3..0000000000 Binary files a/assets/stickers/food/macarons.webp and /dev/null differ diff --git a/assets/stickers/food/muffin.webp b/assets/stickers/food/muffin.webp deleted file mode 100644 index 235b780622..0000000000 Binary files a/assets/stickers/food/muffin.webp and /dev/null differ diff --git a/assets/stickers/food/mushroom.webp b/assets/stickers/food/mushroom.webp deleted file mode 100644 index 64171da0f3..0000000000 Binary files a/assets/stickers/food/mushroom.webp and /dev/null differ diff --git a/assets/stickers/food/mussel.webp b/assets/stickers/food/mussel.webp deleted file mode 100644 index 66accf3198..0000000000 Binary files a/assets/stickers/food/mussel.webp and /dev/null differ diff --git a/assets/stickers/food/noodles.webp b/assets/stickers/food/noodles.webp deleted file mode 100644 index cb3af6373f..0000000000 Binary files a/assets/stickers/food/noodles.webp and /dev/null differ diff --git a/assets/stickers/food/olive-oil.webp b/assets/stickers/food/olive-oil.webp deleted file mode 100644 index 13cbee21bb..0000000000 Binary files a/assets/stickers/food/olive-oil.webp and /dev/null differ diff --git a/assets/stickers/food/olives.webp b/assets/stickers/food/olives.webp deleted file mode 100644 index cdb209596d..0000000000 Binary files a/assets/stickers/food/olives.webp and /dev/null differ diff --git a/assets/stickers/food/onion-rings.webp b/assets/stickers/food/onion-rings.webp deleted file mode 100644 index 6eb9171037..0000000000 Binary files a/assets/stickers/food/onion-rings.webp and /dev/null differ diff --git a/assets/stickers/food/onion.webp b/assets/stickers/food/onion.webp deleted file mode 100644 index 6e87e69d13..0000000000 Binary files a/assets/stickers/food/onion.webp and /dev/null differ diff --git a/assets/stickers/food/orange.webp b/assets/stickers/food/orange.webp deleted file mode 100644 index 8f9b3e2ecb..0000000000 Binary files a/assets/stickers/food/orange.webp and /dev/null differ diff --git a/assets/stickers/food/pancakes.webp b/assets/stickers/food/pancakes.webp deleted file mode 100644 index 273443dc7f..0000000000 Binary files a/assets/stickers/food/pancakes.webp and /dev/null differ diff --git a/assets/stickers/food/pasta.webp b/assets/stickers/food/pasta.webp deleted file mode 100644 index fe68ef7738..0000000000 Binary files a/assets/stickers/food/pasta.webp and /dev/null differ diff --git a/assets/stickers/food/peach.webp b/assets/stickers/food/peach.webp deleted file mode 100644 index a344cf2b28..0000000000 Binary files a/assets/stickers/food/peach.webp and /dev/null differ diff --git a/assets/stickers/food/pear.webp b/assets/stickers/food/pear.webp deleted file mode 100644 index 0876b60274..0000000000 Binary files a/assets/stickers/food/pear.webp and /dev/null differ diff --git a/assets/stickers/food/pepper.webp b/assets/stickers/food/pepper.webp deleted file mode 100644 index dad85702f5..0000000000 Binary files a/assets/stickers/food/pepper.webp and /dev/null differ diff --git a/assets/stickers/food/pie.webp b/assets/stickers/food/pie.webp deleted file mode 100644 index 583aa9ebba..0000000000 Binary files a/assets/stickers/food/pie.webp and /dev/null differ diff --git a/assets/stickers/food/pineapple.webp b/assets/stickers/food/pineapple.webp deleted file mode 100644 index 3827bb4879..0000000000 Binary files a/assets/stickers/food/pineapple.webp and /dev/null differ diff --git a/assets/stickers/food/pizza.webp b/assets/stickers/food/pizza.webp deleted file mode 100644 index 4e61b7e449..0000000000 Binary files a/assets/stickers/food/pizza.webp and /dev/null differ diff --git a/assets/stickers/food/popcorn.webp b/assets/stickers/food/popcorn.webp deleted file mode 100644 index 670c8721d6..0000000000 Binary files a/assets/stickers/food/popcorn.webp and /dev/null differ diff --git a/assets/stickers/food/prawn.webp b/assets/stickers/food/prawn.webp deleted file mode 100644 index 903c288830..0000000000 Binary files a/assets/stickers/food/prawn.webp and /dev/null differ diff --git a/assets/stickers/food/pretzel.webp b/assets/stickers/food/pretzel.webp deleted file mode 100644 index 30e106c1e2..0000000000 Binary files a/assets/stickers/food/pretzel.webp and /dev/null differ diff --git a/assets/stickers/food/pumpkin.webp b/assets/stickers/food/pumpkin.webp deleted file mode 100644 index 28f0eb331e..0000000000 Binary files a/assets/stickers/food/pumpkin.webp and /dev/null differ diff --git a/assets/stickers/food/radish.webp b/assets/stickers/food/radish.webp deleted file mode 100644 index 5c61d7a209..0000000000 Binary files a/assets/stickers/food/radish.webp and /dev/null differ diff --git a/assets/stickers/food/raspberry.webp b/assets/stickers/food/raspberry.webp deleted file mode 100644 index a080fa5895..0000000000 Binary files a/assets/stickers/food/raspberry.webp and /dev/null differ diff --git a/assets/stickers/food/rice.webp b/assets/stickers/food/rice.webp deleted file mode 100644 index 82d217d4c5..0000000000 Binary files a/assets/stickers/food/rice.webp and /dev/null differ diff --git a/assets/stickers/food/roast-chicken.webp b/assets/stickers/food/roast-chicken.webp deleted file mode 100644 index 7e2074b4af..0000000000 Binary files a/assets/stickers/food/roast-chicken.webp and /dev/null differ diff --git a/assets/stickers/food/salad.webp b/assets/stickers/food/salad.webp deleted file mode 100644 index 3b09ab6575..0000000000 Binary files a/assets/stickers/food/salad.webp and /dev/null differ diff --git a/assets/stickers/food/salt.webp b/assets/stickers/food/salt.webp deleted file mode 100644 index 0ddd0d8215..0000000000 Binary files a/assets/stickers/food/salt.webp and /dev/null differ diff --git a/assets/stickers/food/sandwich-1.webp b/assets/stickers/food/sandwich-1.webp deleted file mode 100644 index daec7608e4..0000000000 Binary files a/assets/stickers/food/sandwich-1.webp and /dev/null differ diff --git a/assets/stickers/food/sandwich.webp b/assets/stickers/food/sandwich.webp deleted file mode 100644 index a3ff7db8cf..0000000000 Binary files a/assets/stickers/food/sandwich.webp and /dev/null differ diff --git a/assets/stickers/food/sardine.webp b/assets/stickers/food/sardine.webp deleted file mode 100644 index 8d9a5387f1..0000000000 Binary files a/assets/stickers/food/sardine.webp and /dev/null differ diff --git a/assets/stickers/food/soup.webp b/assets/stickers/food/soup.webp deleted file mode 100644 index fbc22c0e65..0000000000 Binary files a/assets/stickers/food/soup.webp and /dev/null differ diff --git a/assets/stickers/food/soya.webp b/assets/stickers/food/soya.webp deleted file mode 100644 index 8465c60bcb..0000000000 Binary files a/assets/stickers/food/soya.webp and /dev/null differ diff --git a/assets/stickers/food/steak.webp b/assets/stickers/food/steak.webp deleted file mode 100644 index e78357c574..0000000000 Binary files a/assets/stickers/food/steak.webp and /dev/null differ diff --git a/assets/stickers/food/strawberry.webp b/assets/stickers/food/strawberry.webp deleted file mode 100644 index 65becb4f28..0000000000 Binary files a/assets/stickers/food/strawberry.webp and /dev/null differ diff --git a/assets/stickers/food/sushi.webp b/assets/stickers/food/sushi.webp deleted file mode 100644 index bdd3806717..0000000000 Binary files a/assets/stickers/food/sushi.webp and /dev/null differ diff --git a/assets/stickers/food/taco.webp b/assets/stickers/food/taco.webp deleted file mode 100644 index 9a7f2aba6d..0000000000 Binary files a/assets/stickers/food/taco.webp and /dev/null differ diff --git a/assets/stickers/food/toaster.webp b/assets/stickers/food/toaster.webp deleted file mode 100644 index c4faf5eab9..0000000000 Binary files a/assets/stickers/food/toaster.webp and /dev/null differ diff --git a/assets/stickers/food/tomato.webp b/assets/stickers/food/tomato.webp deleted file mode 100644 index 3dcc8889fe..0000000000 Binary files a/assets/stickers/food/tomato.webp and /dev/null differ diff --git a/assets/stickers/food/tuna.webp b/assets/stickers/food/tuna.webp deleted file mode 100644 index 2702db04ea..0000000000 Binary files a/assets/stickers/food/tuna.webp and /dev/null differ diff --git a/assets/stickers/food/vinegar.webp b/assets/stickers/food/vinegar.webp deleted file mode 100644 index 831dfd041e..0000000000 Binary files a/assets/stickers/food/vinegar.webp and /dev/null differ diff --git a/assets/stickers/food/watermelon.webp b/assets/stickers/food/watermelon.webp deleted file mode 100644 index 3a61542599..0000000000 Binary files a/assets/stickers/food/watermelon.webp and /dev/null differ diff --git a/assets/stickers/food/yogurt.webp b/assets/stickers/food/yogurt.webp deleted file mode 100644 index 8b1ead4407..0000000000 Binary files a/assets/stickers/food/yogurt.webp and /dev/null differ diff --git a/assets/stickers/weather/cloud.webp b/assets/stickers/weather/cloud.webp deleted file mode 100644 index bf22dfddcb..0000000000 Binary files a/assets/stickers/weather/cloud.webp and /dev/null differ diff --git a/assets/stickers/weather/cloudy-1.webp b/assets/stickers/weather/cloudy-1.webp deleted file mode 100644 index 62e255b8e6..0000000000 Binary files a/assets/stickers/weather/cloudy-1.webp and /dev/null differ diff --git a/assets/stickers/weather/cloudy-night.webp b/assets/stickers/weather/cloudy-night.webp deleted file mode 100644 index a5ded41a87..0000000000 Binary files a/assets/stickers/weather/cloudy-night.webp and /dev/null differ diff --git a/assets/stickers/weather/cloudy.webp b/assets/stickers/weather/cloudy.webp deleted file mode 100644 index e7c6fd9158..0000000000 Binary files a/assets/stickers/weather/cloudy.webp and /dev/null differ diff --git a/assets/stickers/weather/eclipse.webp b/assets/stickers/weather/eclipse.webp deleted file mode 100644 index 0d0c13f63b..0000000000 Binary files a/assets/stickers/weather/eclipse.webp and /dev/null differ diff --git a/assets/stickers/weather/full-moon.webp b/assets/stickers/weather/full-moon.webp deleted file mode 100644 index d822dbd337..0000000000 Binary files a/assets/stickers/weather/full-moon.webp and /dev/null differ diff --git a/assets/stickers/weather/hail.webp b/assets/stickers/weather/hail.webp deleted file mode 100644 index 61d0c06c92..0000000000 Binary files a/assets/stickers/weather/hail.webp and /dev/null differ diff --git a/assets/stickers/weather/lightning.webp b/assets/stickers/weather/lightning.webp deleted file mode 100644 index e51f9e9f56..0000000000 Binary files a/assets/stickers/weather/lightning.webp and /dev/null differ diff --git a/assets/stickers/weather/moon-phases-1.webp b/assets/stickers/weather/moon-phases-1.webp deleted file mode 100644 index a4a03f8766..0000000000 Binary files a/assets/stickers/weather/moon-phases-1.webp and /dev/null differ diff --git a/assets/stickers/weather/moon-phases-2.webp b/assets/stickers/weather/moon-phases-2.webp deleted file mode 100644 index 0d4e07d47e..0000000000 Binary files a/assets/stickers/weather/moon-phases-2.webp and /dev/null differ diff --git a/assets/stickers/weather/moon-phases-3.webp b/assets/stickers/weather/moon-phases-3.webp deleted file mode 100644 index 4c79517b48..0000000000 Binary files a/assets/stickers/weather/moon-phases-3.webp and /dev/null differ diff --git a/assets/stickers/weather/moon-phases-4.webp b/assets/stickers/weather/moon-phases-4.webp deleted file mode 100644 index a80ad75fe4..0000000000 Binary files a/assets/stickers/weather/moon-phases-4.webp and /dev/null differ diff --git a/assets/stickers/weather/moon-phases-5.webp b/assets/stickers/weather/moon-phases-5.webp deleted file mode 100644 index 79448740ac..0000000000 Binary files a/assets/stickers/weather/moon-phases-5.webp and /dev/null differ diff --git a/assets/stickers/weather/moon-phases.webp b/assets/stickers/weather/moon-phases.webp deleted file mode 100644 index e3c4733a82..0000000000 Binary files a/assets/stickers/weather/moon-phases.webp and /dev/null differ diff --git a/assets/stickers/weather/planet-earth.webp b/assets/stickers/weather/planet-earth.webp deleted file mode 100644 index 7e0facfa00..0000000000 Binary files a/assets/stickers/weather/planet-earth.webp and /dev/null differ diff --git a/assets/stickers/weather/rain-1.webp b/assets/stickers/weather/rain-1.webp deleted file mode 100644 index 723c8f276a..0000000000 Binary files a/assets/stickers/weather/rain-1.webp and /dev/null differ diff --git a/assets/stickers/weather/rain.webp b/assets/stickers/weather/rain.webp deleted file mode 100644 index fe8bd4fabd..0000000000 Binary files a/assets/stickers/weather/rain.webp and /dev/null differ diff --git a/assets/stickers/weather/raindrop.webp b/assets/stickers/weather/raindrop.webp deleted file mode 100644 index 639a2734fb..0000000000 Binary files a/assets/stickers/weather/raindrop.webp and /dev/null differ diff --git a/assets/stickers/weather/rainy-1.webp b/assets/stickers/weather/rainy-1.webp deleted file mode 100644 index 5743bba10c..0000000000 Binary files a/assets/stickers/weather/rainy-1.webp and /dev/null differ diff --git a/assets/stickers/weather/rainy.webp b/assets/stickers/weather/rainy.webp deleted file mode 100644 index b628b37a58..0000000000 Binary files a/assets/stickers/weather/rainy.webp and /dev/null differ diff --git a/assets/stickers/weather/snowflake.webp b/assets/stickers/weather/snowflake.webp deleted file mode 100644 index 1f27b4f0b9..0000000000 Binary files a/assets/stickers/weather/snowflake.webp and /dev/null differ diff --git a/assets/stickers/weather/storm.webp b/assets/stickers/weather/storm.webp deleted file mode 100644 index 75fdc3e484..0000000000 Binary files a/assets/stickers/weather/storm.webp and /dev/null differ diff --git a/assets/stickers/weather/sun.webp b/assets/stickers/weather/sun.webp deleted file mode 100644 index 68f5e1c7be..0000000000 Binary files a/assets/stickers/weather/sun.webp and /dev/null differ diff --git a/assets/stickers/weather/temperature-1.webp b/assets/stickers/weather/temperature-1.webp deleted file mode 100644 index b376004d70..0000000000 Binary files a/assets/stickers/weather/temperature-1.webp and /dev/null differ diff --git a/assets/stickers/weather/temperature.webp b/assets/stickers/weather/temperature.webp deleted file mode 100644 index 23413f193f..0000000000 Binary files a/assets/stickers/weather/temperature.webp and /dev/null differ diff --git a/assets/stickers/weather/thermometer-1.webp b/assets/stickers/weather/thermometer-1.webp deleted file mode 100644 index 13fc728d77..0000000000 Binary files a/assets/stickers/weather/thermometer-1.webp and /dev/null differ diff --git a/assets/stickers/weather/thermometer-2.webp b/assets/stickers/weather/thermometer-2.webp deleted file mode 100644 index ff6dd52bff..0000000000 Binary files a/assets/stickers/weather/thermometer-2.webp and /dev/null differ diff --git a/assets/stickers/weather/thermometer.webp b/assets/stickers/weather/thermometer.webp deleted file mode 100644 index 65f2ef1781..0000000000 Binary files a/assets/stickers/weather/thermometer.webp and /dev/null differ diff --git a/assets/stickers/weather/tornado.webp b/assets/stickers/weather/tornado.webp deleted file mode 100644 index 93dd67aa90..0000000000 Binary files a/assets/stickers/weather/tornado.webp and /dev/null differ diff --git a/assets/stickers/weather/wind.webp b/assets/stickers/weather/wind.webp deleted file mode 100644 index 1c7aacaa19..0000000000 Binary files a/assets/stickers/weather/wind.webp and /dev/null differ diff --git a/res/drawable-hdpi/ic_local_dining_white_24dp.webp b/res/drawable-hdpi/ic_local_dining_white_24dp.webp deleted file mode 100644 index ce7463dd88..0000000000 Binary files a/res/drawable-hdpi/ic_local_dining_white_24dp.webp and /dev/null differ diff --git a/res/drawable-hdpi/ic_pets_white_24dp.webp b/res/drawable-hdpi/ic_pets_white_24dp.webp deleted file mode 100644 index 0478ad5f42..0000000000 Binary files a/res/drawable-hdpi/ic_pets_white_24dp.webp and /dev/null differ diff --git a/res/drawable-hdpi/ic_tag_faces_white_24dp.webp b/res/drawable-hdpi/ic_tag_faces_white_24dp.webp deleted file mode 100644 index 5abf561832..0000000000 Binary files a/res/drawable-hdpi/ic_tag_faces_white_24dp.webp and /dev/null differ diff --git a/res/drawable-hdpi/ic_wb_sunny_white_24dp.webp b/res/drawable-hdpi/ic_wb_sunny_white_24dp.webp deleted file mode 100644 index c00d06088b..0000000000 Binary files a/res/drawable-hdpi/ic_wb_sunny_white_24dp.webp and /dev/null differ diff --git a/res/drawable-hdpi/ic_work_white_24dp.webp b/res/drawable-hdpi/ic_work_white_24dp.webp deleted file mode 100644 index 15ef829b4a..0000000000 Binary files a/res/drawable-hdpi/ic_work_white_24dp.webp and /dev/null differ diff --git a/res/drawable-mdpi/ic_local_dining_white_24dp.webp b/res/drawable-mdpi/ic_local_dining_white_24dp.webp deleted file mode 100644 index cfeaf7eadd..0000000000 Binary files a/res/drawable-mdpi/ic_local_dining_white_24dp.webp and /dev/null differ diff --git a/res/drawable-mdpi/ic_pets_white_24dp.webp b/res/drawable-mdpi/ic_pets_white_24dp.webp deleted file mode 100644 index f4f2c6ae64..0000000000 Binary files a/res/drawable-mdpi/ic_pets_white_24dp.webp and /dev/null differ diff --git a/res/drawable-mdpi/ic_tag_faces_white_24dp.webp b/res/drawable-mdpi/ic_tag_faces_white_24dp.webp deleted file mode 100644 index f5efdf32b2..0000000000 Binary files a/res/drawable-mdpi/ic_tag_faces_white_24dp.webp and /dev/null differ diff --git a/res/drawable-mdpi/ic_wb_sunny_white_24dp.webp b/res/drawable-mdpi/ic_wb_sunny_white_24dp.webp deleted file mode 100644 index a7eda0c939..0000000000 Binary files a/res/drawable-mdpi/ic_wb_sunny_white_24dp.webp and /dev/null differ diff --git a/res/drawable-mdpi/ic_work_white_24dp.webp b/res/drawable-mdpi/ic_work_white_24dp.webp deleted file mode 100644 index f0e6312126..0000000000 Binary files a/res/drawable-mdpi/ic_work_white_24dp.webp and /dev/null differ diff --git a/res/drawable-xhdpi/ic_local_dining_white_24dp.webp b/res/drawable-xhdpi/ic_local_dining_white_24dp.webp deleted file mode 100644 index f248e68b89..0000000000 Binary files a/res/drawable-xhdpi/ic_local_dining_white_24dp.webp and /dev/null differ diff --git a/res/drawable-xhdpi/ic_pets_white_24dp.webp b/res/drawable-xhdpi/ic_pets_white_24dp.webp deleted file mode 100644 index 92f709db99..0000000000 Binary files a/res/drawable-xhdpi/ic_pets_white_24dp.webp and /dev/null differ diff --git a/res/drawable-xhdpi/ic_tag_faces_white_24dp.webp b/res/drawable-xhdpi/ic_tag_faces_white_24dp.webp deleted file mode 100644 index bc4a21d937..0000000000 Binary files a/res/drawable-xhdpi/ic_tag_faces_white_24dp.webp and /dev/null differ diff --git a/res/drawable-xhdpi/ic_wb_sunny_white_24dp.webp b/res/drawable-xhdpi/ic_wb_sunny_white_24dp.webp deleted file mode 100644 index 55cc4fc28c..0000000000 Binary files a/res/drawable-xhdpi/ic_wb_sunny_white_24dp.webp and /dev/null differ diff --git a/res/drawable-xhdpi/ic_work_white_24dp.webp b/res/drawable-xhdpi/ic_work_white_24dp.webp deleted file mode 100644 index 77f37391aa..0000000000 Binary files a/res/drawable-xhdpi/ic_work_white_24dp.webp and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_local_dining_white_24dp.webp b/res/drawable-xxhdpi/ic_local_dining_white_24dp.webp deleted file mode 100644 index 1609e554d5..0000000000 Binary files a/res/drawable-xxhdpi/ic_local_dining_white_24dp.webp and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_pets_white_24dp.webp b/res/drawable-xxhdpi/ic_pets_white_24dp.webp deleted file mode 100644 index 9c5c00fd5e..0000000000 Binary files a/res/drawable-xxhdpi/ic_pets_white_24dp.webp and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_tag_faces_white_24dp.webp b/res/drawable-xxhdpi/ic_tag_faces_white_24dp.webp deleted file mode 100644 index dd5762d6b4..0000000000 Binary files a/res/drawable-xxhdpi/ic_tag_faces_white_24dp.webp and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_wb_sunny_white_24dp.webp b/res/drawable-xxhdpi/ic_wb_sunny_white_24dp.webp deleted file mode 100644 index e611c5ff61..0000000000 Binary files a/res/drawable-xxhdpi/ic_wb_sunny_white_24dp.webp and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_work_white_24dp.webp b/res/drawable-xxhdpi/ic_work_white_24dp.webp deleted file mode 100644 index 9294cb118d..0000000000 Binary files a/res/drawable-xxhdpi/ic_work_white_24dp.webp and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_local_dining_white_24dp.webp b/res/drawable-xxxhdpi/ic_local_dining_white_24dp.webp deleted file mode 100644 index af24d8f35c..0000000000 Binary files a/res/drawable-xxxhdpi/ic_local_dining_white_24dp.webp and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_pets_white_24dp.webp b/res/drawable-xxxhdpi/ic_pets_white_24dp.webp deleted file mode 100644 index bd1a4936d2..0000000000 Binary files a/res/drawable-xxxhdpi/ic_pets_white_24dp.webp and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_tag_faces_white_24dp.webp b/res/drawable-xxxhdpi/ic_tag_faces_white_24dp.webp deleted file mode 100644 index f8fea58cd2..0000000000 Binary files a/res/drawable-xxxhdpi/ic_tag_faces_white_24dp.webp and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_wb_sunny_white_24dp.webp b/res/drawable-xxxhdpi/ic_wb_sunny_white_24dp.webp deleted file mode 100644 index 0e36b1f889..0000000000 Binary files a/res/drawable-xxxhdpi/ic_wb_sunny_white_24dp.webp and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_work_white_24dp.webp b/res/drawable-xxxhdpi/ic_work_white_24dp.webp deleted file mode 100644 index 31f586db4a..0000000000 Binary files a/res/drawable-xxxhdpi/ic_work_white_24dp.webp and /dev/null differ diff --git a/res/layout/image_editor_hud.xml b/res/layout/image_editor_hud.xml index 8601d9919a..5c4f442be2 100644 --- a/res/layout/image_editor_hud.xml +++ b/res/layout/image_editor_hud.xml @@ -74,14 +74,6 @@ android:padding="8dp" android:src="@drawable/ic_brush_highlight_32" /> - - - - - - - - - - diff --git a/res/layout/scribble_select_sticker_fragment.xml b/res/layout/scribble_select_sticker_fragment.xml deleted file mode 100644 index fbf8aefd6e..0000000000 --- a/res/layout/scribble_select_sticker_fragment.xml +++ /dev/null @@ -1,9 +0,0 @@ - - diff --git a/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java b/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java index 67d7aba0a6..7eebe308bc 100644 --- a/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java +++ b/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java @@ -298,14 +298,8 @@ public final class ImageEditorFragment extends Fragment implements ImageEditorHu break; } - case INSERT_ASSET_STICKER: { - Intent intent = new Intent(getContext(), StickerSelectActivity.class); - startActivityForResult(intent, SELECT_OLD_STICKER_REQUEST_CODE); - break; - } - case INSERT_STICKER: { - Intent intent = new Intent(getContext(), NewStickerSelectActivity.class); + Intent intent = new Intent(getContext(), ImageEditorStickerSelectActivity.class); startActivityForResult(intent, SELECT_NEW_STICKER_REQUEST_CODE); break; } diff --git a/src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java b/src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java index 81f37d5f9d..40770cf1d1 100644 --- a/src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java +++ b/src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java @@ -36,8 +36,7 @@ public final class ImageEditorHud extends LinearLayout { private View drawButton; private View highlightButton; private View textButton; - private View oldStickerButton; - private View newStickerButton; + private View stickerButton; private View undoButton; private View saveButton; private View deleteButton; @@ -83,8 +82,7 @@ public final class ImageEditorHud extends LinearLayout { drawButton = findViewById(R.id.scribble_draw_button); highlightButton = findViewById(R.id.scribble_highlight_button); textButton = findViewById(R.id.scribble_text_button); - oldStickerButton = findViewById(R.id.old_scribble_sticker_button); - newStickerButton = findViewById(R.id.scribble_sticker_button); + stickerButton = findViewById(R.id.scribble_sticker_button); undoButton = findViewById(R.id.scribble_undo_button); saveButton = findViewById(R.id.scribble_save_button); deleteButton = findViewById(R.id.scribble_delete_button); @@ -118,16 +116,13 @@ public final class ImageEditorHud extends LinearLayout { setVisibleViewsWhenInMode(Mode.INSERT_STICKER, confirmButton); - setVisibleViewsWhenInMode(Mode.INSERT_ASSET_STICKER, confirmButton); - setVisibleViewsWhenInMode(Mode.CROP, confirmButton, cropFlipButton, cropRotateButton, cropAspectLock, undoButton); for (Set views : visibilityModeMap.values()) { allViews.addAll(views); } - allViews.add(newStickerButton); - allViews.add(oldStickerButton); + allViews.add(stickerButton); } private void setVisibleViewsWhenInMode(Mode mode, View... views) { @@ -137,9 +132,9 @@ public final class ImageEditorHud extends LinearLayout { @MainThread public void setStickersAvailable(boolean stickersAvailable) { if (stickersAvailable) { - setVisibleViewsWhenInMode(Mode.NONE, drawButton, highlightButton, textButton, newStickerButton, cropButton, undoButton, saveButton); + setVisibleViewsWhenInMode(Mode.NONE, drawButton, highlightButton, textButton, stickerButton, cropButton, undoButton, saveButton); } else { - setVisibleViewsWhenInMode(Mode.NONE, drawButton, highlightButton, textButton, oldStickerButton, cropButton, undoButton, saveButton); + setVisibleViewsWhenInMode(Mode.NONE, drawButton, highlightButton, textButton, cropButton, undoButton, saveButton); } updateButtonVisibility(currentMode); } @@ -167,8 +162,7 @@ public final class ImageEditorHud extends LinearLayout { drawButton.setOnClickListener(v -> setMode(Mode.DRAW)); highlightButton.setOnClickListener(v -> setMode(Mode.HIGHLIGHT)); textButton.setOnClickListener(v -> setMode(Mode.TEXT)); - oldStickerButton.setOnClickListener(v -> setMode(Mode.INSERT_ASSET_STICKER)); - newStickerButton.setOnClickListener(v -> setMode(Mode.INSERT_STICKER)); + stickerButton.setOnClickListener(v -> setMode(Mode.INSERT_STICKER)); saveButton.setOnClickListener(v -> eventListener.onSave()); } @@ -269,7 +263,6 @@ public final class ImageEditorHud extends LinearLayout { HIGHLIGHT, MOVE_DELETE, INSERT_STICKER, - INSERT_ASSET_STICKER } public interface EventListener { diff --git a/src/org/thoughtcrime/securesms/scribbles/NewStickerSelectActivity.java b/src/org/thoughtcrime/securesms/scribbles/ImageEditorStickerSelectActivity.java similarity index 93% rename from src/org/thoughtcrime/securesms/scribbles/NewStickerSelectActivity.java rename to src/org/thoughtcrime/securesms/scribbles/ImageEditorStickerSelectActivity.java index ae6c81d773..61b05f889e 100644 --- a/src/org/thoughtcrime/securesms/scribbles/NewStickerSelectActivity.java +++ b/src/org/thoughtcrime/securesms/scribbles/ImageEditorStickerSelectActivity.java @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.stickers.StickerKeyboardProvider; import org.thoughtcrime.securesms.stickers.StickerManagementActivity; import org.thoughtcrime.securesms.util.concurrent.SignalExecutors; -public final class NewStickerSelectActivity extends FragmentActivity { +public final class ImageEditorStickerSelectActivity extends FragmentActivity { @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -48,7 +48,7 @@ public final class NewStickerSelectActivity extends FragmentActivity { @Override public void onStickerManagementClicked() { - startActivity(StickerManagementActivity.getIntent(NewStickerSelectActivity.this)); + startActivity(StickerManagementActivity.getIntent(ImageEditorStickerSelectActivity.this)); } } )); diff --git a/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java b/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java deleted file mode 100644 index f3c6c4fdc7..0000000000 --- a/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * Copyright (C) 2016 Open Whisper Systems - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.thoughtcrime.securesms.scribbles; - - -import android.content.Context; -import androidx.annotation.NonNull; -import org.thoughtcrime.securesms.logging.Log; - -import org.thoughtcrime.securesms.util.AsyncLoader; - -import java.io.IOException; - -class StickerLoader extends AsyncLoader { - - private static final String TAG = StickerLoader.class.getSimpleName(); - - private final String assetDirectory; - - StickerLoader(Context context, String assetDirectory) { - super(context); - this.assetDirectory = assetDirectory; - } - - @Override - public @NonNull - String[] loadInBackground() { - try { - String[] files = getContext().getAssets().list(assetDirectory); - - for (int i=0;i. - */ -package org.thoughtcrime.securesms.scribbles; - -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; -import androidx.annotation.Nullable; -import com.google.android.material.tabs.TabLayout; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; -import androidx.fragment.app.FragmentManager; -import androidx.fragment.app.FragmentStatePagerAdapter; -import androidx.viewpager.widget.ViewPager; -import android.view.MenuItem; - -import org.thoughtcrime.securesms.R; - -public class StickerSelectActivity extends FragmentActivity implements StickerSelectFragment.StickerSelectionListener { - - private static final String TAG = StickerSelectActivity.class.getSimpleName(); - - private static final int[] TAB_TITLES = new int[] { - R.drawable.ic_tag_faces_white_24dp, - R.drawable.ic_work_white_24dp, - R.drawable.ic_pets_white_24dp, - R.drawable.ic_local_dining_white_24dp, - R.drawable.ic_wb_sunny_white_24dp - }; - - @Override - protected void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.scribble_select_sticker_activity); - - ViewPager viewPager = (ViewPager) findViewById(R.id.camera_sticker_pager); - viewPager.setAdapter(new StickerPagerAdapter(getSupportFragmentManager(), this)); - - TabLayout tabLayout = (TabLayout) findViewById(R.id.camera_sticker_tabs); - tabLayout.setupWithViewPager(viewPager); - - for (int i=0;i. - */ -package org.thoughtcrime.securesms.scribbles; - -import android.content.Context; -import android.net.Uri; -import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import com.bumptech.glide.load.engine.DiskCacheStrategy; - -import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.mms.GlideApp; -import org.thoughtcrime.securesms.mms.GlideRequests; - -public class StickerSelectFragment extends Fragment implements LoaderManager.LoaderCallbacks { - - private RecyclerView recyclerView; - private GlideRequests glideRequests; - private String assetDirectory; - private StickerSelectionListener listener; - - public static StickerSelectFragment newInstance(String assetDirectory) { - StickerSelectFragment fragment = new StickerSelectFragment(); - - Bundle args = new Bundle(); - args.putString("assetDirectory", assetDirectory); - fragment.setArguments(args); - - return fragment; - } - - public @Nullable View onCreateView(@NonNull LayoutInflater inflater, - @Nullable ViewGroup container, - @Nullable Bundle savedInstanceState) - { - View view = inflater.inflate(R.layout.scribble_select_sticker_fragment, container, false); - this.recyclerView = view.findViewById(R.id.stickers_recycler_view); - - return view; - } - - @Override - public void onActivityCreated(Bundle bundle) { - super.onActivityCreated(bundle); - - this.glideRequests = GlideApp.with(this); - this.assetDirectory = getArguments().getString("assetDirectory"); - - getLoaderManager().initLoader(0, null, this); - this.recyclerView.setLayoutManager(new GridLayoutManager(getActivity(), 3)); - } - - @Override - public @NonNull Loader onCreateLoader(int id, Bundle args) { - return new StickerLoader(getActivity(), assetDirectory); - } - - @Override - public void onLoadFinished(@NonNull Loader loader, String[] data) { - recyclerView.setAdapter(new StickersAdapter(getActivity(), glideRequests, data)); - } - - @Override - public void onLoaderReset(@NonNull Loader loader) { - recyclerView.setAdapter(null); - } - - public void setListener(StickerSelectionListener listener) { - this.listener = listener; - } - - class StickersAdapter extends RecyclerView.Adapter { - - private final GlideRequests glideRequests; - private final String[] stickerFiles; - private final LayoutInflater layoutInflater; - - StickersAdapter(@NonNull Context context, @NonNull GlideRequests glideRequests, @NonNull String[] stickerFiles) { - this.glideRequests = glideRequests; - this.stickerFiles = stickerFiles; - this.layoutInflater = LayoutInflater.from(context); - } - - @Override - public @NonNull StickerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - return new StickerViewHolder(layoutInflater.inflate(R.layout.scribble_sticker_item, parent, false)); - } - - @Override - public void onBindViewHolder(@NonNull StickerViewHolder holder, int position) { - holder.fileName = stickerFiles[position]; - - glideRequests.load(Uri.parse("file:///android_asset/" + holder.fileName)) - .diskCacheStrategy(DiskCacheStrategy.NONE) - .into(holder.image); - } - - @Override - public int getItemCount() { - return stickerFiles.length; - } - - @Override - public void onViewRecycled(@NonNull StickerViewHolder holder) { - super.onViewRecycled(holder); - glideRequests.clear(holder.image); - } - - private void onStickerSelected(String fileName) { - if (listener != null) listener.onStickerSelected(fileName); - } - - class StickerViewHolder extends RecyclerView.ViewHolder { - - private String fileName; - private ImageView image; - - StickerViewHolder(View itemView) { - super(itemView); - image = itemView.findViewById(R.id.sticker_image); - itemView.setOnClickListener(view -> { - int pos = getAdapterPosition(); - if (pos >= 0) { - onStickerSelected(fileName); - } - }); - } - } - } - - interface StickerSelectionListener { - void onStickerSelected(String name); - } - - -}