migrate ui components to gpui-kit

desktop/Cargo.toml

@@ -1,51 +1,51 @@
-[package]
-name = "coop"
-version.workspace = true
-edition.workspace = true
-publish.workspace = true
-
-[[bin]]
-name = "coop"
-path = "src/main.rs"
-
-[package.metadata.packager]
-name = "Coop"
-product-name = "Coop"
-description = "Chat Freely, Stay Private on Nostr"
-identifier = "su.reya.coop"
-category = "SocialNetworking"
-version = "2.0.0-alpha"
-out-dir = "../dist"
-before-packaging-command = "cargo build --release"
-resources = ["Cargo.toml", "src"]
-icons = [
-    "resources/32x32.png",
-    "resources/128x128.png",
-    "resources/128x128@2x.png",
-    "resources/icon.icns",
-    "resources/icon.ico",
-]
-
-[dependencies]
-assets = { path = "../crates/assets" }
-workspace = { path = "../crates/workspace" }
-ui = { path = "../crates/ui" }
-theme = { path = "../crates/theme" }
-state = { path = "../crates/state" }
-nip4e = { path = "../crates/nip4e" }
-chat = { path = "../crates/chat" }
-nip29 = { path = "../crates/nip29" }
-settings = { path = "../crates/settings" }
-auto_update = { path = "../crates/auto_update" }
-person = { path = "../crates/person" }
-
-gpui.workspace = true
-gpui_platform.workspace = true
-gpui_linux.workspace = true
-gpui_windows.workspace = true
-gpui_macos.workspace = true
-reqwest_client.workspace = true
-
-log.workspace = true
-tracing-subscriber.workspace = true
-nostr-sdk.workspace = true
+[package]
+name = "coop"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[[bin]]
+name = "coop"
+path = "src/main.rs"
+
+[package.metadata.packager]
+name = "Coop"
+product-name = "Coop"
+description = "Chat Freely, Stay Private on Nostr"
+identifier = "su.reya.coop"
+category = "SocialNetworking"
+version = "2.0.0-alpha"
+out-dir = "../dist"
+before-packaging-command = "cargo build --release"
+resources = ["Cargo.toml", "src"]
+icons = [
+    "resources/32x32.png",
+    "resources/128x128.png",
+    "resources/128x128@2x.png",
+    "resources/icon.icns",
+    "resources/icon.ico",
+]
+
+[dependencies]
+assets = { path = "../crates/assets" }
+workspace = { path = "../crates/workspace" }
+ui = { path = "../crates/ui" }
+state = { path = "../crates/state" }
+nip4e = { path = "../crates/nip4e" }
+chat = { path = "../crates/chat" }
+nip29 = { path = "../crates/nip29" }
+settings = { path = "../crates/settings" }
+auto_update = { path = "../crates/auto_update" }
+person = { path = "../crates/person" }
+
+gpui.workspace = true
+gpui_platform.workspace = true
+gpui-kit.workspace = true
+gpui_linux.workspace = true
+gpui_windows.workspace = true
+gpui_macos.workspace = true
+reqwest_client.workspace = true
+
+log.workspace = true
+tracing-subscriber.workspace = true
+nostr-sdk.workspace = true

desktop/src/main.rs

@@ -2,15 +2,14 @@ use std::sync::{Arc, Mutex};
 
 use assets::Assets;
 use gpui::{
-    App, AppContext, Bounds, KeyBinding, Menu, MenuItem, SharedString, TitlebarOptions,
+    App, Bounds, KeyBinding, Menu, MenuItem, SharedString, TitlebarOptions,
     WindowBackgroundAppearance, WindowBounds, WindowDecorations, WindowKind, WindowOptions,
     actions, point, px, size,
 };
 use gpui_platform::application;
 use nostr_sdk::prelude::SecretKey;
 use state::{APP_ID, CLIENT_NAME};
-use theme::TABBAR_HEIGHT;
-use ui::Root;
+use ui::TABBAR_HEIGHT;
 
 actions!(coop, [Quit]);
 
@@ -28,14 +27,11 @@ fn main() {
 
     // Run application
     application()
-        .with_assets(Assets)
+        .with_assets(assets::CombinedAssets)
         .with_http_client(Arc::new(reqwest_client::ReqwestClient::new()))
         .run(move |cx| {
-            // Initialize components
-            ui::init(cx);
-
-            // Initialize theme
-            theme::init(cx);
+            // Initialize the framework before anything renders
+            gpui_kit::init(cx);
 
             // Load embedded fonts in assets/fonts
             load_embedded_fonts(cx);
@@ -106,10 +102,8 @@ fn main() {
                 ..Default::default()
             };
 
-            cx.open_window(opts, |window, cx| {
-                cx.new(|cx| Root::new(workspace::init(window, cx).into(), window, cx))
-            })
-            .expect("Failed to open window. Please restart the application.");
+            gpui_kit::open_window(opts, cx, workspace::init)
+                .expect("Failed to open window. Please restart the application.");
 
             cx.activate(true);
         });