diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index 8de1d1e8b..6f9dbff7d 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -1474,6 +1474,7 @@ PRIVATE qrc/emoji_5.qrc qrc/emoji_6.qrc qrc/emoji_7.qrc + qrc/emoji_8.qrc qrc/emoji_preview.qrc qrc/telegram/animations.qrc qrc/telegram/export.qrc diff --git a/Telegram/Resources/emoji/emoji_1.webp b/Telegram/Resources/emoji/emoji_1.webp index c4051383a..4bf92eca5 100644 Binary files a/Telegram/Resources/emoji/emoji_1.webp and b/Telegram/Resources/emoji/emoji_1.webp differ diff --git a/Telegram/Resources/emoji/emoji_2.webp b/Telegram/Resources/emoji/emoji_2.webp index c707db8e9..988947793 100644 Binary files a/Telegram/Resources/emoji/emoji_2.webp and b/Telegram/Resources/emoji/emoji_2.webp differ diff --git a/Telegram/Resources/emoji/emoji_3.webp b/Telegram/Resources/emoji/emoji_3.webp index d7eddeb5c..5e2172deb 100644 Binary files a/Telegram/Resources/emoji/emoji_3.webp and b/Telegram/Resources/emoji/emoji_3.webp differ diff --git a/Telegram/Resources/emoji/emoji_4.webp b/Telegram/Resources/emoji/emoji_4.webp index b668f059b..4859c1337 100644 Binary files a/Telegram/Resources/emoji/emoji_4.webp and b/Telegram/Resources/emoji/emoji_4.webp differ diff --git a/Telegram/Resources/emoji/emoji_5.webp b/Telegram/Resources/emoji/emoji_5.webp index 064a94d3f..3539ebe03 100644 Binary files a/Telegram/Resources/emoji/emoji_5.webp and b/Telegram/Resources/emoji/emoji_5.webp differ diff --git a/Telegram/Resources/emoji/emoji_6.webp b/Telegram/Resources/emoji/emoji_6.webp index fe7d47564..8da39a6b1 100644 Binary files a/Telegram/Resources/emoji/emoji_6.webp and b/Telegram/Resources/emoji/emoji_6.webp differ diff --git a/Telegram/Resources/emoji/emoji_7.webp b/Telegram/Resources/emoji/emoji_7.webp index 970a64c95..3c31b2345 100644 Binary files a/Telegram/Resources/emoji/emoji_7.webp and b/Telegram/Resources/emoji/emoji_7.webp differ diff --git a/Telegram/Resources/emoji/emoji_8.webp b/Telegram/Resources/emoji/emoji_8.webp new file mode 100644 index 000000000..c3e6b3b0d Binary files /dev/null and b/Telegram/Resources/emoji/emoji_8.webp differ diff --git a/Telegram/Resources/qrc/emoji_8.qrc b/Telegram/Resources/qrc/emoji_8.qrc new file mode 100644 index 000000000..51765a39b --- /dev/null +++ b/Telegram/Resources/qrc/emoji_8.qrc @@ -0,0 +1,5 @@ + + + ../emoji/emoji_8.webp + + diff --git a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp index cc70419d5..7c6ae96c8 100644 --- a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp +++ b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp @@ -41,9 +41,9 @@ inline auto PreviewPath(int i) { const auto kSets = { Set{ { 0, 0, 0, "Mac" }, PreviewPath(0) }, - Set{ { 1, 1392, 8'184'590, "Android" }, PreviewPath(1) }, - Set{ { 2, 1393, 5'413'219, "Twemoji" }, PreviewPath(2) }, - Set{ { 3, 1394, 6'967'218, "JoyPixels" }, PreviewPath(3) }, + Set{ { 1, 1804, 8'115'639, "Android" }, PreviewPath(1) }, + Set{ { 2, 1805, 5'481'197, "Twemoji" }, PreviewPath(2) }, + Set{ { 3, 1806, 7'047'594, "JoyPixels" }, PreviewPath(3) }, }; using Loading = MTP::DedicatedLoader::Progress; diff --git a/Telegram/codegen b/Telegram/codegen index 2d03abc7d..145c9e617 160000 --- a/Telegram/codegen +++ b/Telegram/codegen @@ -1 +1 @@ -Subproject commit 2d03abc7de8558ae8862688a226b3d5a817dc466 +Subproject commit 145c9e617170eda5932c7d7064449fe262ee2a0a diff --git a/Telegram/lib_ui b/Telegram/lib_ui index ba73905c1..88423818f 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit ba73905c117da8ba06de54c5d35a707603093815 +Subproject commit 88423818f8b8cbb5b0914f72caccba6019bd6935 diff --git a/changelog.txt b/changelog.txt index 8d42e0054..f648b5939 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,6 @@ 4.9.9 (18.09.23) +- Add support for Emoji 15. - Several crash fixes. 4.9.8 (16.09.23)