implement resend form ability on request failure

src/app/browser/window/tab/item/page/input/titan.rs

@@ -3,36 +3,31 @@ mod form;
 mod title;
 
 use control::Control;
+use control::Send;
 use form::Form;
-use title::Title;
-
-use gtk::{gio::SimpleAction, glib::uuid_string_random, prelude::BoxExt, Box, Label, Orientation};
+use gtk::{
+    prelude::{BoxExt, ButtonExt, TextBufferExt, TextViewExt},
+    Label, Orientation, TextView,
+};
 use std::rc::Rc;
+use title::Title;
 
 const MARGIN: i32 = 6;
 const SPACING: i32 = 8;
 
-pub struct Titan {
-    // Components
-    pub g_box: Box,
+pub trait Titan {
+    fn titan(callback: impl Fn(&[u8], Box<dyn Fn()>) + 'static) -> Self;
 }
 
-impl Titan {
-    // Constructors
-
-    /// Build new `Self`
-    pub fn build(on_send: impl Fn(&[u8], &Label) + 'static) -> Self {
-        // Init local actions
-        let action_update = SimpleAction::new(&uuid_string_random(), None);
-        let action_send = SimpleAction::new(&uuid_string_random(), None);
-
+impl Titan for gtk::Box {
+    fn titan(callback: impl Fn(&[u8], Box<dyn Fn()>) + 'static) -> Self {
         // Init components
-        let control = Rc::new(Control::build(action_send.clone()));
-        let form = Rc::new(Form::build(action_update.clone()));
-        let title = Title::build(None);
+        let control = Rc::new(Control::build());
+        let form = TextView::form();
+        let title = Label::title(None);
 
         // Init widget
-        let g_box = Box::builder()
+        let g_box = gtk::Box::builder()
             .margin_bottom(MARGIN)
             .margin_end(MARGIN)
             .margin_start(MARGIN)
@@ -41,21 +36,31 @@ impl Titan {
             .orientation(Orientation::Vertical)
             .build();
 
-        g_box.append(&title.label);
-        g_box.append(&form.text_view);
+        g_box.append(&title);
+        g_box.append(&form);
         g_box.append(&control.g_box);
 
-        // Init events
-        action_update.connect_activate({
-            let control = control.clone();
+        // Connect events
+        control.send.connect_clicked({
             let form = form.clone();
-            move |_, _| control.update(Some(form.text().len()))
+            move |this| {
+                this.set_sending();
+                callback(
+                    form.text().as_bytes(),
+                    Box::new({
+                        let this = this.clone();
+                        move || this.set_resend() // on failure
+                    }),
+                )
+            }
         });
 
-        action_send
-            .connect_activate(move |_, _| on_send(form.text().as_bytes(), &control.counter.label));
+        form.buffer().connect_changed({
+            let control = control.clone();
+            move |this| control.update(Some(this.char_count()))
+        });
 
-        // Return activated struct
-        Self { g_box }
+        // Return activated `Self`
+        g_box
     }
 }

src/app/browser/window/tab/item/page/input/titan/control.rs

@@ -2,16 +2,17 @@ mod counter;
 mod send;
 
 use counter::Counter;
-use gtk::gio::SimpleAction;
-use gtk::{prelude::BoxExt, Align, Box, Orientation};
-use send::Send;
-use std::rc::Rc;
+use gtk::{
+    prelude::{BoxExt, WidgetExt},
+    Align, Box, Button, Label, Orientation,
+};
+pub use send::Send;
 
 const SPACING: i32 = 8;
 
 pub struct Control {
-    pub counter: Rc<Counter>,
-    pub send: Rc<Send>,
+    pub counter: Label,
+    pub send: Button,
     pub g_box: Box,
 }
 
@@ -19,10 +20,10 @@ impl Control {
     // Constructors
 
     /// Build new `Self`
-    pub fn build(action_send: SimpleAction) -> Self {
+    pub fn build() -> Self {
         // Init components
-        let counter = Rc::new(Counter::new());
-        let send = Rc::new(Send::build(action_send));
+        let counter = Label::counter();
+        let send = Button::send();
 
         // Init main widget
         let g_box = Box::builder()
@@ -31,8 +32,8 @@ impl Control {
             .spacing(SPACING)
             .build();
 
-        g_box.append(&counter.label);
-        g_box.append(&send.button);
+        g_box.append(&counter);
+        g_box.append(&send);
 
         // Return activated struct
         Self {
@@ -43,10 +44,10 @@ impl Control {
     }
 
     // Actions
-    pub fn update(&self, bytes_total: Option<usize>) {
+    pub fn update(&self, char_count: Option<i32>) {
         // Update children components
-        self.counter.update(bytes_total);
-        self.send.update(match bytes_total {
+        self.counter.update(char_count);
+        self.send.set_sensitive(match char_count {
             Some(total) => total > 0,
             None => false,
         });

src/app/browser/window/tab/item/page/input/titan/control/counter.rs

@@ -1,31 +1,26 @@
 use gtk::{prelude::WidgetExt, Label};
 
-pub struct Counter {
-    pub label: Label,
+pub trait Counter {
+    fn counter() -> Self;
+    fn update(&self, char_count: Option<i32>);
 }
 
-impl Default for Counter {
-    fn default() -> Self {
-        Self::new()
-    }
-}
+impl Counter for Label {
+    // Constructors
 
-impl Counter {
-    // Construct
-    pub fn new() -> Self {
-        Self {
-            label: Label::builder().css_classes(["dim-label"]).build(), // @TODO use `dimmed` in Adw 1.6,
-        }
+    fn counter() -> Self {
+        Label::builder().css_classes(["dim-label"]).build() // @TODO use `dimmed` in Adw 1.6,
     }
 
     // Actions
-    pub fn update(&self, bytes_total: Option<usize>) {
-        match bytes_total {
+
+    fn update(&self, char_count: Option<i32>) {
+        match char_count {
             Some(value) => {
-                self.label.set_label(&value.to_string());
-                self.label.set_visible(value > 0);
+                self.set_label(&value.to_string());
+                self.set_visible(value > 0);
             }
-            None => self.label.set_visible(false),
+            None => self.set_visible(false),
         }
     }
 }

src/app/browser/window/tab/item/page/input/titan/control/send.rs

@@ -1,40 +1,28 @@
 use gtk::{
-    gio::SimpleAction,
-    prelude::{ActionExt, ButtonExt, WidgetExt},
+    prelude::{ButtonExt, WidgetExt},
     Button,
 };
 
-pub struct Send {
-    pub button: Button,
+pub trait Send {
+    fn send() -> Self;
+    fn set_sending(&self);
+    fn set_resend(&self);
 }
 
-impl Send {
-    // Constructors
-
-    /// Build new `Self`
-    pub fn build(action_send: SimpleAction) -> Self {
-        // Init main widget
-        let button = Button::builder()
+impl Send for Button {
+    fn send() -> Self {
+        Button::builder()
             .css_classes(["accent"]) // | `suggested-action`
             .label("Send")
             .sensitive(false)
-            .build();
-
-        // Init events
-        button.connect_clicked({
-            move |this| {
-                this.set_sensitive(false);
-                this.set_label("sending..");
-                action_send.activate(None);
-            }
-        });
-
-        // Return activated `Self`
-        Self { button }
+            .build()
     }
-
-    // Actions
-    pub fn update(&self, is_sensitive: bool) {
-        self.button.set_sensitive(is_sensitive);
+    fn set_sending(&self) {
+        self.set_sensitive(false);
+        self.set_label("sending..");
+    }
+    fn set_resend(&self) {
+        self.set_sensitive(true);
+        self.set_label("Resend");
     }
 }

src/app/browser/window/tab/item/page/input/titan/form.rs

@@ -1,7 +1,6 @@
 use gtk::{
-    gio::SimpleAction,
     glib::GString,
-    prelude::{ActionExt, TextBufferExt, TextViewExt, WidgetExt},
+    prelude::{TextBufferExt, TextViewExt, WidgetExt},
     TextView, WrapMode,
 };
 use libspelling::{Checker, TextBufferAdapter};
@@ -9,15 +8,16 @@ use sourceview::Buffer;
 
 const MARGIN: i32 = 8;
 
-pub struct Form {
-    pub text_view: TextView,
+pub trait Form {
+    fn form() -> Self;
+    fn text(&self) -> GString;
 }
 
-impl Form {
+impl Form for TextView {
     // Constructors
 
     /// Build new `Self`
-    pub fn build(action_update: SimpleAction) -> Self {
+    fn form() -> Self {
         // Init [SourceView](https://gitlab.gnome.org/GNOME/gtksourceview) type buffer
         let buffer = Buffer::builder().build();
 
@@ -43,22 +43,18 @@ impl Form {
         text_view.set_size_request(-1, 38); // @TODO [#635](https://gitlab.gnome.org/GNOME/pygobject/-/issues/635)
 
         // Init events
-        text_view.buffer().connect_changed(move |_| {
-            action_update.activate(None);
-        });
-
         text_view.connect_realize(|this| {
             this.grab_focus();
         });
 
         // Return activated `Self`
-        Self { text_view }
+        text_view
     }
 
     // Getters
 
-    pub fn text(&self) -> GString {
-        let buffer = self.text_view.buffer();
+    fn text(&self) -> GString {
+        let buffer = self.buffer();
         buffer.text(&buffer.start_iter(), &buffer.end_iter(), true)
     }
 }

src/app/browser/window/tab/item/page/input/titan/title.rs

@@ -1,20 +1,15 @@
 use gtk::{Align, Label};
 
-pub struct Title {
-    pub label: Label,
+pub trait Title {
+    fn title(title: Option<&str>) -> Self;
 }
 
-impl Title {
-    // Constructors
-
-    /// Build new `Self`
-    pub fn build(title: Option<&str>) -> Self {
-        Self {
-            label: Label::builder()
-                .css_classes(["heading"])
-                .halign(Align::Start)
-                .label(title.unwrap_or("Titan input"))
-                .build(),
-        }
+impl Title for Label {
+    fn title(title: Option<&str>) -> Self {
+        Label::builder()
+            .css_classes(["heading"])
+            .halign(Align::Start)
+            .label(title.unwrap_or("Titan input"))
+            .build()
     }
 }