Skip to content

Add chat members to the chat info #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Add chat members to the chat info #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
266045e
chat-info-members: Add GtkListBox with chat members
yuraiz Nov 19, 2022
ede80af
chat-info-members: Use GtkListView instead of GtkListBox
yuraiz Jan 8, 2023
43bd738
chat-info-members: Load additional members on scrolling
yuraiz Jan 3, 2023
85ab7c3
chat-info-members: Put members list in a separate widget
yuraiz Jan 8, 2023
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
1 change: 1 addition & 0 deletions data/resources/resources.gresource.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<file compressed="true" preprocess="xml-stripblanks">ui/content.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/content-chat-action-bar.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/content-chat-history.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/content-chat-info-member-row.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/content-chat-info-window.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/content-event-row.ui</file>
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-document.ui</file>
Expand Down
4 changes: 4 additions & 0 deletions data/resources/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,3 +298,7 @@ window.chat-info .main-page > avatar {
window.chat-info .main-page > list {
margin-top: 12px;
}

chatmember {
padding: 6px 0px;
}
54 changes: 54 additions & 0 deletions data/resources/ui/content-chat-info-member-row.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="ContentChatInfoMemberRow" parent="GtkWidget">
<property name="layout-manager">
<object class="GtkBoxLayout">
<property name="spacing">12</property>
</object>
</property>
<child>
<object class="ComponentsAvatar" id="avatar">
<property name="size">40</property>
</object>
</child>
<child>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="valign">center</property>
<child>
<object class="GtkBox">
<property name="hexpand">True</property>
<child>
<object class="GtkLabel" id="user_name_label">
<style>
<class name="heading"/>
</style>
<property name="ellipsize">end</property>
</object>
</child>
<child>
<object class="GtkLabel" id="member_status_label">
<style>
<class name="accent"/>
<class name="caption"/>
</style>
<property name="hexpand">True</property>
<property name="xalign">1</property>
<property name="ellipsize">end</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkInscription" id="user_status_label">
<style>
<class name="dim-label"/>
</style>
<property name="xalign">0</property>
<property name="text-overflow">ellipsize-end</property>
</object>
</child>
</object>
</child>
</template>
</interface>
128 changes: 85 additions & 43 deletions data/resources/ui/content-chat-info-window.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="ContentChatInfoWindow" parent="AdwWindow">
<property name="default-width">360</property>
<property name="default-width">400</property>
<property name="default-height">600</property>
<property name="modal">True</property>
<style>
<class name="chat-info"/>
Expand All @@ -12,58 +13,99 @@
<object class="GtkBox">
<property name="orientation">vertical</property>
<child>
<object class="GtkHeaderBar">
<object class="AdwHeaderBar">
<property name="centering-policy">strict</property>
<property name="title-widget">
<object class="AdwWindowTitle">
<property name="visible">False</property>
<object class="AdwViewSwitcherTitle" id="title">
<property name="title" translatable="yes">Info</property>
<property name="stack">stack</property>
</object>
</property>
<style>
<class name="flat"/>
</style>
</object>
</child>
<child>
<object class="AdwClamp">
<property name="child">
<object class="GtkBox">
<property name="orientation">vertical</property>
<style>
<class name="main-page"/>
</style>
<child>
<object class="ComponentsAvatar">
<property name="size">128</property>
<binding name="item">
<object class="AdwViewStack" id="stack">
<property name="vexpand">True</property>
<child>
<object class="AdwViewStackPage">
<property name="name">info</property>
<property name="title" translatable="yes">Info</property>
<property name="icon-name">help-about-symbolic</property>
<property name="child">
<object class="GtkScrolledWindow">
<property name="child">
<object class="AdwClamp">
<property name="child">
<object class="GtkBox">
<property name="orientation">vertical</property>
<style>
<class name="main-page"/>
</style>
<child>
<object class="ComponentsAvatar">
<property name="size">128</property>
<binding name="item">
<lookup name="chat">ContentChatInfoWindow</lookup>
</binding>
</object>
</child>
<child>
<object class="GtkLabel" id="name_label">
<property name="wrap">True</property>
<property name="justify">center</property>
<style>
<class name="title-1"/>
</style>
</object>
</child>
<child>
<object class="GtkInscription" id="subtitle_label">
<property name="text-overflow">ellipsize-end</property>
<property name="xalign">0.5</property>
</object>
</child>
<child>
<object class="GtkListBox" id="info_list">
<property name="selection-mode">none</property>
<style>
<class name="boxed-list"/>
</style>
</object>
</child>
</object>
</property>
</object>
</property>
</object>
</property>
</object>
</child>
<child>
<object class="AdwViewStackPage" id="members_page">
<property name="name">members</property>
<property name="title" translatable="yes">Members</property>
<property name="icon-name">avatar-default-symbolic</property>
<property name="visible">False</property>
<binding name="visible">
<lookup name="visible">members_list</lookup>
</binding>
<property name="child">
<object class="ContentChatInfoMembers" id="members_list">
<binding name="chat">
<lookup name="chat">ContentChatInfoWindow</lookup>
</binding>
</object>
</child>
<child>
<object class="GtkLabel" id="name_label">
<property name="wrap">True</property>
<property name="justify">center</property>
<style>
<class name="title-1"/>
</style>
</object>
</child>
<child>
<object class="GtkInscription" id="subtitle_label">
<property name="text-overflow">ellipsize-middle</property>
<property name="xalign">0.5</property>
</object>
</child>
<child>
<object class="GtkListBox" id="info_list">
<property name="selection-mode">none</property>
<style>
<class name="boxed-list"/>
</style>
</object>
</child>
</property>
</object>
</property>
</child>
</object>
</child>
<child>
<object class="AdwViewSwitcherBar">
<property name="stack">stack</property>
<binding name="reveal">
<lookup name="title-visible">title</lookup>
</binding>
</object>
</child>
</object>
Expand Down
91 changes: 91 additions & 0 deletions src/session/content/chat_info_window/member_row.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
use crate::tdlib::ChatMember;
use gettextrs::gettext;
use gtk::prelude::*;
use gtk::subclass::prelude::*;
use gtk::{glib, CompositeTemplate};

use crate::session::components::Avatar;
use crate::{expressions, strings};
use tdlib::enums::{UserStatus, UserType};

mod imp {
use super::*;
#[derive(Debug, Default, CompositeTemplate)]
#[template(resource = "/com/github/melix99/telegrand/ui/content-chat-info-member-row.ui")]
pub(crate) struct MemberRow {
#[template_child]
pub(super) avatar: TemplateChild<Avatar>,
#[template_child]
pub(super) user_name_label: TemplateChild<gtk::Label>,
#[template_child]
pub(super) member_status_label: TemplateChild<gtk::Label>,
#[template_child]
pub(super) user_status_label: TemplateChild<gtk::Inscription>,
}

#[glib::object_subclass]
impl ObjectSubclass for MemberRow {
const NAME: &'static str = "ContentChatInfoMemberRow";
type Type = super::MemberRow;
type ParentType = gtk::Widget;

fn class_init(klass: &mut Self::Class) {
Self::bind_template(klass);
klass.set_css_name("chatmember");
}

fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
obj.init_template();
}
}

impl ObjectImpl for MemberRow {
fn dispose(&self) {
self.avatar.unparent();
self.user_status_label.parent().unwrap().unparent();
}
}

impl WidgetImpl for MemberRow {}

impl BoxImpl for MemberRow {}
}

glib::wrapper! {
pub(crate) struct MemberRow(ObjectSubclass<imp::MemberRow>)
@extends gtk::Widget;
}

impl MemberRow {
pub fn new() -> Self {
glib::Object::new(&[])
}
pub fn bind_member(&self, member: ChatMember) {
let imp = self.imp();

let user = member.user();

let user_expression = gtk::ObjectExpression::new(&user);
let name_expression = expressions::user_display_name(&user_expression);
name_expression.bind(&*imp.user_name_label, "label", Some(&user));

if let UserType::Bot(_) = user.type_().0 {
imp.user_status_label.set_text(Some(&gettext("bot")));
} else {
let status = user.status().0;
let status_label = &*imp.user_status_label;

match status {
UserStatus::Online(_) => status_label.set_css_classes(&["accent"]),
_ => status_label.set_css_classes(&["dim-label"]),
}

let status = strings::user_status(&status);
imp.user_status_label.set_text(Some(&status));
};

imp.member_status_label.set_label(&member.status());

imp.avatar.set_item(Some(user.upcast()));
}
}
Loading