Application: use modern features for loading assets, use startup (#769)

elementary · Apr 3, 2024 · b95233f · b95233f
1 parent 410f486
commit b95233f
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 78 deletions.
diff --git a/data/AlbumImage.css b/data/AlbumImage.css
diff --git a/data/PlaybackIndicator.css → data/Application.css b/data/PlaybackIndicator.css → data/Application.css
@@ -1,16 +1,50 @@
-spinner {
+/*
+ * SPDX-License-Identifier: LGPL-3.0-or-later
+ * SPDX-FileCopyrightText: 2021 elementary, Inc. (https://elementary.io)
+ */
+
+album {
+    background-image:
+        linear-gradient(
+            170deg,
+            alpha(
+                @highlight_color,
+                0.1
+            ),
+            alpha(
+                @highlight_color,
+                0.15
+            ) 43%,
+            alpha(
+                @highlight_color,
+                0
+            ) 44%
+        ),
+        -gtk-icontheme("audio-x-generic-symbolic"),
+        linear-gradient(
+            to bottom,
+            @base_color,
+            @base_color
+        );
+    background-size: cover, 50%, cover;
+    background-repeat: no-repeat;
+    background-position: center center;
+    color: alpha(@insensitive_fg_color, 0.75);
+}
+
+spinner.play-indicator {
     animation: none;
     color: @accent_color;
     min-width: 16px;
     transition: none;
 }
 
-spinner:checked {
+spinner.play-indicator:checked {
     opacity: 1;
     -gtk-icon-source: -gtk-icontheme("playback-paused-symbolic");
 }
 
-spinner:checked.playing {
+spinner.play-indicator:checked.playing {
     animation: playing 1.1s linear infinite;
     -gtk-icon-source: -gtk-icontheme("playback-playing-00-symbolic");
 }
@@ -36,4 +70,3 @@ spinner:checked.playing {
     95% { -gtk-icon-source: -gtk-icontheme("playback-playing-17-symbolic"); }
     100% { -gtk-icon-source: -gtk-icontheme("playback-playing-00-symbolic"); }
 }
-
diff --git a/data/music.gresource.xml b/data/music.gresource.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/io/elementary/music">
-    <file compressed="true">AlbumImage.css</file>
-
-    <file compressed="true">PlaybackIndicator.css</file>
+    <file compressed="true">Application.css</file>
+  </gresource>
+  <gresource prefix="/io/elementary/music/icons">
     <file alias="16x16/status/playback-paused-symbolic.svg" compressed="true">playback-indicator/paused.svg</file>
     <file alias="16x16/status/playback-playing-00-symbolic.svg" compressed="true">playback-indicator/playing-00.svg</file>
     <file alias="16x16/status/playback-playing-01-symbolic.svg" compressed="true">playback-indicator/playing-01.svg</file>

diff --git a/src/Application.vala b/src/Application.vala
@@ -33,11 +33,10 @@ public class Music.Application : Gtk.Application {
         GLib.Intl.textdomain (Constants.GETTEXT_PACKAGE);
     }
 
-    protected override void activate () {
-        if (active_window != null) {
-            active_window.present_with_time (Gdk.CURRENT_TIME);
-            return;
-        }
+    protected override void startup () {
+        base.startup ();
+
+        Granite.init ();
 
         add_action_entries (ACTION_ENTRIES, this);
 
@@ -47,6 +46,29 @@ public class Music.Application : Gtk.Application {
         ((SimpleAction) lookup_action (ACTION_PREVIOUS)).set_enabled (false);
         ((SimpleAction) lookup_action (ACTION_SHUFFLE)).set_enabled (false);
 
+        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.orange";
+
+        gtk_settings.gtk_application_prefer_dark_theme = (
+            granite_settings.prefers_color_scheme == DARK
+        );
+
+        granite_settings.notify["prefers-color-scheme"].connect (() => {
+            gtk_settings.gtk_application_prefer_dark_theme = (
+                granite_settings.prefers_color_scheme == DARK
+            );
+        });
+    }
+
+    protected override void activate () {
+        if (active_window != null) {
+            active_window.present ();
+            return;
+        }
+
         playback_manager = PlaybackManager.get_default ();
 
         var mpris_id = Bus.own_name (
@@ -69,24 +91,6 @@ public class Music.Application : Gtk.Application {
 
         add_window (main_window);
 
-        Gtk.IconTheme.get_for_display (Gdk.Display.get_default ()).add_resource_path ("/io/elementary/music");
-
-        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.orange";
-
-        gtk_settings.gtk_application_prefer_dark_theme = (
-            granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK
-        );
-
-        granite_settings.notify["prefers-color-scheme"].connect (() => {
-            gtk_settings.gtk_application_prefer_dark_theme = (
-                granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK
-            );
-        });
-
         /*
         * This is very finicky. Bind size after present else set_titlebar gives us bad sizes
         * Set maximize after height/width else window is min size on unmaximize

diff --git a/src/Widgets/AlbumImage.vala b/src/Widgets/AlbumImage.vala
@@ -6,21 +6,11 @@
 public class Music.AlbumImage : Gtk.Grid {
     public Gtk.Image image;
 
-    private static Gtk.CssProvider css_provider;
-
     class construct {
         set_css_name ("album");
     }
 
-    static construct {
-        css_provider = new Gtk.CssProvider ();
-        css_provider.load_from_resource ("/io/elementary/music/AlbumImage.css");
-    }
-
     construct {
-        unowned var style_context = get_style_context ();
-        style_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-
         image = new Gtk.Image ();
 
         add_css_class (Granite.STYLE_CLASS_CARD);

diff --git a/src/Widgets/TrackRow.vala b/src/Widgets/TrackRow.vala
@@ -6,7 +6,6 @@
 public class Music.TrackRow : Gtk.ListBoxRow {
     public AudioObject audio_object { get; construct; }
 
-    private static Gtk.CssProvider css_provider;
     private static PlaybackManager playback_manager;
 
     private Gtk.Spinner play_icon;
@@ -17,16 +16,13 @@ public class Music.TrackRow : Gtk.ListBoxRow {
 
     static construct {
         playback_manager = PlaybackManager.get_default ();
-
-        css_provider = new Gtk.CssProvider ();
-        css_provider.load_from_resource ("io/elementary/music/PlaybackIndicator.css");
     }
 
     construct {
         play_icon = new Gtk.Spinner () {
             spinning = playback_manager.current_audio == audio_object
         };
-        play_icon.get_style_context ().add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        play_icon.add_css_class ("play-indicator");
 
         var album_image = new Music.AlbumImage ();
         album_image.image.height_request = 32;