From ef870aa74a2818a584fd5baca725a51f71258068 Mon Sep 17 00:00:00 2001
From: Christopher Davis <christopherdavis@gnome.org>
Date: Thu, 11 Jul 2024 19:54:38 -0400
Subject: [PATCH 1/2] window: Use AdwSpinner for list pane

Drop the "Loading" label, as it provides no extra
clarification.

See:
https://developer.gnome.org/hig/patterns/feedback/spinners.html#general-guidelines
---
 data/ui/contacts-main-window.ui | 23 ++++-------------------
 meson.build                     |  2 +-
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/data/ui/contacts-main-window.ui b/data/ui/contacts-main-window.ui
index 3ec8959c..fc70e16d 100644
--- a/data/ui/contacts-main-window.ui
+++ b/data/ui/contacts-main-window.ui
@@ -179,25 +179,10 @@ SPDX-License-Identifier: GPL-2.0-or-later
                       <object class="GtkStack" id="list_pane_stack">
                         <!-- The loading spinner page -->
                         <child>
-                          <object class="GtkBox">
-                            <property name="orientation">vertical</property>
-                            <property name="homogeneous">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <child>
-                              <object class="GtkSpinner">
-                                <property name="spinning">True</property>
-                                <property name="valign">end</property>
-                                <property name="halign">center</property>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label1">
-                                <property name="valign">start</property>
-                                <property name="halign">center</property>
-                                <property name="label" translatable="yes">Loading</property>
-                              </object>
-                            </child>
+                          <object class="AdwSpinner">
+                            <style>
+                              <class name="dim-label"/>
+                            </style>
                           </object>
                         </child>
                         <!-- The list pane with the actual contacts -->
diff --git a/meson.build b/meson.build
index 750a185a..1b319f7c 100644
--- a/meson.build
+++ b/meson.build
@@ -48,7 +48,7 @@ gio_unix = dependency('gio-unix-2.0', version: '>=' + min_glib_version)
 glib = dependency('glib-2.0', version: '>=' + min_glib_version)
 gmodule_export = dependency('gmodule-export-2.0', version: '>=' + min_glib_version)
 gtk4_dep = dependency('gtk4', version: '>= 4.12')
-libadwaita_dep = dependency('libadwaita-1', version: '>= 1.4.alpha')
+libadwaita_dep = dependency('libadwaita-1', version: '>= 1.6.beta')
 # E-D-S
 libebook = dependency('libebook-1.2', version: '>=' + min_eds_version)
 libedataserver = dependency('libedataserver-1.2', version: '>=' + min_eds_version)
-- 
GitLab


From 4fdabd194f819e86ed68a7f3d9d58183cd569e44 Mon Sep 17 00:00:00 2001
From: Christopher Davis <christopherdavis@gnome.org>
Date: Thu, 11 Jul 2024 20:02:30 -0400
Subject: [PATCH 2/2] import-dialog: Port to AdwSpinner

---
 src/contacts-import-dialog.vala | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/contacts-import-dialog.vala b/src/contacts-import-dialog.vala
index 1047b1a6..f95ece19 100644
--- a/src/contacts-import-dialog.vala
+++ b/src/contacts-import-dialog.vala
@@ -65,27 +65,23 @@ public class Contacts.ImportDialog : Adw.Window {
       group.title = file_name;
 
     // Now, parse the data and show a loading spinner while busy
-    var spinner = new Gtk.Spinner ();
+    var spinner = new Adw.Spinner ();
     group.add (spinner);
 
     GLib.ListModel parsed;
     uint n_parsed = 0;
     try {
-      spinner.start ();
-
       var parse_op = new Io.ParseOperation (file);
       yield parse_op.execute ();
       debug ("Successfully parsed a contact");
       parsed = parse_op.parsed;
       n_parsed = parsed.get_n_items ();
       this.parsed_results.append (parsed);
-      spinner.stop ();
       group.remove (spinner);
     } catch (GLib.Error err) {
       warning ("Couldn't parse file: %s", err.message);
       set_error_label (group,
                        _("An error occurred reading the file '%s'".printf (file_name)));
-      spinner.stop ();
       group.remove (spinner);
       return;
     }
-- 
GitLab