add some animation

resources/resources.gresource.xml

@@ -7,5 +7,6 @@
     <file compressed="true" preprocess="xml-stripblanks">item.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">movie.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">history.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">episoderow.ui</file>
   </gresource>
 </gresources>

resources/ui/episoderow.ui

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <template class="EpisodeRow" parent="GtkBox">
+    <child>
+      <object class="GtkPicture" id="image">
+      </object>
+    </child>
+    <child>
+      <object class="GtkLabel" id="content_label">
+      </object>
+    </child>
+  </template>
+</interface>

resources/ui/history.ui

@@ -26,7 +26,14 @@
                   </object>
                 </child>
                 <child>
-                  <object class="GtkGridView" id="historygrid">
+                  <object class="GtkRevealer" id="historyrevealer">
+                    <property name="transition-type">crossfade</property>
+                    <property name="transition-duration">700</property>
+                    <property name="reveal-child">False</property>
+                    <child>
+                      <object class="GtkGridView" id="historygrid">
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>

resources/ui/item.ui

@@ -55,8 +55,14 @@
                     <property name="valign">fill</property>
                     <property name="margin-bottom">3</property>
                     <child>
-                      <object class="GtkListView" id="itemlist">
-                        <property name="orientation">horizontal</property>
+                      <object class="GtkRevealer" id="itemrevealer">
+                        <property name="transition-duration">700</property>
+                        <property name="reveal-child">False</property>
+                        <child>
+                          <object class="GtkListView" id="itemlist">
+                            <property name="orientation">horizontal</property>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>

resources/ui/search.ui

@@ -30,7 +30,14 @@
                       </object>
                     </child>
                     <child>
-                      <object class="GtkGridView" id="searchgrid">
+                      <object class="GtkRevealer" id="searchrevealer">
+                        <property name="transition-type">crossfade</property>
+                        <property name="transition-duration">700</property>
+                        <property name="reveal-child">False</property>
+                        <child>
+                          <object class="GtkGridView" id="searchgrid">
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>

src/ui/mod.rs

@@ -1,4 +1,4 @@
-
+mod provider;
 mod image;
 mod network;
 mod new_dropsel;

src/ui/provider/episoderowitem.rs

@@ -0,0 +1,58 @@
+mod imp {
+    use std::cell::RefCell;
+
+    use glib::Properties;
+    use gtk::glib;
+    use gtk::prelude::*;
+    use gtk::subclass::prelude::*;
+
+    use super::TaskData;
+
+    // ANCHOR: struct_and_subclass
+    // Object holding the state
+    #[derive(Properties, Default)]
+    #[properties(wrapper_type = super::EpisodeObject)]
+    pub struct EpisodeObject {
+        #[property(name = "imageid", get, set, type = String, member = imageid)]
+        #[property(name = "label", get, set, type = String, member = label)]
+        pub data: RefCell<TaskData>,
+    }
+
+    // The central trait for subclassing a GObject
+    #[glib::object_subclass]
+    impl ObjectSubclass for EpisodeObject {
+        const NAME: &'static str = "EpisodeObject";
+        type Type = super::EpisodeObject;
+    }
+
+    // Trait shared by all GObjects
+    #[glib::derived_properties]
+    impl ObjectImpl for EpisodeObject {}
+    // ANCHOR_END: struct_and_subclass
+}
+
+use glib::Object;
+use gtk::glib;
+
+// ANCHOR: glib_wrapper_and_new
+glib::wrapper! {
+    pub struct EpisodeObject(ObjectSubclass<imp::EpisodeObject>);
+}
+
+impl EpisodeObject {
+    pub fn new(imageid: bool, label: String) -> Self {
+        Object::builder()
+            .property("imageid", imageid)
+            .property("label", label)
+            .build()
+    }
+}
+// ANCHOR_END: glib_wrapper_and_new
+
+// ANCHOR: task_data
+#[derive(Default)]
+pub struct TaskData {
+    pub imageid: String,
+    pub label: String,
+}
+// ANCHOR: task_data

src/ui/provider/mod.rs

@@ -0,0 +1 @@
+pub mod episoderowitem;

src/ui/widgets/episoderow.rs

