mirror of
https://github.com/bitwarden/android.git
synced 2026-04-29 20:38:41 -05:00
[PM-22786] Migrate BitwardenRowOfActions to ui module (#5381)
This commit is contained in:
@@ -33,11 +33,11 @@ import com.bitwarden.ui.platform.components.button.BitwardenStandardIconButton
|
|||||||
import com.bitwarden.ui.platform.components.divider.BitwardenHorizontalDivider
|
import com.bitwarden.ui.platform.components.divider.BitwardenHorizontalDivider
|
||||||
import com.bitwarden.ui.platform.components.field.color.bitwardenTextFieldButtonColors
|
import com.bitwarden.ui.platform.components.field.color.bitwardenTextFieldButtonColors
|
||||||
import com.bitwarden.ui.platform.components.model.CardStyle
|
import com.bitwarden.ui.platform.components.model.CardStyle
|
||||||
|
import com.bitwarden.ui.platform.components.row.BitwardenRowOfActions
|
||||||
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
|
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
|
||||||
import com.bitwarden.ui.platform.theme.BitwardenTheme
|
import com.bitwarden.ui.platform.theme.BitwardenTheme
|
||||||
import com.x8bit.bitwarden.R
|
import com.x8bit.bitwarden.R
|
||||||
import com.x8bit.bitwarden.ui.platform.components.model.TooltipData
|
import com.x8bit.bitwarden.ui.platform.components.model.TooltipData
|
||||||
import com.x8bit.bitwarden.ui.platform.components.row.BitwardenRowOfActions
|
|
||||||
import com.x8bit.bitwarden.ui.platform.util.persistentListOfNotNull
|
import com.x8bit.bitwarden.ui.platform.util.persistentListOfNotNull
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -51,13 +51,13 @@ import com.bitwarden.ui.platform.components.button.BitwardenStandardIconButton
|
|||||||
import com.bitwarden.ui.platform.components.divider.BitwardenHorizontalDivider
|
import com.bitwarden.ui.platform.components.divider.BitwardenHorizontalDivider
|
||||||
import com.bitwarden.ui.platform.components.field.color.bitwardenTextFieldColors
|
import com.bitwarden.ui.platform.components.field.color.bitwardenTextFieldColors
|
||||||
import com.bitwarden.ui.platform.components.model.CardStyle
|
import com.bitwarden.ui.platform.components.model.CardStyle
|
||||||
|
import com.bitwarden.ui.platform.components.row.BitwardenRowOfActions
|
||||||
import com.bitwarden.ui.platform.theme.BitwardenTheme
|
import com.bitwarden.ui.platform.theme.BitwardenTheme
|
||||||
import com.x8bit.bitwarden.R
|
import com.x8bit.bitwarden.R
|
||||||
import com.x8bit.bitwarden.ui.platform.components.field.toolbar.BitwardenCutCopyTextToolbar
|
import com.x8bit.bitwarden.ui.platform.components.field.toolbar.BitwardenCutCopyTextToolbar
|
||||||
import com.x8bit.bitwarden.ui.platform.components.field.toolbar.BitwardenEmptyTextToolbar
|
import com.x8bit.bitwarden.ui.platform.components.field.toolbar.BitwardenEmptyTextToolbar
|
||||||
import com.x8bit.bitwarden.ui.platform.components.model.TextToolbarType
|
import com.x8bit.bitwarden.ui.platform.components.model.TextToolbarType
|
||||||
import com.x8bit.bitwarden.ui.platform.components.model.TooltipData
|
import com.x8bit.bitwarden.ui.platform.components.model.TooltipData
|
||||||
import com.x8bit.bitwarden.ui.platform.components.row.BitwardenRowOfActions
|
|
||||||
import com.x8bit.bitwarden.ui.platform.components.util.nonLetterColorVisualTransformation
|
import com.x8bit.bitwarden.ui.platform.components.util.nonLetterColorVisualTransformation
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ import com.bitwarden.ui.platform.components.button.BitwardenStandardIconButton
|
|||||||
import com.bitwarden.ui.platform.components.divider.BitwardenHorizontalDivider
|
import com.bitwarden.ui.platform.components.divider.BitwardenHorizontalDivider
|
||||||
import com.bitwarden.ui.platform.components.field.color.bitwardenTextFieldColors
|
import com.bitwarden.ui.platform.components.field.color.bitwardenTextFieldColors
|
||||||
import com.bitwarden.ui.platform.components.model.CardStyle
|
import com.bitwarden.ui.platform.components.model.CardStyle
|
||||||
|
import com.bitwarden.ui.platform.components.row.BitwardenRowOfActions
|
||||||
import com.bitwarden.ui.platform.theme.BitwardenTheme
|
import com.bitwarden.ui.platform.theme.BitwardenTheme
|
||||||
import com.x8bit.bitwarden.R
|
import com.x8bit.bitwarden.R
|
||||||
import com.x8bit.bitwarden.ui.platform.components.field.toolbar.BitwardenCutCopyTextToolbar
|
import com.x8bit.bitwarden.ui.platform.components.field.toolbar.BitwardenCutCopyTextToolbar
|
||||||
@@ -67,7 +68,6 @@ import com.x8bit.bitwarden.ui.platform.components.icon.BitwardenIcon
|
|||||||
import com.x8bit.bitwarden.ui.platform.components.model.IconData
|
import com.x8bit.bitwarden.ui.platform.components.model.IconData
|
||||||
import com.x8bit.bitwarden.ui.platform.components.model.TextToolbarType
|
import com.x8bit.bitwarden.ui.platform.components.model.TextToolbarType
|
||||||
import com.x8bit.bitwarden.ui.platform.components.model.TooltipData
|
import com.x8bit.bitwarden.ui.platform.components.model.TooltipData
|
||||||
import com.x8bit.bitwarden.ui.platform.components.row.BitwardenRowOfActions
|
|
||||||
import kotlinx.collections.immutable.ImmutableList
|
import kotlinx.collections.immutable.ImmutableList
|
||||||
import kotlinx.collections.immutable.persistentListOf
|
import kotlinx.collections.immutable.persistentListOf
|
||||||
import kotlinx.collections.immutable.toImmutableList
|
import kotlinx.collections.immutable.toImmutableList
|
||||||
|
|||||||
@@ -34,10 +34,10 @@ import com.bitwarden.ui.platform.base.util.toAnnotatedString
|
|||||||
import com.bitwarden.ui.platform.components.button.BitwardenStandardIconButton
|
import com.bitwarden.ui.platform.components.button.BitwardenStandardIconButton
|
||||||
import com.bitwarden.ui.platform.components.divider.BitwardenHorizontalDivider
|
import com.bitwarden.ui.platform.components.divider.BitwardenHorizontalDivider
|
||||||
import com.bitwarden.ui.platform.components.model.CardStyle
|
import com.bitwarden.ui.platform.components.model.CardStyle
|
||||||
|
import com.bitwarden.ui.platform.components.row.BitwardenRowOfActions
|
||||||
import com.bitwarden.ui.platform.theme.BitwardenTheme
|
import com.bitwarden.ui.platform.theme.BitwardenTheme
|
||||||
import com.x8bit.bitwarden.R
|
import com.x8bit.bitwarden.R
|
||||||
import com.x8bit.bitwarden.ui.platform.components.model.TooltipData
|
import com.x8bit.bitwarden.ui.platform.components.model.TooltipData
|
||||||
import com.x8bit.bitwarden.ui.platform.components.row.BitwardenRowOfActions
|
|
||||||
import com.x8bit.bitwarden.ui.platform.components.toggle.color.bitwardenSwitchColors
|
import com.x8bit.bitwarden.ui.platform.components.toggle.color.bitwardenSwitchColors
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ import androidx.compose.ui.text.input.KeyboardType
|
|||||||
import androidx.compose.ui.text.input.VisualTransformation
|
import androidx.compose.ui.text.input.VisualTransformation
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
import com.bitwarden.authenticator.R
|
import com.bitwarden.authenticator.R
|
||||||
import com.bitwarden.authenticator.ui.platform.components.row.BitwardenRowOfActions
|
|
||||||
import com.bitwarden.authenticator.ui.platform.theme.AuthenticatorTheme
|
import com.bitwarden.authenticator.ui.platform.theme.AuthenticatorTheme
|
||||||
|
import com.bitwarden.ui.platform.components.row.BitwardenRowOfActions
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents a Bitwarden-styled text field accompanied by a series of actions.
|
* Represents a Bitwarden-styled text field accompanied by a series of actions.
|
||||||
|
|||||||
@@ -1,58 +0,0 @@
|
|||||||
package com.bitwarden.authenticator.ui.platform.components.row
|
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.RowScope
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.layout.size
|
|
||||||
import androidx.compose.material3.Icon
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.res.painterResource
|
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import com.bitwarden.authenticator.R
|
|
||||||
import com.bitwarden.authenticator.ui.platform.theme.AuthenticatorTheme
|
|
||||||
|
|
||||||
/**
|
|
||||||
* A composable function to display a row of actions.
|
|
||||||
*
|
|
||||||
* This function takes in a trailing lambda which provides a `RowScope` in order to
|
|
||||||
* layout individual actions. The actions will be arranged in a horizontal
|
|
||||||
* sequence, spaced by 8.dp, and are vertically centered.
|
|
||||||
*
|
|
||||||
* @param actions The composable actions to execute within the [RowScope]. Typically used to
|
|
||||||
* layout individual icons or buttons.
|
|
||||||
*/
|
|
||||||
@Composable
|
|
||||||
fun BitwardenRowOfActions(
|
|
||||||
modifier: Modifier = Modifier,
|
|
||||||
actions: @Composable RowScope.() -> Unit,
|
|
||||||
) {
|
|
||||||
Row(
|
|
||||||
modifier = modifier.padding(start = 8.dp),
|
|
||||||
horizontalArrangement = Arrangement.spacedBy(8.dp),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
content = actions,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Preview(showBackground = true)
|
|
||||||
@Composable
|
|
||||||
private fun BitwardenRowOfIconButtons_preview() {
|
|
||||||
AuthenticatorTheme {
|
|
||||||
BitwardenRowOfActions {
|
|
||||||
Icon(
|
|
||||||
painter = painterResource(id = R.drawable.ic_tooltip),
|
|
||||||
contentDescription = "Icon 1",
|
|
||||||
modifier = Modifier.size(24.dp),
|
|
||||||
)
|
|
||||||
Icon(
|
|
||||||
painter = painterResource(id = R.drawable.ic_tooltip),
|
|
||||||
contentDescription = "Icon 2",
|
|
||||||
modifier = Modifier.size(24.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.x8bit.bitwarden.ui.platform.components.row
|
package com.bitwarden.ui.platform.components.row
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.RowScope
|
import androidx.compose.foundation.layout.RowScope
|
||||||
Reference in New Issue
Block a user