From 1ef85b5c852462c08b72c8b15b1be485b2feacef Mon Sep 17 00:00:00 2001 From: Sam DuBois Date: Sat, 17 Dec 2022 23:54:57 -0700 Subject: [PATCH] Moved the key over across from the name. Almost like a temporary verifier in a way. I think I would also like to organize this file eventually so its a bit easier to find things --- damus/Views/ProfileView.swift | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/damus/Views/ProfileView.swift b/damus/Views/ProfileView.swift index 7e06393a..ca6ebd1b 100644 --- a/damus/Views/ProfileView.swift +++ b/damus/Views/ProfileView.swift @@ -54,14 +54,24 @@ struct ProfileNameView: View { Group { if let real_name = profile?.display_name { VStack(alignment: .leading) { - Text(real_name) - .font(.title3.weight(.bold)) + HStack { + Text(real_name) + .font(.title3.weight(.bold)) + + KeyView(pubkey: pubkey) + .pubkey_context_menu(bech32_pubkey: pubkey) + } ProfileName(pubkey: pubkey, profile: profile, prefix: "@", contacts: contacts, show_friend_confirmed: true) .font(.callout) .foregroundColor(.gray) } } else { - ProfileName(pubkey: pubkey, profile: profile, contacts: contacts, show_friend_confirmed: true) + HStack { + ProfileName(pubkey: pubkey, profile: profile, contacts: contacts, show_friend_confirmed: true) + + KeyView(pubkey: pubkey) + .pubkey_context_menu(bech32_pubkey: pubkey) + } } } } @@ -110,9 +120,6 @@ struct ProfileView: View { Spacer() - KeyView(pubkey: profile.pubkey) - .pubkey_context_menu(bech32_pubkey: bech32_pubkey(profile.pubkey) ?? profile.pubkey) - if let lnuri = data?.lightning_uri { LNButton(lnuri) } @@ -169,7 +176,6 @@ struct ProfileView: View { .frame(maxHeight: .infinity, alignment: .topLeading) } .frame(maxWidth: .infinity, alignment: .topLeading) - .navigationBarTitle("Profile") .onReceive(handle_notify(.switched_timeline)) { _ in dismiss() }