diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt index 44ee72c7a9..fd25957f01 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/itemlisting/ItemListingScreen.kt @@ -69,13 +69,13 @@ import com.bitwarden.authenticator.ui.platform.components.header.BitwardenListHe import com.bitwarden.authenticator.ui.platform.components.header.BitwardenListHeaderTextWithSupportLabel import com.bitwarden.authenticator.ui.platform.components.model.IconResource import com.bitwarden.authenticator.ui.platform.components.scaffold.BitwardenScaffold -import com.bitwarden.authenticator.ui.platform.components.util.rememberVectorPainter import com.bitwarden.authenticator.ui.platform.composition.LocalIntentManager import com.bitwarden.authenticator.ui.platform.composition.LocalPermissionsManager import com.bitwarden.authenticator.ui.platform.manager.intent.IntentManager import com.bitwarden.authenticator.ui.platform.manager.permissions.PermissionsManager import com.bitwarden.authenticator.ui.platform.theme.Typography import com.bitwarden.ui.platform.base.util.EventsEffect +import com.bitwarden.ui.platform.components.util.rememberVectorPainter import com.bitwarden.ui.platform.feature.settings.appearance.model.AppTheme import com.bitwarden.ui.util.asText import kotlinx.coroutines.launch diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/appbar/action/BitwardenSearchActionItem.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/appbar/action/BitwardenSearchActionItem.kt index dc5cba9026..53387b1643 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/appbar/action/BitwardenSearchActionItem.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/appbar/action/BitwardenSearchActionItem.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import androidx.compose.ui.tooling.preview.Preview import com.bitwarden.authenticator.R -import com.bitwarden.authenticator.ui.platform.components.util.rememberVectorPainter +import com.bitwarden.ui.platform.components.util.rememberVectorPainter /** * Represents the Bitwarden search action item. diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/button/BitwardenStandardIconButton.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/button/BitwardenStandardIconButton.kt index f8f217d965..34e77bc782 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/button/BitwardenStandardIconButton.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/button/BitwardenStandardIconButton.kt @@ -10,7 +10,7 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.tooling.preview.Preview import com.bitwarden.authenticator.R import com.bitwarden.authenticator.ui.platform.components.model.IconResource -import com.bitwarden.authenticator.ui.platform.components.util.rememberVectorPainter +import com.bitwarden.ui.platform.components.util.rememberVectorPainter /** * An icon button that displays an icon from the provided [IconResource]. diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/card/BitwardenActionCard.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/card/BitwardenActionCard.kt index e273f3cac4..8afc4a6466 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/card/BitwardenActionCard.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/card/BitwardenActionCard.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.bitwarden.authenticator.R -import com.bitwarden.authenticator.ui.platform.components.util.rememberVectorPainter +import com.bitwarden.ui.platform.components.util.rememberVectorPainter /** * A reusable card for displaying actions to the user. diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/row/BitwardenExternalLinkRow.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/row/BitwardenExternalLinkRow.kt index e48770b899..642e3f1ac3 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/row/BitwardenExternalLinkRow.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/row/BitwardenExternalLinkRow.kt @@ -12,9 +12,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import com.bitwarden.authenticator.R import com.bitwarden.authenticator.ui.platform.components.dialog.BitwardenTwoButtonDialog -import com.bitwarden.authenticator.ui.platform.components.util.rememberVectorPainter import com.bitwarden.authenticator.ui.platform.theme.AuthenticatorTheme import com.bitwarden.ui.platform.base.util.mirrorIfRtl +import com.bitwarden.ui.platform.components.util.rememberVectorPainter /** * Represents a row of text that can be clicked on and contains an external link. diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/stepper/BitwardenStepper.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/stepper/BitwardenStepper.kt index 54822996d3..a937234736 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/stepper/BitwardenStepper.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/stepper/BitwardenStepper.kt @@ -9,9 +9,9 @@ import com.bitwarden.authenticator.R import com.bitwarden.authenticator.ui.platform.components.field.BitwardenTextFieldWithActions import com.bitwarden.authenticator.ui.platform.components.icon.BitwardenIconButtonWithResource import com.bitwarden.authenticator.ui.platform.components.model.IconResource -import com.bitwarden.authenticator.ui.platform.components.util.rememberVectorPainter import com.bitwarden.ui.platform.base.util.ZERO_WIDTH_CHARACTER import com.bitwarden.ui.platform.base.util.orNullIfBlank +import com.bitwarden.ui.platform.components.util.rememberVectorPainter /** * Displays a stepper that allows the user to increment and decrement an int value. diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/util/RememberVectorPainter.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/util/RememberVectorPainter.kt deleted file mode 100644 index 1f63459471..0000000000 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/util/RememberVectorPainter.kt +++ /dev/null @@ -1,19 +0,0 @@ -package com.bitwarden.authenticator.ui.platform.components.util - -import androidx.annotation.DrawableRes -import androidx.compose.runtime.Composable -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.VectorPainter -import androidx.compose.ui.graphics.vector.rememberVectorPainter -import androidx.compose.ui.res.vectorResource - -/** - * Returns a [VectorPainter] built from the given [id] to circumvent issues with painter resources - * recomposing unnecessarily. - */ -@Composable -fun rememberVectorPainter( - @DrawableRes id: Int, -): VectorPainter = rememberVectorPainter( - image = ImageVector.vectorResource(id), -) diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/debugmenu/DebugMenuScreen.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/debugmenu/DebugMenuScreen.kt index 26b5680090..62d4b8ec97 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/debugmenu/DebugMenuScreen.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/debugmenu/DebugMenuScreen.kt @@ -28,11 +28,11 @@ import com.bitwarden.authenticator.ui.platform.components.button.BitwardenFilled import com.bitwarden.authenticator.ui.platform.components.divider.BitwardenHorizontalDivider import com.bitwarden.authenticator.ui.platform.components.header.BitwardenListHeaderText import com.bitwarden.authenticator.ui.platform.components.scaffold.BitwardenScaffold -import com.bitwarden.authenticator.ui.platform.components.util.rememberVectorPainter import com.bitwarden.authenticator.ui.platform.feature.debugmenu.components.ListItemContent import com.bitwarden.authenticator.ui.platform.theme.AuthenticatorTheme import com.bitwarden.ui.platform.base.util.EventsEffect import com.bitwarden.ui.platform.base.util.standardHorizontalMargin +import com.bitwarden.ui.platform.components.util.rememberVectorPainter /** * Top level screen for the debug menu. diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/SettingsScreen.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/SettingsScreen.kt index ba2fc115aa..2ee4d7f8bb 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/SettingsScreen.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/settings/SettingsScreen.kt @@ -56,7 +56,6 @@ import com.bitwarden.authenticator.ui.platform.components.row.BitwardenExternalL import com.bitwarden.authenticator.ui.platform.components.row.BitwardenTextRow import com.bitwarden.authenticator.ui.platform.components.scaffold.BitwardenScaffold import com.bitwarden.authenticator.ui.platform.components.toggle.BitwardenWideSwitch -import com.bitwarden.authenticator.ui.platform.components.util.rememberVectorPainter import com.bitwarden.authenticator.ui.platform.composition.LocalBiometricsManager import com.bitwarden.authenticator.ui.platform.composition.LocalIntentManager import com.bitwarden.authenticator.ui.platform.feature.settings.data.model.DefaultSaveOption @@ -66,6 +65,7 @@ import com.bitwarden.authenticator.ui.platform.theme.AuthenticatorTheme import com.bitwarden.authenticator.ui.platform.util.displayLabel import com.bitwarden.ui.platform.base.util.EventsEffect import com.bitwarden.ui.platform.base.util.mirrorIfRtl +import com.bitwarden.ui.platform.components.util.rememberVectorPainter import com.bitwarden.ui.platform.feature.settings.appearance.model.AppTheme import com.bitwarden.ui.util.Text import com.bitwarden.ui.util.asText diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/tutorial/TutorialScreen.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/tutorial/TutorialScreen.kt index d143da4415..d9bab21dd6 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/tutorial/TutorialScreen.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/feature/tutorial/TutorialScreen.kt @@ -45,10 +45,10 @@ import com.bitwarden.authenticator.R import com.bitwarden.authenticator.ui.platform.components.button.BitwardenFilledTonalButton import com.bitwarden.authenticator.ui.platform.components.button.BitwardenTextButton import com.bitwarden.authenticator.ui.platform.components.scaffold.BitwardenScaffold -import com.bitwarden.authenticator.ui.platform.components.util.rememberVectorPainter import com.bitwarden.authenticator.ui.platform.util.isPortrait import com.bitwarden.ui.platform.base.util.EventsEffect import com.bitwarden.ui.platform.base.util.standardHorizontalMargin +import com.bitwarden.ui.platform.components.util.rememberVectorPainter import kotlinx.coroutines.launch /**