Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 133 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ once_cell = "1.17"
pretty_env_logger = "0.4"
qrcode-generator = { version = "4.1", default-features = false }
regex = "1.7"
rlt = { package = "gtk-rlottie", git = "https://github.com/YuraIz/gtk-rlottie-rs" }
tdlib = { version = "0.6", default-features = false }
temp-dir = "0.1"
thiserror = "1.0"
14 changes: 14 additions & 0 deletions build-aux/com.github.melix99.telegrand.Devel.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,20 @@
"*.a"
],
"modules": [
{
"name": "rlottie",
"buildsystem": "meson",
"config-opts": [
"-Dwerror=false"
],
"sources": [
{
"type": "git",
"url": "https://github.com/melix99/rlottie",
"branch": "fix-build"
}
]
},
{
"name": "blueprint-compiler",
"buildsystem": "meson",
Expand Down
1 change: 0 additions & 1 deletion data/resources/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ blueprints = custom_target('blueprints',
'ui/sidebar-row-menu.blp',
'ui/sidebar-session-switcher.blp',
'ui/window.blp',
'ui/content-message-sticker.blp',
'ui/content-message-text.blp',
'ui/content-message-document.blp',
'ui/components-message-entry.blp',
Expand Down
1 change: 0 additions & 1 deletion data/resources/resources.gresource.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<file compressed="true" preprocess="xml-stripblanks">ui/content-event-row.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-document.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-photo.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-sticker.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-text.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/content-send-photo-dialog.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/login.ui</file>
Expand Down
5 changes: 5 additions & 0 deletions data/resources/style-dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
background-color: @dark_2;
}

/* sticker must be repainted to a text color in messages */
messagesticker.needs-repainting > overlay > widget > widget {
filter: invert(1);
}

.chat-list row .unread-count-muted {
background-color: @dark_2;
}
Expand Down
15 changes: 0 additions & 15 deletions data/resources/ui/content-message-sticker.blp

This file was deleted.

2 changes: 2 additions & 0 deletions src/components/mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
mod avatar;
mod message_entry;
mod snow;
mod sticker;

pub(crate) use self::avatar::Avatar;
pub(crate) use self::message_entry::MessageEntry;
pub(crate) use self::snow::Snow;
pub(crate) use self::sticker::Sticker;
Loading