From 57002161e894bc11a54752c02f6dcf29660362c6 Mon Sep 17 00:00:00 2001
From: Automeris naranja <automerisnaranja@tutanota.com>
Date: Sat, 4 May 2024 03:15:26 -0300
Subject: [PATCH 1/3] review-dialog: Use AdwPreferencesPage:description
 property

Use AdwPreferencesPage:description property to show the page
description instead of using a GtkLabel.
---
 src/gs-review-dialog.ui | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/gs-review-dialog.ui b/src/gs-review-dialog.ui
index b7f727650..bffc62cbd 100644
--- a/src/gs-review-dialog.ui
+++ b/src/gs-review-dialog.ui
@@ -39,6 +39,7 @@
             </child>
             <property name="content">
               <object class="AdwPreferencesPage">
+                <property name="description" translatable="yes">Please provide a rating, summary and review text. Reviews should not be used to report problems: instead, contact the developer or your support provider.</property>
                 <property name="vexpand">True</property>
                 <child>
                   <object class="AdwPreferencesGroup">
@@ -46,21 +47,6 @@
                       <object class="GtkBox">
                         <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="developer_name_label">
-                            <property name="label" translatable="yes">Please provide a rating, summary and review text. Reviews should not be used to report problems: instead, contact the developer or your support provider.</property>
-                            <property name="justify">center</property>
-                            <property name="valign">fill</property>
-                            <property name="wrap">True</property>
-                            <property name="wrap-mode">word-char</property>
-                            <property name="xalign">0.5</property>
-                            <property name="yalign">0.5</property>
-                            <property name="margin-bottom">12</property>
-                            <style>
-                              <class name="dim-label"/>
-                            </style>
-                          </object>
-                        </child>
                         <child>
                           <object class="GsStarWidget" id="star">
                             <property name="halign">center</property>
-- 
GitLab


From d18d476c5c961260e7c8e4a1ce2671fde9d5eee8 Mon Sep 17 00:00:00 2001
From: Automeris naranja <automerisnaranja@tutanota.com>
Date: Sat, 4 May 2024 03:17:20 -0300
Subject: [PATCH 2/3] review-dialog: Port "Write a short review" row to
 AdwPreferencesRow

Doing so, it won't be necessary to use a GtkListBox to contain
the review row and the review summary entry row; both rows are
inside an AdwPreferencesGroup already.
---
 src/gs-review-dialog.ui | 106 ++++++++++++++++++----------------------
 1 file changed, 48 insertions(+), 58 deletions(-)

diff --git a/src/gs-review-dialog.ui b/src/gs-review-dialog.ui
index bffc62cbd..a6b1626b1 100644
--- a/src/gs-review-dialog.ui
+++ b/src/gs-review-dialog.ui
@@ -69,85 +69,75 @@
                 <child>
                   <object class="AdwPreferencesGroup">
                     <child>
-                      <object class="GtkListBox">
-                        <property name="selection_mode">none</property>
-                        <property name="halign">fill</property>
-                        <property name="valign">start</property>
+                      <object class="AdwEntryRow" id="summary_entry">
+                        <property name="activatable">False</property>
+                        <property name="focusable">False</property>
+                        <property name="title" translatable="yes">Review Summary</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwPreferencesRow" id="review_row">
+                        <property name="activatable">False</property>
+                        <property name="focusable">False</property>
                         <style>
-                          <class name="boxed-list"/>
+                          <class name="review-row"/>
                         </style>
                         <child>
-                          <object class="AdwEntryRow" id="summary_entry">
-                            <property name="activatable">False</property>
-                            <property name="focusable">False</property>
-                            <property name="title" translatable="yes">Review Summary</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkListBoxRow" id="review_row">
-                            <property name="activatable">False</property>
-                            <property name="focusable">False</property>
-                            <style>
-                              <class name="review-row"/>
-                            </style>
+                          <object class="GtkBox">
+                            <property name="orientation">vertical</property>
+                            <property name="vexpand">True</property>
                             <child>
                               <object class="GtkBox">
-                                <property name="orientation">vertical</property>
-                                <property name="vexpand">True</property>
+                                <property name="valign">center</property>
+                                <property name="hexpand">False</property>
+                                <style>
+                                  <class name="header"/>
+                                </style>
                                 <child>
-                                  <object class="GtkBox">
+                                  <object class="GtkBox" id="title_box">
+                                    <property name="orientation">vertical</property>
                                     <property name="valign">center</property>
-                                    <property name="hexpand">False</property>
+                                    <property name="hexpand">True</property>
                                     <style>
-                                      <class name="header"/>
+                                      <class name="title"/>
                                     </style>
                                     <child>
