From f210382bdc87ff2740282e9941e9794caa104d46 Mon Sep 17 00:00:00 2001
From: Hari Rana <theevilskeleton@riseup.net>
Date: Sun, 30 Jul 2023 21:53:19 -0400
Subject: [PATCH] calendar-row: Port to AdwSwitchRow

---
 src/gui/calendar-management/calendar-row.ui   | 86 ++++---------------
 .../calendar-management/gcal-calendars-page.c | 15 ++--
 2 files changed, 20 insertions(+), 81 deletions(-)

diff --git a/src/gui/calendar-management/calendar-row.ui b/src/gui/calendar-management/calendar-row.ui
index 9b3d142c..7c44c5d8 100644
--- a/src/gui/calendar-management/calendar-row.ui
+++ b/src/gui/calendar-management/calendar-row.ui
@@ -1,77 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <object class="GtkListBoxRow" id="row">
-    <property name="width_request">100</property>
-    <child>
-      <object class="GtkGrid" id="grid">
-        <property name="margin-top">12</property>
-        <property name="margin-bottom">12</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <property name="column_spacing">6</property>
-        <child>
-          <object class="GtkImage" id="icon">
-            <property name="pixel_size">24</property>
-            <layout>
-              <property name="column">0</property>
-              <property name="row">0</property>
-              <property name="row-span">2</property>
-            </layout>
-            <style>
-              <class name="calendar-color-image"/>
-            </style>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="subtitle">
-            <property name="hexpand">True</property>
-            <property name="xalign">0</property>
-            <layout>
-              <property name="column">1</property>
-              <property name="row">1</property>
-            </layout>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="title">
-            <property name="xalign">0</property>
-            <layout>
-              <property name="column">1</property>
-              <property name="row">0</property>
-            </layout>
-          </object>
-        </child>
+  <object class="AdwSwitchRow" id="row">
+    <property name="use-markup">False</property>
+    <child type="prefix">
+      <object class="GtkImage" id="icon">
+        <property name="pixel-size">24</property>
+        <style>
+          <class name="calendar-color-image"/>
+        </style>
+      </object>
+    </child>
 
-        <!-- Visibility switch -->
-        <child>
-          <object class="GtkSwitch" id="switch">
-            <property name="hexpand">True</property>
-            <property name="halign">end</property>
-            <property name="valign">center</property>
-            <layout>
-              <property name="column">2</property>
-              <property name="row">0</property>
-              <property name="row-span">2</property>
-            </layout>
-          </object>
-        </child>
-
-        <!-- Arrow indicator -->
-        <child>
-          <object class="GtkImage">
-            <property name="halign">end</property>
-            <property name="valign">center</property>
-            <layout>
-              <property name="column">3</property>
-              <property name="row">0</property>
-              <property name="row-span">3</property>
-            </layout>
-            <property name="icon-name">go-next-symbolic</property>
-          </object>
-        </child>
+    <child type="suffix">
+      <object class="GtkImage">
+        <property name="halign">end</property>
+        <property name="valign">center</property>
+        <property name="icon-name">go-next-symbolic</property>
       </object>
     </child>
   </object>
diff --git a/src/gui/calendar-management/gcal-calendars-page.c b/src/gui/calendar-management/gcal-calendars-page.c
index 3b184cd1..c85a65e9 100644
--- a/src/gui/calendar-management/gcal-calendars-page.c
+++ b/src/gui/calendar-management/gcal-calendars-page.c
@@ -73,11 +73,8 @@ make_calendar_row (GcalCalendarsPage *self,
   g_autoptr (GtkBuilder) builder = NULL;
   const GdkRGBA *color;
   GcalManager *manager;
-  GtkWidget *bottom_label;
-  GtkWidget *top_label;
   GtkWidget *icon;
   GtkWidget *row;
-  GtkWidget *sw;
 
   manager = gcal_context_get_manager (self->context);
   get_source_parent_name_color (manager, gcal_calendar_get_source (calendar), &parent_name, NULL);
@@ -98,9 +95,9 @@ make_calendar_row (GcalCalendarsPage *self,
   gtk_image_set_from_paintable (GTK_IMAGE (icon), color_paintable);
 
   /* source name label */
-  top_label = GTK_WIDGET (gtk_builder_get_object (builder, "title"));
-  gtk_label_set_label (GTK_LABEL (top_label), gcal_calendar_get_name (calendar));
-  g_object_bind_property (calendar, "name", top_label, "label", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
+  adw_preferences_row_set_title (ADW_PREFERENCES_ROW (row), gcal_calendar_get_name (calendar));
+  g_object_bind_property (calendar, "name", row, "title", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
+
   g_signal_connect_object (calendar,
                            "notify::name",
                            G_CALLBACK (gtk_list_box_invalidate_sort),
@@ -114,12 +111,10 @@ make_calendar_row (GcalCalendarsPage *self,
                            0);
 
   /* visibility switch */
-  sw = GTK_WIDGET (gtk_builder_get_object (builder, "switch"));
-  g_object_bind_property (calendar, "visible", sw, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
+  g_object_bind_property (calendar, "visible", row, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
 
   /* parent source name label */
-  bottom_label = GTK_WIDGET (gtk_builder_get_object (builder, "subtitle"));
-  gtk_label_set_label (GTK_LABEL (bottom_label), parent_name);
+  adw_action_row_set_subtitle (ADW_ACTION_ROW (row), parent_name);
 
   gtk_size_group_add_widget (self->sizegroup, row);