From 18bafaba8a5acc15edbddab194c7a489378acec1 Mon Sep 17 00:00:00 2001 From: David Perez Date: Tue, 1 Jul 2025 11:23:50 -0500 Subject: [PATCH] PM-22213: Hide current access count when editing and there is not max access count (#5451) --- .../send/addedit/AddEditSendContent.kt | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendContent.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendContent.kt index 546daa68f8..ed62606461 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendContent.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/tools/feature/send/addedit/AddEditSendContent.kt @@ -34,6 +34,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import com.bitwarden.ui.platform.base.util.cardStyle import com.bitwarden.ui.platform.base.util.standardHorizontalMargin +import com.bitwarden.ui.platform.components.animation.AnimateNullableContentVisibility import com.bitwarden.ui.platform.components.button.BitwardenOutlinedButton import com.bitwarden.ui.platform.components.button.BitwardenOutlinedErrorButton import com.bitwarden.ui.platform.components.model.CardStyle @@ -41,7 +42,6 @@ import com.bitwarden.ui.platform.components.toggle.BitwardenSwitch import com.bitwarden.ui.platform.components.util.rememberVectorPainter import com.bitwarden.ui.platform.resource.BitwardenDrawable import com.bitwarden.ui.platform.theme.BitwardenTheme -import com.bitwarden.ui.util.asText import com.x8bit.bitwarden.R import com.x8bit.bitwarden.ui.platform.components.card.BitwardenInfoCalloutCard import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenTwoButtonDialog @@ -391,14 +391,26 @@ private fun AddEditSendOptions( color = BitwardenTheme.colorScheme.text.secondary, modifier = Modifier.fillMaxWidth(), ) - state.common.currentAccessCount.takeUnless { isAddMode }?.let { - Spacer(modifier = Modifier.height(16.dp)) - Text( - text = R.string.current_access_count.asText(it).invoke(), - style = BitwardenTheme.typography.bodySmall, - color = BitwardenTheme.colorScheme.text.secondary, - modifier = Modifier.fillMaxWidth(), - ) + AnimateNullableContentVisibility( + targetState = state + .common + .currentAccessCount + ?.takeUnless { isAddMode || state.common.maxAccessCount == null }, + enter = fadeIn() + expandVertically(), + exit = fadeOut() + shrinkVertically(), + ) { + Column { + Spacer(modifier = Modifier.height(16.dp)) + Text( + text = stringResource( + id = R.string.current_access_count, + formatArgs = arrayOf(it), + ), + style = BitwardenTheme.typography.bodySmall, + color = BitwardenTheme.colorScheme.text.secondary, + modifier = Modifier.fillMaxWidth(), + ) + } } }, value = state.common.maxAccessCount,