TakeV
/
Tooth
mirror of https://github.com/TakeV-Lambda/Tooth.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(Base)[status]: separate loading logic from messages

This commit is contained in:
Evangelos Paterakis 2023-02-16 00:35:09 +02:00
parent 4aa033f496
commit 17eb47ff4e
No known key found for this signature in database
GPG Key ID: FE5185F095BFC8C9
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Views/Base.vala
View File

@ -4,7 +4,6 @@ using Gtk;
public class Tooth.Views.Base : Box {
public static string STATUS_EMPTY = _("Nothing to see here");
public static string STATUS_LOADING = " ";
public string? icon { get; set; default = null; }
public string label { get; set; default = ""; }
@ -33,6 +32,7 @@ public class Tooth.Views.Base : Box {
public string state { get; set; default = "status"; }
public string status_title { get; set; default = STATUS_EMPTY; }
public string status_message { get; set; default = STATUS_EMPTY; }
public bool status_loading { get; set; default = false; }
construct {
build_actions ();
@ -40,17 +40,27 @@ public class Tooth.Views.Base : Box {
status_button.label = _("Reload");
bind_property ("state", states, "visible-child-name", BindingFlags.SYNC_CREATE);
bind_property ("status-loading", status_stack, "visible-child-name", BindingFlags.SYNC_CREATE, (b, src, ref target) => {
target.set_string (src.get_boolean () ? "spinner" : "message");
return true;
});
bind_property ("status-message", status_message_label, "label", BindingFlags.SYNC_CREATE, (b, src, ref target) => {
var src_s = src.get_string ();
target.set_string (src_s);
status_message_label.visible = src_s != STATUS_EMPTY && src_s != "";
return true;
});
bind_property ("status-title", status_title_label, "label", BindingFlags.SYNC_CREATE, (b, src, ref target) => {
var src_s = src.get_string ();
target.set_string (src_s);
status_message = STATUS_EMPTY;
status_loading = src_s == "";
return true;
});
notify["status-title"].connect (() => {
status_title_label.label = status_title;
status_message = STATUS_EMPTY;
status_stack.visible_child_name = status_title == STATUS_LOADING ? "spinner" : "message";
});
notify["current"].connect (() => {

4
src/Views/Search.vala
View File

@ -58,7 +58,7 @@ public class Tooth.Views.Search : Views.TabbedBase {
clear ();
state = "status";
status_title = STATUS_LOADING;
status_loading = true;
API.SearchResults.request.begin (query, accounts.active, (obj, res) => {
try {
var results = API.SearchResults.request.end (res);
@ -73,6 +73,8 @@ public class Tooth.Views.Search : Views.TabbedBase {
results.hashtags.@foreach (e => append_entity (hashtags_tab, e));
}
status_title = STATUS_EMPTY;
on_content_changed ();
}
catch (Error e) {

2
src/Views/Thread.vala
View File

@ -9,7 +9,7 @@ public class Tooth.Views.Thread : Views.ContentBase, AccountHolder {
public Thread (API.Status status) {
Object (
root_status: status,
status_title: STATUS_LOADING,
status_loading: true,
label: _("Conversation")
);
construct_account_holder ();

2
src/Views/Timeline.vala
View File

@ -106,7 +106,7 @@ public class Tooth.Views.Timeline : AccountHolder, Streamable, Views.ContentBase
scrolled.vadjustment.value = 0;
status_button.sensitive = false;
clear ();
status_title = STATUS_LOADING;
status_loading = true;
GLib.Idle.add (request);
}