diff --git a/crates/chat_ui/src/lib.rs b/crates/chat_ui/src/lib.rs
index 1be3d1a4..aa775d90 100644
--- a/crates/chat_ui/src/lib.rs
+++ b/crates/chat_ui/src/lib.rs
@@ -12,7 +12,7 @@ use gpui::{
Focusable, InteractiveElement, IntoElement, ListAlignment, ListOffset, ListState, MouseButton,
ObjectFit, ParentElement, Render, SharedString, SharedUri, StatefulInteractiveElement, Styled,
StyledImage, Subscription, SystemNotification, SystemNotificationAction, Task, WeakEntity,
- Window, div, img, list, px, relative, retain_all, svg,
+ Window, div, img, list, px, relative, rems, retain_all, svg,
};
use gpui_kit::assets::IconName;
use gpui_kit::base::StyledExt as _;
@@ -1077,7 +1077,7 @@ impl ChatPanel {
window.open_dialog(cx, move |this, _window, cx| {
let relays = profile.messaging_relays();
- this.title("Messaging Relays")
+ this.title("Messaging relays")
.close_button(true)
.child(v_flex().gap_1().children({
let mut items = vec![];
@@ -1134,7 +1134,7 @@ impl ChatPanel {
svg()
.path("brand/coop.svg")
.size_12()
- .text_color(cx.theme().list_active),
+ .text_color(cx.theme().accent),
)
.child(PRIVATE_NOTICE)
.into_any_element()
@@ -1228,7 +1228,11 @@ impl ChatPanel {
cx,
)
})
- .element(ix.into(), window, cx);
+ .element(
+ SharedString::from(format!("text-{}", message.id.to_hex())).into(),
+ window,
+ cx,
+ );
self.render_text_message(ix, message, text, show_author, cx)
} else {
@@ -1238,7 +1242,7 @@ impl ChatPanel {
fn render_text_message(
&self,
- ix: usize,
+ _ix: usize,
message: &Message,
rendered_text: AnyElement,
show_author: bool,
@@ -1270,7 +1274,7 @@ impl ChatPanel {
None => rendered_text,
};
- let row = MessageRow::new(ix)
+ let row = MessageRow::new(SharedString::from(format!("message-{}", id.to_hex())))
.show_author(show_author)
.hide_avatar(hide_avatar)
.avatar(
@@ -1300,16 +1304,6 @@ impl ChatPanel {
this.child(self.render_message_file(&id, file, cx))
})
.when(has_reactions, |this| this.child(reactions))
- .overlay(
- div()
- .group_hover("", |this| this.bg(cx.theme().list_active))
- .absolute()
- .left_0()
- .top_0()
- .w(px(2.))
- .h_full()
- .bg(gpui::transparent_black()),
- )
.overlay(self.render_actions(&id, &pk, cx))
.on_mouse_down(
MouseButton::Middle,
@@ -1399,14 +1393,19 @@ impl ChatPanel {
) -> impl IntoIterator
- {
let mut items = Vec::with_capacity(replies.len());
- for (ix, id) in replies.iter().enumerate() {
+ for id in replies.iter() {
let Some(message) = self.message(id) else {
continue;
};
let author = self.profile(&message.author, cx);
items.push(
- ReplyPreview::new(ix, author.name(), message.preview()).on_click({
+ ReplyPreview::new(
+ SharedString::from(format!("reply-{}", id.to_hex())),
+ author.name(),
+ message.preview(),
+ )
+ .on_click({
let id = *id;
cx.listener(move |this, _event, _window, _cx| {
this.scroll_to(&id);
@@ -1437,7 +1436,7 @@ impl ChatPanel {
} else if failed {
SharedString::from("• Error")
} else if pending {
- SharedString::from("• Sending...")
+ SharedString::from("• Sending")
} else {
SharedString::from("• Unknown")
};
@@ -1462,7 +1461,7 @@ impl ChatPanel {
})
.unwrap_or_default();
- this.title(SharedString::from("Sent Reports"))
+ this.title(SharedString::from("Sent reports"))
.close_button(true)
.child(v_flex().gap_4().children(items))
});
@@ -1699,7 +1698,7 @@ impl ChatPanel {
img(local.image_source())
.border_1()
.border_color(cx.theme().border)
- .h(px(250.))
+ .h(rems(16.))
.object_fit(ObjectFit::Cover)
.rounded(cx.theme().radius_lg),
)
@@ -1734,7 +1733,7 @@ impl ChatPanel {
.border_1()
.border_color(cx.theme().border)
.rounded(cx.theme().radius)
- .child(Icon::new(IconName::Lock).text_color(cx.theme().primary))
+ .child(Icon::new(IconName::Lock).text_color(cx.theme().accent))
.child(
v_flex()
.min_w_0()
@@ -1835,18 +1834,22 @@ impl ChatPanel {
items
}
- fn render_reply(&self, ix: usize, id: &EventId, cx: &Context) -> impl IntoElement {
+ fn render_reply(&self, id: &EventId, cx: &Context) -> impl IntoElement {
if let Some(text) = self.message(id) {
let profile = self.directory.read(cx).person(&text.author, cx);
- ReplyPreview::new(ix, profile.name(), text.preview())
- .on_remove({
- let id = text.id;
- cx.listener(move |this, _, _, cx| {
- this.remove_reply(&id, cx);
- })
+ ReplyPreview::new(
+ SharedString::from(format!("reply-{}", id.to_hex())),
+ profile.name(),
+ text.preview(),
+ )
+ .on_remove({
+ let id = text.id;
+ cx.listener(move |this, _, _, cx| {
+ this.remove_reply(&id, cx);
})
- .into_any_element()
+ })
+ .into_any_element()
} else {
div().into_any_element()
}
@@ -1859,8 +1862,8 @@ impl ChatPanel {
) -> impl IntoIterator
- {
let mut items = vec![];
- for (ix, id) in self.replies_to.read(cx).iter().enumerate() {
- items.push(self.render_reply(ix, id, cx));
+ for id in self.replies_to.read(cx).iter() {
+ items.push(self.render_reply(id, cx));
}
items
diff --git a/crates/nip29_ui/src/details.rs b/crates/nip29_ui/src/details.rs
index 4c898bda..a27fe6cb 100644
--- a/crates/nip29_ui/src/details.rs
+++ b/crates/nip29_ui/src/details.rs
@@ -1,5 +1,6 @@
use gpui::{
- AnyElement, App, IntoElement, ParentElement, SharedString, Styled, WeakEntity, Window, div, px,
+ AnyElement, App, IntoElement, ParentElement, SharedString, Styled, WeakEntity, Window, div,
+ rems,
};
use gpui_kit::base::StyledExt as _;
use gpui_kit::component::description_list::{DescriptionItem, DescriptionList};
@@ -10,9 +11,9 @@ use ui::Avatar;
pub(crate) fn open(group: WeakEntity, window: &mut Window, cx: &mut App) {
window.open_dialog(cx, move |this, _window, cx| {
- this.max_h(px(600.))
+ this.max_h(rems(37.5))
.close_button(true)
- .title("About Group")
+ .title("About group")
.child(body(&group, cx))
});
}
diff --git a/crates/nip29_ui/src/invite.rs b/crates/nip29_ui/src/invite.rs
index b7cce3a7..b12c050b 100644
--- a/crates/nip29_ui/src/invite.rs
+++ b/crates/nip29_ui/src/invite.rs
@@ -3,7 +3,7 @@ use common::TimestampExt;
use gpui::prelude::FluentBuilder;
use gpui::{
App, AppContext, ClipboardItem, Entity, IntoElement, ParentElement, SharedString, Styled,
- WeakEntity, Window, div, px,
+ WeakEntity, Window, div, px, rems,
};
use gpui_kit::component::button::{Button, ButtonVariant, ButtonVariants};
use gpui_kit::component::dialog::DialogButtonProps;
@@ -25,7 +25,7 @@ pub(crate) fn open(group: WeakEntity, window: &mut Window, cx: &mut App)
});
window.open_dialog(cx, move |this, _window, cx| {
- this.max_h(px(600.))
+ this.max_h(rems(37.5))
.close_button(true)
.title("Invites")
.child(body(group.clone(), input.clone(), cx))
diff --git a/crates/nip29_ui/src/lib.rs b/crates/nip29_ui/src/lib.rs
index ef65d882..8f9fe9cf 100644
--- a/crates/nip29_ui/src/lib.rs
+++ b/crates/nip29_ui/src/lib.rs
@@ -8,7 +8,7 @@ use gpui::{
Action, Anchor, AnyElement, App, AppContext, ClipboardItem, Context, Entity, EventEmitter,
FocusHandle, Focusable, FollowMode, InteractiveElement, IntoElement, ListAlignment,
ListScrollEvent, ListState, ParentElement, Render, SharedString, Styled, Subscription, Task,
- WeakEntity, Window, div, list, px,
+ WeakEntity, Window, div, list, px, rems,
};
use gpui_kit::assets::IconName;
use gpui_kit::base::StyledExt as _;
@@ -167,7 +167,7 @@ pub fn actions(group: WeakEntity, cx: &App) -> AnyElement {
)
.child(
Button::new("group-delete")
- .icon(IconName::CircleX)
+ .icon(IconName::Trash)
.tooltip("Delete group")
.ghost()
.small()
@@ -965,16 +965,11 @@ impl GroupPanel {
.py_1p5()
.border_b_1()
.border_color(cx.theme().border)
- .children(pins.iter().map(|pin| {
- div()
- .px_1p5()
- .py_0p5()
- .rounded(cx.theme().radius)
- .bg(cx.theme().primary)
- .text_xs()
- .text_color(cx.theme().muted_foreground)
- .child(pin_label(group, pin))
- }))
+ .children(
+ pins.iter().map(|pin| {
+ gpui_kit::component::tag::Tag::secondary().child(pin_label(group, pin))
+ }),
+ )
.into_any_element()
}
@@ -1025,7 +1020,7 @@ impl GroupPanel {
.child(
Button::new("load-older")
.label(if loading {
- "Loading earlier messages…"
+ "Loading earlier messages"
} else {
"Load earlier messages"
})
@@ -1083,7 +1078,7 @@ impl GroupPanel {
row.child("You're in preview mode. Join this group to talk.")
.child(
Button::new("join")
- .label("Request to Join")
+ .label("Request to join")
.small()
.ghost()
.on_click(cx.listener(move |this, _event, _window, cx| {
@@ -1152,7 +1147,11 @@ impl GroupPanel {
cx,
)
})
- .element(ix.into(), window, cx),
+ .element(
+ SharedString::from(format!("text-{}", message.id.to_hex())).into(),
+ window,
+ cx,
+ ),
};
let admin = nostr
@@ -1378,7 +1377,7 @@ impl GroupPanel {
.child(
div()
.flex_shrink_0()
- .max_w(px(140.))
+ .max_w(rems(8.75))
.truncate()
.font_semibold()
.text_color(cx.theme().foreground)
@@ -1408,8 +1407,7 @@ impl GroupPanel {
fn render_attachments(&self, cx: &mut Context) -> Vec {
self.attachments
.iter()
- .enumerate()
- .map(|(ix, url)| {
+ .map(|url| {
let url = url.clone();
h_flex()
@@ -1425,12 +1423,12 @@ impl GroupPanel {
.child(Icon::new(IconName::Link).xsmall())
.child(
div()
- .max_w(px(200.))
+ .max_w(rems(12.5))
.truncate()
.child(attachment_name(&url)),
)
.child(
- Button::new(SharedString::from(format!("remove-attachment-{ix}")))
+ Button::new(SharedString::from(format!("remove-attachment-{}", url)))
.icon(IconName::Close)
.tooltip("Remove")
.ghost()
diff --git a/crates/nip29_ui/src/message.rs b/crates/nip29_ui/src/message.rs
index f23e7b7b..d6ba2b98 100644
--- a/crates/nip29_ui/src/message.rs
+++ b/crates/nip29_ui/src/message.rs
@@ -33,7 +33,7 @@ pub(crate) struct Actions {
}
pub(crate) fn render(
- ix: usize,
+ _ix: usize,
message: &Message,
content: AnyElement,
show_author: bool,
@@ -58,33 +58,36 @@ pub(crate) fn render(
nostr.read(cx).current_user(),
);
- let row = MessageRow::new(ix)
- .show_author(show_author)
- .hide_avatar(hide_avatar)
- .avatar(
- Avatar::new(author.avatar())
- .seed(author.avatar_seed())
- .small()
- .flex_shrink_0(),
- )
- .author(author.name())
- .timestamp(message.created_at.to_human_time())
- .when(!message.replies_to.is_empty(), |this| {
- this.children(replies(
- &message.replies_to,
- &persons,
- &actions.group,
- &actions.panel,
- cx,
- ))
- })
- .child(content)
- .when(!message.media.is_empty(), |this| {
- this.child(MessageMedia::new(&message.media))
- })
- .when(!reaction_groups.is_empty(), |this| {
- this.child(ReactionBar::new(reaction_groups))
- });
+ let row = MessageRow::new(SharedString::from(format!(
+ "message-{}",
+ message.id.to_hex()
+ )))
+ .show_author(show_author)
+ .hide_avatar(hide_avatar)
+ .avatar(
+ Avatar::new(author.avatar())
+ .seed(author.avatar_seed())
+ .small()
+ .flex_shrink_0(),
+ )
+ .author(author.name())
+ .timestamp(message.created_at.to_human_time())
+ .when(!message.replies_to.is_empty(), |this| {
+ this.children(replies(
+ &message.replies_to,
+ &persons,
+ &actions.group,
+ &actions.panel,
+ cx,
+ ))
+ })
+ .child(content)
+ .when(!message.media.is_empty(), |this| {
+ this.child(MessageMedia::new(&message.media))
+ })
+ .when(!reaction_groups.is_empty(), |this| {
+ this.child(ReactionBar::new(reaction_groups))
+ });
let id = message.id;
let admin = actions.admin;
@@ -249,7 +252,7 @@ pub(crate) fn render(
}
pub(crate) fn render_activity(
- ix: usize,
+ _ix: usize,
activity: &Activity,
persons: &Entity,
cx: &App,
@@ -258,12 +261,14 @@ pub(crate) fn render_activity(
let hide_avatar = AppSettings::get_hide_avatar(cx);
h_flex()
- .id(ix)
+ .id(SharedString::from(format!(
+ "activity-{}",
+ activity.id.to_hex()
+ )))
.w_full()
.gap_2()
.py_1()
.px_3()
- .hover(|this| this.bg(cx.theme().list_hover))
.child(badge(activity, cx))
.when(!hide_avatar, |this| {
this.child(
@@ -340,7 +345,7 @@ fn replies(
let mut items = Vec::with_capacity(targets.len());
- for (ix, id) in targets.iter().enumerate() {
+ for id in targets.iter() {
let context = entity.read_with(cx, |group, cx| {
let message = group.message(*id)?;
let author = persons.read(cx).person(&message.author, cx);
@@ -359,15 +364,19 @@ fn replies(
let panel = panel.clone();
items.push(
- ReplyPreview::new(ix, author, preview)
- .on_click(move |_event, _window, cx| {
- if let Err(error) = panel.update(cx, |panel, cx| {
- panel.scroll_to(&id, cx);
- }) {
- log::warn!("nip29: scrolling to message failed: {error}");
- }
- })
- .into_any_element(),
+ ReplyPreview::new(
+ SharedString::from(format!("reply-{}", id.to_hex())),
+ author,
+ preview,
+ )
+ .on_click(move |_event, _window, cx| {
+ if let Err(error) = panel.update(cx, |panel, cx| {
+ panel.scroll_to(&id, cx);
+ }) {
+ log::warn!("nip29: scrolling to message failed: {error}");
+ }
+ })
+ .into_any_element(),
);
}
diff --git a/crates/nip29_ui/src/metadata.rs b/crates/nip29_ui/src/metadata.rs
index 38b97438..f0cf497a 100644
--- a/crates/nip29_ui/src/metadata.rs
+++ b/crates/nip29_ui/src/metadata.rs
@@ -11,7 +11,7 @@ use gpui_kit::component::dialog::DialogButtonProps;
use gpui_kit::component::input::InputState;
use gpui_kit::component::notification::Notification;
use gpui_kit::component::switch::Switch;
-use gpui_kit::component::{ActiveTheme, Sizable, WindowExt, h_flex, v_flex};
+use gpui_kit::component::{ActiveTheme, Disableable, Sizable, WindowExt, h_flex, v_flex};
use nip29::{Group, GroupId, GroupMetadata};
use nostr_sdk::prelude::RelayUrl;
use ui::settings_row;
@@ -100,7 +100,7 @@ pub(crate) fn open(group: WeakEntity, window: &mut Window, cx: &mut App)
let supported = *livekit.read(cx) != Some(false);
this.close_button(true)
- .title("Edit Group")
+ .title("Edit group")
.button_props(
DialogButtonProps::default()
.cancel_text("Cancel")
@@ -161,24 +161,27 @@ pub(crate) fn open(group: WeakEntity, window: &mut Window, cx: &mut App)
.child(settings_row(
"LiveKit",
if supported {
- "Announce audio and video support."
+ "Announce audio and video support"
} else {
"The relay doesn't announce LiveKit support."
},
- Switch::new("livekit").checked(current.livekit).on_click({
- let flags = flags.clone();
- let livekit = livekit.clone();
+ Switch::new("livekit")
+ .checked(current.livekit)
+ .disabled(!supported)
+ .on_click({
+ let flags = flags.clone();
+ let livekit = livekit.clone();
- move |next, _window, cx| {
- if *next && *livekit.read(cx) == Some(false) {
- return;
+ move |next, _window, cx| {
+ if *next && *livekit.read(cx) == Some(false) {
+ return;
+ }
+ flags.update(cx, |flags, cx| {
+ flags.livekit = *next;
+ cx.notify();
+ });
}
- flags.update(cx, |flags, cx| {
- flags.livekit = *next;
- cx.notify();
- });
- }
- }),
+ }),
cx,
)),
),
@@ -293,10 +296,10 @@ fn children_section(children: &Entity>, cx: &App) -> AnyElement {
.flex_shrink_0()
.gap_1()
.when(ix > 0, |this| {
- this.child(move_button(children.clone(), ix, ix - 1, "up"))
+ this.child(move_button(children.clone(), child, ix, ix - 1, "up"))
})
.when(ix + 1 < list.len(), |this| {
- this.child(move_button(children.clone(), ix, ix + 1, "down"))
+ this.child(move_button(children.clone(), child, ix, ix + 1, "down"))
});
section = section.child(
@@ -319,11 +322,12 @@ fn children_section(children: &Entity>, cx: &App) -> AnyElement {
fn move_button(
children: Entity>,
+ child: &GroupId,
ix: usize,
target: usize,
direction: &'static str,
) -> Button {
- Button::new(SharedString::from(format!("child-{direction}-{ix}")))
+ Button::new(SharedString::from(format!("child-{direction}-{child}")))
.label(if direction == "up" { "Up" } else { "Down" })
.ghost()
.small()
diff --git a/crates/nip60_ui/src/lib.rs b/crates/nip60_ui/src/lib.rs
index df1b4644..b9bde809 100644
--- a/crates/nip60_ui/src/lib.rs
+++ b/crates/nip60_ui/src/lib.rs
@@ -74,7 +74,7 @@ pub fn open_nutzap(
window.open_dialog(cx, move |this, _window, _cx| {
this.width(px(380.))
- .title("Send Nutzap")
+ .title("Send eCash")
.on_ok({
let send = send.clone();
move |event, window, cx| send(event, window, cx)
diff --git a/crates/nip60_ui/src/wallet.rs b/crates/nip60_ui/src/wallet.rs
index 9f3c950f..967b5f2e 100644
--- a/crates/nip60_ui/src/wallet.rs
+++ b/crates/nip60_ui/src/wallet.rs
@@ -126,7 +126,7 @@ impl WalletPanel {
.border_dashed()
.border_color(cx.theme().border)
.rounded(cx.theme().radius_lg)
- .child("No transactions yet.")
+ .child("No transactions yet")
.into_any_element();
}
@@ -646,7 +646,7 @@ fn open_receive_dialog(window: &mut Window, cx: &mut App) {
.step(1.)
.min(1.)
});
- let token_input = cx.new(|cx| InputState::new(window, cx).placeholder("cashu…"));
+ let token_input = cx.new(|cx| InputState::new(window, cx).placeholder("cashu"));
let create_invoice: SubmitFn = {
let wallet = WalletRegistry::global(cx);
diff --git a/crates/ui/src/avatar.rs b/crates/ui/src/avatar.rs
index 33d9b4fd..ac583755 100644
--- a/crates/ui/src/avatar.rs
+++ b/crates/ui/src/avatar.rs
@@ -1,6 +1,6 @@
use gpui::{
- App, Div, Hsla, InteractiveElement, IntoElement, ParentElement, Pixels, RenderOnce,
- SharedString, StyleRefinement, Styled, Window, div, px,
+ App, Div, Hsla, InteractiveElement, IntoElement, ParentElement, Rems, RenderOnce, SharedString,
+ StyleRefinement, Styled, Window, div, rems,
};
use gpui_base::AvatarImage;
use gpui_kit::base::StyledExt as _;
@@ -115,7 +115,7 @@ impl RenderOnce for Avatar {
#[derive(IntoElement)]
struct PixelAvatar {
seed: u64,
- side: Pixels,
+ side: Rems,
style: StyleRefinement,
}
@@ -187,13 +187,14 @@ impl RenderOnce for PixelAvatar {
}
/// The rendered side length of an avatar at `size`.
-fn side_length(size: Size) -> Pixels {
+fn side_length(size: Size) -> Rems {
match size {
- Size::XSmall => px(16.),
- Size::Small => px(24.),
- Size::Medium => px(48.),
- Size::Large => px(80.),
- Size::Size(size) => size,
+ Size::XSmall => rems(1.),
+ Size::Small => rems(1.5),
+ Size::Medium => rems(3.),
+ Size::Large => rems(5.),
+ // Custom sizes arrive in px; assume the 16px default rem.
+ Size::Size(size) => rems(size.as_f32() / 16.),
}
}
diff --git a/crates/ui/src/message.rs b/crates/ui/src/message.rs
index 75f1d46e..371aa8b9 100644
--- a/crates/ui/src/message.rs
+++ b/crates/ui/src/message.rs
@@ -7,7 +7,7 @@ use gpui::{
Animation, AnimationExt as _, AnyElement, App, ClickEvent, Context, ElementId,
InteractiveElement as _, IntoElement, MouseButton, MouseDownEvent, ObjectFit,
ParentElement as _, RenderOnce, SharedString, SharedUri, StatefulInteractiveElement as _,
- StyleRefinement, Styled, StyledImage, Window, div, img, px,
+ StyleRefinement, Styled, StyledImage, Window, div, img, rems,
};
use gpui_kit::assets::IconName;
use gpui_kit::component::button::{Button, ButtonVariants as _};
@@ -199,10 +199,10 @@ impl RenderOnce for MessageRow {
if show_author {
match avatar {
Some(avatar) => this.child(avatar),
- None => this.child(div().flex_shrink_0().w(px(24.))),
+ None => this.child(div().flex_shrink_0().w_6()),
}
} else {
- this.child(div().flex_shrink_0().w(px(24.)))
+ this.child(div().flex_shrink_0().w_6())
}
})
.child(
@@ -212,7 +212,7 @@ impl RenderOnce for MessageRow {
.min_w_0()
.flex_initial()
.overflow_hidden()
- .text_size(px(15.))
+ .text_base()
.when(show_author, |this| {
this.child(
h_flex()
@@ -383,7 +383,7 @@ impl RenderOnce for MessageMedia {
img(only.clone())
.border_1()
.border_color(cx.theme().border)
- .h(px(250.))
+ .h(rems(16.))
.object_fit(ObjectFit::Cover)
.rounded(cx.theme().radius_lg),
)
@@ -398,14 +398,17 @@ impl RenderOnce for MessageMedia {
.flex_wrap()
.gap_2()
.refine_style(&style)
- .children(media.into_iter().enumerate().map(|(ix, item)| {
- div().id(format!("media-{ix}")).flex_shrink_0().child(
- img(item)
- .h_32()
- .border_1()
- .border_color(cx.theme().border)
- .rounded(cx.theme().radius_lg),
- )
+ .children(media.into_iter().map(|item| {
+ div()
+ .id(SharedString::from(format!("media-{}", item)))
+ .flex_shrink_0()
+ .child(
+ img(item)
+ .h_32()
+ .border_1()
+ .border_color(cx.theme().border)
+ .rounded(cx.theme().radius_lg),
+ )
}))
.into_any_element()
}
@@ -494,7 +497,7 @@ impl RenderOnce for ReactionBar {
.when(!group.mine, |this| this.border_color(cx.theme().border))
.when(group.image.is_none(), |this| this.child(group.emoji))
.when_some(group.image, |this, image| {
- this.child(img(image).size(px(16.)).flex_shrink_0())
+ this.child(img(image).size_4().flex_shrink_0())
})
.child(SharedString::from(group.count.to_string()))
}))
diff --git a/crates/workspace/src/dialogs/join_group.rs b/crates/workspace/src/dialogs/join_group.rs
index e96107e7..1dbd226e 100644
--- a/crates/workspace/src/dialogs/join_group.rs
+++ b/crates/workspace/src/dialogs/join_group.rs
@@ -11,7 +11,7 @@ use nip29::{GroupReference, GroupsRegistry};
type SubmitFn = Rc bool>;
pub fn open(window: &mut Window, cx: &mut App) {
- let input = cx.new(|cx| InputState::new(window, cx).placeholder("naddr1…"));
+ let input = cx.new(|cx| InputState::new(window, cx).placeholder("naddr1"));
let join: SubmitFn = {
let input = input.clone();
diff --git a/crates/workspace/src/dialogs/new_group.rs b/crates/workspace/src/dialogs/new_group.rs
index 0ca1ce97..83776cf9 100644
--- a/crates/workspace/src/dialogs/new_group.rs
+++ b/crates/workspace/src/dialogs/new_group.rs
@@ -3,7 +3,7 @@ use gpui::prelude::FluentBuilder;
use gpui::{
AnyElement, App, AppContext, Context, Div, Entity, InteractiveElement as _, IntoElement,
ParentElement, Render, SharedString, StatefulInteractiveElement as _, StyleRefinement, Styled,
- Subscription, Task, WeakEntity, Window, div, px,
+ Subscription, Task, WeakEntity, Window, div, px, rems,
};
use gpui_kit::base::StyledExt as _;
use gpui_kit::component::button::{Button, ButtonVariants};
@@ -491,7 +491,7 @@ impl Render for NewGroup {
.child(
v_flex()
.id("group-dialog-content")
- .h(px(500.))
+ .h(rems(31.25))
.gap_3()
.when_some(self.error.clone(), |this, error| {
this.child(self.render_error(&error, web_url.as_deref(), cx))
diff --git a/crates/workspace/src/dialogs/profile.rs b/crates/workspace/src/dialogs/profile.rs
index b3c83eb2..ede59029 100644
--- a/crates/workspace/src/dialogs/profile.rs
+++ b/crates/workspace/src/dialogs/profile.rs
@@ -72,7 +72,7 @@ impl ProfileDialog {
let bio_input = cx.new(|cx| {
TextareaState::new(window, cx)
.auto_grow(3, 8)
- .placeholder("A short introduce about you.")
+ .placeholder("A short introduction about you")
});
let directory = Directory::new(cx);
@@ -438,7 +438,7 @@ impl Render for ProfileDialog {
Button::new("update")
.icon(IconName::SquarePen)
.label("Update")
- .primary()
+ .outline()
.on_click(cx.listener(move |this, _ev, window, cx| {
this.toggle_edit(window, cx);
})),
@@ -449,7 +449,7 @@ impl Render for ProfileDialog {
Button::new("message")
.icon(IconName::MessageSquare)
.label("Message")
- .primary()
+ .outline()
.on_click(cx.listener(move |this, _ev, window, cx| {
this.message(window, cx);
})),
diff --git a/crates/workspace/src/dialogs/relays.rs b/crates/workspace/src/dialogs/relays.rs
index 1618b448..e11a7b88 100644
--- a/crates/workspace/src/dialogs/relays.rs
+++ b/crates/workspace/src/dialogs/relays.rs
@@ -352,7 +352,7 @@ impl GossipRelays {
let metadata = self.metadata;
if !value.starts_with("ws") {
- self.set_error("Relay URl is invalid", window, cx);
+ self.set_error("Relay URL is invalid", window, cx);
return;
}
@@ -364,7 +364,7 @@ impl GossipRelays {
cx.notify();
}
} else {
- self.set_error("Relay URl is invalid", window, cx);
+ self.set_error("Relay URL is invalid", window, cx);
}
}
@@ -496,7 +496,7 @@ impl InboxRelays {
let value = self.input.read(cx).value().to_string();
if !value.starts_with("ws") {
- self.set_error("Relay URl is invalid", window, cx);
+ self.set_error("Relay URL is invalid", window, cx);
return;
}
@@ -508,7 +508,7 @@ impl InboxRelays {
cx.notify();
}
} else {
- self.set_error("Relay URl is invalid", window, cx);
+ self.set_error("Relay URL is invalid", window, cx);
}
}
@@ -646,7 +646,7 @@ fn relay_row(
.px_2()
.justify_between()
.rounded(cx.theme().radius)
- .bg(cx.theme().sidebar)
+ .bg(cx.theme().secondary)
.context_menu({
let on_remove = on_remove.clone();
diff --git a/crates/workspace/src/dialogs/screening.rs b/crates/workspace/src/dialogs/screening.rs
index 7558594e..750a0b9e 100644
--- a/crates/workspace/src/dialogs/screening.rs
+++ b/crates/workspace/src/dialogs/screening.rs
@@ -5,7 +5,7 @@ use common::TimestampExt;
use gpui::prelude::FluentBuilder;
use gpui::{
App, AppContext, Context, Div, Entity, IntoElement, ParentElement, Render, SharedString,
- Styled, Subscription, Task, Window, div, px, relative, uniform_list,
+ Styled, Subscription, Task, Window, div, relative, rems, uniform_list,
};
use gpui_kit::assets::IconName;
use gpui_kit::base::StyledExt as _;
@@ -324,7 +324,7 @@ impl Screening {
items
})
- .h(px(300.)),
+ .h(rems(18.75)),
),
)
});
@@ -571,7 +571,7 @@ fn status_badge(status: Option, cx: &App) -> Div {
if let Some(status) = status {
this.child(Icon::new(IconName::CircleCheck).small().text_color({
if status {
- cx.theme().primary
+ cx.theme().success
} else {
cx.theme().muted_foreground
}
diff --git a/crates/workspace/src/dialogs/settings.rs b/crates/workspace/src/dialogs/settings.rs
index 135151bc..4b8190d0 100644
--- a/crates/workspace/src/dialogs/settings.rs
+++ b/crates/workspace/src/dialogs/settings.rs
@@ -93,7 +93,7 @@ impl Preferences {
});
#[cfg(not(target_arch = "wasm32"))]
- let mint_input = cx.new(|cx| InputState::new(window, cx).placeholder("https://mint…"));
+ let mint_input = cx.new(|cx| InputState::new(window, cx).placeholder("https://mint"));
let subscriptions = vec![
Self::wire_number_input(&font_size_input, FONT_SIZE_RANGE, cx, |value, cx| {
@@ -446,7 +446,7 @@ impl Preferences {
impl Render for Preferences {
fn render(&mut self, window: &mut Window, cx: &mut Context) -> impl IntoElement {
- const SCREENING: &str = "Show an screening dialog to verify the unknown sender.";
+ const SCREENING: &str = "Show a screening dialog to verify the unknown sender.";
const WOT: &str = "Treat people followed by your contacts as known senders.";
const AVATAR: &str = "Hide all avatar pictures to improve performance.";
const APPEARANCE: &str =
@@ -475,7 +475,7 @@ impl Render for Preferences {
let background_label = match &panel_background_path {
Some(path) => path.display().to_string(),
- None => String::from("Default Background"),
+ None => String::from("Default background"),
};
v_flex()
@@ -497,7 +497,7 @@ impl Render for Preferences {
cx,
))
.child(settings_row(
- "Web of Trust",
+ "Web of trust",
WOT,
Switch::new("wot-auto-trust")
.checked(wot_auto_trust)
@@ -536,33 +536,33 @@ impl Render for Preferences {
}),
cx,
))
- .child(self.render_theme_choice("theme-light", "Light Theme", LIGHT_THEME, false, cx))
- .child(self.render_theme_choice("theme-dark", "Dark Theme", DARK_THEME, true, cx))
+ .child(self.render_theme_choice("theme-light", "Light theme", LIGHT_THEME, false, cx))
+ .child(self.render_theme_choice("theme-dark", "Dark theme", DARK_THEME, true, cx))
.child(Separator::horizontal())
.child(
v_flex()
.w_full()
.gap_3()
.child(settings_row(
- "Font Size",
+ "Font size",
FONT_SIZE,
NumberInput::new(&self.font_size_input).w_24(),
cx,
))
.child(settings_row(
- "Corner Radius",
+ "Corner radius",
RADIUS,
NumberInput::new(&self.radius_input).w_24(),
cx,
))
.child(settings_row(
- "Large Corner Radius",
+ "Large corner radius",
RADIUS_LG,
NumberInput::new(&self.radius_lg_input).w_24(),
cx,
))
.child(settings_row(
- "Focus Ring",
+ "Focus ring",
FOCUS_RING,
Switch::new("focus-ring")
.checked(theme.focus_ring)
@@ -624,7 +624,7 @@ impl Render for Preferences {
)
.child(Separator::horizontal())
.child(settings_row(
- "Decoupling Encryption Key",
+ "Decoupling encryption key",
NIP4E,
Switch::new("nip4e")
.checked(nip4e)
@@ -634,7 +634,7 @@ impl Render for Preferences {
cx,
))
.child(settings_row(
- "Rotate Encryption Key",
+ "Rotate encryption key",
NIP4E_ROTATION,
Switch::new("nip4e_rotation")
.checked(nip4e_rotation_days.is_some())
@@ -654,7 +654,7 @@ impl Render for Preferences {
.child(self.render_dictation_shortcut(window, cx))
.child(Separator::horizontal())
.child(settings_block(
- "Media Upload Service",
+ "Media upload service",
MEDIA,
h_flex()
.gap_1()
diff --git a/crates/workspace/src/dock/tab_panel.rs b/crates/workspace/src/dock/tab_panel.rs
index c92101b4..a5f875c6 100644
--- a/crates/workspace/src/dock/tab_panel.rs
+++ b/crates/workspace/src/dock/tab_panel.rs
@@ -678,7 +678,7 @@ impl TabGroupRenderer for CoopTabGroupSkin {
h_flex()
.id("tabs-inner")
.relative()
- .gap(px(4.))
+ .gap_1()
.overflow_x_scroll()
.lock_scroll_axis()
.track_scroll(&self.scroll_handle)
diff --git a/crates/workspace/src/lib.rs b/crates/workspace/src/lib.rs
index 0ad9d495..c623fc18 100644
--- a/crates/workspace/src/lib.rs
+++ b/crates/workspace/src/lib.rs
@@ -11,7 +11,7 @@ use chat::{ChatEvent, ChatRegistry};
use common::download_dir;
use gpui::{
Action, App, AppContext, Context, Entity, Focusable, InteractiveElement, IntoElement,
- ParentElement, Pixels, Render, SharedString, Styled, Subscription, Task, Window, div, px,
+ ParentElement, Pixels, Render, SharedString, Styled, Subscription, Task, Window, div, px, rems,
};
use gpui_kit::component::button::{Button, ButtonVariant};
use gpui_kit::component::command::{
@@ -480,7 +480,7 @@ impl Workspace {
.bordered(false)
.rounded(cx.theme().radius_lg)
.placeholder("Search themes...")
- .max_h(px(420.))
+ .max_h(rems(26.25))
.on_confirm(move |index, _, cx| {
if let Some(name) = Self::theme_name_at(index, cx) {
AppSettings::select_theme(&name, cx);
diff --git a/crates/workspace/src/panels/browse.rs b/crates/workspace/src/panels/browse.rs
index db9073b9..a08f6de6 100644
--- a/crates/workspace/src/panels/browse.rs
+++ b/crates/workspace/src/panels/browse.rs
@@ -296,7 +296,7 @@ impl BrowsePanel {
.max_w_64()
.px_1()
.rounded(cx.theme().radius)
- .bg(cx.theme().sidebar)
+ .bg(cx.theme().secondary)
.child(Input::new(&self.input).appearance(false).flex_1())
.child(
Button::new("relay-browse")
@@ -376,7 +376,7 @@ impl BrowsePanel {
.cursor_pointer()
.border_1()
.border_color(transparent_black())
- .bg(cx.theme().sidebar)
+ .bg(cx.theme().group_box)
.hover(|this| {
this.bg(cx.theme().secondary)
.border_color(cx.theme().border)
@@ -510,12 +510,12 @@ impl Render for BrowsePanel {
} else {
let text = if discover {
if self.discovering {
- "Discovering groups…"
+ "Discovering groups"
} else {
"No groups found."
}
} else if self.loading {
- "Loading groups…"
+ "Loading groups"
} else {
"No groups found."
};
diff --git a/crates/workspace/src/panels/contact_list.rs b/crates/workspace/src/panels/contact_list.rs
index 4cc1ff58..7caf4f0e 100644
--- a/crates/workspace/src/panels/contact_list.rs
+++ b/crates/workspace/src/panels/contact_list.rs
@@ -307,7 +307,7 @@ impl ContactListPanel {
.rounded(cx.theme().radius_lg)
.text_xs()
.text_align(TextAlign::Center)
- .child(SharedString::from("Please add some relays."))
+ .child(SharedString::from("No contacts yet"))
}
}
diff --git a/crates/workspace/src/panels/greeter.rs b/crates/workspace/src/panels/greeter.rs
index 3e4802a0..6fd9727b 100644
--- a/crates/workspace/src/panels/greeter.rs
+++ b/crates/workspace/src/panels/greeter.rs
@@ -213,17 +213,17 @@ impl GreeterPanel {
} else {
requests
.iter()
- .enumerate()
- .map(|(index, (room, preview))| {
+ .map(|(room, preview)| {
let room = room.clone();
let dock = dock.clone();
let name = room.read(cx).display_name(cx);
let seed = room.read(cx).display_image_seed(cx);
let created_at = room.read(cx).created_at.to_ago();
+ let id = room.read(cx).id;
let preview = preview.clone();
h_flex()
- .id(format!("request-{index}"))
+ .id(format!("request-{id}"))
.group("")
.w_full()
.h_9()
@@ -280,8 +280,8 @@ impl GreeterPanel {
),
)
.child(
- Button::new(format!("response-{index}"))
- .label("Response")
+ Button::new(format!("response-{id}"))
+ .label("Respond")
.xsmall()
.ghost()
.invisible()
@@ -332,17 +332,17 @@ impl GreeterPanel {
let rows: Vec = self
.follow_ups
.iter()
- .enumerate()
- .map(|(index, (room, preview))| {
+ .map(|(room, preview)| {
let room = room.clone();
let dock = dock.clone();
let name = room.read(cx).display_name(cx);
let seed = room.read(cx).display_image_seed(cx);
let created_at = room.read(cx).created_at.to_ago();
+ let id = room.read(cx).id;
let preview = preview.clone();
h_flex()
- .id(format!("follow-up-{index}"))
+ .id(format!("follow-up-{id}"))
.group("")
.w_full()
.h_9()
@@ -399,7 +399,7 @@ impl GreeterPanel {
),
)
.child(
- Button::new(format!("reply-{index}"))
+ Button::new(format!("reply-{id}"))
.label("Reply")
.xsmall()
.ghost()
diff --git a/crates/workspace/src/sidebar/header.rs b/crates/workspace/src/sidebar/header.rs
index 5334b115..68fcd523 100644
--- a/crates/workspace/src/sidebar/header.rs
+++ b/crates/workspace/src/sidebar/header.rs
@@ -284,7 +284,7 @@ fn open_logout_dialog(window: &mut Window, cx: &mut App) {
window.open_alert_dialog(cx, |alert, _, _| {
alert
- .title("Log Out?")
+ .title("Log out")
.description(DESCRIPTION)
.button_props(
DialogButtonProps::default()
diff --git a/crates/workspace/src/sidebar/rows.rs b/crates/workspace/src/sidebar/rows.rs
index 7f713b87..cf06689e 100644
--- a/crates/workspace/src/sidebar/rows.rs
+++ b/crates/workspace/src/sidebar/rows.rs
@@ -51,7 +51,7 @@ pub(crate) fn open_room(
.button_props(
DialogButtonProps::default()
.cancel_text("Ignore")
- .ok_text("Response"),
+ .ok_text("Respond"),
)
.on_cancel(move |_event, window, cx| {
window.dispatch_action(Box::new(ClosePanel), cx);
@@ -200,7 +200,7 @@ impl Sidebar {
h_flex()
.gap_1()
.when(spam, |this| {
- this.child(Tag::danger().xsmall().child("SPAM"))
+ this.child(Tag::danger().xsmall().child("Spam"))
})
.when(!spam, |this| {
this.child(
diff --git a/crates/workspace/src/sidebar/search.rs b/crates/workspace/src/sidebar/search.rs
index 7024a4c9..b3c6950a 100644
--- a/crates/workspace/src/sidebar/search.rs
+++ b/crates/workspace/src/sidebar/search.rs
@@ -309,7 +309,7 @@ impl Sidebar {
public_key: *public_key,
}));
}
- None => rows.push(SidebarRow::Empty("Searching...")),
+ None => rows.push(SidebarRow::Empty("Searching")),
}
}