Skip to content
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

Show contact status in "Start chat" window #81

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+71 −27
Open

Show contact status in "Start chat" window #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 23 additions & 23 deletions main/data/add_conversation/list_row.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk" version="4.0"/>
<object class="GtkGrid" id="outer_grid">
<property name="margin-start">3</property>
<property name="margin-end">3</property>
<property name="margin-top">3</property>
<property name="margin-bottom">3</property>
<property name="column-spacing">10</property>
<object class="GtkBox" id="outer_box">
<property name="orientation">horizontal</property>
<property name="spacing">8</property>
<property name="margin-start">6</property>
<property name="margin-end">6</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<child>
<object class="DinoUiAvatarPicture" id="picture">
<property name="height-request">30</property>
Expand All @@ -15,34 +16,33 @@
</object>
</child>
<child>
<object class="GtkGrid">
<property name="valign">center</property>
<object class="GtkBox">
<property name="orientation">vertical</property>
<property name="valign">center</property>
<child>
<object class="GtkLabel" id="name_label">
<property name="max_width_chars">1</property>
<property name="ellipsize">end</property>
<property name="hexpand">1</property>
<property name="xalign">0</property>
<layout>
<property name="column">0</property>
<property name="row">0</property>
</layout>
<object class="GtkBox">
<property name="orientation">horizontal</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="name_label">
<property name="ellipsize">end</property>
<property name="xalign">0</property>
</object>
</child>
<child>
<object class="GtkImage" id="status_dot">
<property name="pixel-size">8</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkLabel" id="via_label">
<property name="max_width_chars">1</property>
<property name="ellipsize">end</property>
<property name="hexpand">1</property>
<property name="xalign">0</property>
<attributes>
<attribute name="scale" value="0.8"></attribute>
</attributes>
<layout>
<property name="column">0</property>
<property name="row">1</property>
</layout>
</object>
</child>
</object>
Expand Down
1 change: 1 addition & 0 deletions main/src/ui/add_conversation/conference_list.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ internal class ConferenceListRow : ListRow {
this.account = account;
this.bookmark = bookmark;

status_dot.visible = false;
name_label.label = bookmark.name != null && bookmark.name != "" ? bookmark.name : bookmark.jid.to_string();
if (stream_interactor.get_accounts().size > 1) {
via_label.label = "via " + account.bare_jid.to_string();
Expand Down
51 changes: 47 additions & 4 deletions main/src/ui/add_conversation/list_row.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,69 @@ namespace Dino.Ui {

public class ListRow : Widget {

public Grid outer_grid;
public Box outer_box;
public AvatarPicture picture;
public Label name_label;
public Image status_dot;
public Label via_label;

public string? status_str;
public Jid? jid;
public Account? account;

construct {
Builder builder = new Builder.from_resource("/im/dino/Dino/add_conversation/list_row.ui");
outer_grid = (Grid) builder.get_object("outer_grid");
outer_box = (Box) builder.get_object("outer_box");
picture = (AvatarPicture) builder.get_object("picture");
name_label = (Label) builder.get_object("name_label");
status_dot = (Image) builder.get_object("status_dot");
via_label = (Label) builder.get_object("via_label");


this.layout_manager = new BinLayout();
outer_grid.set_parent(this);
outer_box.set_parent(this);
}

public ListRow() {}

private void set_status_dot(StreamInteractor stream_interactor, Jid jid, Account account){
Gee.List<Jid>? full_jids = stream_interactor.get_module(PresenceManager.IDENTITY).get_full_jids(jid, account);
string presences = "";
if (full_jids != null) {
for (int i = 0; i < full_jids.size; i++) {
Jid full_jid = full_jids[i];
string presence = stream_interactor.get_module(PresenceManager.IDENTITY).get_last_show(full_jid, account);
presences += presence + " ";
}
} else presences = null;

if (presences == null) {
status_dot.set_from_icon_name("dino-status-offline");
return;
}
// Do not disturb > Interested in Chatting > Online > Away = Extended Away
if(presences.contains(Presence.Stanza.SHOW_DND)) {
status_dot.set_from_icon_name("dino-status-dnd");
return;
}

if(presences.contains(Presence.Stanza.SHOW_CHAT)) {
status_dot.set_from_icon_name("dino-status-chat");
return;
}

if(presences.contains(Presence.Stanza.SHOW_ONLINE)) {
status_dot.set_from_icon_name("dino-status-online");
return;
}

if(presences.contains(Presence.Stanza.SHOW_AWAY) || presences.contains(Presence.Stanza.SHOW_XA)) {
status_dot.set_from_icon_name("dino-status-away");
return;
}

}

public ListRow.from_jid(StreamInteractor stream_interactor, Jid jid, Account account, bool show_account) {
this.jid = jid;
this.account = account;
Expand All @@ -46,10 +88,11 @@ public class ListRow : Widget {
}
name_label.label = display_name;
picture.model = new ViewModel.CompatAvatarPictureModel(stream_interactor).set_conversation(conv);
set_status_dot(stream_interactor, jid, account);
}

public override void dispose() {
outer_grid.unparent();
outer_box.unparent();
}
}

Expand Down
Loading