PM-34499: bug: Add appropriate external link callouts for attachments (#6752)

Author: david-livefront

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/attachments/preview/PreviewAttachmentScreen.kt

@@ -87,6 +87,7 @@ fun PreviewAttachmentScreen(
                         onClick = {
                             viewModel.trySendAction(PreviewAttachmentAction.DownloadClick)
                         },
+                        isExternalLink = true,
                         modifier = Modifier.testTag("ToolbarDownloadButton"),
                     )
                 },
@@ -119,6 +120,7 @@ fun PreviewAttachmentScreen(
                     label = BitwardenString.download_file.asText(),
                     icon = rememberVectorPainter(id = BitwardenDrawable.ic_download),
                     onClick = { viewModel.trySendAction(PreviewAttachmentAction.DownloadClick) },
+                    isExternalLink = true,
                     testTag = "ErrorStateDownloadButton",
                 ),
                 modifier = Modifier.fillMaxSize(),

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/component/VaultItemAttachment.kt

@@ -100,6 +100,7 @@ fun VaultItemAttachment(
                 BitwardenStandardIconButton(
                     vectorIconRes = BitwardenDrawable.ic_download,
                     contentDescription = stringResource(id = BitwardenString.download),
+                    isExternalLink = true,
                     onClick = {
                         if (!attachmentItem.isDownloadAllowed) {
                             shouldShowPremiumWarningDialog = true

app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/attachments/preview/PreviewAttachmentScreenTest.kt

@@ -63,7 +63,7 @@ class PreviewAttachmentScreenTest : BitwardenComposeTest() {
 
     @Test
     fun `download button click should send DownloadClick`() {
-        composeTestRule.onNodeWithContentDescription("Download").performClick()
+        composeTestRule.onNodeWithContentDescription("Download, External link").performClick()
         verify(exactly = 1) {
             viewModel.trySendAction(PreviewAttachmentAction.DownloadClick)
         }

app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt

@@ -780,7 +780,9 @@ class VaultItemScreenTest : BitwardenComposeTest() {
         }
 
         composeTestRule.assertNoDialogExists()
-        composeTestRule.onNodeWithContentDescriptionAfterScroll("Download").performClick()
+        composeTestRule
+            .onNodeWithContentDescriptionAfterScroll("Download, External link")
+            .performClick()
 
         composeTestRule
             .onAllNodesWithText(
@@ -824,7 +826,9 @@ class VaultItemScreenTest : BitwardenComposeTest() {
         }
 
         composeTestRule.assertNoDialogExists()
-        composeTestRule.onNodeWithContentDescriptionAfterScroll("Download").performClick()
+        composeTestRule
+            .onNodeWithContentDescriptionAfterScroll("Download, External link")
+            .performClick()
 
         composeTestRule
             .onAllNodesWithText(
@@ -864,7 +868,9 @@ class VaultItemScreenTest : BitwardenComposeTest() {
         }
 
         composeTestRule.assertNoDialogExists()
-        composeTestRule.onNodeWithContentDescriptionAfterScroll("Download").performClick()
+        composeTestRule
+            .onNodeWithContentDescriptionAfterScroll("Download, External link")
+            .performClick()
 
         composeTestRule
             .onAllNodesWithText(
@@ -907,7 +913,9 @@ class VaultItemScreenTest : BitwardenComposeTest() {
         }
 
         composeTestRule.assertNoDialogExists()
-        composeTestRule.onNodeWithContentDescriptionAfterScroll("Download").performClick()
+        composeTestRule
+            .onNodeWithContentDescriptionAfterScroll("Download, External link")
+            .performClick()
 
         composeTestRule.assertNoDialogExists()
 

ui/src/main/kotlin/com/bitwarden/ui/platform/components/button/BitwardenStandardIconButton.kt

@@ -7,12 +7,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import com.bitwarden.ui.platform.components.button.color.bitwardenStandardIconButtonColors
 import com.bitwarden.ui.platform.components.util.rememberVectorPainter
 import com.bitwarden.ui.platform.resource.BitwardenDrawable
+import com.bitwarden.ui.platform.resource.BitwardenString
 import com.bitwarden.ui.platform.theme.BitwardenTheme
 
 /**
@@ -23,6 +25,8 @@ import com.bitwarden.ui.platform.theme.BitwardenTheme
  * @param onClick Callback for when the icon button is clicked.
  * @param modifier A [Modifier] for the composable.
  * @param isEnabled Whether the button should be enabled.
+ * @param isExternalLink Whether the icon button is an external link.
+ * @param contentColor The color applied to the icon.
  */
 @Composable
 fun BitwardenStandardIconButton(
@@ -31,6 +35,7 @@ fun BitwardenStandardIconButton(
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
     isEnabled: Boolean = true,
+    isExternalLink: Boolean = false,
     contentColor: Color = BitwardenTheme.colorScheme.icon.primary,
 ) {
     BitwardenStandardIconButton(
@@ -39,6 +44,7 @@ fun BitwardenStandardIconButton(
         onClick = onClick,
         modifier = modifier,
         isEnabled = isEnabled,
+        isExternalLink = isExternalLink,
         contentColor = contentColor,
     )
 }
@@ -51,6 +57,8 @@ fun BitwardenStandardIconButton(
  * @param onClick Callback for when the icon button is clicked.
  * @param modifier A [Modifier] for the composable.
  * @param isEnabled Whether the button should be enabled.
+ * @param isExternalLink Whether the icon button is an external link.
+ * @param contentColor The color applied to the icon.
  */
 @Composable
 fun BitwardenStandardIconButton(
@@ -59,11 +67,20 @@ fun BitwardenStandardIconButton(
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
     isEnabled: Boolean = true,
+    isExternalLink: Boolean = false,
     contentColor: Color = BitwardenTheme.colorScheme.icon.primary,
 ) {
+    val formattedContentDescription = if (isExternalLink) {
+        stringResource(
+            id = BitwardenString.external_link_format,
+            formatArgs = arrayOf(contentDescription),
+        )
+    } else {
+        contentDescription
+    }
     IconButton(
         modifier = modifier.semantics(mergeDescendants = true) {
-            this.contentDescription = contentDescription
+            this.contentDescription = formattedContentDescription
         },
         onClick = onClick,
         colors = bitwardenStandardIconButtonColors(contentColor = contentColor),