From 2ebbac0f584a202407e8f9533b385443fb6dc859 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Thu, 9 Mar 2023 10:08:11 -0500
Subject: [PATCH] Showing pubkeys prominently in the Profile Page.

---
 .../ui/screen/loggedIn/ProfileScreen.kt       | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
index fafccb56b..5a7753827 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Bolt
+import androidx.compose.material.icons.filled.ContentCopy
 import androidx.compose.material.icons.filled.EditNote
 import androidx.compose.material.icons.filled.Link
 import androidx.compose.material.icons.filled.MoreVert
@@ -349,20 +350,21 @@ private fun ProfileHeader(
                 ) {
                     MessageButton(baseUser, navController)
 
-                    NPubCopyButton(baseUser)
+                    // No need for this button anymore
+                    // NPubCopyButton(baseUser)
 
                     if (accountUser == baseUser) {
                         EditButton(account)
-                    } else {
-                        if (account.isHidden(baseUser)) {
-                            ShowUserButton {
-                                account.showUser(baseUser.pubkeyHex)
-                            }
-                        } else if (accountUser.isFollowing(baseUser)) {
-                            UnfollowButton { coroutineScope.launch(Dispatchers.IO) { account.unfollow(baseUser) } }
-                        } else {
-                            FollowButton { coroutineScope.launch(Dispatchers.IO) { account.follow(baseUser) } }
+                    }
+
+                    if (account.isHidden(baseUser)) {
+                        ShowUserButton {
+                            account.showUser(baseUser.pubkeyHex)
                         }
+                    } else if (accountUser.isFollowing(baseUser)) {
+                        UnfollowButton { coroutineScope.launch(Dispatchers.IO) { account.unfollow(baseUser) } }
+                    } else {
+                        FollowButton { coroutineScope.launch(Dispatchers.IO) { account.follow(baseUser) } }
                     }
                 }
             }
@@ -388,6 +390,7 @@ private fun DrawAdditionalInfo(baseUser: User, account: Account, navController:
     val userBadge = userBadgeState?.user ?: return
 
     val uri = LocalUriHandler.current
+    val clipboardManager = LocalClipboardManager.current
 
     Row(verticalAlignment = Alignment.Bottom) {
         user.bestDisplayName()?.let {
@@ -408,6 +411,26 @@ private fun DrawAdditionalInfo(baseUser: User, account: Account, navController:
         }
     }
 
+    Row(verticalAlignment = Alignment.CenterVertically) {
+        Text(
+            text = user.pubkeyDisplayHex(),
+            modifier = Modifier.padding(top = 1.dp, bottom = 1.dp),
+            color = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+        )
+
+        IconButton(
+            modifier = Modifier.size(30.dp).padding(start = 5.dp),
+            onClick = { clipboardManager.setText(AnnotatedString(user.pubkeyNpub())); }
+        ) {
+            Icon(
+                imageVector = Icons.Default.ContentCopy,
+                null,
+                modifier = Modifier.padding(end = 5.dp).size(15.dp),
+                tint = MaterialTheme.colors.onSurface.copy(alpha = 0.32f)
+            )
+        }
+    }
+
     DisplayNip05ProfileStatus(user)
 
     val website = user.info?.website