feat: adopt the native OS theme (#66)

Reviewed-on: #66

crates/assets/Cargo.toml

@@ -8,3 +8,4 @@ publish.workspace = true
 gpui.workspace = true
 anyhow.workspace = true
 rust-embed.workspace = true
+gpui-kit.workspace = true

crates/assets/src/lib.rs

@@ -1,7 +1,8 @@
-use anyhow::Context;
 use gpui::{AssetSource, Result, SharedString};
 use rust_embed::RustEmbed;
 
+/// The Lucide icons the app and the kit components draw, vendored so they ship
+/// with the binary and resolve like any other coop asset.
 #[derive(RustEmbed)]
 #[folder = "../../assets"]
 #[include = "fonts/**/*"]
@@ -10,11 +11,28 @@ use rust_embed::RustEmbed;
 #[exclude = "*.DS_Store"]
 pub struct Assets;
 
+/// Coop's bundled assets, with the GPUI Kit component icon bundle as the
+/// fallback for any icon not vendored here.
+pub struct CombinedAssets;
+
+impl AssetSource for CombinedAssets {
+    fn load(&self, path: &str) -> Result<Option<std::borrow::Cow<'static, [u8]>>> {
+        if let Ok(Some(data)) = Assets.load(path) {
+            return Ok(Some(data));
+        }
+        gpui_kit::assets::Assets.load(path)
+    }
+
+    fn list(&self, path: &str) -> Result<Vec<SharedString>> {
+        let mut paths = Assets.list(path).unwrap_or_default();
+        paths.extend(gpui_kit::assets::Assets.list(path)?);
+        Ok(paths)
+    }
+}
+
 impl AssetSource for Assets {
     fn load(&self, path: &str) -> Result<Option<std::borrow::Cow<'static, [u8]>>> {
-        Self::get(path)
-            .map(|f| Some(f.data))
-            .with_context(|| format!("loading asset at path {path:?}"))
+        Ok(Self::get(path).map(|f| f.data))
     }
 
     fn list(&self, path: &str) -> Result<Vec<SharedString>> {

crates/assets/tests/icons.rs

@@ -0,0 +1,39 @@
+use gpui::AssetSource;
+
+#[test]
+fn icons_resolve_from_the_vendored_folder() {
+    // Icons coop's code and the kit components draw, served by the vendored
+    // folder (signed's set, filled with the kit bundle where coop needs more).
+    let vendored = [
+        "icons/search.svg",
+        "icons/close.svg",
+        "icons/panel-left.svg",
+        "icons/window-minimize.svg",
+        "icons/settings-2.svg",
+        "icons/x.svg",
+        "icons/compass.svg",
+        "icons/radio-tower.svg",
+    ];
+    for path in vendored {
+        let own = assets::Assets
+            .load(path)
+            .unwrap_or_else(|e| panic!("{path} errored in own embed: {e}"));
+        assert!(own.is_some(), "own embed is missing {path}");
+
+        let combined = assets::CombinedAssets.load(path).unwrap();
+        assert!(combined.is_some(), "CombinedAssets fails to serve {path}");
+    }
+
+    // Coop's own files still load through the combined source.
+    let own = [
+        "brand/coop.svg",
+        "brand/bg1.jpg",
+        "fonts/Inter/Inter-Medium.ttf",
+    ];
+    for path in own {
+        assert!(
+            matches!(assets::CombinedAssets.load(path), Ok(Some(_))),
+            "CombinedAssets fails to serve coop asset {path}"
+        );
+    }
+}