From 891978b4eb8e9cca8563b9ddd22bdbc1b24b9595 Mon Sep 17 00:00:00 2001
From: Romain Vigier <romain@romainvigier.fr>
Date: Mon, 4 Oct 2021 15:18:51 +0200
Subject: [PATCH 1/7] extensions-app: Use AdwApplication

Initialize libadwaita, which loads the libadwaita stylesheet
and allow following the dark style preference of the system.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1997>
---
 subprojects/extensions-app/data/ui/extension-row.ui     | 1 -
 subprojects/extensions-app/data/ui/extensions-window.ui | 1 -
 subprojects/extensions-app/js/main.js                   | 4 ++--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/subprojects/extensions-app/data/ui/extension-row.ui b/subprojects/extensions-app/data/ui/extension-row.ui
index ec56fedc9e..f41d8fbb7e 100644
--- a/subprojects/extensions-app/data/ui/extension-row.ui
+++ b/subprojects/extensions-app/data/ui/extension-row.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
   <template class="ExtensionRow" parent="GtkListBoxRow">
     <property name="activatable">False</property>
     <child>
diff --git a/subprojects/extensions-app/data/ui/extensions-window.ui b/subprojects/extensions-app/data/ui/extensions-window.ui
index f049bd7e36..faafa05092 100644
--- a/subprojects/extensions-app/data/ui/extensions-window.ui
+++ b/subprojects/extensions-app/data/ui/extensions-window.ui
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.20"/>
   <menu id="primary-menu">
     <section>
       <item>
diff --git a/subprojects/extensions-app/js/main.js b/subprojects/extensions-app/js/main.js
index 48d382f3f6..cbdac693f2 100644
--- a/subprojects/extensions-app/js/main.js
+++ b/subprojects/extensions-app/js/main.js
@@ -4,7 +4,7 @@ imports.gi.versions.Gtk = '4.0';
 
 const Gettext = imports.gettext;
 const Package = imports.package;
-const { Gdk, GLib, Gio, GObject, Gtk, Shew } = imports.gi;
+const { Adw, Gdk, GLib, Gio, GObject, Gtk, Shew } = imports.gi;
 
 Package.initFormat();
 
