fix: Bundle Icons For macOS

README.md

@@ -39,6 +39,7 @@ Dependencies (Linux)
 - `libxkbcommon-dev`
 - `libcosmic`
 - `libsqlite3-dev`
+- `cosmic-icons`
 
 Dependencies (macOS)
 

justfile

@@ -64,9 +64,10 @@ build-release-macos *args:
     lipo "target/aarch64-apple-darwin/release/{{name}}" -create -output "{{app-binary}}"
 
     mkdir -p "{{app-binary-dir}}"
-    mkdir -p "{{app-extras-dir}}"
+    mkdir -p "{{app-extras-dir}}/icons/"
     cp -fRp "{{app-template}}" "{{app-dir}}"
     cp -fp "{{app-binary}}" "{{app-binary-dir}}"
+    cp ./res/icons/* "{{app-extras-dir}}/icons/"
     touch -r "{{app-binary}}" "{{app-dir}}/{{app-name}}"
     echo "Created '{{app-name}}' in '{{app-dir}}'"
     git stash -- {{app-template-plist}}

src/app.rs

@@ -10,6 +10,7 @@ use crate::pages::accounts::{add_account, edit_account, AppAccountsMessage, Page
 use crate::pages::bookmarks::{
     edit_bookmark, new_bookmark, view_notes, AppBookmarksMessage, PageBookmarksView,
 };
+use crate::utils::icons::load_icon;
 use cosmic::app::{Core, Task};
 use cosmic::cosmic_config::{self, CosmicConfigEntry, Update};
 use cosmic::cosmic_theme::{self, ThemeMode};
@@ -255,7 +256,7 @@ impl Application for Cosmicding {
         let dialog = match dialog_page {
             DialogPage::RemoveAccount(account) => {
                 widget::dialog(fl!("remove") + " " + { &account.display_name })
-                    .icon(icon::from_name("dialog-warning-symbolic").size(58).icon())
+                    .icon(icon::icon(load_icon("dialog-warning-symbolic")).size(58))
                     .body(fl!("remove-account-confirm"))
                     .primary_action(
                         widget::button::destructive(fl!("yes")).on_press_maybe(Some(
@@ -268,7 +269,7 @@ impl Application for Cosmicding {
             }
             DialogPage::RemoveBookmark(account, bookmark) => {
                 widget::dialog(fl!("remove") + " " + { &bookmark.title })
-                    .icon(icon::from_name("dialog-warning-symbolic").size(58).icon())
+                    .icon(icon::icon(load_icon("dialog-warning-symbolic")).size(58))
                     .body(fl!("remove-bookmark-confirm"))
                     .primary_action(widget::button::destructive(fl!("yes")).on_press_maybe(Some(
                         Message::CompleteRemoveDialog(account.clone(), Some(bookmark.clone())),

src/main.rs

@@ -1,5 +1,5 @@
 mod app;
 mod config;
 mod db;
 mod http;
 mod i18n;
@@ -9,6 +9,7 @@
 mod nav;
 mod pages;
 mod style;
+mod utils;
 
 use crate::config::{Config, CONFIG_VERSION};
 use app::{Flags, APPID};

src/nav.rs

@@ -1,3 +1,4 @@
+use crate::utils::icons::load_icon;
 use cosmic::{widget::icon, Element};
 
 use crate::{app, fl};
@@ -24,8 +25,8 @@ impl AppNavPage {
     }
     pub fn icon(self) -> cosmic::widget::Icon {
         match self {
-            Self::BookmarksView => icon::from_name("web-browser-symbolic").icon(),
-            Self::AccountsView => icon::from_name("contact-new-symbolic").icon(),
+            Self::BookmarksView => icon::icon(load_icon("web-browser-symbolic")),
+            Self::AccountsView => icon::icon(load_icon("contact-new-symbolic")),
         }
     }