@@ -0,0 +1,102 @@
+use glib::Object;
+use gtk::prelude::*;
+use gtk::subclass::prelude::*;
+use gtk::{glib, pango};
+use pango::{AttrInt, AttrList};
+
+use crate::ui::provider::episoderowitem::EpisodeObject;
+
+mod imp {
+    use std::cell::RefCell;
+
+    use glib::Binding;
+    use gtk::subclass::prelude::*;
+    use gtk::{glib, CheckButton, CompositeTemplate, Label, Picture};
+
+    // Object holding the state
+    #[derive(Default, CompositeTemplate)]
+    #[template(resource = "/moe/tsukimi/episoderow.ui")]
+    pub struct EpisodeRow {
+        #[template_child]
+        pub image: TemplateChild<Picture>,
+        #[template_child]
+        pub content_label: TemplateChild<Label>,
+        // Vector holding the bindings to properties of `TaskObject`
+        pub bindings: RefCell<Vec<Binding>>,
+    }
+
+    // The central trait for subclassing a GObject
+    #[glib::object_subclass]
+    impl ObjectSubclass for EpisodeRow {
+        // `NAME` needs to match `class` attribute of template
+        const NAME: &'static str = "EpisodeRow";
+        type Type = super::EpisodeRow;
+        type ParentType = gtk::Box;
+
+        fn class_init(klass: &mut Self::Class) {
+            klass.bind_template();
+        }
+
+        fn instance_init(obj: &glib::subclass::InitializingObject<Self>) {
+            obj.init_template();
+        }
+    }
+
+    // Trait shared by all GObjects
+    impl ObjectImpl for EpisodeRow {}
+
+    // Trait shared by all widgets
+    impl WidgetImpl for EpisodeRow {}
+
+    // Trait shared by all boxes
+    impl BoxImpl for EpisodeRow {}
+}
+
+glib::wrapper! {
+    pub struct EpisodeRow(ObjectSubclass<imp::EpisodeRow>)
+    @extends gtk::Box, gtk::Widget,
+    @implements gtk::Accessible, gtk::Buildable, gtk::ConstraintTarget, gtk::Orientable;
+}
+
+impl Default for EpisodeRow {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl EpisodeRow {
+    pub fn new() -> Self {
+        Object::builder().build()
+    }
+
+    pub fn bind(&self, episode_object: &EpisodeObject) {
+        // Get state
+        let image = self.imp().image.get();
+        let content_label = self.imp().content_label.get();
+        let mut bindings = self.imp().bindings.borrow_mut();
+
+        // Bind `task_object.completed` to `task_row.completed_button.active`
+        let image_binding = episode_object
+            .bind_property("completed", &image, "active")
+            .bidirectional()
+            .sync_create()
+            .build();
+        // Save binding
+        bindings.push(image_binding);
+
+        // Bind `task_object.content` to `task_row.content_label.label`
+        let content_label_binding = episode_object
+            .bind_property("content", &content_label, "label")
+            .sync_create()
+            .build();
+        // Save binding
+        bindings.push(content_label_binding);
+    }
+
+    pub fn unbind(&self) {
+        // Unbind all stored bindings
+        for binding in self.imp().bindings.borrow_mut().drain(..) {
+            binding.unbind();
+        }
+    }
+}

src/ui/widgets/history.rs

@@ -29,6 +29,8 @@ mod imp {
         pub spinner: TemplateChild<gtk::Spinner>,
         #[template_child]
         pub historyscrolled: TemplateChild<gtk::ScrolledWindow>,
+        #[template_child]
+        pub historyrevealer: TemplateChild<gtk::Revealer>,
         pub selection: gtk::SingleSelection,
     }
 
@@ -55,6 +57,7 @@ mod imp {
             self.parent_constructed();
             let obj = self.obj();
             let spinner = self.spinner.get();
+            let historyrevealer = self.historyrevealer.get();
             spinner.set_visible(true);
             let (sender, receiver) = async_channel::bounded::<Vec<crate::ui::network::Resume>>(1);
             crate::ui::network::runtime().spawn(glib::clone!(@strong sender => async move {
@@ -72,6 +75,7 @@ mod imp {
                         store.append(&object);
                     }
                     spinner.set_visible(false);
+                    historyrevealer.set_reveal_child(true);
                 }
             }));
 

src/ui/widgets/item.rs

@@ -23,6 +23,8 @@ mod imp {
         pub itemlist: TemplateChild<gtk::ListView>,
         #[template_child]
         pub osdbox: TemplateChild<gtk::Box>,
+        #[template_child]
+        pub itemrevealer: TemplateChild<gtk::Revealer>,
         pub selection: gtk::SingleSelection,
     }
 
@@ -49,6 +51,7 @@ mod imp {
         fn constructed(&self) {
             self.parent_constructed();
             let obj = self.obj();
+            let itemrevealer = self.itemrevealer.get();
             let id = obj.id();
             let path = format!(
                 "{}/.local/share/tsukimi/b{}.png",
@@ -110,6 +113,7 @@ mod imp {
                     let object = glib::BoxedAnyObject::new(info);
                     store.append(&object);
                 }
+                itemrevealer.set_reveal_child(true);
             });
 
             let factory = gtk::SignalListItemFactory::new();
@@ -120,7 +124,7 @@ mod imp {
                 let vbox = gtk::Box::new(gtk::Orientation::Vertical, 5);
                 let label = gtk::Label::new(Some(&seriesinfo.Name));
                 label.set_halign(gtk::Align::Start);
-                let markup = format!("E{} : {}", seriesinfo.IndexNumber, seriesinfo.Name);
+                let markup = format!("{}. {}", seriesinfo.IndexNumber, seriesinfo.Name);
                 label.set_markup(markup.as_str());
                 label.set_ellipsize(gtk::pango::EllipsizeMode::End);
                 label.set_size_request(-1,20);

src/ui/widgets/mod.rs

@@ -3,4 +3,5 @@ pub mod settings;
 pub mod search;
 pub mod item;
 pub mod movie;
-pub mod history;
+pub mod history;
+pub mod episoderow;

src/ui/widgets/search.rs

@@ -31,6 +31,8 @@ mod imp {
         pub spinner: TemplateChild<gtk::Spinner>,
         #[template_child]
         pub searchscrolled: TemplateChild<gtk::ScrolledWindow>,
+        #[template_child]
+        pub searchrevealer: TemplateChild<gtk::Revealer>,
         pub selection: gtk::SingleSelection,
     }
 
@@ -57,6 +59,8 @@ mod imp {
             let obj = self.obj();
             self.parent_constructed();
             let spinner = self.spinner.get();
+            let searchrevealer = self.searchrevealer.get();
+
             let (sender, receiver) = async_channel::bounded::<Vec<crate::ui::network::SearchResult>>(1);
             self.searchentry.connect_activate(glib::clone!(@strong sender,@weak spinner=> move |entry| {
                 spinner.set_visible(true);
@@ -81,6 +85,7 @@ mod imp {
                             store.append(&object);
                         }
                     }
+                    searchrevealer.set_reveal_child(true);
                 }
             }));