Load themes from settings and rework Settings trait

crates/client2/src/client2.rs

@@ -24,6 +24,7 @@ use rand::prelude::*;
 use rpc::proto::{AnyTypedEnvelope, EntityMessage, EnvelopedMessage, PeerId, RequestMessage};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
+use settings2::Settings;
 use std::{
     any::TypeId,
     collections::HashMap,
@@ -78,7 +79,7 @@ pub struct SignOut;
 pub struct Reconnect;
 
 pub fn init_settings(cx: &mut AppContext) {
-    settings2::register::<TelemetrySettings>(cx);
+    TelemetrySettings::register(cx);
 }
 
 pub fn init(client: &Arc<Client>, cx: &mut AppContext) {
@@ -371,7 +372,7 @@ pub struct TelemetrySettingsContent {
     pub metrics: Option<bool>,
 }
 
-impl settings2::Setting for TelemetrySettings {
+impl settings2::Settings for TelemetrySettings {
     const KEY: Option<&'static str> = Some("telemetry");
 
     type FileContent = TelemetrySettingsContent;

crates/client2/src/telemetry.rs

@@ -3,6 +3,7 @@ use gpui2::{serde_json, AppContext, AppMetadata, Executor, Task};
 use lazy_static::lazy_static;
 use parking_lot::Mutex;
 use serde::Serialize;
+use settings2::Settings;
 use std::{env, io::Write, mem, path::PathBuf, sync::Arc, time::Duration};
 use sysinfo::{Pid, PidExt, ProcessExt, System, SystemExt};
 use tempfile::NamedTempFile;
@@ -191,7 +192,7 @@ impl Telemetry {
                 };
 
                 let telemetry_settings = if let Ok(telemetry_settings) =
-                    cx.update(|cx| *settings2::get::<TelemetrySettings>(cx))
+                    cx.update(|cx| *TelemetrySettings::get_global(cx))
                 {
                     telemetry_settings
                 } else {
@@ -211,7 +212,7 @@ impl Telemetry {
         is_staff: bool,
         cx: &AppContext,
     ) {
-        if !settings2::get::<TelemetrySettings>(cx).metrics {
+        if !TelemetrySettings::get_global(cx).metrics {
             return;
         }