@@ -38,7 +38,7 @@ function toggleState(action) {
 }
 
 var Application = GObject.registerClass(
-class Application extends Gtk.Application {
+class Application extends Adw.Application {
     _init() {
         GLib.set_prgname('gnome-extensions-app');
         super._init({ application_id: Package.name });
-- 
GitLab


From f0754431bffca1c510965df011846372c7518926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 5 Jan 2022 14:51:53 +0100
Subject: [PATCH 2/7] extensions-app: Use Adw.Application's automatic style
 loading

Now that we switched to AdwApplication, we can automate loading
the custom stylesheet by simply using the expected name and
resource prefix.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1997>
---
 .../data/css/{application.css => style.css}        |  0
 subprojects/extensions-app/data/meson.build        |  6 +++++-
 ... => org.gnome.Extensions.data.gresource.xml.in} |  6 ++++--
 subprojects/extensions-app/js/main.js              | 14 +-------------
 4 files changed, 10 insertions(+), 16 deletions(-)
 rename subprojects/extensions-app/data/css/{application.css => style.css} (100%)
 rename subprojects/extensions-app/data/{org.gnome.Extensions.data.gresource.xml => org.gnome.Extensions.data.gresource.xml.in} (69%)

diff --git a/subprojects/extensions-app/data/css/application.css b/subprojects/extensions-app/data/css/style.css
similarity index 100%
rename from subprojects/extensions-app/data/css/application.css
rename to subprojects/extensions-app/data/css/style.css
diff --git a/subprojects/extensions-app/data/meson.build b/subprojects/extensions-app/data/meson.build
index 4b601e8bd1..4f24267b04 100644
--- a/subprojects/extensions-app/data/meson.build
+++ b/subprojects/extensions-app/data/meson.build
@@ -1,6 +1,10 @@
 gnome.compile_resources(
   app_id + '.data',
-  base_id + '.data.gresource.xml',
+  configure_file(
+    input: base_id + '.data.gresource.xml.in',
+    output: app_id + '.data.gresource.xml',
+    configuration: {'profile': '/'.join(profile.split('.')) },
+  ),
   gresource_bundle: true,
   install: true,
   install_dir: pkgdatadir
diff --git a/subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml b/subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml.in
similarity index 69%
rename from subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml
rename to subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml.in
index 659c03ffc8..ca04c08c12 100644
--- a/subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml
+++ b/subprojects/extensions-app/data/org.gnome.Extensions.data.gresource.xml.in
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/Extensions">
-    <file>css/application.css</file>
+  <gresource prefix="/org/gnome/Extensions@profile@">
+    <file alias="style.css">css/style.css</file>
+  </gresource>
 
+  <gresource prefix="/org/gnome/Extensions">
     <file>dbus-interfaces/org.gnome.Shell.Extensions.xml</file>
 
     <file>ui/extension-row.ui</file>
diff --git a/subprojects/extensions-app/js/main.js b/subprojects/extensions-app/js/main.js
index cbdac693f2..563cd7e456 100644
--- a/subprojects/extensions-app/js/main.js
+++ b/subprojects/extensions-app/js/main.js
@@ -1,10 +1,9 @@
 /* exported main */
-imports.gi.versions.Gdk = '4.0';
 imports.gi.versions.Gtk = '4.0';
 
 const Gettext = imports.gettext;
 const Package = imports.package;
-const { Adw, Gdk, GLib, Gio, GObject, Gtk, Shew } = imports.gi;
+const { Adw, GLib, Gio, GObject, Gtk, Shew } = imports.gi;
 
 Package.initFormat();
 
@@ -58,17 +57,6 @@ class Application extends Adw.Application {
     vfunc_startup() {
         super.vfunc_startup();
 
-        let provider = new Gtk.CssProvider();
-        let uri = 'resource:///org/gnome/Extensions/css/application.css';
-        try {
-            provider.load_from_file(Gio.File.new_for_uri(uri));
-        } catch (e) {
-            logError(e, 'Failed to add application style');
-        }
-        Gtk.StyleContext.add_provider_for_display(Gdk.Display.get_default(),
-            provider,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-
         const action = new Gio.SimpleAction({ name: 'quit' });
         action.connect('activate', () => this._window.close());
         this.add_action(action);
-- 
GitLab


From ec0ee7eaecab8a84dc037e87bf226d9819c05f2e Mon Sep 17 00:00:00 2001
From: Romain Vigier <romain@romainvigier.fr>
Date: Mon, 4 Oct 2021 15:22:09 +0200
Subject: [PATCH 3/7] extensions-app: Use `.heading` class for headings

Don't hardcode headings styling.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1997>
---
 .../data/ui/extensions-window.ui              | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/subprojects/extensions-app/data/ui/extensions-window.ui b/subprojects/extensions-app/data/ui/extensions-window.ui
index faafa05092..1a95f9acf6 100644
--- a/subprojects/extensions-app/data/ui/extensions-window.ui
+++ b/subprojects/extensions-app/data/ui/extensions-window.ui
@@ -33,9 +33,9 @@
             <property name="label" translatable="yes">Warning</property>
             <property name="xalign">0</property>
             <property name="margin-top">6</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
+            <style>
+              <class name="heading"/>
+            </style>
           </object>
         </child>
         <child>
@@ -147,9 +147,9 @@
                                 <property name="halign">start</property>
                                 <property name="hexpand">True</property>
                                 <property name="label" translatable="yes">Manually Installed</property>
-                                <attributes>
-                                  <attribute name="weight" value="bold"/>
-                                </attributes>
+                                <style>
+                                  <class name="heading"/>
+                                </style>
                               </object>
                             </child>
                             <child>
@@ -171,9 +171,9 @@
                                 <property name="halign">start</property>
                                 <property name="hexpand">True</property>
                                 <property name="label" translatable="yes">Built-In</property>
-                                <attributes>
-                                  <attribute name="weight" value="bold"/>
-                                </attributes>
+                                <style>
+                                  <class name="heading"/>
+                                </style>
                               </object>
                             </child>
                             <child>
@@ -285,9 +285,9 @@
                   <object class="GtkLabel">
                     <property name="halign">start</property>
                     <property name="label" translatable="yes">Extension Updates Ready</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                    </attributes>
+                    <style>
+                      <class name="heading"/>
+                    </style>
                   </object>
                 </child>
                 <child>
-- 
GitLab


From 35b26229bcf319aa67a4d64a158ce55ce9e03473 Mon Sep 17 00:00:00 2001
From: Romain Vigier <romain@romainvigier.fr>
Date: Mon, 4 Oct 2021 15:42:48 +0200
Subject: [PATCH 4/7] extensions-app: Use `.content` class for lists

Since the `.content` class comes with its own separators, we
don't need the property `use-separators` on the list.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1997>
---
 subprojects/extensions-app/data/ui/extensions-window.ui | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/subprojects/extensions-app/data/ui/extensions-window.ui b/subprojects/extensions-app/data/ui/extensions-window.ui
index 1a95f9acf6..e69726ba50 100644
--- a/subprojects/extensions-app/data/ui/extensions-window.ui
+++ b/subprojects/extensions-app/data/ui/extensions-window.ui
@@ -155,10 +155,9 @@
                             <child>
                               <object class="GtkListBox" id="userList">
                                 <property name="selection-mode">none</property>
-                                <property name="show-separators">True</property>
                                 <property name="margin-bottom">24</property>
                                 <style>
-                                  <class name="frame"/>
+                                  <class name="content"/>
                                 </style>
                               </object>
                             </child>
@@ -179,9 +178,8 @@
                             <child>
                               <object class="GtkListBox" id="systemList">
                                 <property name="selection-mode">none</property>
-                                <property name="show-separators">True</property>
                                 <style>
-                                  <class name="frame"/>
+                                  <class name="content"/>
                                 </style>
                               </object>
                             </child>
-- 
GitLab


From e0f2674d8be33fa5f6871a6cf10dedffeb1a99e1 Mon Sep 17 00:00:00 2001
From: Romain Vigier <romain@romainvigier.fr>
Date: Mon, 4 Oct 2021 15:45:21 +0200
Subject: [PATCH 5/7] extensions-app: Replace empty views with AdwStatusPage

AdwStatusPage provides consistent styling for empty views.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1997>
---
 .../data/ui/extensions-window.ui              | 57 ++-----------------
 1 file changed, 6 insertions(+), 51 deletions(-)

diff --git a/subprojects/extensions-app/data/ui/extensions-window.ui b/subprojects/extensions-app/data/ui/extensions-window.ui
index e69726ba50..e849b48f1e 100644
--- a/subprojects/extensions-app/data/ui/extensions-window.ui
+++ b/subprojects/extensions-app/data/ui/extensions-window.ui
@@ -195,29 +195,9 @@
               <object class="GtkStackPage">
                 <property name="name">placeholder</property>
                 <property name="child">
-                  <object class="GtkBox">
-                    <property name="orientation">vertical</property>
-                    <property name="margin-start">32</property>
-                    <property name="margin-end">32</property>
-                    <property name="margin-top">32</property>
-                    <property name="margin-bottom">32</property>
-                    <property name="spacing">6</property>
-                    <property name="valign">center</property>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="pixel-size">96</property>
-                        <property name="icon-name">org.gnome.Extensions-symbolic</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">No Installed Extensions</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                          <attribute name="scale" value="1.44"/>
-                        </attributes>
-                      </object>
-                    </child>
+                  <object class="AdwStatusPage">
+                    <property name="icon-name">org.gnome.Extensions-symbolic</property>
+                    <property name="title" translatable="yes">No Installed Extensions</property>
                   </object>
                 </property>
               </object>
@@ -226,34 +206,9 @@
               <object class="GtkStackPage">
                 <property name="name">noshell</property>
                 <property name="child">
-                  <object class="GtkBox">
-                    <property name="margin-start">100</property>
-                    <property name="margin-end">100</property>
-                    <property name="margin-top">100</property>
-                    <property name="margin-bottom">60</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">12</property>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">Something’s gone wrong</property>
-                        <attributes>
-                          <attribute name="scale" value="1.44"/>
-                        </attributes>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel">
-                        <property name="label" translatable="yes">We’re very sorry, but it was not possible to get the list of installed extensions. Make sure you are logged into GNOME and try again.</property>
-                        <property name="justify">center</property>
-                        <property name="wrap">True</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                    </child>
+                  <object class="AdwStatusPage">
+                    <property name="title" translatable="yes">Something’s gone wrong</property>
+                    <property name="description" translatable="yes">We’re very sorry, but it was not possible to get the list of installed extensions. Make sure you are logged into GNOME and try again.</property>
                   </object>
                 </property>
               </object>
-- 
GitLab


From 1359cedc001ae9c06317872a3fd9e00490c3ac5a Mon Sep 17 00:00:00 2001
From: Romain Vigier <romain@romainvigier.fr>
Date: Tue, 5 Oct 2021 09:49:13 +0200
Subject: [PATCH 6/7] extensions-app: Vertically center updates bar text

With the new stylesheet, the text is too close to the bar border.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1997>
---
 subprojects/extensions-app/data/ui/extensions-window.ui | 1 +
 1 file changed, 1 insertion(+)

diff --git a/subprojects/extensions-app/data/ui/extensions-window.ui b/subprojects/extensions-app/data/ui/extensions-window.ui
index e849b48f1e..f96441c488 100644
--- a/subprojects/extensions-app/data/ui/extensions-window.ui
+++ b/subprojects/extensions-app/data/ui/extensions-window.ui
@@ -234,6 +234,7 @@
             <child>
               <object class="GtkBox">
                 <property name="orientation">vertical</property>
+                <property name="valign">center</property>
                 <child>
                   <object class="GtkLabel">
                     <property name="halign">start</property>
-- 
GitLab


From ab5977713b5b5dbfd0a1cec453f0a0528800dedf Mon Sep 17 00:00:00 2001
From: Romain Vigier <romain@romainvigier.fr>
Date: Mon, 18 Oct 2021 15:18:11 +0200
Subject: [PATCH 7/7] extensions-app: Use AdwPreferencesPage and
 AdwPreferencesGroup

Give consistent styling and sizing to extensions lists.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1997>
---
 .../extensions-app/data/ui/extension-row.ui   |  2 -
 .../data/ui/extensions-window.ui              | 78 +++++--------------
 subprojects/extensions-app/js/main.js         |  9 ++-
 3 files changed, 26 insertions(+), 63 deletions(-)

diff --git a/subprojects/extensions-app/data/ui/extension-row.ui b/subprojects/extensions-app/data/ui/extension-row.ui
index f41d8fbb7e..8330f05ce2 100644
--- a/subprojects/extensions-app/data/ui/extension-row.ui
+++ b/subprojects/extensions-app/data/ui/extension-row.ui
@@ -89,7 +89,6 @@
                 <child>
                   <object class="GtkLabel" id="descriptionLabel">
                     <property name="ellipsize">end</property>
-                    <property name="max-width-chars">60</property>
                     <property name="xalign">0</property>
                     <property name="yalign">0</property>
                   </object>
@@ -171,7 +170,6 @@
                     <property name="visible">False</property>
                     <property name="selectable">True</property>
                     <property name="wrap">True</property>
-                    <property name="max-width-chars">60</property>
                     <property name="xalign">0</property>
                     <layout>
                       <property name="column">1</property>
diff --git a/subprojects/extensions-app/data/ui/extensions-window.ui b/subprojects/extensions-app/data/ui/extensions-window.ui
index f96441c488..740c62128e 100644
--- a/subprojects/extensions-app/data/ui/extensions-window.ui
+++ b/subprojects/extensions-app/data/ui/extensions-window.ui
@@ -124,65 +124,29 @@
               <object class="GtkStackPage">
                 <property name="name">main</property>
                 <property name="child">
-                  <object class="GtkScrolledWindow" id="scrolledWindow">
-                    <property name="hscrollbar-policy">never</property>
+                  <object class="AdwPreferencesPage">
                     <child>
-                      <object class="GtkViewport">
-                        <property name="scroll-to-focus">True</property>
+                      <object class="AdwPreferencesGroup" id="userGroup">
+                        <property name="title" translatable="yes">Manually Installed</property>
                         <child>
-                          <object class="GtkBox">
-                            <property name="orientation">vertical</property>
-                            <property name="halign">center</property>
-                            <property name="margin-start">36</property>
-                            <property name="margin-end">36</property>
-                            <property name="margin-top">36</property>
-                            <property name="margin-bottom">36</property>
-                            <property name="spacing">12</property>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="visible"
-                                          bind-source="userList"
-                                          bind-property="visible"
-                                          bind-flags="sync-create"/>
-                                <property name="halign">start</property>
-                                <property name="hexpand">True</property>
-                                <property name="label" translatable="yes">Manually Installed</property>
-                                <style>
-                                  <class name="heading"/>
-                                </style>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkListBox" id="userList">
-                                <property name="selection-mode">none</property>
-                                <property name="margin-bottom">24</property>
-                                <style>
-                                  <class name="content"/>
-                                </style>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkLabel">
-                                <property name="visible"
-                                          bind-source="systemList"
-                                          bind-property="visible"
-                                          bind-flags="sync-create"/>
-                                <property name="halign">start</property>
-                                <property name="hexpand">True</property>
-                                <property name="label" translatable="yes">Built-In</property>
-                                <style>
-                                  <class name="heading"/>
-                                </style>
-                              </object>
-                            </child>
-                            <child>
-                              <object class="GtkListBox" id="systemList">
-                                <property name="selection-mode">none</property>
-                                <style>
-                                  <class name="content"/>
-                                </style>
-                              </object>
-                            </child>
+                          <object class="GtkListBox" id="userList">
+                            <property name="selection-mode">none</property>
+                            <style>
+                              <class name="content"/>
+                            </style>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="AdwPreferencesGroup" id="systemGroup">
+                        <property name="title" translatable="yes">Built-In</property>
+                        <child>
+                          <object class="GtkListBox" id="systemList">
+                            <property name="selection-mode">none</property>
+                            <style>
+                              <class name="content"/>
+                            </style>
                           </object>
                         </child>
                       </object>
diff --git a/subprojects/extensions-app/js/main.js b/subprojects/extensions-app/js/main.js
index 563cd7e456..329d3870dd 100644
--- a/subprojects/extensions-app/js/main.js
+++ b/subprojects/extensions-app/js/main.js
@@ -74,10 +74,11 @@ var ExtensionsWindow = GObject.registerClass({
     GTypeName: 'ExtensionsWindow',
     Template: 'resource:///org/gnome/Extensions/ui/extensions-window.ui',
     InternalChildren: [
+        'userGroup',
         'userList',
+        'systemGroup',
         'systemList',
         'mainStack',
-        'scrolledWindow',
         'searchBar',
         'searchButton',
         'searchEntry',
@@ -316,10 +317,10 @@ var ExtensionsWindow = GObject.registerClass({
     }
 
     _syncListVisibility() {
-        this._userList.visible = [...this._userList].length > 1;
-        this._systemList.visible = [...this._systemList].length > 1;
+        this._userGroup.visible = [...this._userList].length > 1;
+        this._systemGroup.visible = [...this._systemList].length > 1;
 
-        if (this._userList.visible || this._systemList.visible)
+        if (this._userGroup.visible || this._systemGroup.visible)
             this._mainStack.visible_child_name = 'main';
         else
             this._mainStack.visible_child_name = 'placeholder';
-- 
GitLab