Force elementary stylesheet and update where appropriate

Author: teamcons

data/cherrypick.metainfo.xml.in

@@ -38,19 +38,23 @@
   <screenshots>
     <screenshot type="default">
       <caption>Cherrypick's main window</caption>
-      <image>
-        https://github.com/ellie-commons/cherrypick/blob/main/data/screenshots/window-light.png?raw=true
-      </image>
+      <image>https://raw.githubusercontent.com/ellie-commons/cherrypick/@version@/data/screenshots/window-light.png</image>
     </screenshot>
     <screenshot>
       <caption>Main window with dark theme</caption>
-      <image>
-        https://github.com/ellie-commons/cherrypick/blob/main/data/screenshots/window-dark.png?raw=true
-      </image>
+      <image>https://raw.githubusercontent.com/ellie-commons/cherrypick/@version@/data/screenshots/window-dark.png</image>
     </screenshot>
   </screenshots>
 
   <releases>
+    <release date="2025-12-20" version="2.1.5">
+      <description>
+        <ul>
+          <li>Force elementary stylesheet to fix issues</li>
+          <li>It is cherry</li>
+        </ul>
+      </description>
+    </release>
     <release date="2025-12-11" version="2.1.4">
       <description>
         <ul>

data/screenshots/window-dark.png

@@ -1,4 +1,4 @@
-id: io.github.ellie_commons.cherrypick
+app-id: io.github.ellie_commons.cherrypick
 # elementary SDK is not available on Flathub, so use the elementary BaseApp instead
 base: io.elementary.BaseApp
 base-version: 'circe-25.08'
@@ -31,8 +31,8 @@ modules:
     sources:
       - type: git
         url: https://github.com/ellie-commons/cherrypick.git
-        tag: 2.1.3
-        commit: 2b4633d0b822e8165bb3703d9745cf9679f4b09c
+        tag: 2.1.4
+        commit: 172c4377e098bc3b06fce24321537c5360e2951f
         x-checker-data:
           type: git
           tag-pattern: '^([\d.]+)$'

data/screenshots/window-light.png

@@ -1,6 +1,6 @@
 project('io.github.ellie_commons.cherrypick', 
 'c', 'vala', 
-version: '2.1.4')
+version: '2.1.5')
 
 subdir('src')
 subdir('data')
@@ -14,6 +14,7 @@ portal_dep = dependency('libportal')
 picker_dependencies = [glib_dep, gtk_dep, granite_dep, portal_dep, meson.get_compiler('c').find_library('m', required: true)]
 
 config_data = configuration_data()
+config_data.set('version', meson.project_version())
 config_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
 config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 config_file = configure_file(

io.github.ellie_commons.cherrypick.flathub.yml

@@ -44,8 +44,8 @@ namespace Cherrypick {
 
         public override void startup () {
             base.startup ();
-            // Currently this crashes for 8.2 (which flathub has) bc https://github.com/elementary/granite/pull/893
-            // Granite.init ();
+            Gtk.init ();
+            Granite.init ();
 
             Intl.setlocale (LocaleCategory.ALL, "");
             Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
@@ -55,6 +55,8 @@ namespace Cherrypick {
 
             var granite_settings = Granite.Settings.get_default ();
             var gtk_settings = Gtk.Settings.get_default ();
+            gtk_settings.gtk_icon_theme_name = "elementary";
+            gtk_settings.gtk_theme_name = "io.elementary.stylesheet.strawberry";
 
             gtk_settings.gtk_application_prefer_dark_theme = (
                                                             granite_settings.prefers_color_scheme == DARK