migrate ui components to gpui-kit

crates/settings/Cargo.toml

@@ -1,22 +1,22 @@
-[package]
-name = "settings"
-version.workspace = true
-edition.workspace = true
-publish.workspace = true
-
-[dependencies]
-theme = { path = "../theme" }
-common = { path = "../common" }
-
-nostr-sdk.workspace = true
-gpui.workspace = true
-anyhow.workspace = true
-log.workspace = true
-smallvec.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-
-paste = "1.0.15"
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-smol.workspace = true
+[package]
+name = "settings"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+gpui-kit.workspace = true
+common = { path = "../common" }
+
+nostr-sdk.workspace = true
+gpui.workspace = true
+anyhow.workspace = true
+log.workspace = true
+smallvec.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+
+paste = "1.0.15"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+smol.workspace = true

crates/settings/src/lib.rs

@@ -6,7 +6,30 @@ use gpui::{App, AppContext, Context, Entity, Global, ImageSource, Subscription,
 use nostr_sdk::prelude::*;
 use serde::{Deserialize, Serialize};
 use smallvec::{SmallVec, smallvec};
-use theme::{AppExt as _, AppearanceMode};
+
+/// The user's appearance preference, persisted with the rest of the settings.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]
+pub enum AppearanceMode {
+    /// Follow the OS.
+    System,
+    Light,
+    /// Paint dark regardless of the OS.
+    #[default]
+    Dark,
+}
+
+impl AppearanceMode {
+    pub const ALL: [Self; 3] = [Self::System, Self::Light, Self::Dark];
+
+    /// Menu/label text.
+    pub fn label(self) -> &'static str {
+        match self {
+            Self::System => "System",
+            Self::Light => "Light",
+            Self::Dark => "Dark",
+        }
+    }
+}
 
 pub fn init(cx: &mut App) {
     AppSettings::set_global(cx.new(AppSettings::new), cx)
@@ -276,8 +299,15 @@ impl AppSettings {
 
     /// Apply the persisted appearance mode to the app
     pub fn apply_theme(&mut self, cx: &mut Context<Self>) {
+        use gpui_kit::component::Theme;
+
         let mode = self.inner.read(cx).appearance_mode;
-        cx.set_appearance_mode(mode);
+        match mode {
+            AppearanceMode::System => Theme::sync_system_appearance(None, cx),
+            AppearanceMode::Light => Theme::change(gpui_kit::component::ThemeMode::Light, None, cx),
+            AppearanceMode::Dark => Theme::change(gpui_kit::component::ThemeMode::Dark, None, cx),
+        }
+        cx.refresh_windows();
     }
 
     /// Check if decoupling encryption key is enabled