Skip to content

Commit ca3b686

Browse files
yuraizyuraiz
committed
Add support for animated emoji
1 parent c6d51e7 commit ca3b686

File tree

12 files changed

+407
-194
lines changed

12 files changed

+407
-194
lines changed

‎Cargo.lock‎

Lines changed: 42 additions & 100 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ regex = "1.7"
2222
tdlib = { version = "0.4", default-features = false }
2323
temp-dir = "0.1"
2424
thiserror = "1.0"
25-
rlt = { package="gtk-rlottie", git="https://github.com/YuraIz/gtk-rlottie-rs", branch="main" }
25+
rlt = { package="gtk-rlottie", git="https://github.com/YuraIz/gtk-rlottie-rs" }

‎data/resources/resources.gresource.xml‎

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,48 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<gresources>
3-
<gresource prefix="/com/github/melix99/telegrand/">
4-
<file preprocess="xml-stripblanks">icons/scalable/actions/big-x-symbolic.svg</file>
5-
<file preprocess="xml-stripblanks">icons/scalable/actions/clear-symbolic.svg</file>
6-
<file preprocess="xml-stripblanks">icons/scalable/actions/send-symbolic.svg</file>
7-
<file preprocess="xml-stripblanks">icons/scalable/status/message-failed-symbolic.svg</file>
8-
<file preprocess="xml-stripblanks">icons/scalable/status/message-pending-symbolic.svg</file>
9-
<file preprocess="xml-stripblanks">icons/scalable/status/message-read-symbolic.svg</file>
10-
<file preprocess="xml-stripblanks">icons/scalable/status/message-unread-left-symbolic.svg</file>
11-
<file preprocess="xml-stripblanks">icons/scalable/status/message-unread-right-symbolic.svg</file>
3+
<gresource prefix="/com/github/melix99/telegrand/">
4+
<file preprocess="xml-stripblanks">icons/scalable/actions/big-x-symbolic.svg</file>
5+
<file preprocess="xml-stripblanks">icons/scalable/actions/clear-symbolic.svg</file>
6+
<file preprocess="xml-stripblanks">icons/scalable/actions/send-symbolic.svg</file>
7+
<file preprocess="xml-stripblanks">icons/scalable/status/message-failed-symbolic.svg</file>
8+
<file preprocess="xml-stripblanks">icons/scalable/status/message-pending-symbolic.svg</file>
9+
<file preprocess="xml-stripblanks">icons/scalable/status/message-read-symbolic.svg</file>
10+
<file preprocess="xml-stripblanks">icons/scalable/status/message-unread-left-symbolic.svg</file>
11+
<file preprocess="xml-stripblanks">icons/scalable/status/message-unread-right-symbolic.svg</file>
1212