-                                      <object class="GtkBox" id="title_box">
-                                        <property name="orientation">vertical</property>
-                                        <property name="valign">center</property>
-                                        <property name="hexpand">True</property>
+                                      <object class="GtkLabel">
+                                        <property name="ellipsize">none</property>
+                                        <property name="label" translatable="yes" context="app review" comments="Translators: This is where the users enter their opinions about the apps.">Write a short review</property>
+                                        <property name="lines">0</property>
+                                        <property name="mnemonic-widget">review_row</property>
+                                        <property name="wrap">True</property>
+                                        <property name="wrap-mode">word-char</property>
+                                        <property name="xalign">0</property>
                                         <style>
+                                          <class name="dim-label"/>
                                           <class name="title"/>
                                         </style>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="ellipsize">none</property>
-                                            <property name="label" translatable="yes" context="app review" comments="Translators: This is where the users enter their opinions about the apps.">Write a short review</property>
-                                            <property name="lines">0</property>
-                                            <property name="mnemonic-widget">review_row</property>
-                                            <property name="wrap">True</property>
-                                            <property name="wrap-mode">word-char</property>
-                                            <property name="xalign">0</property>
-                                            <style>
-                                              <class name="dim-label"/>
-                                              <class name="title"/>
-                                            </style>
-                                          </object>
-                                        </child>
                                       </object>
                                     </child>
-                                    <child>
-                                      <object class="GtkImage" id="edit_icon">
-                                        <property name="valign">center</property>
-                                        <property name="can-target">False</property>
-                                        <property name="icon-name">document-edit-symbolic</property>
-                                        <style>
-                                          <class name="edit-icon"/>
-                                        </style>
-                                      </object>
-                                    </child>
-                                   </object>
+                                  </object>
                                 </child>
                                 <child>
-                                  <object class="GtkTextView" id="text_view">
-                                    <property name="can_focus">True</property>
-                                    <property name="height-request">120</property>
-                                    <property name="wrap-mode">word-char</property>
+                                  <object class="GtkImage" id="edit_icon">
+                                    <property name="valign">center</property>
+                                    <property name="can-target">False</property>
+                                    <property name="icon-name">document-edit-symbolic</property>
                                     <style>
-                                      <class name="review-textbox"/>
+                                      <class name="edit-icon"/>
                                     </style>
                                   </object>
                                 </child>
+                               </object>
+                            </child>
+                            <child>
+                              <object class="GtkTextView" id="text_view">
+                                <property name="can_focus">True</property>
+                                <property name="height-request">120</property>
+                                <property name="wrap-mode">word-char</property>
+                                <style>
+                                  <class name="review-textbox"/>
+                                </style>
                               </object>
                             </child>
                           </object>
-- 
GitLab


From cb31d906a800de93ca2046e9f0df92ddeb07430e Mon Sep 17 00:00:00 2001
From: Automeris naranja <automerisnaranja@tutanota.com>
Date: Sat, 4 May 2024 03:21:38 -0300
Subject: [PATCH 3/3] review-dialog: Remove hexpand and vexpand properties

AdwHeaderBar and AdwPreferencesPage have the hexpand and vexpand
properties respectively, but they currently don't do a thing.

They were added in [1] and [2]. Several other dialogs from
Software don't have these properties in their AdwHeaderbar
and AdwPreferencesPage widgets.

[1] https://gitlab.gnome.org/GNOME/gnome-software/-/commit/6c24a69dcb89bda16907946f488cdc0d2aa3b898
[2] https://gitlab.gnome.org/GNOME/gnome-software/-/commit/90cf1ee87036214099ffa56f179f79e628f3c673
---
 src/gs-review-dialog.ui | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gs-review-dialog.ui b/src/gs-review-dialog.ui
index a6b1626b1..65fd6ddb3 100644
--- a/src/gs-review-dialog.ui
+++ b/src/gs-review-dialog.ui
@@ -13,7 +13,6 @@
               <object class="AdwHeaderBar">
                 <property name="show_start_title_buttons">False</property>
                 <property name="show_end_title_buttons">False</property>
-                <property name="hexpand">True</property>
                 <property name="title-widget">
                   <object class="AdwWindowTitle">
                     <property name="title" bind-source="GsReviewDialog" bind-property="title" bind-flags="sync-create"/>
@@ -40,7 +39,6 @@
             <property name="content">
               <object class="AdwPreferencesPage">
                 <property name="description" translatable="yes">Please provide a rating, summary and review text. Reviews should not be used to report problems: instead, contact the developer or your support provider.</property>
-                <property name="vexpand">True</property>
                 <child>
                   <object class="AdwPreferencesGroup">
                     <child>
-- 
GitLab