diff --git a/crates/signed_app/src/repo/header.rs b/crates/signed_app/src/repo/header.rs index 52ee80f..745c976 100644 --- a/crates/signed_app/src/repo/header.rs +++ b/crates/signed_app/src/repo/header.rs @@ -8,7 +8,6 @@ use gpui::{ use signed_state::{Backend, Nip34Kind}; use ui::avatar::Avatar; use ui::button::{Button, ButtonVariant}; -use ui::clipboard::ClipboardButton; use ui::common::{Sizable, StyledExt as _, h_flex, v_flex}; use ui::dropdown_menu::DropdownMenu; use ui::icons::{Icon, IconRole}; @@ -18,7 +17,9 @@ use ui::theme::ActiveTheme as _; use ui::tooltip::Tooltip; use utils::relative_time_secs; -use super::helpers::{bound_repo_label, clone_group, fork_row, nostr_clone_url, repo_display_name}; +use super::helpers::{ + bound_repo_label, clone_group, clone_row, fork_row, nostr_clone_url, repo_display_name, +}; use super::{RepoDetailView, actions, dialogs}; impl RepoDetailView { @@ -150,13 +151,15 @@ impl RepoDetailView { .gap_4() .child(clone_group( "Clone with ngit", - "copy-ngit", + "copy-ngit".into(), &ngit_for_popover, + cx, )) .child(clone_group( "Clone with nak", - "copy-nak", + "copy-nak".into(), &nak_for_popover, + cx, )) .child( v_flex() @@ -164,21 +167,28 @@ impl RepoDetailView { .child( div() .text_xs() - .text_color(cx.theme().colors.muted_foreground) + .font_semibold() .child("Grasp Servers"), ) .when(git_for_popover.is_empty(), |this| { this.child( - div().text_xs().child("No git clone urls."), + div() + .text_xs() + .text_center() + .text_color( + cx.theme().colors.muted_foreground, + ) + .child("No git clone urls."), ) }) .children(git_for_popover.iter().enumerate().map( |(ix, command)| { - ClipboardButton::new( + clone_row( SharedString::from(format!( "copy-git-{ix}" )), - command.clone(), + command.clone().into(), + cx, ) }, )), diff --git a/crates/signed_app/src/repo/helpers.rs b/crates/signed_app/src/repo/helpers.rs index 9250e8c..ce7244d 100644 --- a/crates/signed_app/src/repo/helpers.rs +++ b/crates/signed_app/src/repo/helpers.rs @@ -52,11 +52,47 @@ pub(super) struct RepoData { pub(super) head_commit: Option, } -pub(super) fn clone_group(label: &str, id: &'static str, command: &SharedString) -> AnyElement { +pub(super) fn clone_group( + label: &str, + id: SharedString, + command: &SharedString, + cx: &App, +) -> AnyElement { v_flex() .gap_1() - .child(div().text_xs().child(SharedString::from(label))) - .child(ClipboardButton::new(id, command.clone())) + .min_w_0() + .child( + div() + .text_xs() + .font_semibold() + .child(SharedString::from(label)), + ) + .child(clone_row(id, command.clone(), cx)) + .into_any_element() +} + +/// One copyable clone command with its text visible next to the copy icon. +pub(super) fn clone_row(id: SharedString, command: SharedString, cx: &App) -> AnyElement { + h_flex() + .h_8() + .px_2() + .gap_2() + .min_w_0() + .bg(cx.theme().colors.secondary) + .rounded(cx.theme().radius.control) + .text_color(cx.theme().colors.secondary_foreground) + .child( + div() + .flex_1() + .min_w_0() + .overflow_hidden() + .whitespace_nowrap() + .text_ellipsis() + .font_family(cx.theme().mono_font) + .text_xs() + .child(command.clone()), + ) + .child(ClipboardButton::new(id, command).xsmall()) .into_any_element() }