mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-11-24 10:25:57 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add BitwardenOutlinedErrorButton and rename BitwardenErrorButton (#3984)

Browse source
This commit is contained in:
David Perez 2024-09-27 11:42:12 -05:00 committed by GitHub
parent b696964cb7
commit aa6762dc22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 80 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenErrorButton.kt → app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledErrorButton.kt
View file

@ -21,7 +21,7 @@ import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme
* @param isEnabled Whether or not the button is enabled.
*/
@Composable
fun BitwardenErrorButton(
fun BitwardenFilledErrorButton(
label: String,
onClick: () -> Unit,
modifier: Modifier = Modifier,
@ -51,7 +51,7 @@ fun BitwardenErrorButton(
@Composable
private fun BitwardenErrorButton_preview_isEnabled() {
BitwardenTheme {
BitwardenErrorButton(
BitwardenFilledErrorButton(
label = "Label",
onClick = {},
isEnabled = true,
@ -63,7 +63,7 @@ private fun BitwardenErrorButton_preview_isEnabled() {
@Composable
private fun BitwardenErrorButton_preview_isNotEnabled() {
BitwardenTheme {
BitwardenErrorButton(
BitwardenFilledErrorButton(
label = "Label",
onClick = {},
isEnabled = false,

73
app/src/main/java/com/x8bit/bitwarden/ui/platform/components/button/BitwardenOutlinedErrorButton.kt Normal file
View file

@ -0,0 +1,73 @@
package com.x8bit.bitwarden.ui.platform.components.button
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedButton
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
/**
* Represents a Bitwarden-styled filled [OutlinedButton] for error states.
*
* @param label The label for the button.
* @param onClick The callback when the button is clicked.
* @param modifier The [Modifier] to be applied to the button.
* @param isEnabled Whether or not the button is enabled.
*/
@Composable
fun BitwardenOutlinedErrorButton(
label: String,
onClick: () -> Unit,
modifier: Modifier = Modifier,
isEnabled: Boolean = true,
) {
OutlinedButton(
modifier = modifier.semantics(mergeDescendants = true) { },
onClick = onClick,
enabled = isEnabled,
contentPadding = PaddingValues(
vertical = 10.dp,
horizontal = 24.dp,
),
colors = ButtonDefaults.outlinedButtonColors(
contentColor = MaterialTheme.colorScheme.error,
),
border = BorderStroke(
width = 1.dp,
color = MaterialTheme.colorScheme.error.copy(
alpha = if (isEnabled) 1f else 0.12f,
),
),
) {
Text(
text = label,
style = MaterialTheme.typography.labelLarge,
)
}
}
@Preview
@Composable
private fun BitwardenOutlinedErrorButton_preview_isEnabled() {
BitwardenOutlinedErrorButton(
label = "Label",
onClick = {},
isEnabled = true,
)
}
@Preview
@Composable
private fun BBitwardenOutlinedErrorButton_preview_isNotEnabled() {
BitwardenOutlinedErrorButton(
label = "Label",
onClick = {},
isEnabled = false,
)
}

4
app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/deleteaccount/DeleteAccountScreen.kt
View file

@ -34,7 +34,7 @@ import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect
import com.x8bit.bitwarden.ui.platform.base.util.asText
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenErrorButton
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledErrorButton
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenOutlinedButton
import com.x8bit.bitwarden.ui.platform.components.dialog.BasicDialogState
import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenBasicDialog
@ -203,7 +203,7 @@ private fun DeleteAccountButton(
)
}
BitwardenErrorButton(
BitwardenFilledErrorButton(
label = stringResource(id = R.string.delete_account),
onClick = {
if (isUnlockWithPasswordEnabled) {

4
app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/deleteaccountconfirmation/DeleteAccountConfirmationScreen.kt
View file

@ -32,7 +32,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect
import com.x8bit.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenErrorButton
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenFilledErrorButton
import com.x8bit.bitwarden.ui.platform.components.button.BitwardenOutlinedButton
import com.x8bit.bitwarden.ui.platform.components.dialog.BasicDialogState
import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenBasicDialog
@ -176,7 +176,7 @@ private fun DeleteAccountConfirmationContent(
.fillMaxWidth(),
)
Spacer(modifier = Modifier.height(12.dp))
BitwardenErrorButton(
BitwardenFilledErrorButton(
label = stringResource(id = R.string.delete_account),
onClick = onDeleteAccountClick,
isEnabled = state.verificationCode.isNotBlank(),