bitwarden/android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-12-11 13:57:03 -06:00
Code Issues Packages Projects Releases 169 Wiki Activity

Update onboarding secondary buttons to match designs (#5936)

Browse Source
This commit is contained in:
David Perez 2025-09-24 14:10:07 -05:00 committed by GitHub
parent b558d70703
commit c122f83fa6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutofillScreen.kt
View File

@ -34,7 +34,7 @@ import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
import com.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar import com.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
import com.bitwarden.ui.platform.components.appbar.NavigationIcon import com.bitwarden.ui.platform.components.appbar.NavigationIcon
import com.bitwarden.ui.platform.components.button.BitwardenFilledButton import com.bitwarden.ui.platform.components.button.BitwardenFilledButton
import com.bitwarden.ui.platform.components.button.BitwardenTextButton import com.bitwarden.ui.platform.components.button.BitwardenOutlinedButton
import com.bitwarden.ui.platform.components.dialog.BitwardenBasicDialog import com.bitwarden.ui.platform.components.dialog.BitwardenBasicDialog
import com.bitwarden.ui.platform.components.dialog.BitwardenTwoButtonDialog import com.bitwarden.ui.platform.components.dialog.BitwardenTwoButtonDialog
import com.bitwarden.ui.platform.components.image.BitwardenGifImage import com.bitwarden.ui.platform.components.image.BitwardenGifImage
@ -189,7 +189,7 @@ private fun SetupAutoFillContent(
) )
Spacer(modifier = Modifier.height(12.dp)) Spacer(modifier = Modifier.height(12.dp))
if (state.isInitialSetup) { if (state.isInitialSetup) {
BitwardenTextButton( BitwardenOutlinedButton(
label = stringResource(BitwardenString.turn_on_later), label = stringResource(BitwardenString.turn_on_later),
onClick = onTurnOnLaterClick, onClick = onTurnOnLaterClick,
modifier = Modifier modifier = Modifier

8
app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockScreen.kt
View File

@ -38,7 +38,7 @@ import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
import com.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar import com.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
import com.bitwarden.ui.platform.components.appbar.NavigationIcon import com.bitwarden.ui.platform.components.appbar.NavigationIcon
import com.bitwarden.ui.platform.components.button.BitwardenFilledButton import com.bitwarden.ui.platform.components.button.BitwardenFilledButton
import com.bitwarden.ui.platform.components.button.BitwardenTextButton import com.bitwarden.ui.platform.components.button.BitwardenOutlinedButton
import com.bitwarden.ui.platform.components.dialog.BitwardenBasicDialog import com.bitwarden.ui.platform.components.dialog.BitwardenBasicDialog
import com.bitwarden.ui.platform.components.dialog.BitwardenLoadingDialog import com.bitwarden.ui.platform.components.dialog.BitwardenLoadingDialog
import com.bitwarden.ui.platform.components.dialog.BitwardenTwoButtonDialog import com.bitwarden.ui.platform.components.dialog.BitwardenTwoButtonDialog
@ -218,11 +218,11 @@ private fun SetUpLaterButton(
) { ) {
var displayConfirmation by rememberSaveable { mutableStateOf(value = false) } var displayConfirmation by rememberSaveable { mutableStateOf(value = false) }
if (displayConfirmation) { if (displayConfirmation) {
@Suppress("MaxLineLength")
BitwardenTwoButtonDialog( BitwardenTwoButtonDialog(
title = stringResource(id = BitwardenString.set_up_unlock_later), title = stringResource(id = BitwardenString.set_up_unlock_later),
message = stringResource( message = stringResource(
id = BitwardenString.you_can_return_to_complete_this_step_anytime_from_account_security_in_settings, id = BitwardenString
.you_can_return_to_complete_this_step_anytime_from_account_security_in_settings,
), ),
confirmButtonText = stringResource(id = BitwardenString.confirm), confirmButtonText = stringResource(id = BitwardenString.confirm),
dismissButtonText = stringResource(id = BitwardenString.cancel), dismissButtonText = stringResource(id = BitwardenString.cancel),
@ -235,7 +235,7 @@ private fun SetUpLaterButton(
) )
} }
BitwardenTextButton( BitwardenOutlinedButton(
label = stringResource(id = BitwardenString.set_up_later), label = stringResource(id = BitwardenString.set_up_later),
onClick = { displayConfirmation = true }, onClick = { displayConfirmation = true },
modifier = modifier.testTag(tag = "SetUpLaterButton"), modifier = modifier.testTag(tag = "SetUpLaterButton"),