bitwarden/android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-12-10 09:56:45 -06:00
Code Issues Packages Projects Releases 169 Wiki Activity

[PM-22815] Migrate BitwardenContentBlock to ui module (#5383)

Browse Source
This commit is contained in:
Patrick Honkonen 2025-06-18 11:05:21 -04:00 committed by GitHub
parent e7cf5a7efa
commit 6c41c358ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 20 additions and 20 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/masterpasswordguidance/MasterPasswordGuidanceScreen.kt
View File

@ -27,13 +27,13 @@ import com.bitwarden.ui.platform.base.util.annotatedStringResource
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
import com.bitwarden.ui.platform.base.util.toAnnotatedString
import com.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
import com.bitwarden.ui.platform.components.content.model.ContentBlockData
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
import com.bitwarden.ui.platform.resource.BitwardenDrawable
import com.bitwarden.ui.platform.theme.BitwardenTheme
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.ui.platform.components.card.BitwardenActionCard
import com.x8bit.bitwarden.ui.platform.components.card.BitwardenContentCard
import com.x8bit.bitwarden.ui.platform.components.model.ContentBlockData
import com.x8bit.bitwarden.ui.platform.components.scaffold.BitwardenScaffold
import kotlinx.collections.immutable.persistentListOf
@ -150,7 +150,7 @@ private fun MasterPasswordGuidanceContentBlocks(modifier: Modifier = Modifier) {
subtitleText = annotatedStringResource(
id = R.string.put_the_words_together_in_any_order_to_form_your_passphrase,
),
iconVectorResource = R.drawable.ic_number2,
iconVectorResource = BitwardenDrawable.ic_number2,
),
ContentBlockData(
headerText = stringResource(R.string.make_it_yours).toAnnotatedString(),

2
app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/preventaccountlockout/PreventAccountLockoutScreen.kt
View File

@ -25,12 +25,12 @@ import androidx.hilt.navigation.compose.hiltViewModel
import com.bitwarden.ui.platform.base.util.EventsEffect
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
import com.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
import com.bitwarden.ui.platform.components.content.model.ContentBlockData
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
import com.bitwarden.ui.platform.resource.BitwardenDrawable
import com.bitwarden.ui.platform.theme.BitwardenTheme
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.ui.platform.components.card.BitwardenContentCard
import com.x8bit.bitwarden.ui.platform.components.model.ContentBlockData
import com.x8bit.bitwarden.ui.platform.components.scaffold.BitwardenScaffold
import kotlinx.collections.immutable.persistentListOf

4
app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/card/BitwardenContentCard.kt
View File

@ -8,9 +8,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.TextStyle
import com.bitwarden.ui.platform.components.content.BitwardenContentBlock
import com.bitwarden.ui.platform.components.content.model.ContentBlockData
import com.bitwarden.ui.platform.theme.BitwardenTheme
import com.x8bit.bitwarden.ui.platform.components.content.BitwardenContentBlock
import com.x8bit.bitwarden.ui.platform.components.model.ContentBlockData
import kotlinx.collections.immutable.ImmutableList
/**

2
app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/privilegedapps/about/AboutPrivilegedAppsScreen.kt
View File

@ -19,12 +19,12 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
import com.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
import com.bitwarden.ui.platform.components.content.model.ContentBlockData
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
import com.bitwarden.ui.platform.resource.BitwardenDrawable
import com.bitwarden.ui.platform.theme.BitwardenTheme
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.ui.platform.components.card.BitwardenContentCard
import com.x8bit.bitwarden.ui.platform.components.model.ContentBlockData
import com.x8bit.bitwarden.ui.platform.components.scaffold.BitwardenScaffold
import kotlinx.collections.immutable.persistentListOf

8
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt
View File

@ -47,6 +47,7 @@ import com.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
import com.bitwarden.ui.platform.components.appbar.NavigationIcon
import com.bitwarden.ui.platform.components.button.BitwardenFilledButton
import com.bitwarden.ui.platform.components.button.BitwardenOutlinedButton
import com.bitwarden.ui.platform.components.content.model.ContentBlockData
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
import com.bitwarden.ui.platform.resource.BitwardenDrawable
import com.bitwarden.ui.platform.theme.BitwardenTheme
@ -55,7 +56,6 @@ import com.x8bit.bitwarden.ui.platform.components.bottomsheet.BitwardenModalBott
import com.x8bit.bitwarden.ui.platform.components.card.BitwardenContentCard
import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenLoadingDialog
import com.x8bit.bitwarden.ui.platform.components.dialog.BitwardenTwoButtonDialog
import com.x8bit.bitwarden.ui.platform.components.model.ContentBlockData
import com.x8bit.bitwarden.ui.platform.components.scaffold.BitwardenScaffold
import com.x8bit.bitwarden.ui.platform.composition.LocalIntentManager
import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager
@ -306,7 +306,7 @@ private fun ImportLoginsStepOneContent(
subtitleText = null,
),
ContentBlockData(
iconVectorResource = R.drawable.ic_number2,
iconVectorResource = BitwardenDrawable.ic_number2,
headerText = instruction2,
subtitleText = null,
),
@ -352,7 +352,7 @@ private fun ImportLoginsStepTwoContent(
subtitleText = null,
),
ContentBlockData(
iconVectorResource = R.drawable.ic_number2,
iconVectorResource = BitwardenDrawable.ic_number2,
headerText = instruction2,
subtitleText = null,
),
@ -394,7 +394,7 @@ private fun ImportLoginsStepThreeContent(
subtitleText = null,
),
ContentBlockData(
iconVectorResource = R.drawable.ic_number2,
iconVectorResource = BitwardenDrawable.ic_number2,
headerText = instruction2,
subtitleText = null,
),

5
app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt
View File

@ -24,10 +24,11 @@ import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
import com.bitwarden.ui.platform.base.util.toAnnotatedString
import com.bitwarden.ui.platform.components.button.BitwardenFilledButton
import com.bitwarden.ui.platform.components.button.BitwardenOutlinedButton
import com.bitwarden.ui.platform.components.content.model.ContentBlockData
import com.bitwarden.ui.platform.resource.BitwardenDrawable
import com.bitwarden.ui.platform.theme.BitwardenTheme
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.ui.platform.components.card.BitwardenContentCard
import com.x8bit.bitwarden.ui.platform.components.model.ContentBlockData
import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.persistentListOf
@ -120,7 +121,7 @@ private fun ImportLoginsInstructionStep_preview() {
subtitleText = null,
),
ContentBlockData(
iconVectorResource = R.drawable.ic_number2,
iconVectorResource = BitwardenDrawable.ic_number2,
headerText = buildAnnotatedString {
append("Step text 2")
},

8
app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/content/BitwardenContentBlock.kt → ui/src/main/kotlin/com/bitwarden/ui/platform/components/content/BitwardenContentBlock.kt
View File

@ -1,4 +1,4 @@
package com.x8bit.bitwarden.ui.platform.components.content
package com.bitwarden.ui.platform.components.content
import androidx.annotation.DrawableRes
import androidx.compose.foundation.background
@ -20,10 +20,10 @@ import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.bitwarden.ui.platform.base.util.bottomDivider
import com.bitwarden.ui.platform.components.content.model.ContentBlockData
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
import com.bitwarden.ui.platform.resource.BitwardenDrawable
import com.bitwarden.ui.platform.theme.BitwardenTheme
import com.x8bit.bitwarden.R
import com.x8bit.bitwarden.ui.platform.components.model.ContentBlockData
/**
* An overloaded version [BitwardenContentBlock] which takes a [ContentBlockData] for the
@ -129,7 +129,7 @@ private fun BitwardenContentBlock_preview() {
data = ContentBlockData(
headerText = "Header",
subtitleText = "Subtitle",
iconVectorResource = R.drawable.ic_number2,
iconVectorResource = BitwardenDrawable.ic_number2,
),
)
BitwardenContentBlock(

7
app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/model/ContentBlockData.kt → ui/src/main/kotlin/com/bitwarden/ui/platform/components/content/model/ContentBlockData.kt
View File

@ -1,14 +1,13 @@
package com.x8bit.bitwarden.ui.platform.components.model
package com.bitwarden.ui.platform.components.content.model
import androidx.annotation.DrawableRes
import androidx.compose.runtime.Immutable
import androidx.compose.ui.text.AnnotatedString
import com.bitwarden.ui.platform.base.util.toAnnotatedString
import com.x8bit.bitwarden.ui.platform.components.content.BitwardenContentBlock
import com.bitwarden.ui.platform.components.content.BitwardenContentBlock
/**
* Wrapper class for data to display in a
* [BitwardenContentBlock]
* Wrapper class for data to display in a [BitwardenContentBlock]
*/
@Immutable
data class ContentBlockData(

0
app/src/main/res/drawable/ic_number2.xml → ui/src/main/res/drawable/ic_number2.xml
View File