Skip to content

Commit fcf312f

Browse files
authored
Merge pull request #429 from yuraiz/animated-emojis
Add support of animated stickers and emojis
2 parents 61ab3a7 + 439a5de commit fcf312f

File tree

14 files changed

+438
-223
lines changed

14 files changed

+438
-223
lines changed

Cargo.lock

Lines changed: 133 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ once_cell = "1.17"
1919
pretty_env_logger = "0.4"
2020
qrcode-generator = { version = "4.1", default-features = false }
2121
regex = "1.7"
22+
rlt = { package = "gtk-rlottie", git = "https://github.com/YuraIz/gtk-rlottie-rs" }
2223
tdlib = { version = "0.6", default-features = false }
2324
temp-dir = "0.1"
2425
thiserror = "1.0"

build-aux/com.github.melix99.telegrand.Devel.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,20 @@
3636
"*.a"
3737
],
3838
"modules": [
39+
{
40+
"name": "rlottie",
41+
"buildsystem": "meson",
42+
"config-opts": [
43+
"-Dwerror=false"
44+
],
45+
"sources": [
46+
{
47+
"type": "git",
48+
"url": "https://github.com/melix99/rlottie",
49+
"branch": "fix-build"
50+
}
51+
]
52+
},
3953
{
4054
"name": "blueprint-compiler",
4155
"buildsystem": "meson",

data/resources/meson.build

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ blueprints = custom_target('blueprints',
1717
'ui/sidebar-row-menu.blp',
1818
'ui/sidebar-session-switcher.blp',
1919
'ui/window.blp',
20-
'ui/content-message-sticker.blp',
2120
'ui/content-message-text.blp',
2221
'ui/content-message-document.blp',
2322
'ui/components-message-entry.blp',

data/resources/resources.gresource.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
<file compressed="true" preprocess="xml-stripblanks">ui/content-event-row.ui</file>
2323
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-document.ui</file>
2424
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-photo.ui</file>
25-
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-sticker.ui</file>
2625
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-text.ui</file>
2726
<file compressed="true" preprocess="xml-stripblanks">ui/content-send-photo-dialog.ui</file>
2827
<file compressed="true" preprocess="xml-stripblanks">ui/login.ui</file>

data/resources/style-dark.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
background-color: @dark_2;
33
}
44

5+
/* sticker must be repainted to a text color in messages */
6+
messagesticker.needs-repainting > overlay > widget > widget {
7+
filter: invert(1);
8+
}
9+
510
.chat-list row .unread-count-muted {
611
background-color: @dark_2;
712
}

data/resources/ui/content-message-sticker.blp

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/components/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
mod avatar;
22
mod message_entry;
33
mod snow;
4+
mod sticker;
45

56
pub(crate) use self::avatar::Avatar;
67
pub(crate) use self::message_entry::MessageEntry;
78
pub(crate) use self::snow::Snow;
9+
pub(crate) use self::sticker::Sticker;

0 commit comments

Comments
 (0)