[gnome-control-center/gbsneto/applications-panel-cleanups: 6/16] applications: Group built-in row with storage

[Georges Basile Stavracas Neto <gbsneto src gnome org>]

commit dc4d8e262f0d8b03779b4199b9a295669cc48a87
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Thu Jan 20 13:27:08 2022 -0300

    applications: Group built-in row with storage
    
    As per latest mockup

 panels/applications/cc-applications-panel.c  | 23 +++++++++--------------
 panels/applications/cc-applications-panel.ui | 18 ++++++++----------
 2 files changed, 17 insertions(+), 24 deletions(-)
---
diff --git a/panels/applications/cc-applications-panel.c b/panels/applications/cc-applications-panel.c
index 021192478..567186e61 100644
--- a/panels/applications/cc-applications-panel.c
+++ b/panels/applications/cc-applications-panel.c
@@ -867,7 +867,7 @@ update_permission_section (CcApplicationsPanel *self,
 {
   g_autofree gchar *portal_app_id = get_portal_app_id (info);
   gboolean disabled, allowed, set;
-  gboolean has_any = FALSE, has_builtin = FALSE;
+  gboolean has_any = FALSE;
 
   if (portal_app_id == NULL)
     {
@@ -901,11 +901,6 @@ update_permission_section (CcApplicationsPanel *self,
   has_any |= add_snap_permissions (self, info, portal_app_id);
 #endif
 
-  remove_static_permissions (self);
-  has_builtin = add_static_permissions (self, info, portal_app_id);
-  gtk_widget_set_visible (GTK_WIDGET (self->builtin), has_builtin);
-  has_any |= has_builtin;
-
   gtk_widget_set_visible (self->permission_section, has_any);
 }
 
@@ -1632,16 +1627,16 @@ update_usage_section (CcApplicationsPanel *self,
                       GAppInfo            *info)
 {
   g_autofree gchar *portal_app_id = get_portal_app_id (info);
+  gboolean has_builtin = FALSE;
 
   if (portal_app_id != NULL)
-    {
-      gtk_widget_show (self->usage_section);
-      update_app_sizes (self, portal_app_id);
-    }
-  else
-    {
-      gtk_widget_hide (self->usage_section);
-    }
+    update_app_sizes (self, portal_app_id);
+
+  remove_static_permissions (self);
+  has_builtin = add_static_permissions (self, info, portal_app_id);
+  gtk_widget_set_visible (GTK_WIDGET (self->builtin), has_builtin);
+
+  gtk_widget_set_visible (GTK_WIDGET (self->usage_section), portal_app_id || has_builtin);
 }
 
 /* --- panel setup --- */
diff --git a/panels/applications/cc-applications-panel.ui b/panels/applications/cc-applications-panel.ui
index 35b845600..e461cde8a 100644
--- a/panels/applications/cc-applications-panel.ui
+++ b/panels/applications/cc-applications-panel.ui
@@ -98,14 +98,6 @@
                         <property name="info" translatable="yes">Disabled</property>
                       </object>
                     </child>
-                    <child>
-                      <object class="CcInfoRow" id="builtin">
-                        <property name="title" translatable="yes">Built-in Permissions</property>
-                        <property name="info" translatable="yes">Cannot be changed</property>
-                        <property name="has-expander">True</property>
-                        <property name="is-link">True</property>
-                      </object>
-                    </child>
                     <style>
                       <class name="boxed-list"/>
                     </style>
@@ -249,8 +241,6 @@
 
             <child>
               <object class="AdwPreferencesGroup" id="usage_section">
-                <property name="title" translatable="yes">Usage</property>
-                <property name="description" translatable="yes">How much resources this application is 
using.</property>
                 <child>
                   <object class="GtkListBox" id="usage_list">
                     <property name="selection-mode">none</property>
@@ -258,6 +248,14 @@
                     <style>
                       <class name="boxed-list"/>
                     </style>
+                    <child>
+                      <object class="CcInfoRow" id="builtin">
+                        <property name="title" translatable="yes">Built-in Permissions</property>
+                        <property name="info" translatable="yes">Cannot be changed</property>
+                        <property name="has-expander">True</property>
+                        <property name="is-link">True</property>
+                      </object>
+                    </child>
                     <child>
                       <object class="CcInfoRow" id="storage">
                         <property name="title" translatable="yes">Storage</property>