diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index c9a44973c6..4b44d1bc52 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1197.apk +apkFileName: com.discord-1198.apk compressionType: false doNotCompress: - resources.arsc @@ -3224,5 +3224,5 @@ usesFramework: tag: null version: 2.4.2-83a459-SNAPSHOT versionInfo: - versionCode: '1197' - versionName: '31.0' + versionCode: '1198' + versionName: 32-alpha1 diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index c81e50ae48..9e5fabae29 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/drawable-xhdpi/emoji_activity_color.png b/com.discord/res/drawable-xhdpi/emoji_activity_color.png deleted file mode 100644 index 096fc27fb7..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_activity_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_activity_dark.png b/com.discord/res/drawable-xhdpi/emoji_activity_dark.png deleted file mode 100644 index f1a957b742..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_activity_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_activity_light.png b/com.discord/res/drawable-xhdpi/emoji_activity_light.png deleted file mode 100644 index 7715938f6d..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_activity_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_custom_color.png b/com.discord/res/drawable-xhdpi/emoji_custom_color.png deleted file mode 100644 index 34e7333ef5..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_custom_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_custom_dark.png b/com.discord/res/drawable-xhdpi/emoji_custom_dark.png deleted file mode 100644 index 44b8f0f358..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_custom_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_custom_light.png b/com.discord/res/drawable-xhdpi/emoji_custom_light.png deleted file mode 100644 index a1fd5a140f..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_custom_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_flags_color.png b/com.discord/res/drawable-xhdpi/emoji_flags_color.png deleted file mode 100644 index 31a9adb5c8..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_flags_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_flags_dark.png b/com.discord/res/drawable-xhdpi/emoji_flags_dark.png deleted file mode 100644 index 15e60f766d..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_flags_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_flags_light.png b/com.discord/res/drawable-xhdpi/emoji_flags_light.png deleted file mode 100644 index 24e865fc62..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_flags_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_food_color.png b/com.discord/res/drawable-xhdpi/emoji_food_color.png deleted file mode 100644 index 23cd2c231e..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_food_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_food_dark.png b/com.discord/res/drawable-xhdpi/emoji_food_dark.png deleted file mode 100644 index 866e17f216..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_food_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_food_light.png b/com.discord/res/drawable-xhdpi/emoji_food_light.png deleted file mode 100644 index 0f462d88ab..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_food_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_nature_color.png b/com.discord/res/drawable-xhdpi/emoji_nature_color.png deleted file mode 100644 index dba53de52c..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_nature_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_nature_dark.png b/com.discord/res/drawable-xhdpi/emoji_nature_dark.png deleted file mode 100644 index c19a273757..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_nature_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_nature_light.png b/com.discord/res/drawable-xhdpi/emoji_nature_light.png deleted file mode 100644 index 28431a9015..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_nature_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_object_color.png b/com.discord/res/drawable-xhdpi/emoji_object_color.png deleted file mode 100644 index e18a969b69..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_object_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_object_dark.png b/com.discord/res/drawable-xhdpi/emoji_object_dark.png deleted file mode 100644 index 5c081dbec1..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_object_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_object_light.png b/com.discord/res/drawable-xhdpi/emoji_object_light.png deleted file mode 100644 index 2e607bad96..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_object_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_people_color.png b/com.discord/res/drawable-xhdpi/emoji_people_color.png deleted file mode 100644 index b00942d283..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_people_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_people_dark.png b/com.discord/res/drawable-xhdpi/emoji_people_dark.png deleted file mode 100644 index deef6ad536..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_people_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_people_light.png b/com.discord/res/drawable-xhdpi/emoji_people_light.png deleted file mode 100644 index d06249c7c6..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_people_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_recent_color.png b/com.discord/res/drawable-xhdpi/emoji_recent_color.png deleted file mode 100644 index 3ebb61c532..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_recent_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_recent_dark.png b/com.discord/res/drawable-xhdpi/emoji_recent_dark.png deleted file mode 100644 index 90165a0b17..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_recent_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_recent_light.png b/com.discord/res/drawable-xhdpi/emoji_recent_light.png deleted file mode 100644 index 3a9fdd7e05..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_recent_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_symbol_color.png b/com.discord/res/drawable-xhdpi/emoji_symbol_color.png deleted file mode 100644 index b72a493342..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_symbol_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_symbol_dark.png b/com.discord/res/drawable-xhdpi/emoji_symbol_dark.png deleted file mode 100644 index dbd157edb7..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_symbol_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_symbol_light.png b/com.discord/res/drawable-xhdpi/emoji_symbol_light.png deleted file mode 100644 index 074930a8d6..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_symbol_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_travel_color.png b/com.discord/res/drawable-xhdpi/emoji_travel_color.png deleted file mode 100644 index 87e4ffb06b..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_travel_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_travel_dark.png b/com.discord/res/drawable-xhdpi/emoji_travel_dark.png deleted file mode 100644 index 15ad731f4b..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_travel_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xhdpi/emoji_travel_light.png b/com.discord/res/drawable-xhdpi/emoji_travel_light.png deleted file mode 100644 index 3a895a60ec..0000000000 Binary files a/com.discord/res/drawable-xhdpi/emoji_travel_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_activity_color.png b/com.discord/res/drawable-xxhdpi/emoji_activity_color.png deleted file mode 100644 index a519f9f18f..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_activity_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_activity_dark.png b/com.discord/res/drawable-xxhdpi/emoji_activity_dark.png deleted file mode 100644 index fad297822a..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_activity_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_activity_light.png b/com.discord/res/drawable-xxhdpi/emoji_activity_light.png deleted file mode 100644 index d80b47575b..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_activity_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_custom_color.png b/com.discord/res/drawable-xxhdpi/emoji_custom_color.png deleted file mode 100644 index 80807dc2e3..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_custom_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_custom_dark.png b/com.discord/res/drawable-xxhdpi/emoji_custom_dark.png deleted file mode 100644 index 470f3a5187..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_custom_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_custom_light.png b/com.discord/res/drawable-xxhdpi/emoji_custom_light.png deleted file mode 100644 index 2f4a77e2ef..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_custom_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_flags_color.png b/com.discord/res/drawable-xxhdpi/emoji_flags_color.png deleted file mode 100644 index 994c8c1012..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_flags_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_flags_dark.png b/com.discord/res/drawable-xxhdpi/emoji_flags_dark.png deleted file mode 100644 index 33de28ad48..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_flags_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_flags_light.png b/com.discord/res/drawable-xxhdpi/emoji_flags_light.png deleted file mode 100644 index 7152bae0df..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_flags_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_food_color.png b/com.discord/res/drawable-xxhdpi/emoji_food_color.png deleted file mode 100644 index 6ab97554c6..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_food_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_food_dark.png b/com.discord/res/drawable-xxhdpi/emoji_food_dark.png deleted file mode 100644 index 8025c52e46..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_food_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_food_light.png b/com.discord/res/drawable-xxhdpi/emoji_food_light.png deleted file mode 100644 index d3e3729170..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_food_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_nature_color.png b/com.discord/res/drawable-xxhdpi/emoji_nature_color.png deleted file mode 100644 index d797a41e49..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_nature_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_nature_dark.png b/com.discord/res/drawable-xxhdpi/emoji_nature_dark.png deleted file mode 100644 index 48c5d111e9..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_nature_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_nature_light.png b/com.discord/res/drawable-xxhdpi/emoji_nature_light.png deleted file mode 100644 index cc54cf52f0..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_nature_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_object_color.png b/com.discord/res/drawable-xxhdpi/emoji_object_color.png deleted file mode 100644 index 00f23babbd..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_object_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_object_dark.png b/com.discord/res/drawable-xxhdpi/emoji_object_dark.png deleted file mode 100644 index c2acfc5774..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_object_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_object_light.png b/com.discord/res/drawable-xxhdpi/emoji_object_light.png deleted file mode 100644 index 53684a2a5a..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_object_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_people_color.png b/com.discord/res/drawable-xxhdpi/emoji_people_color.png deleted file mode 100644 index 5e4de3cc81..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_people_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_people_dark.png b/com.discord/res/drawable-xxhdpi/emoji_people_dark.png deleted file mode 100644 index 1d0af643ff..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_people_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_people_light.png b/com.discord/res/drawable-xxhdpi/emoji_people_light.png deleted file mode 100644 index 17bc75863d..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_people_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_recent_color.png b/com.discord/res/drawable-xxhdpi/emoji_recent_color.png deleted file mode 100644 index 336ffaf004..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_recent_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_recent_dark.png b/com.discord/res/drawable-xxhdpi/emoji_recent_dark.png deleted file mode 100644 index 6806f2df25..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_recent_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_recent_light.png b/com.discord/res/drawable-xxhdpi/emoji_recent_light.png deleted file mode 100644 index 51f0d7f4a1..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_recent_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_symbol_color.png b/com.discord/res/drawable-xxhdpi/emoji_symbol_color.png deleted file mode 100644 index 82154ec445..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_symbol_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_symbol_dark.png b/com.discord/res/drawable-xxhdpi/emoji_symbol_dark.png deleted file mode 100644 index b4b95c6ddf..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_symbol_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_symbol_light.png b/com.discord/res/drawable-xxhdpi/emoji_symbol_light.png deleted file mode 100644 index 26a7742640..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_symbol_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_travel_color.png b/com.discord/res/drawable-xxhdpi/emoji_travel_color.png deleted file mode 100644 index 3c9522039b..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_travel_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_travel_dark.png b/com.discord/res/drawable-xxhdpi/emoji_travel_dark.png deleted file mode 100644 index 1c84bf7cfe..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_travel_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/emoji_travel_light.png b/com.discord/res/drawable-xxhdpi/emoji_travel_light.png deleted file mode 100644 index 4350c7df4e..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/emoji_travel_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/empty_pins_dark.png b/com.discord/res/drawable-xxhdpi/empty_pins_dark.png deleted file mode 100644 index 9ec0245035..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/empty_pins_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxhdpi/empty_pins_light.png b/com.discord/res/drawable-xxhdpi/empty_pins_light.png deleted file mode 100644 index 2fd41913a8..0000000000 Binary files a/com.discord/res/drawable-xxhdpi/empty_pins_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_activity_color.png b/com.discord/res/drawable-xxxhdpi/emoji_activity_color.png deleted file mode 100644 index 459a369180..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_activity_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_activity_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_activity_dark.png deleted file mode 100644 index a6c7071fd7..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_activity_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_activity_light.png b/com.discord/res/drawable-xxxhdpi/emoji_activity_light.png deleted file mode 100644 index 53c3e9a97b..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_activity_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_custom_color.png b/com.discord/res/drawable-xxxhdpi/emoji_custom_color.png deleted file mode 100644 index 6ece1aa344..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_custom_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_custom_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_custom_dark.png deleted file mode 100644 index d25c0b6546..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_custom_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_custom_light.png b/com.discord/res/drawable-xxxhdpi/emoji_custom_light.png deleted file mode 100644 index 29e91213bc..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_custom_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_flags_color.png b/com.discord/res/drawable-xxxhdpi/emoji_flags_color.png deleted file mode 100644 index c89e1bfe26..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_flags_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_flags_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_flags_dark.png deleted file mode 100644 index b2d367f74b..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_flags_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_flags_light.png b/com.discord/res/drawable-xxxhdpi/emoji_flags_light.png deleted file mode 100644 index f0b0b0fc30..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_flags_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_food_color.png b/com.discord/res/drawable-xxxhdpi/emoji_food_color.png deleted file mode 100644 index 82c9790e69..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_food_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_food_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_food_dark.png deleted file mode 100644 index 2e667547c7..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_food_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_food_light.png b/com.discord/res/drawable-xxxhdpi/emoji_food_light.png deleted file mode 100644 index 4fbbc65ddd..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_food_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_nature_color.png b/com.discord/res/drawable-xxxhdpi/emoji_nature_color.png deleted file mode 100644 index 885b124511..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_nature_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_nature_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_nature_dark.png deleted file mode 100644 index 68625ad514..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_nature_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_nature_light.png b/com.discord/res/drawable-xxxhdpi/emoji_nature_light.png deleted file mode 100644 index 28f3d0357a..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_nature_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_object_color.png b/com.discord/res/drawable-xxxhdpi/emoji_object_color.png deleted file mode 100644 index c32fde482f..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_object_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_object_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_object_dark.png deleted file mode 100644 index 90e2181d91..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_object_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_object_light.png b/com.discord/res/drawable-xxxhdpi/emoji_object_light.png deleted file mode 100644 index 8dd7a100e0..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_object_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_people_color.png b/com.discord/res/drawable-xxxhdpi/emoji_people_color.png deleted file mode 100644 index 2ac3772da3..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_people_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_people_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_people_dark.png deleted file mode 100644 index 2e3e907a94..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_people_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_people_light.png b/com.discord/res/drawable-xxxhdpi/emoji_people_light.png deleted file mode 100644 index 31841dd409..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_people_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_recent_color.png b/com.discord/res/drawable-xxxhdpi/emoji_recent_color.png deleted file mode 100644 index 97d86919b1..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_recent_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_recent_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_recent_dark.png deleted file mode 100644 index 2838b9fb0b..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_recent_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_recent_light.png b/com.discord/res/drawable-xxxhdpi/emoji_recent_light.png deleted file mode 100644 index ccc62d37f0..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_recent_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_symbol_color.png b/com.discord/res/drawable-xxxhdpi/emoji_symbol_color.png deleted file mode 100644 index 6451f33d01..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_symbol_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_symbol_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_symbol_dark.png deleted file mode 100644 index 1f5cdc2207..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_symbol_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_symbol_light.png b/com.discord/res/drawable-xxxhdpi/emoji_symbol_light.png deleted file mode 100644 index 8f5f122155..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_symbol_light.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_travel_color.png b/com.discord/res/drawable-xxxhdpi/emoji_travel_color.png deleted file mode 100644 index 29ebe76dcd..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_travel_color.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_travel_dark.png b/com.discord/res/drawable-xxxhdpi/emoji_travel_dark.png deleted file mode 100644 index e49d934ea4..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_travel_dark.png and /dev/null differ diff --git a/com.discord/res/drawable-xxxhdpi/emoji_travel_light.png b/com.discord/res/drawable-xxxhdpi/emoji_travel_light.png deleted file mode 100644 index 8b34fc9092..0000000000 Binary files a/com.discord/res/drawable-xxxhdpi/emoji_travel_light.png and /dev/null differ diff --git a/com.discord/res/drawable/ic_emoji_activity_dark.xml b/com.discord/res/drawable/ic_emoji_activity_dark.xml deleted file mode 100644 index 91f7caab5f..0000000000 --- a/com.discord/res/drawable/ic_emoji_activity_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_activity_light.xml b/com.discord/res/drawable/ic_emoji_activity_light.xml deleted file mode 100644 index da50329b71..0000000000 --- a/com.discord/res/drawable/ic_emoji_activity_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_custom_dark.xml b/com.discord/res/drawable/ic_emoji_custom_dark.xml deleted file mode 100644 index 22cb2f9a10..0000000000 --- a/com.discord/res/drawable/ic_emoji_custom_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_custom_light.xml b/com.discord/res/drawable/ic_emoji_custom_light.xml deleted file mode 100644 index c99f90daa1..0000000000 --- a/com.discord/res/drawable/ic_emoji_custom_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_flags_dark.xml b/com.discord/res/drawable/ic_emoji_flags_dark.xml deleted file mode 100644 index 6a0ad339df..0000000000 --- a/com.discord/res/drawable/ic_emoji_flags_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_flags_light.xml b/com.discord/res/drawable/ic_emoji_flags_light.xml deleted file mode 100644 index 5667ea59c9..0000000000 --- a/com.discord/res/drawable/ic_emoji_flags_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_food_dark.xml b/com.discord/res/drawable/ic_emoji_food_dark.xml deleted file mode 100644 index 1d6d0c0f21..0000000000 --- a/com.discord/res/drawable/ic_emoji_food_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_food_light.xml b/com.discord/res/drawable/ic_emoji_food_light.xml deleted file mode 100644 index 92f7d0b643..0000000000 --- a/com.discord/res/drawable/ic_emoji_food_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_nature_dark.xml b/com.discord/res/drawable/ic_emoji_nature_dark.xml deleted file mode 100644 index 178b5f19a0..0000000000 --- a/com.discord/res/drawable/ic_emoji_nature_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_nature_light.xml b/com.discord/res/drawable/ic_emoji_nature_light.xml deleted file mode 100644 index da42b6f124..0000000000 --- a/com.discord/res/drawable/ic_emoji_nature_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_objects_dark.xml b/com.discord/res/drawable/ic_emoji_objects_dark.xml deleted file mode 100644 index d6692fe3db..0000000000 --- a/com.discord/res/drawable/ic_emoji_objects_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_objects_light.xml b/com.discord/res/drawable/ic_emoji_objects_light.xml deleted file mode 100644 index bc5143e9ac..0000000000 --- a/com.discord/res/drawable/ic_emoji_objects_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_people_dark.xml b/com.discord/res/drawable/ic_emoji_people_dark.xml deleted file mode 100644 index 95cc0daa19..0000000000 --- a/com.discord/res/drawable/ic_emoji_people_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_people_light.xml b/com.discord/res/drawable/ic_emoji_people_light.xml deleted file mode 100644 index 3fde54272a..0000000000 --- a/com.discord/res/drawable/ic_emoji_people_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_recent_dark.xml b/com.discord/res/drawable/ic_emoji_recent_dark.xml deleted file mode 100644 index 567e77e125..0000000000 --- a/com.discord/res/drawable/ic_emoji_recent_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_recent_light.xml b/com.discord/res/drawable/ic_emoji_recent_light.xml deleted file mode 100644 index 81219d6123..0000000000 --- a/com.discord/res/drawable/ic_emoji_recent_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_symbols_dark.xml b/com.discord/res/drawable/ic_emoji_symbols_dark.xml deleted file mode 100644 index 461a5a9456..0000000000 --- a/com.discord/res/drawable/ic_emoji_symbols_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_symbols_light.xml b/com.discord/res/drawable/ic_emoji_symbols_light.xml deleted file mode 100644 index d81584db08..0000000000 --- a/com.discord/res/drawable/ic_emoji_symbols_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_travel_dark.xml b/com.discord/res/drawable/ic_emoji_travel_dark.xml deleted file mode 100644 index b9ec427f21..0000000000 --- a/com.discord/res/drawable/ic_emoji_travel_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_travel_light.xml b/com.discord/res/drawable/ic_emoji_travel_light.xml deleted file mode 100644 index cf39f1096f..0000000000 --- a/com.discord/res/drawable/ic_emoji_travel_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/com.discord/res/drawable/ic_emoji_search_empty_dark.xml b/com.discord/res/drawable/ic_expression_search_empty_dark.xml similarity index 100% rename from com.discord/res/drawable/ic_emoji_search_empty_dark.xml rename to com.discord/res/drawable/ic_expression_search_empty_dark.xml diff --git a/com.discord/res/drawable/ic_emoji_search_empty_light.xml b/com.discord/res/drawable/ic_expression_search_empty_light.xml similarity index 100% rename from com.discord/res/drawable/ic_emoji_search_empty_light.xml rename to com.discord/res/drawable/ic_expression_search_empty_light.xml diff --git a/com.discord/res/layout-v22/emoji_picker_header_item_v2.xml b/com.discord/res/layout-v22/emoji_picker_header_item.xml similarity index 100% rename from com.discord/res/layout-v22/emoji_picker_header_item_v2.xml rename to com.discord/res/layout-v22/emoji_picker_header_item.xml diff --git a/com.discord/res/layout-v22/widget_emoji_picker_v2.xml b/com.discord/res/layout-v22/widget_emoji_picker.xml similarity index 97% rename from com.discord/res/layout-v22/widget_emoji_picker_v2.xml rename to com.discord/res/layout-v22/widget_emoji_picker.xml index 572b56cf21..ee09594001 100644 --- a/com.discord/res/layout-v22/widget_emoji_picker_v2.xml +++ b/com.discord/res/layout-v22/widget_emoji_picker.xml @@ -18,7 +18,7 @@ - - + + \ No newline at end of file diff --git a/com.discord/res/layout/emoji_category_item_guild.xml b/com.discord/res/layout/emoji_category_item_guild.xml index 68589a28ba..df056ae37e 100644 --- a/com.discord/res/layout/emoji_category_item_guild.xml +++ b/com.discord/res/layout/emoji_category_item_guild.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/emoji_picker_emoji_item.xml b/com.discord/res/layout/emoji_picker_emoji_item.xml index 9a5852881a..df3d8ee461 100644 --- a/com.discord/res/layout/emoji_picker_emoji_item.xml +++ b/com.discord/res/layout/emoji_picker_emoji_item.xml @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/com.discord/res/layout/emoji_picker_emoji_item_v2.xml b/com.discord/res/layout/emoji_picker_emoji_item_v2.xml deleted file mode 100644 index 6983985fd9..0000000000 --- a/com.discord/res/layout/emoji_picker_emoji_item_v2.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/com.discord/res/layout/emoji_picker_header_item.xml b/com.discord/res/layout/emoji_picker_header_item.xml index 44c5b90a40..f672d5f978 100644 --- a/com.discord/res/layout/emoji_picker_header_item.xml +++ b/com.discord/res/layout/emoji_picker_header_item.xml @@ -1,3 +1,3 @@ - \ No newline at end of file diff --git a/com.discord/res/layout/emoji_picker_header_item_v2.xml b/com.discord/res/layout/emoji_picker_header_item_v2.xml deleted file mode 100644 index f672d5f978..0000000000 --- a/com.discord/res/layout/emoji_picker_header_item_v2.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_input_emoji_picker.xml b/com.discord/res/layout/widget_chat_input_emoji_picker.xml deleted file mode 100644 index 5c37fdc371..0000000000 --- a/com.discord/res/layout/widget_chat_input_emoji_picker.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml b/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml index 5e7474e7af..8ca6b7c72d 100644 --- a/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml +++ b/com.discord/res/layout/widget_chat_list_adapter_item_embed.xml @@ -1,5 +1,5 @@ - diff --git a/com.discord/res/layout/widget_emoji_picker_v2.xml b/com.discord/res/layout/widget_emoji_picker.xml similarity index 97% rename from com.discord/res/layout/widget_emoji_picker_v2.xml rename to com.discord/res/layout/widget_emoji_picker.xml index bba5b39012..ad2b369365 100644 --- a/com.discord/res/layout/widget_emoji_picker_v2.xml +++ b/com.discord/res/layout/widget_emoji_picker.xml @@ -18,7 +18,7 @@ - - + + \ No newline at end of file diff --git a/com.discord/res/values/attrs.xml b/com.discord/res/values/attrs.xml index dca95cb354..5206bc912e 100644 --- a/com.discord/res/values/attrs.xml +++ b/com.discord/res/values/attrs.xml @@ -1772,16 +1772,6 @@ - - - - - - - - - - diff --git a/com.discord/res/values/dimens.xml b/com.discord/res/values/dimens.xml index 1ae009921e..4416bd2d54 100644 --- a/com.discord/res/values/dimens.xml +++ b/com.discord/res/values/dimens.xml @@ -108,10 +108,10 @@ 8.0dip 12.0dip 5.0dip + 0.25dip 600.0dip 128.0dip - 48.0dip - 44.0dip + 44.0dip 136.0dip 24.0dip 4.0dip diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml index d20d6ecdbb..0ebf86428e 100644 --- a/com.discord/res/values/ids.xml +++ b/com.discord/res/values/ids.xml @@ -527,6 +527,7 @@ + @@ -741,8 +742,6 @@ - - diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml index 5d5b5f4376..78132c986d 100644 --- a/com.discord/res/values/plurals.xml +++ b/com.discord/res/values/plurals.xml @@ -575,8 +575,8 @@ %s Server Boost - %s unread mentions - %s unread mention + %s mentions + %s mention %s users @@ -618,9 +618,9 @@ **1** person used this template - , %s unread mentions + %s mentions, - , %s unread mention + %s mention, %s days diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index f805b68cb1..91f6f5ac39 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -1364,158 +1364,148 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2309,10 +2299,10 @@ - - - - + + + + @@ -3027,596 +3017,576 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3639,228 +3609,228 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3912,13 +3882,13 @@ - - - - - - - + + + + + + + @@ -3932,72 +3902,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4005,58 +3945,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4066,19 +4006,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -4682,2105 +4622,2104 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6898,597 +6837,594 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -17173,831 +17109,830 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index c92ca6e465..c5e4fd11fc 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1133,7 +1133,7 @@ We’re here to make a good impression." Presets Select a color Transparency - 6e3a88d939cb4ca0975fae8ea10e1503 + b413eb1188f64ab2b80b1dabe3a478d4 Coming Soon Search Animated GIFs on the Web Displays text with emphasis. @@ -2879,8 +2879,8 @@ Servers that have set up a Welcome Screen see improvements in more people sticki Enable Server Widget %1$s (server) %1$s (%2$s store %3$s announcement %4$s other %5$s}) - %1$s (%2$s store %3$s announcement %4$s other %5$s}), %6$s - %1$s (%2$s store %3$s announcement %4$s other %5$s}), has unread messages + , %1$s, %2$s (%3$s store %4$s announcement %5$s other %6$s}) + unread, %1$s (%2$s store %3$s announcement %4$s other %5$s}) %1$s (voice channel) %1$s (voice channel), %2$s of %3$s users %1$s (voice channel), %2$s @@ -3995,7 +3995,7 @@ Want to know more about Discord?" Oh no, an error has occurred. Code %1$s Discord has to install some stuff before we can launch your game. Installing (%1$s of %2$s). Discord has to install some stuff before we can launch your game. Installing %1$s (%2$s of %3$s). - Get tailored features and tools that can help grow your community! + Get custom features and tools that can help you run your community. Well, it looks like the **%1$s %2$s** microphone hardware mute switch is on. We suggest adding a phone to your 2 factor authentication settings as a backup. Add Phone diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml index 8c812093bf..8b3061a3d7 100644 --- a/com.discord/res/values/styles.xml +++ b/com.discord/res/values/styles.xml @@ -419,19 +419,9 @@ @color/primary_700 @color/white_alpha_10 @color/primary_600 - @drawable/ic_emoji_activity_dark - @drawable/ic_emoji_custom_dark - @drawable/ic_emoji_flags_dark - @drawable/ic_emoji_food_dark - @drawable/ic_emoji_nature_dark - @drawable/ic_emoji_objects_dark - @drawable/ic_emoji_people_dark - @drawable/ic_emoji_recent_dark - @drawable/ic_emoji_symbols_dark - @drawable/ic_emoji_travel_dark @drawable/ic_emoji_placeholder_primary_500 @drawable/img_empty_server_settings_emoji_dark - @drawable/ic_emoji_search_empty_dark + @drawable/ic_expression_search_empty_dark @drawable/ic_header_members_add_white_24dp #ff303337 @drawable/ic_group_add_white_24dp @@ -697,19 +687,9 @@ @color/primary_300 @color/black_alpha_10 @color/primary_300 - @drawable/ic_emoji_activity_light - @drawable/ic_emoji_custom_light - @drawable/ic_emoji_flags_light - @drawable/ic_emoji_food_light - @drawable/ic_emoji_nature_light - @drawable/ic_emoji_objects_light - @drawable/ic_emoji_people_light - @drawable/ic_emoji_recent_light - @drawable/ic_emoji_symbols_light - @drawable/ic_emoji_travel_light @drawable/ic_emoji_placeholder_primary_100 @drawable/img_empty_server_settings_emoji_light - @drawable/ic_emoji_search_empty_light + @drawable/ic_expression_search_empty_light @drawable/ic_header_members_add_grey_24dp @color/white_6 @drawable/ic_group_add_grey_24dp @@ -2642,14 +2622,6 @@ fill_parent -