From 174f7f6cc51c8b5cdcb88850326db5330226fa10 Mon Sep 17 00:00:00 2001 From: Joel Klabo Date: Tue, 28 Feb 2023 18:52:29 -0800 Subject: [PATCH] Update Width of Copy Pubkey Background Changelog-Fixed: Fixed width of copy pubkey on profile page Closes: #714 --- damus/Views/ProfileView.swift | 39 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/damus/Views/ProfileView.swift b/damus/Views/ProfileView.swift index 8e4c3272..0da86f45 100644 --- a/damus/Views/ProfileView.swift +++ b/damus/Views/ProfileView.swift @@ -515,26 +515,25 @@ struct KeyView: View { let bech32 = bech32_pubkey(pubkey) ?? pubkey HStack { - RoundedRectangle(cornerRadius: 11) - .frame(height: 22) - .foregroundColor(fillColor()) - .overlay( - HStack { - Button { - copyPubkey(bech32) - } label: { - Label(NSLocalizedString("Public Key", comment: "Label indicating that the text is a user's public account key."), systemImage: "key.fill") - .font(.custom("key", size: 12.0)) - .labelStyle(IconOnlyLabelStyle()) - .foregroundStyle(hex_to_rgb(pubkey)) - .symbolRenderingMode(.palette) - } - .padding(.leading,4) - Text(verbatim: "\(abbrev_pubkey(bech32, amount: 16))") - .font(.footnote) - .foregroundColor(keyColor()) - } - ) + HStack { + Button { + copyPubkey(bech32) + } label: { + Label(NSLocalizedString("Public Key", comment: "Label indicating that the text is a user's public account key."), systemImage: "key.fill") + .font(.custom("key", size: 12.0)) + .labelStyle(IconOnlyLabelStyle()) + .foregroundStyle(hex_to_rgb(pubkey)) + .symbolRenderingMode(.palette) + } + .padding(.trailing, 2) + Text(verbatim: "\(abbrev_pubkey(bech32, amount: 16))") + .font(.footnote) + .foregroundColor(keyColor()) + } + .padding(2) + .padding([.leading, .trailing], 3) + .background(RoundedRectangle(cornerRadius: 11).foregroundColor(fillColor())) + if isCopied != true { Button { copyPubkey(bech32)