13-
<file compressed="true" preprocess="xml-stripblanks">ui/add-account-row.ui</file>
14-
<file compressed="true" preprocess="xml-stripblanks">ui/avatar-with-selection.ui</file>
15-
<file compressed="true" preprocess="xml-stripblanks">ui/components-avatar.ui</file>
16-
<file compressed="true" preprocess="xml-stripblanks">ui/components-message-entry.ui</file>
17-
<file compressed="true" preprocess="xml-stripblanks">ui/content.ui</file>
18-
<file compressed="true" preprocess="xml-stripblanks">ui/content-chat-action-bar.ui</file>
19-
<file compressed="true" preprocess="xml-stripblanks">ui/content-chat-history.ui</file>
20-
<file compressed="true" preprocess="xml-stripblanks">ui/content-chat-info-window.ui</file>
21-
<file compressed="true" preprocess="xml-stripblanks">ui/content-event-row.ui</file>
22-
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-document.ui</file>
23-
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-photo.ui</file>
24-
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-sticker.ui</file>
25-
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-text.ui</file>
26-
<file compressed="true" preprocess="xml-stripblanks">ui/content-send-photo-dialog.ui</file>
27-
<file compressed="true" preprocess="xml-stripblanks">ui/login.ui</file>
28-
<file compressed="true" preprocess="xml-stripblanks">ui/message-menu.ui</file>
29-
<file compressed="true" preprocess="xml-stripblanks">ui/phone-number-input.ui</file>
30-
<file compressed="true" preprocess="xml-stripblanks">ui/preferences-window.ui</file>
31-
<file compressed="true" preprocess="xml-stripblanks">ui/session-entry-row.ui</file>
32-
<file compressed="true" preprocess="xml-stripblanks">ui/session-manager.ui</file>
33-
<file compressed="true" preprocess="xml-stripblanks">ui/session.ui</file>
34-
<file compressed="true" preprocess="xml-stripblanks" alias="gtk/help-overlay.ui">ui/shortcuts.ui</file>
35-
<file compressed="true" preprocess="xml-stripblanks">ui/sidebar-avatar.ui</file>
36-
<file compressed="true" preprocess="xml-stripblanks">ui/sidebar-row.ui</file>
37-
<file compressed="true" preprocess="xml-stripblanks">ui/sidebar-row-menu.ui</file>
38-
<file compressed="true" preprocess="xml-stripblanks">ui/sidebar-search.ui</file>
39-
<file compressed="true" preprocess="xml-stripblanks">ui/sidebar-session-switcher.ui</file>
40-
<file compressed="true" preprocess="xml-stripblanks">ui/sidebar.ui</file>
41-
<file compressed="true" preprocess="xml-stripblanks">ui/window.ui</file>
13+
<file compressed="true" preprocess="xml-stripblanks">ui/add-account-row.ui</file>
14+
<file compressed="true" preprocess="xml-stripblanks">ui/avatar-with-selection.ui</file>
15+
<file compressed="true" preprocess="xml-stripblanks">ui/components-avatar.ui</file>
16+
<file compressed="true" preprocess="xml-stripblanks">ui/components-message-entry.ui</file>
17+
<file compressed="true" preprocess="xml-stripblanks">ui/content.ui</file>
18+
<file compressed="true" preprocess="xml-stripblanks">ui/content-chat-action-bar.ui</file>
19+
<file compressed="true" preprocess="xml-stripblanks">ui/content-chat-history.ui</file>
20+
<file compressed="true" preprocess="xml-stripblanks">ui/content-chat-info-window.ui</file>
21+
<file compressed="true" preprocess="xml-stripblanks">ui/content-event-row.ui</file>
22+
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-document.ui</file>
23+
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-animated-emoji.ui</file>
24+
<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>
26+
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-text.ui</file>
27+
<file compressed="true" preprocess="xml-stripblanks">ui/content-send-photo-dialog.ui</file>
28+
<file compressed="true" preprocess="xml-stripblanks">ui/login.ui</file>
29+
<file compressed="true" preprocess="xml-stripblanks">ui/message-menu.ui</file>
30+
<file compressed="true" preprocess="xml-stripblanks">ui/phone-number-input.ui</file>
31+
<file compressed="true" preprocess="xml-stripblanks">ui/preferences-window.ui</file>
32+
<file compressed="true" preprocess="xml-stripblanks">ui/session-entry-row.ui</file>
33+
<file compressed="true" preprocess="xml-stripblanks">ui/session-manager.ui</file>
34+
<file compressed="true" preprocess="xml-stripblanks">ui/session.ui</file>
35+
<file compressed="true" preprocess="xml-stripblanks" alias="gtk/help-overlay.ui">ui/shortcuts.ui</file>
36+
<file compressed="true" preprocess="xml-stripblanks">ui/sidebar-avatar.ui</file>
37+
<file compressed="true" preprocess="xml-stripblanks">ui/sidebar-row.ui</file>
38+
<file compressed="true" preprocess="xml-stripblanks">ui/sidebar-row-menu.ui</file>
39+
<file compressed="true" preprocess="xml-stripblanks">ui/sidebar-search.ui</file>
40+
<file compressed="true" preprocess="xml-stripblanks">ui/sidebar-session-switcher.ui</file>
41+
<file compressed="true" preprocess="xml-stripblanks">ui/sidebar.ui</file>
42+
<file compressed="true" preprocess="xml-stripblanks">ui/window.ui</file>
4243

43-
<file compressed="true">style.css</file>
44-
<file compressed="true">style-dark.css</file>
45-
<file compressed="true">style-hc.css</file>
46-
</gresource>
44+
<file compressed="true">style.css</file>
45+
<file compressed="true">style-dark.css</file>
46+
<file compressed="true">style-hc.css</file>
47+
</gresource>
4748
</gresources>

‎data/resources/ui/content-message-animated-emoji.ui‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<interface>
3+
<template class="ContentMessageAnimatedEmoji" parent="ContentMessageBase">
4+
<child>
5+
<object class="GtkBox" id="gtk_box">
6+
<property name="orientation">vertical</property>
7+
<property name="vexpand">true</property>
8+
<child>
9+
<object class="GtkGestureClick" id="click">
10+
<property name="button">1</property>
11+
</object>
12+
</child>
13+
<child>
14+
<object class="AdwBin" id="bin">
15+
<property name="vexpand">true</property>
16+
</object>
17+
</child>
18+
<child>
19+
<object class="MessageIndicators" id="indicators">
20+
<property name="halign">end</property>
21+
<property name="valign">end</property>
22+
</object>
23+
</child>
24+
</object>
25+
</child>
26+
</template>
27+
</interface>

‎src/session/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 vector_path;
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::vector_path::StickerPreview;

0 commit comments

Comments
 (0)