From 1a9496a1c40182a51985a1dab3a7897b4da73693 Mon Sep 17 00:00:00 2001
From: Dave Patrick Caberto <davecruz48@gmail.com>
Date: Sun, 14 Jul 2024 11:04:20 +0800
Subject: [PATCH] misc: port to AdwSpinner

---
 Cargo.toml                          | 2 +-
 data/resources/ui/page.ui           | 6 ++----
 data/resources/ui/recent_popover.ui | 6 ++----
 meson.build                         | 2 +-
 src/recent_popover.rs               | 2 +-
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index d2ba377..adc58fc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 lto = true
 
 [dependencies]
-adw = { package = "libadwaita", version = "0.7", features = ["v1_5"] }
+adw = { package = "libadwaita", version = "0.7", features = ["v1_6"] }
 anyhow = "1.0.75"
 async-lock = "3.2"
 futures-util = { version = "0.3.29", features = ["io"] }
diff --git a/data/resources/ui/page.ui b/data/resources/ui/page.ui
index ef51fba..36638f8 100644
--- a/data/resources/ui/page.ui
+++ b/data/resources/ui/page.ui
@@ -100,12 +100,10 @@
                     <property name="can-target">False</property>
                     <property name="transition-type">crossfade</property>
                     <property name="child">
-                      <object class="GtkSpinner">
-                        <property name="width-request">18</property>
-                        <property name="height-request">18</property>
+                      <object class="AdwSpinner">
                         <property name="margin-start">6</property>
                         <property name="margin-end">6</property>
-                        <property name="spinning">True</property>
+                        <property name="size">18</property>
                       </object>
                     </property>
                   </object>
diff --git a/data/resources/ui/recent_popover.ui b/data/resources/ui/recent_popover.ui
index 46d43fe..427ad6a 100644
--- a/data/resources/ui/recent_popover.ui
+++ b/data/resources/ui/recent_popover.ui
@@ -25,12 +25,10 @@
             <property name="vhomogeneous">false</property>
             <property name="hhomogeneous">false</property>
             <child>
-              <object class="GtkSpinner" id="loading_page">
-                <property name="spinning">True</property>
-                <property name="width-request">24</property>
-                <property name="height-request">24</property>
+              <object class="AdwSpinner" id="loading_page">
                 <property name="margin-top">24</property>
                 <property name="margin-bottom">24</property>
+                <property name="size">24</property>
               </object>
             </child>
             <child>
diff --git a/meson.build b/meson.build
index 0a2198c..616ccff 100644
--- a/meson.build
+++ b/meson.build
@@ -15,7 +15,7 @@ dependency('glib-2.0', version: '>= 2.66')
 dependency('gio-2.0', version: '>= 2.66')
 dependency('gtk4', version: '>= 4.15.3')
 dependency('gtksourceview-5', version: '>= 5.11')
-dependency('libadwaita-1', version: '>= 1.5')
+dependency('libadwaita-1', version: '>= 1.6')
 dependency('webkitgtk-6.0', version: '>= 2.43')
 
 glib_compile_resources = find_program('glib-compile-resources', required: true)
diff --git a/src/recent_popover.rs b/src/recent_popover.rs
index de3597d..a16d62b 100644
--- a/src/recent_popover.rs
+++ b/src/recent_popover.rs
@@ -25,7 +25,7 @@ mod imp {
         #[template_child]
         pub(super) stack: TemplateChild<gtk::Stack>,
         #[template_child]
-        pub(super) loading_page: TemplateChild<gtk::Spinner>,
+        pub(super) loading_page: TemplateChild<adw::Spinner>,
         #[template_child]
         pub(super) empty_page: TemplateChild<adw::StatusPage>,
         #[template_child]