File tree 11 files changed +29
-38
lines changed
kotlin/com/x8bit/bitwarden/ui
auth/feature/completeregistration
ui/src/main/kotlin/com/bitwarden/ui/platform 11 files changed +29
-38
lines changed Original file line number Diff line number Diff line change @@ -40,6 +40,7 @@ import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
40
40
import com.bitwarden.ui.platform.components.model.CardStyle
41
41
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
42
42
import com.bitwarden.ui.platform.model.WindowSize
43
+ import com.bitwarden.ui.platform.resource.BitwardenDrawable
43
44
import com.bitwarden.ui.platform.theme.BitwardenTheme
44
45
import com.bitwarden.ui.platform.util.rememberWindowSize
45
46
import com.x8bit.bitwarden.R
@@ -211,7 +212,7 @@ private fun CompleteRegistrationContent(
211
212
)
212
213
Spacer (modifier = Modifier .height(24 .dp))
213
214
BitwardenActionCardSmall (
214
- actionIcon = rememberVectorPainter(id = R .drawable .ic_question_circle),
215
+ actionIcon = rememberVectorPainter(id = BitwardenDrawable .ic_question_circle),
215
216
actionText = stringResource(id = R .string.what_makes_a_password_strong),
216
217
callToActionText = stringResource(id = R .string.learn_more),
217
218
callToActionTextColor = BitwardenTheme .colorScheme.text.interaction,
Original file line number Diff line number Diff line change @@ -17,8 +17,8 @@ import androidx.compose.ui.unit.dp
17
17
import com.bitwarden.ui.platform.base.util.cardStyle
18
18
import com.bitwarden.ui.platform.components.model.CardStyle
19
19
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
20
+ import com.bitwarden.ui.platform.resource.BitwardenDrawable
20
21
import com.bitwarden.ui.platform.theme.BitwardenTheme
21
- import com.x8bit.bitwarden.R
22
22
import com.x8bit.bitwarden.ui.platform.components.button.color.bitwardenFilledButtonColors
23
23
24
24
/* *
@@ -85,7 +85,7 @@ private fun BitwardenFilledButton_preview() {
85
85
BitwardenFilledButton (
86
86
label = " Label" ,
87
87
onClick = {},
88
- icon = rememberVectorPainter(id = R .drawable .ic_question_circle),
88
+ icon = rememberVectorPainter(id = BitwardenDrawable .ic_question_circle),
89
89
isEnabled = true ,
90
90
)
91
91
BitwardenFilledButton (
@@ -97,7 +97,7 @@ private fun BitwardenFilledButton_preview() {
97
97
BitwardenFilledButton (
98
98
label = " Label" ,
99
99
onClick = {},
100
- icon = rememberVectorPainter(id = R .drawable .ic_question_circle),
100
+ icon = rememberVectorPainter(id = BitwardenDrawable .ic_question_circle),
101
101
isEnabled = false ,
102
102
)
103
103
}
Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ import androidx.compose.ui.Modifier
7
7
import androidx.compose.ui.graphics.painter.Painter
8
8
import androidx.compose.ui.tooling.preview.Preview
9
9
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
10
- import com.x8bit. bitwarden.R
10
+ import com.bitwarden.ui.platform.resource.BitwardenDrawable
11
11
import com.x8bit.bitwarden.ui.platform.components.button.color.bitwardenFilledErrorButtonColors
12
12
13
13
/* *
@@ -50,7 +50,7 @@ private fun BitwardenErrorButton_preview() {
50
50
BitwardenFilledErrorButton (
51
51
label = " Label" ,
52
52
onClick = {},
53
- icon = rememberVectorPainter(id = R .drawable .ic_question_circle),
53
+ icon = rememberVectorPainter(id = BitwardenDrawable .ic_question_circle),
54
54
isEnabled = true ,
55
55
)
56
56
BitwardenFilledErrorButton (
@@ -62,7 +62,7 @@ private fun BitwardenErrorButton_preview() {
62
62
BitwardenFilledErrorButton (
63
63
label = " Label" ,
64
64
onClick = {},
65
- icon = rememberVectorPainter(id = R .drawable .ic_question_circle),
65
+ icon = rememberVectorPainter(id = BitwardenDrawable .ic_question_circle),
66
66
isEnabled = false ,
67
67
)
68
68
}
Original file line number Diff line number Diff line change @@ -20,8 +20,8 @@ import androidx.compose.ui.unit.dp
20
20
import com.bitwarden.ui.platform.base.util.cardStyle
21
21
import com.bitwarden.ui.platform.components.model.CardStyle
22
22
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
23
+ import com.bitwarden.ui.platform.resource.BitwardenDrawable
23
24
import com.bitwarden.ui.platform.theme.BitwardenTheme
24
- import com.x8bit.bitwarden.R
25
25
import com.x8bit.bitwarden.ui.platform.components.button.color.bitwardenOutlinedButtonColors
26
26
27
27
/* *
@@ -107,7 +107,7 @@ private fun BitwardenOutlinedButton_preview() {
107
107
BitwardenOutlinedButton (
108
108
label = " Label" ,
109
109
onClick = {},
110
- icon = rememberVectorPainter(id = R .drawable .ic_question_circle),
110
+ icon = rememberVectorPainter(id = BitwardenDrawable .ic_question_circle),
111
111
isEnabled = true ,
112
112
)
113
113
BitwardenOutlinedButton (
@@ -119,7 +119,7 @@ private fun BitwardenOutlinedButton_preview() {
119
119
BitwardenOutlinedButton (
120
120
label = " Label" ,
121
121
onClick = {},
122
- icon = rememberVectorPainter(id = R .drawable .ic_question_circle),
122
+ icon = rememberVectorPainter(id = BitwardenDrawable .ic_question_circle),
123
123
isEnabled = false ,
124
124
)
125
125
}
Original file line number Diff line number Diff line change @@ -7,8 +7,8 @@ import androidx.compose.ui.Modifier
7
7
import androidx.compose.ui.graphics.painter.Painter
8
8
import androidx.compose.ui.tooling.preview.Preview
9
9
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
10
+ import com.bitwarden.ui.platform.resource.BitwardenDrawable
10
11
import com.bitwarden.ui.platform.theme.BitwardenTheme
11
- import com.x8bit.bitwarden.R
12
12
import com.x8bit.bitwarden.ui.platform.components.button.color.bitwardenOutlinedButtonColors
13
13
14
14
/* *
@@ -55,7 +55,7 @@ private fun BBitwardenOutlinedErrorButton_preview() {
55
55
BitwardenOutlinedErrorButton (
56
56
label = " Label" ,
57
57
onClick = {},
58
- icon = rememberVectorPainter(id = R .drawable .ic_question_circle),
58
+ icon = rememberVectorPainter(id = BitwardenDrawable .ic_question_circle),
59
59
isEnabled = true ,
60
60
)
61
61
BitwardenOutlinedErrorButton (
@@ -67,7 +67,7 @@ private fun BBitwardenOutlinedErrorButton_preview() {
67
67
BitwardenOutlinedErrorButton (
68
68
label = " Label" ,
69
69
onClick = {},
70
- icon = rememberVectorPainter(id = R .drawable .ic_question_circle),
70
+ icon = rememberVectorPainter(id = BitwardenDrawable .ic_question_circle),
71
71
isEnabled = false ,
72
72
)
73
73
}
Original file line number Diff line number Diff line change @@ -10,8 +10,8 @@ import androidx.compose.ui.Modifier
10
10
import androidx.compose.ui.tooling.preview.Preview
11
11
import androidx.compose.ui.unit.dp
12
12
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
13
+ import com.bitwarden.ui.platform.resource.BitwardenDrawable
13
14
import com.bitwarden.ui.platform.theme.BitwardenTheme
14
- import com.x8bit.bitwarden.R
15
15
16
16
/* *
17
17
* A composable function to display a row of actions.
@@ -41,12 +41,12 @@ private fun BitwardenRowOfIconButtons_preview() {
41
41
BitwardenTheme {
42
42
BitwardenRowOfActions {
43
43
Icon (
44
- painter = rememberVectorPainter(id = R .drawable .ic_question_circle),
44
+ painter = rememberVectorPainter(id = BitwardenDrawable .ic_question_circle),
45
45
contentDescription = " Icon 1" ,
46
46
modifier = Modifier .size(24 .dp),
47
47
)
48
48
Icon (
49
- painter = rememberVectorPainter(id = R .drawable .ic_question_circle),
49
+ painter = rememberVectorPainter(id = BitwardenDrawable .ic_question_circle),
50
50
contentDescription = " Icon 2" ,
51
51
modifier = Modifier .size(24 .dp),
52
52
)
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -8,9 +8,9 @@ import androidx.compose.ui.Modifier
8
8
import androidx.compose.ui.semantics.contentDescription
9
9
import androidx.compose.ui.semantics.semantics
10
10
import androidx.compose.ui.tooling.preview.Preview
11
- import com.bitwarden.ui.R
12
11
import com.bitwarden.ui.platform.components.button.color.bitwardenFilledIconButtonColors
13
12
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
13
+ import com.bitwarden.ui.platform.resource.BitwardenDrawable
14
14
import com.bitwarden.ui.platform.theme.BitwardenTheme
15
15
16
16
/* *
@@ -50,7 +50,7 @@ fun BitwardenFilledIconButton(
50
50
private fun BitwardenFilledIconButton_preview () {
51
51
BitwardenTheme {
52
52
BitwardenFilledIconButton (
53
- vectorIconRes = R .drawable .ic_question_circle,
53
+ vectorIconRes = BitwardenDrawable .ic_question_circle,
54
54
contentDescription = " Sample Icon" ,
55
55
onClick = {},
56
56
)
Original file line number Diff line number Diff line change @@ -10,9 +10,9 @@ import androidx.compose.ui.graphics.painter.Painter
10
10
import androidx.compose.ui.semantics.contentDescription
11
11
import androidx.compose.ui.semantics.semantics
12
12
import androidx.compose.ui.tooling.preview.Preview
13
- import com.bitwarden.ui.R
14
13
import com.bitwarden.ui.platform.components.button.color.bitwardenStandardIconButtonColors
15
14
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
15
+ import com.bitwarden.ui.platform.resource.BitwardenDrawable
16
16
import com.bitwarden.ui.platform.theme.BitwardenTheme
17
17
18
18
/* *
@@ -81,7 +81,7 @@ fun BitwardenStandardIconButton(
81
81
private fun BitwardenStandardIconButton_preview () {
82
82
BitwardenTheme {
83
83
BitwardenStandardIconButton (
84
- vectorIconRes = R .drawable .ic_question_circle,
84
+ vectorIconRes = BitwardenDrawable .ic_question_circle,
85
85
contentDescription = " Sample Icon" ,
86
86
onClick = {},
87
87
)
Original file line number Diff line number Diff line change @@ -8,9 +8,9 @@ import androidx.compose.ui.Modifier
8
8
import androidx.compose.ui.semantics.contentDescription
9
9
import androidx.compose.ui.semantics.semantics
10
10
import androidx.compose.ui.tooling.preview.Preview
11
- import com.bitwarden.ui.R
12
11
import com.bitwarden.ui.platform.components.button.color.bitwardenTonalIconButtonColors
13
12
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
13
+ import com.bitwarden.ui.platform.resource.BitwardenDrawable
14
14
import com.bitwarden.ui.platform.theme.BitwardenTheme
15
15
16
16
/* *
@@ -50,7 +50,7 @@ fun BitwardenTonalIconButton(
50
50
private fun BitwardenTonalIconButton_preview () {
51
51
BitwardenTheme {
52
52
BitwardenTonalIconButton (
53
- vectorIconRes = R .drawable .ic_question_circle,
53
+ vectorIconRes = BitwardenDrawable .ic_question_circle,
54
54
contentDescription = " Sample Icon" ,
55
55
onClick = {},
56
56
)
Original file line number Diff line number Diff line change
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
You can’t perform that action at this time.
0 commit comments