diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/button/BitwardenTextSelectionButton.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/button/BitwardenTextSelectionButton.kt index 4eba2da6a6..fe8c0ce0cb 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/button/BitwardenTextSelectionButton.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/button/BitwardenTextSelectionButton.kt @@ -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.field.color.bitwardenTextFieldButtonColors 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.theme.BitwardenTheme import com.x8bit.bitwarden.R 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 /** diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt index 580d73e13c..b299449729 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt @@ -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.field.color.bitwardenTextFieldColors 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.x8bit.bitwarden.R 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.model.TextToolbarType 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 /** diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextField.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextField.kt index 2fb6c4080b..f477a8906e 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextField.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/field/BitwardenTextField.kt @@ -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.field.color.bitwardenTextFieldColors 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.x8bit.bitwarden.R 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.TextToolbarType 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.persistentListOf import kotlinx.collections.immutable.toImmutableList diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/toggle/BitwardenSwitch.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/toggle/BitwardenSwitch.kt index 75839efe60..b947fa0d87 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/toggle/BitwardenSwitch.kt +++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/toggle/BitwardenSwitch.kt @@ -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.divider.BitwardenHorizontalDivider 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.x8bit.bitwarden.R 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 /** diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/field/BitwardenTextFieldWithActions.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/field/BitwardenTextFieldWithActions.kt index 84e9079ac5..20add6681b 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/field/BitwardenTextFieldWithActions.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/field/BitwardenTextFieldWithActions.kt @@ -15,8 +15,8 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.tooling.preview.Preview 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.ui.platform.components.row.BitwardenRowOfActions /** * Represents a Bitwarden-styled text field accompanied by a series of actions. diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/row/BitwardenRowOfActions.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/row/BitwardenRowOfActions.kt deleted file mode 100644 index 5beee18af1..0000000000 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/row/BitwardenRowOfActions.kt +++ /dev/null @@ -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), - ) - } - } -} diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/row/BitwardenRowOfActions.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/row/BitwardenRowOfActions.kt similarity index 97% rename from app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/row/BitwardenRowOfActions.kt rename to ui/src/main/kotlin/com/bitwarden/ui/platform/components/row/BitwardenRowOfActions.kt index 0296b8ec54..814406ef89 100644 --- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/row/BitwardenRowOfActions.kt +++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/row/BitwardenRowOfActions.kt @@ -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.RowScope