Skip to content

Commit 2022ab8

Browse files
committed
Introduce BitwardenDrawable type alias
This commit introduces a type alias `BitwardenDrawable` for `com.bitwarden.ui.R.drawable`. This allows for a more concise and consistent way to reference drawable resources from the `ui` module. The following files have been updated to use `BitwardenDrawable`: - `BitwardenRowOfActions.kt` - `BitwardenTonalIconButton.kt` - `BitwardenFilledIconButton.kt` - `BitwardenStandardIconButton.kt` - `BitwardenOutlinedButton.kt` - `BitwardenFilledButton.kt` - `CompleteRegistrationScreen.kt` - `BitwardenOutlinedErrorButton.kt` - `BitwardenFilledErrorButton.kt`
1 parent f9d25f8 commit 2022ab8

File tree

11 files changed

+29
-38
lines changed

11 files changed

+29
-38
lines changed

app/src/main/kotlin/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
4040
import com.bitwarden.ui.platform.components.model.CardStyle
4141
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
4242
import com.bitwarden.ui.platform.model.WindowSize
43+
import com.bitwarden.ui.platform.resource.BitwardenDrawable
4344
import com.bitwarden.ui.platform.theme.BitwardenTheme
4445
import com.bitwarden.ui.platform.util.rememberWindowSize
4546
import com.x8bit.bitwarden.R
@@ -211,7 +212,7 @@ private fun CompleteRegistrationContent(
211212
)
212213
Spacer(modifier = Modifier.height(24.dp))
213214
BitwardenActionCardSmall(
214-
actionIcon = rememberVectorPainter(id = R.drawable.ic_question_circle),
215+
actionIcon = rememberVectorPainter(id = BitwardenDrawable.ic_question_circle),
215216
actionText = stringResource(id = R.string.what_makes_a_password_strong),
216217
callToActionText = stringResource(id = R.string.learn_more),
217218
callToActionTextColor = BitwardenTheme.colorScheme.text.interaction,

app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledButton.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import androidx.compose.ui.unit.dp
1717
import com.bitwarden.ui.platform.base.util.cardStyle
1818
import com.bitwarden.ui.platform.components.model.CardStyle
1919
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
20+
import com.bitwarden.ui.platform.resource.BitwardenDrawable
2021
import com.bitwarden.ui.platform.theme.BitwardenTheme
21-
import com.x8bit.bitwarden.R
2222
import com.x8bit.bitwarden.ui.platform.components.button.color.bitwardenFilledButtonColors
2323

2424
/**
@@ -85,7 +85,7 @@ private fun BitwardenFilledButton_preview() {
8585
BitwardenFilledButton(
8686
label = "Label",
8787
onClick = {},
88-
icon = rememberVectorPainter(id = R.drawable.ic_question_circle),
88+
icon = rememberVectorPainter(id = BitwardenDrawable.ic_question_circle),
8989
isEnabled = true,
9090
)
9191
BitwardenFilledButton(
@@ -97,7 +97,7 @@ private fun BitwardenFilledButton_preview() {
9797
BitwardenFilledButton(
9898
label = "Label",
9999
onClick = {},
100-
icon = rememberVectorPainter(id = R.drawable.ic_question_circle),
100+
icon = rememberVectorPainter(id = BitwardenDrawable.ic_question_circle),
101101
isEnabled = false,
102102
)
103103
}

app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/button/BitwardenFilledErrorButton.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import androidx.compose.ui.Modifier
77
import androidx.compose.ui.graphics.painter.Painter
88
import androidx.compose.ui.tooling.preview.Preview
99
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
10-
import com.x8bit.bitwarden.R
10+
import com.bitwarden.ui.platform.resource.BitwardenDrawable
1111
import com.x8bit.bitwarden.ui.platform.components.button.color.bitwardenFilledErrorButtonColors
1212

1313
/**
@@ -50,7 +50,7 @@ private fun BitwardenErrorButton_preview() {
5050
BitwardenFilledErrorButton(
5151
label = "Label",
5252
onClick = {},
53-
icon = rememberVectorPainter(id = R.drawable.ic_question_circle),
53+
icon = rememberVectorPainter(id = BitwardenDrawable.ic_question_circle),
5454
isEnabled = true,
5555
)
5656
BitwardenFilledErrorButton(
@@ -62,7 +62,7 @@ private fun BitwardenErrorButton_preview() {
6262
BitwardenFilledErrorButton(
6363
label = "Label",
6464
onClick = {},
65-
icon = rememberVectorPainter(id = R.drawable.ic_question_circle),
65+
icon = rememberVectorPainter(id = BitwardenDrawable.ic_question_circle),
6666
isEnabled = false,
6767
)
6868
}

app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/button/BitwardenOutlinedButton.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import androidx.compose.ui.unit.dp
2020
import com.bitwarden.ui.platform.base.util.cardStyle
2121
import com.bitwarden.ui.platform.components.model.CardStyle
2222
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
23+
import com.bitwarden.ui.platform.resource.BitwardenDrawable
2324
import com.bitwarden.ui.platform.theme.BitwardenTheme
24-
import com.x8bit.bitwarden.R
2525
import com.x8bit.bitwarden.ui.platform.components.button.color.bitwardenOutlinedButtonColors
2626

2727
/**
@@ -107,7 +107,7 @@ private fun BitwardenOutlinedButton_preview() {
107107
BitwardenOutlinedButton(
108108
label = "Label",
109109
onClick = {},
110-
icon = rememberVectorPainter(id = R.drawable.ic_question_circle),
110+
icon = rememberVectorPainter(id = BitwardenDrawable.ic_question_circle),
111111
isEnabled = true,
112112
)
113113
BitwardenOutlinedButton(
@@ -119,7 +119,7 @@ private fun BitwardenOutlinedButton_preview() {
119119
BitwardenOutlinedButton(
120120
label = "Label",
121121
onClick = {},
122-
icon = rememberVectorPainter(id = R.drawable.ic_question_circle),
122+
icon = rememberVectorPainter(id = BitwardenDrawable.ic_question_circle),
123123
isEnabled = false,
124124
)
125125
}

app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/button/BitwardenOutlinedErrorButton.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import androidx.compose.ui.Modifier
77
import androidx.compose.ui.graphics.painter.Painter
88
import androidx.compose.ui.tooling.preview.Preview
99
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
10+
import com.bitwarden.ui.platform.resource.BitwardenDrawable
1011
import com.bitwarden.ui.platform.theme.BitwardenTheme
11-
import com.x8bit.bitwarden.R
1212
import com.x8bit.bitwarden.ui.platform.components.button.color.bitwardenOutlinedButtonColors
1313

1414
/**
@@ -55,7 +55,7 @@ private fun BBitwardenOutlinedErrorButton_preview() {
5555
BitwardenOutlinedErrorButton(
5656
label = "Label",
5757
onClick = {},
58-
icon = rememberVectorPainter(id = R.drawable.ic_question_circle),
58+
icon = rememberVectorPainter(id = BitwardenDrawable.ic_question_circle),
5959
isEnabled = true,
6060
)
6161
BitwardenOutlinedErrorButton(
@@ -67,7 +67,7 @@ private fun BBitwardenOutlinedErrorButton_preview() {
6767
BitwardenOutlinedErrorButton(
6868
label = "Label",
6969
onClick = {},
70-
icon = rememberVectorPainter(id = R.drawable.ic_question_circle),
70+
icon = rememberVectorPainter(id = BitwardenDrawable.ic_question_circle),
7171
isEnabled = false,
7272
)
7373
}

app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/components/row/BitwardenRowOfActions.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import androidx.compose.ui.Modifier
1010
import androidx.compose.ui.tooling.preview.Preview
1111
import androidx.compose.ui.unit.dp
1212
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
13+
import com.bitwarden.ui.platform.resource.BitwardenDrawable
1314
import com.bitwarden.ui.platform.theme.BitwardenTheme
14-
import com.x8bit.bitwarden.R
1515

1616
/**
1717
* A composable function to display a row of actions.
@@ -41,12 +41,12 @@ private fun BitwardenRowOfIconButtons_preview() {
4141
BitwardenTheme {
4242
BitwardenRowOfActions {
4343
Icon(
44-
painter = rememberVectorPainter(id = R.drawable.ic_question_circle),
44+
painter = rememberVectorPainter(id = BitwardenDrawable.ic_question_circle),
4545
contentDescription = "Icon 1",
4646
modifier = Modifier.size(24.dp),
4747
)
4848
Icon(
49-
painter = rememberVectorPainter(id = R.drawable.ic_question_circle),
49+
painter = rememberVectorPainter(id = BitwardenDrawable.ic_question_circle),
5050
contentDescription = "Icon 2",
5151
modifier = Modifier.size(24.dp),
5252
)

app/src/main/res/drawable/ic_question_circle.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.

ui/src/main/kotlin/com/bitwarden/ui/platform/components/button/BitwardenFilledIconButton.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import androidx.compose.ui.Modifier
88
import androidx.compose.ui.semantics.contentDescription
99
import androidx.compose.ui.semantics.semantics
1010
import androidx.compose.ui.tooling.preview.Preview
11-
import com.bitwarden.ui.R
1211
import com.bitwarden.ui.platform.components.button.color.bitwardenFilledIconButtonColors
1312
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
13+
import com.bitwarden.ui.platform.resource.BitwardenDrawable
1414
import com.bitwarden.ui.platform.theme.BitwardenTheme
1515

1616
/**
@@ -50,7 +50,7 @@ fun BitwardenFilledIconButton(
5050
private fun BitwardenFilledIconButton_preview() {
5151
BitwardenTheme {
5252
BitwardenFilledIconButton(
53-
vectorIconRes = R.drawable.ic_question_circle,
53+
vectorIconRes = BitwardenDrawable.ic_question_circle,
5454
contentDescription = "Sample Icon",
5555
onClick = {},
5656
)

ui/src/main/kotlin/com/bitwarden/ui/platform/components/button/BitwardenStandardIconButton.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import androidx.compose.ui.graphics.painter.Painter
1010
import androidx.compose.ui.semantics.contentDescription
1111
import androidx.compose.ui.semantics.semantics
1212
import androidx.compose.ui.tooling.preview.Preview
13-
import com.bitwarden.ui.R
1413
import com.bitwarden.ui.platform.components.button.color.bitwardenStandardIconButtonColors
1514
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
15+
import com.bitwarden.ui.platform.resource.BitwardenDrawable
1616
import com.bitwarden.ui.platform.theme.BitwardenTheme
1717

1818
/**
@@ -81,7 +81,7 @@ fun BitwardenStandardIconButton(
8181
private fun BitwardenStandardIconButton_preview() {
8282
BitwardenTheme {
8383
BitwardenStandardIconButton(
84-
vectorIconRes = R.drawable.ic_question_circle,
84+
vectorIconRes = BitwardenDrawable.ic_question_circle,
8585
contentDescription = "Sample Icon",
8686
onClick = {},
8787
)

ui/src/main/kotlin/com/bitwarden/ui/platform/components/button/BitwardenTonalIconButton.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import androidx.compose.ui.Modifier
88
import androidx.compose.ui.semantics.contentDescription
99
import androidx.compose.ui.semantics.semantics
1010
import androidx.compose.ui.tooling.preview.Preview
11-
import com.bitwarden.ui.R
1211
import com.bitwarden.ui.platform.components.button.color.bitwardenTonalIconButtonColors
1312
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
13+
import com.bitwarden.ui.platform.resource.BitwardenDrawable
1414
import com.bitwarden.ui.platform.theme.BitwardenTheme
1515

1616
/**
@@ -50,7 +50,7 @@ fun BitwardenTonalIconButton(
5050
private fun BitwardenTonalIconButton_preview() {
5151
BitwardenTheme {
5252
BitwardenTonalIconButton(
53-
vectorIconRes = R.drawable.ic_question_circle,
53+
vectorIconRes = BitwardenDrawable.ic_question_circle,
5454
contentDescription = "Sample Icon",
5555
onClick = {},
5656
)
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package com.bitwarden.ui.platform.resource
2+
3+
/**
4+
* A type alias for the drawable resources in the Bitwarden UI module.
5+
*/
6+
typealias BitwardenDrawable = com.bitwarden.ui.R.drawable

0 commit comments

Comments
 (0)