wip

crates/workspace/src/dialogs/new_chat.rs

@@ -1,10 +1,3 @@
-use crate::nav::Nav;
-use gpui_kit::assets::IconName;
-use gpui_kit::component::avatar::Avatar;
-use gpui_kit::component::button::{Button, ButtonVariants};
-use gpui_kit::component::dock::{DockArea, DockPlacement, PanelHandle};
-use gpui_kit::component::input::{Input, InputEvent, InputState};
-use gpui_kit::component::{ActiveTheme, Disableable, Sizable, WindowExt, h_flex, v_flex};
 use std::ops::Range;
 use std::rc::Rc;
 
@@ -16,11 +9,19 @@ use gpui::{
     Render, SharedString, StatefulInteractiveElement as _, Styled, Subscription, Task, WeakEntity,
     Window, div, px, uniform_list,
 };
+use gpui_kit::assets::IconName;
+use gpui_kit::base::StyledExt as _;
+use gpui_kit::component::button::{Button, ButtonVariants};
+use gpui_kit::component::dock::{DockArea, DockPlacement, PanelHandle};
+use gpui_kit::component::input::{Input, InputEvent, InputState};
+use gpui_kit::component::{ActiveTheme, Disableable, Sizable, WindowExt, h_flex, v_flex};
 use nostr_sdk::prelude::*;
 use person::Directory;
 use settings::AppSettings;
 use state::NostrRegistry;
-use ui::{TextStyle, Typeset as _};
+use ui::Avatar;
+
+use crate::nav::Nav;
 
 /// Maximum number of members a chat can have.
 const MAX_MEMBERS: usize = 3;
@@ -337,12 +338,13 @@ impl NewChat {
 
                 Nav::new(start + offset)
                     .label(profile.name())
-                    .text_style(TextStyle::Callout)
+                    .text_xs()
                     .when(!AppSettings::get_hide_avatar(cx), |this| {
-                        this.prefix(match profile.avatar() {
-                            Some(picture) => Avatar::new().src(picture).small().into_any_element(),
-                            None => Avatar::new().small().flex_shrink_0().into_any_element(),
-                        })
+                        this.prefix(
+                            Avatar::new(profile.avatar())
+                                .seed(profile.avatar_seed())
+                                .small(),
+                        )
                     })
                     .on_click(cx.listener(move |this, _event, _window, cx| {
                         this.toggle_member(&public_key, cx);
@@ -367,12 +369,14 @@ impl NewChat {
                     .p_0p5()
                     .rounded_full()
                     .bg(cx.theme().secondary)
-                    .text_style(TextStyle::Caption2)
+                    .text_xs()
+                    .font_medium()
                     .hover(|this| this.bg(cx.theme().primary))
-                    .child(match profile.avatar() {
-                        Some(picture) => Avatar::new().src(picture).xsmall().into_any_element(),
-                        None => Avatar::new().xsmall().flex_shrink_0().into_any_element(),
-                    })
+                    .child(
+                        Avatar::new(profile.avatar())
+                            .seed(profile.avatar_seed())
+                            .xsmall(),
+                    )
                     .child(div().max_w_32().truncate().child(profile.name()))
                     .on_click(cx.listener(move |this, _event, _window, cx| {
                         this.toggle_member(&public_key, cx);
@@ -411,16 +415,11 @@ impl Render for NewChat {
             })
             .map(|this| {
                 if let Some(error) = self.error.clone() {
-                    this.child(
-                        div()
-                            .text_style(TextStyle::Caption)
-                            .text_color(cx.theme().danger)
-                            .child(error),
-                    )
+                    this.child(div().text_xs().text_color(cx.theme().danger).child(error))
                 } else {
                     this.child(
                         div()
-                            .text_style(TextStyle::Caption)
+                            .text_xs()
                             .text_color(cx.theme().muted_foreground)
                             .child(notice),
                     )