Address PR review feedback

- Assert full state in CardScannerFlagUpdateReceive test
- Remove stale @Suppress("MaxLineLength") from CardTypeHandlers
- Remove explicit keyboardController.show() (focus alone suffices)
- Add camera icon to scan card button
- Reorder ViewModel constructor params alphabetically

Author: SaintPatrck

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditCardItems.kt

@@ -24,6 +24,8 @@ import com.bitwarden.ui.platform.components.field.BitwardenPasswordField
 import com.bitwarden.ui.platform.components.field.BitwardenTextField
 import com.bitwarden.ui.platform.components.header.BitwardenListHeaderText
 import com.bitwarden.ui.platform.components.model.CardStyle
+import com.bitwarden.ui.platform.components.util.rememberVectorPainter
+import com.bitwarden.ui.platform.resource.BitwardenDrawable
 import com.bitwarden.ui.platform.resource.BitwardenString
 import com.x8bit.bitwarden.ui.vault.feature.addedit.handlers.VaultAddEditCardTypeHandlers
 import com.x8bit.bitwarden.ui.vault.model.VaultCardBrand
@@ -59,6 +61,7 @@ fun LazyListScope.vaultAddEditCardItems(
             BitwardenOutlinedButton(
                 label = stringResource(id = BitwardenString.scan_card),
                 onClick = onScanCardClick,
+                icon = rememberVectorPainter(id = BitwardenDrawable.ic_camera_small),
                 modifier = Modifier
                     .testTag("ScanCardButton")
                     .fillMaxWidth()

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreen.kt

@@ -29,8 +29,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.platform.SoftwareKeyboardController
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -110,7 +108,6 @@ fun VaultAddEditScreen(
     credentialProviderCompletionManager: CredentialProviderCompletionManager =
         LocalCredentialProviderCompletionManager.current,
     biometricsManager: BiometricsManager = LocalBiometricsManager.current,
-    keyboardController: SoftwareKeyboardController? = LocalSoftwareKeyboardController.current,
     onNavigateToManualCodeEntryScreen: () -> Unit,
     onNavigateToGeneratorModal: (GeneratorMode.Modal) -> Unit,
     onNavigateToAttachments: (cipherId: String) -> Unit,
@@ -207,7 +204,6 @@ fun VaultAddEditScreen(
 
             VaultAddEditEvent.FocusCardHolderName -> {
                 cardHolderNameFocusRequester.requestFocus()
-                keyboardController?.show()
             }
         }
     }

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt

@@ -125,11 +125,11 @@ class VaultAddEditViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     featureFlagManager: FeatureFlagManager,
     generatorRepository: GeneratorRepository,
+    cardScanManager: CardScanManager,
     private val snackbarRelayManager: SnackbarRelayManager<SnackbarRelay>,
     private val toastManager: ToastManager,
     private val authRepository: AuthRepository,
     private val clipboardManager: BitwardenClipboardManager,
-    private val cardScanManager: CardScanManager,
     private val policyManager: PolicyManager,
     private val vaultRepository: VaultRepository,
     private val bitwardenCredentialManager: BitwardenCredentialManager,

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/handlers/VaultAddEditCardTypeHandlers.kt

@@ -20,7 +20,6 @@ import com.x8bit.bitwarden.ui.vault.model.VaultCardExpirationMonth
  * @property onNumberVisibilityChange Handles the action when the number visibility changes.
  * @property onScanCardClick Handles the action when the scan card button is clicked.
  */
-@Suppress("MaxLineLength")
 data class VaultAddEditCardTypeHandlers(
     val onCardHolderNameTextChange: (String) -> Unit,
     val onNumberTextChange: (String) -> Unit,

app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditScreenTest.kt

@@ -1,7 +1,6 @@
 package com.x8bit.bitwarden.ui.vault.feature.addedit
 
 import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.platform.SoftwareKeyboardController
 import androidx.compose.ui.semantics.SemanticsActions
 import androidx.compose.ui.semantics.SemanticsProperties
 import androidx.compose.ui.test.SemanticsMatcher
@@ -121,10 +120,6 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
     private val biometricsManager: BiometricsManager = mockk {
         every { isUserVerificationSupported } returns true
     }
-    private val keyboardController: SoftwareKeyboardController = mockk {
-        every { show() } just runs
-    }
-
     @Before
     fun setup() {
         setContent(
@@ -145,7 +140,6 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
                 onNavigateToMoveToOrganization = { id, _ -> onNavigateToMoveToOrganizationId = id },
                 onNavigateToCardScanScreen = { onNavigateToCardScanScreenCalled = true },
                 viewModel = viewModel,
-                keyboardController = keyboardController,
             )
         }
     }
@@ -204,7 +198,7 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
     }
 
     @Test
-    fun `on FocusCardHolderName event should focus field and show keyboard`() {
+    fun `on FocusCardHolderName event should focus field`() {
         mutableStateFlow.value = DEFAULT_STATE_CARD
         composeTestRule.waitForIdle()
         mutableEventFlow.tryEmit(VaultAddEditEvent.FocusCardHolderName)
@@ -213,7 +207,6 @@ class VaultAddEditScreenTest : BitwardenComposeTest() {
             .onNodeWithTag("CardholderNameEntry")
             .performScrollTo()
             .assertIsFocused()
-        verify { keyboardController.show() }
     }
 
     @Test

app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModelTest.kt

@@ -5133,11 +5133,12 @@ class VaultAddEditViewModelTest : BaseViewModelTest() {
     @Test
     fun `CardScannerFlagUpdateReceive should update isCardScannerEnabled`() =
         runTest {
+            val initState = createVaultAddItemState()
             val viewModel = createAddVaultItemViewModel()
             mutableCardScannerFlow.value = true
             assertEquals(
-                true,
-                viewModel.stateFlow.value.isCardScannerEnabled,
+                initState.copy(isCardScannerEnabled = true),
+                viewModel.stateFlow.value,
             )
         }