From 0bca6c94b6b70b323f9031739a7ebc1793072732 Mon Sep 17 00:00:00 2001
From: Ashley Wulber <ashley@system76.com>
Date: Thu, 2 Dec 2021 12:56:57 -0500
Subject: [PATCH] refactor: rename app_library application row to app_item

---
 .../application_row.ui => app_item/app_item.ui}  |  2 +-
 .../{application_row => app_item}/imp.rs         | 16 ++++++++--------
 .../{application_row => app_item}/mod.rs         | 10 +++++-----
 examples/app_library/main.rs                     |  2 +-
 examples/app_library/window/mod.rs               | 10 +++-------
 5 files changed, 18 insertions(+), 22 deletions(-)
 rename examples/app_library/{application_row/application_row.ui => app_item/app_item.ui} (94%)
 rename examples/app_library/{application_row => app_item}/imp.rs (63%)
 rename examples/app_library/{application_row => app_item}/mod.rs (64%)

diff --git a/examples/app_library/application_row/application_row.ui b/examples/app_library/app_item/app_item.ui
similarity index 94%
rename from examples/app_library/application_row/application_row.ui
rename to examples/app_library/app_item/app_item.ui
index 48b013c9..c418e0ad 100644
--- a/examples/app_library/application_row/application_row.ui
+++ b/examples/app_library/app_item/app_item.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="ApplicationRow" parent="GtkBox">
+  <template class="AppItem" parent="GtkBox">
     <property name="orientation">vertical</property>
     <property name="halign">center</property>
     <property name="hexpand">true</property>
diff --git a/examples/app_library/application_row/imp.rs b/examples/app_library/app_item/imp.rs
similarity index 63%
rename from examples/app_library/application_row/imp.rs
rename to examples/app_library/app_item/imp.rs
index cbdaabf2..01812af2 100644
--- a/examples/app_library/application_row/imp.rs
+++ b/examples/app_library/app_item/imp.rs
@@ -6,8 +6,8 @@ use gtk4 as gtk;
 use gtk::CompositeTemplate;
 
 #[derive(Debug, Default, CompositeTemplate)]
-#[template(file = "application_row.ui")]
-pub struct ApplicationRow {
+#[template(file = "app_item.ui")]
+pub struct AppItem {
     #[template_child]
     pub name: TemplateChild<gtk::Label>,
     #[template_child]
@@ -15,9 +15,9 @@ pub struct ApplicationRow {
 }
 
 #[glib::object_subclass]
-impl ObjectSubclass for ApplicationRow {
-    const NAME: &'static str = "ApplicationRow";
-    type Type = super::ApplicationRow;
+impl ObjectSubclass for AppItem {
+    const NAME: &'static str = "AppItem";
+    type Type = super::AppItem;
     type ParentType = gtk::Box;
 
     fn class_init(klass: &mut Self::Class) {
@@ -29,6 +29,6 @@ impl ObjectSubclass for ApplicationRow {
     }
 }
 
-impl ObjectImpl for ApplicationRow {}
-impl WidgetImpl for ApplicationRow {}
-impl BoxImpl for ApplicationRow {}
+impl ObjectImpl for AppItem {}
+impl WidgetImpl for AppItem {}
+impl BoxImpl for AppItem {}
diff --git a/examples/app_library/application_row/mod.rs b/examples/app_library/app_item/mod.rs
similarity index 64%
rename from examples/app_library/application_row/mod.rs
rename to examples/app_library/app_item/mod.rs
index e9912a66..2a16d53c 100644
--- a/examples/app_library/application_row/mod.rs
+++ b/examples/app_library/app_item/mod.rs
@@ -6,23 +6,23 @@ use gtk::subclass::prelude::*;
 use gtk::{gio, glib};
 
 glib::wrapper! {
-    pub struct ApplicationRow(ObjectSubclass<imp::ApplicationRow>)
+    pub struct AppItem(ObjectSubclass<imp::AppItem>)
         @extends gtk::Widget, gtk::Box;
 }
 
-impl Default for ApplicationRow {
+impl Default for AppItem {
     fn default() -> Self {
         Self::new()
     }
 }
 
-impl ApplicationRow {
+impl AppItem {
     pub fn new() -> Self {
-        glib::Object::new(&[]).expect("Failed to create ApplicationRow")
+        glib::Object::new(&[]).expect("Failed to create AppItem")
     }
 
     pub fn set_app_info(&self, app_info: &gio::AppInfo) {
-        let self_ = imp::ApplicationRow::from_instance(self);
+        let self_ = imp::AppItem::from_instance(self);
         self_.name.set_text(&app_info.name());
         if let Some(icon) = app_info.icon() {
             self_.image.set_from_gicon(&icon);
diff --git a/examples/app_library/main.rs b/examples/app_library/main.rs
index 584e1897..e2f536fc 100644
--- a/examples/app_library/main.rs
+++ b/examples/app_library/main.rs
@@ -1,4 +1,4 @@
-mod application_row;
+mod app_item;
 mod window;
 
 use gtk::gdk::Display;
diff --git a/examples/app_library/window/mod.rs b/examples/app_library/window/mod.rs
index af7a3856..e173a358 100644
--- a/examples/app_library/window/mod.rs
+++ b/examples/app_library/window/mod.rs
@@ -1,7 +1,7 @@
 mod imp;
 use gtk4 as gtk;
 
-use crate::application_row::ApplicationRow;
+use crate::app_item::AppItem;
 use glib::Object;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
@@ -183,7 +183,7 @@ impl Window {
     fn setup_factory(&self) {
         let factory = SignalListItemFactory::new();
         factory.connect_setup(move |_factory, item| {
-            let row = ApplicationRow::new();
+            let row = AppItem::new();
             item.set_child(Some(&row));
         });
 
@@ -195,11 +195,7 @@ impl Window {
                 .downcast::<gio::AppInfo>()
                 .unwrap();
 
-            let child = grid_item
-                .child()
-                .unwrap()
-                .downcast::<ApplicationRow>()
-                .unwrap();
+            let child = grid_item.child().unwrap().downcast::<AppItem>().unwrap();
             child.set_app_info(&app_info);
         });
         // Set the factory of the list view