fix: align contact detail actions

Author: ben-kaufman

app/src/main/java/to/bitkit/ui/screens/contacts/ContactDetailScreen.kt

@@ -39,7 +39,6 @@ import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.components.TagButton
 import to.bitkit.ui.components.Text13Up
 import to.bitkit.ui.components.VerticalSpacer
-import to.bitkit.ui.scaffold.AppAlertDialog
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.DrawerNavIcon
 import to.bitkit.ui.scaffold.ScreenColumn
@@ -61,7 +60,6 @@ fun ContactDetailScreen(
     LaunchedEffect(Unit) {
         viewModel.effects.collect {
             when (it) {
-                ContactDetailEffect.DeleteSuccess -> onBackClick()
                 is ContactDetailEffect.OpenPayment -> onPayContact(it.paymentRequest, it.publicKey)
             }
         }
@@ -75,14 +73,11 @@ fun ContactDetailScreen(
         onClickPay = { viewModel.payContact() },
         onClickActivity = { uiState.profile?.publicKey?.let { onActivityClick(it) } },
         onClickShare = { uiState.profile?.publicKey?.let { shareText(context, it) } },
-        onClickDelete = { viewModel.showDeleteConfirmation() },
         onClickRetry = { viewModel.loadContact() },
         onAddTag = { viewModel.showAddTagSheet() },
         onRemoveTag = { viewModel.removeTag(it) },
         onDismissAddTagSheet = { viewModel.dismissAddTagSheet() },
         onSaveTag = { viewModel.addTag(it) },
-        onDismissDeleteDialog = { viewModel.dismissDeleteDialog() },
-        onConfirmDelete = { viewModel.deleteContact() },
     )
 }
 
@@ -95,14 +90,11 @@ private fun Content(
     onClickPay: () -> Unit,
     onClickActivity: () -> Unit,
     onClickShare: () -> Unit,
-    onClickDelete: () -> Unit,
     onClickRetry: () -> Unit,
     onAddTag: () -> Unit,
     onRemoveTag: (Int) -> Unit,
     onDismissAddTagSheet: () -> Unit,
     onSaveTag: (String) -> Unit,
-    onDismissDeleteDialog: () -> Unit,
-    onConfirmDelete: () -> Unit,
 ) {
     val currentProfile = uiState.profile
 
@@ -124,24 +116,13 @@ private fun Content(
                 onClickPay = onClickPay,
                 onClickActivity = onClickActivity,
                 onClickShare = onClickShare,
-                onClickDelete = onClickDelete,
                 onAddTag = onAddTag,
                 onRemoveTag = onRemoveTag,
             )
             else -> EmptyState(onClickRetry = onClickRetry)
         }
     }
 
-    if (uiState.showDeleteDialog && currentProfile != null) {
-        AppAlertDialog(
-            title = stringResource(R.string.contacts__delete_confirm_title, currentProfile.name),
-            text = stringResource(R.string.contacts__delete_confirm_text, currentProfile.name),
-            confirmText = stringResource(R.string.common__delete_yes),
-            onConfirm = onConfirmDelete,
-            onDismiss = onDismissDeleteDialog,
-        )
-    }
-
     if (uiState.showAddTagSheet) {
         AddTagSheet(
             onDismiss = onDismissAddTagSheet,
@@ -161,7 +142,6 @@ private fun ContactBody(
     onClickPay: () -> Unit,
     onClickActivity: () -> Unit,
     onClickShare: () -> Unit,
-    onClickDelete: () -> Unit,
     onAddTag: () -> Unit,
     onRemoveTag: (Int) -> Unit,
 ) {
@@ -190,11 +170,6 @@ private fun ContactBody(
             verticalArrangement = Arrangement.spacedBy(16.dp),
             modifier = Modifier.fillMaxWidth()
         ) {
-            ActionButton(
-                onClick = onClickCopy,
-                iconRes = R.drawable.ic_copy,
-                modifier = Modifier.testTag("ContactCopy")
-            )
             if (hasPublicPaymentEndpoint) {
                 ActionButton(
                     onClick = onClickPay,
@@ -204,9 +179,14 @@ private fun ContactBody(
             }
             ActionButton(
                 onClick = onClickActivity,
-                iconRes = R.drawable.ic_list_dashes,
+                iconRes = R.drawable.ic_activity,
                 modifier = Modifier.testTag("ContactActivity")
             )
+            ActionButton(
+                onClick = onClickCopy,
+                iconRes = R.drawable.ic_copy,
+                modifier = Modifier.testTag("ContactCopy")
+            )
             ActionButton(
                 onClick = onClickShare,
                 iconRes = R.drawable.ic_share,
@@ -217,11 +197,6 @@ private fun ContactBody(
                 iconRes = R.drawable.ic_edit,
                 modifier = Modifier.testTag("ContactEdit")
             )
-            ActionButton(
-                onClick = onClickDelete,
-                iconRes = R.drawable.ic_trash,
-                modifier = Modifier.testTag("ContactDelete")
-            )
         }
 
         VerticalSpacer(32.dp)
@@ -320,14 +295,11 @@ private fun Preview() {
             onClickPay = {},
             onClickActivity = {},
             onClickShare = {},
-            onClickDelete = {},
             onClickRetry = {},
             onAddTag = {},
             onRemoveTag = {},
             onDismissAddTagSheet = {},
             onSaveTag = {},
-            onDismissDeleteDialog = {},
-            onConfirmDelete = {},
         )
     }
 }

app/src/main/java/to/bitkit/ui/screens/contacts/ContactDetailViewModel.kt

@@ -178,32 +178,6 @@ class ContactDetailViewModel @Inject constructor(
         persistTags(newTags)
     }
 
-    fun showDeleteConfirmation() {
-        _uiState.update { it.copy(showDeleteDialog = true) }
-    }
-
-    fun dismissDeleteDialog() {
-        _uiState.update { it.copy(showDeleteDialog = false) }
-    }
-
-    fun deleteContact() {
-        viewModelScope.launch {
-            _uiState.update { it.copy(showDeleteDialog = false) }
-            pubkyRepo.removeContact(publicKey)
-                .onSuccess {
-                    ToastEventBus.send(
-                        type = Toast.ToastType.SUCCESS,
-                        title = context.getString(R.string.contacts__delete_success),
-                        testTag = "ContactDeletedToast",
-                    )
-                    _effects.emit(ContactDetailEffect.DeleteSuccess)
-                }
-                .onFailure {
-                    Logger.error("Failed to delete contact '$redactedPublicKey'", it, context = TAG)
-                }
-        }
-    }
-
     private fun persistTags(tags: List<String>) {
         val profile = _uiState.value.profile ?: return
         viewModelScope.launch {
@@ -228,10 +202,8 @@ data class ContactDetailUiState(
     val isLoading: Boolean = false,
     val hasPublicPaymentEndpoint: Boolean = false,
     val showAddTagSheet: Boolean = false,
-    val showDeleteDialog: Boolean = false,
 )
 
 sealed interface ContactDetailEffect {
-    data object DeleteSuccess : ContactDetailEffect
     data class OpenPayment(val paymentRequest: String, val publicKey: String) : ContactDetailEffect
 }

app/src/main/res/drawable/ic_activity.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:pathData="M1.5,8H4.25L5.9,3.5L9.7,12.5L11.5,8H14.5"
+        android:fillColor="@android:color/transparent"
+        android:strokeColor="#FFB800"
+        android:strokeWidth="1.5"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+</vector>