From 019ec8972fd22446dcf80c0efff6b1214753aa90 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Tue, 14 Aug 2018 07:41:58 +0300
Subject: [PATCH] InAppNotif: Add a spinner

---
 podcasts-gtk/resources/gtk/inapp_notif.ui | 32 +++++++++++++++--------
 podcasts-gtk/src/app.rs                   |  3 ++-
 podcasts-gtk/src/widgets/appnotif.rs      | 24 ++++++++++++++++-
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/podcasts-gtk/resources/gtk/inapp_notif.ui b/podcasts-gtk/resources/gtk/inapp_notif.ui
index 60cdd4e..46859e8 100644
--- a/podcasts-gtk/resources/gtk/inapp_notif.ui
+++ b/podcasts-gtk/resources/gtk/inapp_notif.ui
@@ -53,20 +53,12 @@ Tobias Bernard
             <property name="margin_end">3</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkLabel" id="text">
-                <property name="width_request">150</property>
-                <property name="visible">True</property>
+              <object class="GtkSpinner" id="spinner">
                 <property name="can_focus">False</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <property name="margin_start">12</property>
-                <property name="margin_end">12</property>
-                <property name="label" translatable="yes">An in-app action notification</property>
-                <property name="ellipsize">start</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -97,6 +89,24 @@ Tobias Bernard
                 <property name="position">1</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkLabel" id="text">
+                <property name="width_request">150</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="margin_start">12</property>
+                <property name="margin_end">12</property>
+                <property name="label" translatable="yes">An in-app action notification</property>
+                <property name="ellipsize">start</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkButton" id="undo">
                 <property name="label" translatable="yes">Undo</property>
@@ -112,7 +122,7 @@ Tobias Bernard
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="pack_type">end</property>
-                <property name="position">2</property>
+                <property name="position">3</property>
               </packing>
             </child>
           </object>
diff --git a/podcasts-gtk/src/app.rs b/podcasts-gtk/src/app.rs
index 545b332..05076a2 100644
--- a/podcasts-gtk/src/app.rs
+++ b/podcasts-gtk/src/app.rs
@@ -17,7 +17,7 @@ use settings::{self, WindowGeometry};
 use stacks::{Content, PopulatedState};
 use utils;
 use widgets::about_dialog;
-use widgets::appnotif::{InAppNotification, State};
+use widgets::appnotif::{InAppNotification, SpinnerState, State};
 use widgets::player;
 use widgets::show_menu::{mark_all_notif, remove_show_notif, ShowMenu};
 
@@ -332,6 +332,7 @@ impl App {
                     let undo_cb: Option<fn()> = None;
                     let updater = InAppNotification::new(&txt, 1, callback, undo_cb);
                     updater.set_close_state(State::Hidden);
+                    updater.set_spinner_state(SpinnerState::Active);
 
                     let old = self.updater.replace(Some(updater));
                     old.map(|i| i.destroy());
diff --git a/podcasts-gtk/src/widgets/appnotif.rs b/podcasts-gtk/src/widgets/appnotif.rs
index 8771a75..5814e6c 100644
--- a/podcasts-gtk/src/widgets/appnotif.rs
+++ b/podcasts-gtk/src/widgets/appnotif.rs
@@ -12,12 +12,20 @@ pub(crate) enum State {
     Hidden,
 }
 
+#[derive(Debug, Clone, Copy)]
+#[allow(dead_code)]
+pub(crate) enum SpinnerState {
+    Active,
+    Stopped,
+}
+
 #[derive(Debug, Clone)]
 pub(crate) struct InAppNotification {
     revealer: gtk::Revealer,
     text: gtk::Label,
     undo: gtk::Button,
     close: gtk::Button,
+    spinner: gtk::Spinner,
 }
 
 impl Default for InAppNotification {
@@ -28,12 +36,14 @@ impl Default for InAppNotification {
         let text: gtk::Label = builder.get_object("text").unwrap();
         let undo: gtk::Button = builder.get_object("undo").unwrap();
         let close: gtk::Button = builder.get_object("close").unwrap();
+        let spinner = builder.get_object("spinner").unwrap();
 
         InAppNotification {
             revealer,
             text,
             undo,
             close,
+            spinner,
         }
     }
 }
@@ -121,7 +131,6 @@ impl InAppNotification {
         }
     }
 
-    #[allow(dead_code)]
     pub(crate) fn set_close_state(&self, state: State) {
         match state {
             State::Shown => self.close.show(),
@@ -129,6 +138,19 @@ impl InAppNotification {
         }
     }
 
+    pub(crate) fn set_spinner_state(&self, state: SpinnerState) {
+        match state {
+            SpinnerState::Active => {
+                self.spinner.start();
+                self.spinner.show();
+            }
+            SpinnerState::Stopped => {
+                self.spinner.stop();
+                self.spinner.hide();
+            }
+        }
+    }
+
     pub(crate) fn destroy(self) {
         self.revealer.destroy();
     }