Merge branch 'main' into dont-check-for-updates-in-the-guest-session

.github/workflows/gettext.yml

@@ -2,7 +2,7 @@ name: Gettext Updates
 
 on:
   push:
-    branches: [master]
+    branches: [main]
 
 jobs:
   build:

.github/workflows/main.yml

@@ -1,8 +1,6 @@
 name: CI
 
 on:
-  push:
-    branches: [master]
   pull_request:
     types:
       - opened
@@ -25,7 +23,7 @@ jobs:
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y gettext libappstream-dev libflatpak-dev libportal-dev libportal-gtk3-dev libgee-0.8-dev libgranite-dev libgtk-3-dev libhandy-1-dev libjson-glib-dev libpackagekit-glib2-dev libsoup-3.0-dev libxml2-dev libxml2-utils libpolkit-gobject-1-dev meson valac
+        apt install -y gettext libadwaita-1-dev libappstream-dev libflatpak-dev libgee-0.8-dev libgranite-7-dev libgtk-4-dev libjson-glib-dev libpackagekit-glib2-dev libportal-dev libportal-gtk4-dev libsoup-3.0-dev libxml2-dev libxml2-utils libpolkit-gobject-1-dev meson valac
     - name: Build and Test
       env:
         DESTDIR: out

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Release
 
 on:
   pull_request:
-    branches: [master]
+    branches: [main]
     types: [closed]
 jobs:
   release:

README.md

@@ -9,12 +9,12 @@ An open, pay-what-you-want app store for indie developers.
 
 You'll need the following dependencies:
 * gettext
-* libappstream-dev (>= 0.10)
-* libflatpak-dev
+* libadwaita-1-dev
+* libappstream-dev (>= 0.15.2)
+* libflatpak-dev (>= 1.0.7)
 * libgee-0.8-dev
-* libgranite-dev (>=5.2.5)
-* libgtk-3-dev
-* libhandy-1-dev (>=1.3.0)
+* libgranite-7-dev (>=7.1.0)
+* libgtk-4-dev
 * libjson-glib-dev
 * libpackagekit-glib2-dev
 * libpolkit-gobject-1-dev

data/io.elementary.appcenter.gresource.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/io/elementary/appcenter">
-    <file alias="application.css" compressed="true">styles/application.css</file>
+    <file alias="Application.css" compressed="true">styles/application.css</file>
     <file alias="AppInfoView.css" compressed="true">styles/AppInfoView.css</file>
     <file alias="AppListUpdateView.css" compressed="true">styles/AppListUpdateView.css</file>
     <file alias="arrow.css" compressed="true">styles/arrow.css</file>
     <file alias="badge.css" compressed="true">styles/badge.css</file>
     <file alias="banner.css" compressed="true">styles/banner.css</file>
     <file alias="categories.css" compressed="true">styles/categories.css</file>
-    <file alias="fallback.css" compressed="true">styles/fallback.css</file>
     <file alias="loading.css" compressed="true">styles/loading.css</file>
     <file alias="ProgressButton.css" compressed="true">styles/ProgressButton.css</file>
   </gresource>

data/styles/arrow.css

@@ -29,6 +29,7 @@
     margin: 12px;
     padding: 6px;
     color: @text_color;
+    -gtk-icon-size: 24px;
 }
 
 .arrow:active,

data/styles/banner.css

@@ -77,7 +77,7 @@
 
 /*Hack to make the button square-ish*/
 .banner button.image-button.raised {
-    padding: 0.333rem 0.444rem;
+    padding: 0 0.333em;
 }
 
 .banner button:not(.suggested-action) {

data/styles/categories.css

@@ -599,7 +599,7 @@
         radial-gradient(
             circle,
             alpha(@STRAWBERRY_900, 0) 65%,
-            alpha(shade(@STRAWBERRY_900, 0.6), 0.35) 4%
+            alpha(shade(@STRAWBERRY_900, 0.6), 0.35) 66%
         ),
         linear-gradient(
             to bottom,
@@ -651,19 +651,19 @@
     background-image:
         linear-gradient(
             to right,
-            transparent 42px,
-            alpha(@STRAWBERRY_100, 0.25) 42px,
-            alpha(@STRAWBERRY_100, 0.25) 44px,
-            transparent 44px
+            transparent 1.3em,
+            alpha(@STRAWBERRY_100, 0.25) 1.3em,
+            alpha(@STRAWBERRY_100, 0.25) calc(1.3em + 2px),
+            transparent calc(1.3em + 2px)
         ),
         linear-gradient(
             to bottom,
-            white 90%,
-            alpha(@BLUEBERRY_100, 0.2) 90%
+            transparent 0.9em,
+            alpha(@BLUEBERRY_100, 0.2) 0.9em
         );
-    background-position: center center;
-    background-repeat: repeat-y;
-    background-size: 100% 1em;
+    background-position: center center, center 0.7em;
+    background-repeat: no-repeat, repeat-y;
+    background-size: auto auto, 110% 1em; /* Gtk.CSS bug requiring over 100% width maybe? */
     color: @BLACK_300;
     font-size: 24px;
 }

meson.build

@@ -11,7 +11,6 @@ i18n = import('i18n')
 
 add_project_arguments(
     '-DGETTEXT_PACKAGE="@0@"'.format(gettext_name),
-    '-DHANDY_USE_UNSTABLE_API',
     '-DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE',
     language:'c'
 )
@@ -23,17 +22,17 @@ glib = dependency ('glib-2.0')
 gobject = dependency ('gobject-2.0')
 gio = dependency ('gio-2.0')
 gee = dependency ('gee-0.8')
-gtk = dependency ('gtk+-3.0', version: '>=3.10')
-granite = dependency ('granite', version: '>=6.0.0')
-handy = dependency('libhandy-1', version: '>=1.4.0')
+gtk = dependency ('gtk4')
+granite = dependency ('granite-7', version: '>=7.3.0')
+adwaita = dependency('libadwaita-1')
 appstream = dependency ('appstream', version: '>=0.15.2')
 libsoup = dependency ('libsoup-3.0')
 json = dependency ('json-glib-1.0')
 flatpak = dependency ('flatpak')
 xml = dependency ('libxml-2.0')
 polkit = dependency ('polkit-gobject-1')
 portal = dependency('libportal')
-portal_gtk3 = dependency('libportal-gtk3')
+portal_gtk4 = dependency('libportal-gtk4')
 posix = meson.get_compiler('vala').find_library('posix')
 
 dbus = dependency ('dbus-1')
@@ -49,13 +48,13 @@ core_deps = [
 dependencies = core_deps + [
     gtk,
     granite,
-    handy,
+    adwaita,
     appstream,
     flatpak,
     xml,
     polkit,
     portal,
-    portal_gtk3,
+    portal_gtk4,
     posix
 ]