@@ -68,49 +68,49 @@ fun PriceCard(
6868 Box (
6969 modifier = modifier
7070 .clip(shape = MaterialTheme .shapes.medium)
71- .background(Colors .White10 ),
71+ .background(Colors .White10 )
7272 ) {
7373 Column (
74+ verticalArrangement = Arrangement .spacedBy(8 .dp),
7475 modifier = Modifier
7576 .fillMaxWidth()
76- .padding(16 .dp),
77- verticalArrangement = Arrangement .spacedBy(8 .dp),
77+ .padding(16 .dp)
7878 ) {
7979 if (showWidgetTitle) {
8080 Row (
8181 verticalAlignment = Alignment .CenterVertically ,
8282 modifier = Modifier
8383 .padding(bottom = 8 .dp)
84- .testTag(" price_card_widget_title_row" ),
84+ .testTag(" price_card_widget_title_row" )
8585 ) {
8686 Icon (
8787 painter = painterResource(R .drawable.widget_chart_line),
8888 contentDescription = null ,
89+ tint = Color .Unspecified ,
8990 modifier = Modifier
9091 .size(32 .dp)
91- .testTag(" price_card_widget_title_icon" ),
92- tint = Color .Unspecified ,
92+ .testTag(" price_card_widget_title_icon" )
9393 )
9494 HorizontalSpacer (16 .dp)
9595 BodyMSB (
9696 text = stringResource(R .string.widgets__price__name),
97- modifier = Modifier .testTag(" price_card_widget_title_text" ),
97+ modifier = Modifier .testTag(" price_card_widget_title_text" )
9898 )
9999 }
100100 }
101101
102102 Row (
103+ verticalAlignment = Alignment .CenterVertically ,
103104 modifier = Modifier
104105 .fillMaxWidth()
105- .testTag(" price_card_pair_row_${widgetData.pair.displayName} " ),
106- verticalAlignment = Alignment .CenterVertically ,
106+ .testTag(" price_card_pair_row_${widgetData.pair.displayName} " )
107107 ) {
108108 Caption13Up (
109109 text = " ${widgetData.pair.displayName} ${widgetData.period.value} " ,
110110 color = Colors .White64 ,
111111 modifier = Modifier
112112 .weight(1f )
113- .testTag(" PriceWidgetRow-${widgetData.pair.displayName} " ),
113+ .testTag(" PriceWidgetRow-${widgetData.pair.displayName} " )
114114 )
115115 HorizontalSpacer (16 .dp)
116116 Text (
@@ -119,7 +119,7 @@ fun PriceCard(
119119 fontSize = 22 .sp,
120120 lineHeight = 26 .sp,
121121 fontWeight = FontWeight .Bold ,
122- modifier = Modifier .testTag(" price_card_pair_change_${widgetData.pair} " ),
122+ modifier = Modifier .testTag(" price_card_pair_change_${widgetData.pair} " )
123123 )
124124 }
125125
@@ -131,7 +131,7 @@ fun PriceCard(
131131 fontWeight = FontWeight .Bold ,
132132 modifier = Modifier
133133 .fillMaxWidth()
134- .testTag(" price_card_pair_price_${widgetData.pair} " ),
134+ .testTag(" price_card_pair_price_${widgetData.pair} " )
135135 )
136136
137137 ChartComponent (
@@ -140,7 +140,7 @@ fun PriceCard(
140140 .fillMaxWidth()
141141 .height(48 .dp)
142142 .padding(top = 8 .dp)
143- .testTag(" price_card_chart" ),
143+ .testTag(" price_card_chart" )
144144 )
145145
146146 if (pricePreferences.showSource) {
@@ -150,17 +150,17 @@ fun PriceCard(
150150 horizontalArrangement = Arrangement .SpaceBetween ,
151151 modifier = Modifier
152152 .fillMaxWidth()
153- .testTag(" PriceWidgetSource" ),
153+ .testTag(" PriceWidgetSource" )
154154 ) {
155155 CaptionB (
156156 text = stringResource(R .string.widgets__widget__source),
157157 color = Colors .White64 ,
158- modifier = Modifier .testTag(" source_label" ),
158+ modifier = Modifier .testTag(" source_label" )
159159 )
160160 CaptionB (
161161 text = priceDTO.source,
162162 color = Colors .White64 ,
163- modifier = Modifier .testTag(" source_text" ),
163+ modifier = Modifier .testTag(" source_text" )
164164 )
165165 }
166166 }
@@ -182,22 +182,22 @@ fun PriceCardSmall(
182182 Box (
183183 modifier = modifier
184184 .clip(shape = MaterialTheme .shapes.medium)
185- .background(Colors .White10 ),
185+ .background(Colors .White10 )
186186 ) {
187187 Column (
188+ verticalArrangement = Arrangement .spacedBy(16 .dp),
188189 modifier = Modifier
189190 .fillMaxSize()
190- .padding(16 .dp),
191- verticalArrangement = Arrangement .spacedBy(16 .dp),
191+ .padding(16 .dp)
192192 ) {
193193 Column (
194194 verticalArrangement = Arrangement .spacedBy(8 .dp),
195195 ) {
196196 Row (
197+ horizontalArrangement = Arrangement .SpaceBetween ,
197198 modifier = Modifier
198199 .fillMaxWidth()
199- .testTag(" price_card_small_pair_row_${widgetData.pair.displayName} " ),
200- horizontalArrangement = Arrangement .SpaceBetween ,
200+ .testTag(" price_card_small_pair_row_${widgetData.pair.displayName} " )
201201 ) {
202202 Caption13Up (
203203 text = widgetData.pair.displayName,
@@ -216,15 +216,15 @@ fun PriceCardSmall(
216216 fontWeight = FontWeight .Bold ,
217217 modifier = Modifier
218218 .fillMaxWidth()
219- .testTag(" price_card_small_pair_price_${widgetData.pair} " ),
219+ .testTag(" price_card_small_pair_price_${widgetData.pair} " )
220220 )
221221 Text (
222222 text = widgetData.change.formatted,
223223 color = if (widgetData.change.isPositive) Colors .Green else Colors .Red ,
224224 fontSize = 15 .sp,
225225 lineHeight = 20 .sp,
226226 fontWeight = FontWeight .SemiBold ,
227- modifier = Modifier .testTag(" price_card_small_pair_change_${widgetData.pair} " ),
227+ modifier = Modifier .testTag(" price_card_small_pair_change_${widgetData.pair} " )
228228 )
229229 }
230230
@@ -233,7 +233,7 @@ fun PriceCardSmall(
233233 modifier = Modifier
234234 .fillMaxWidth()
235235 .weight(1f )
236- .testTag(" price_card_small_chart" ),
236+ .testTag(" price_card_small_chart" )
237237 )
238238 }
239239 }
@@ -254,10 +254,9 @@ fun ChartComponent(
254254 }
255255
256256 Box (
257- modifier = modifier.clip(ShapeDefaults .Small ),
257+ modifier = modifier.clip(ShapeDefaults .Small )
258258 ) {
259259 LineChart (
260- modifier = Modifier .fillMaxSize(),
261260 data = remember(widgetData.pastValues, baseColor) {
262261 listOf (
263262 Line (
@@ -288,6 +287,7 @@ fun ChartComponent(
288287 ),
289288 minValue = minValue,
290289 maxValue = maxValue,
290+ modifier = Modifier .fillMaxSize()
291291 )
292292 }
293293}
@@ -299,13 +299,12 @@ private val SAMPLE_PAST_VALUES = listOf(1.0, 2.0, 1.5, 3.0, 2.5, 4.0)
299299private fun FullBlockCardPreview () {
300300 AppThemeSurface {
301301 Column (
302+ verticalArrangement = Arrangement .spacedBy(8 .dp),
302303 modifier = Modifier
303304 .fillMaxSize()
304- .padding(16 .dp),
305- verticalArrangement = Arrangement .spacedBy(8 .dp),
305+ .padding(16 .dp)
306306 ) {
307307 PriceCard (
308- modifier = Modifier .fillMaxWidth(),
309308 showWidgetTitle = true ,
310309 pricePreferences = PricePreferences (
311310 showSource = true ,
@@ -325,6 +324,7 @@ private fun FullBlockCardPreview() {
325324 ),
326325 ),
327326 ),
327+ modifier = Modifier .fillMaxWidth()
328328 )
329329 }
330330 }
0 commit comments