File tree Expand file tree Collapse file tree
app/src/main/java/to/bitkit Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -24,6 +24,7 @@ import to.bitkit.R
2424import to.bitkit.appwidget.model.AppWidgetType
2525import to.bitkit.data.dto.price.GraphPeriod
2626import to.bitkit.data.dto.price.TradingPair
27+ import to.bitkit.ext.label
2728import to.bitkit.models.widget.PricePreferences
2829import to.bitkit.ui.components.BodySSB
2930import to.bitkit.ui.components.Caption13Up
@@ -32,7 +33,6 @@ import to.bitkit.ui.components.SecondaryButton
3233import to.bitkit.ui.components.VerticalSpacer
3334import to.bitkit.ui.scaffold.AppTopBar
3435import to.bitkit.ui.scaffold.ScreenColumn
35- import to.bitkit.ui.screens.widgets.price.label
3636import to.bitkit.ui.theme.Colors
3737
3838@Composable
Original file line number Diff line number Diff line change 11package to.bitkit.ext
22
33import androidx.annotation.StringRes
4+ import androidx.compose.runtime.Composable
5+ import androidx.compose.ui.res.stringResource
46import to.bitkit.R
57import to.bitkit.data.dto.price.GraphPeriod
68
@@ -11,3 +13,6 @@ fun GraphPeriod.labelRes(): Int = when (this) {
1113 GraphPeriod .ONE_MONTH -> R .string.appwidget__price__month
1214 GraphPeriod .ONE_YEAR -> R .string.appwidget__price__year
1315}
16+
17+ @Composable
18+ fun GraphPeriod.label (): String = stringResource(labelRes())
Original file line number Diff line number Diff line change @@ -51,9 +51,9 @@ import to.bitkit.ui.theme.Colors
5151
5252@Composable
5353fun PriceCard (
54- modifier : Modifier = Modifier ,
5554 pricePreferences : PricePreferences ,
5655 priceDTO : PriceDTO ,
56+ modifier : Modifier = Modifier ,
5757) {
5858 val widgetData = remember(pricePreferences.enabledPairs, priceDTO.widgets) {
5959 priceDTO.resolveWidget(pricePreferences)
@@ -112,9 +112,9 @@ fun PriceCard(
112112
113113@Composable
114114fun PriceCardSmall (
115- modifier : Modifier = Modifier ,
116115 pricePreferences : PricePreferences ,
117116 priceDTO : PriceDTO ,
117+ modifier : Modifier = Modifier ,
118118) {
119119 val widgetData = remember(pricePreferences.enabledPairs, priceDTO.widgets) {
120120 priceDTO.resolveWidget(pricePreferences)
Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
3131import to.bitkit.R
3232import to.bitkit.data.dto.price.GraphPeriod
3333import to.bitkit.data.dto.price.TradingPair
34- import to.bitkit.ext.labelRes
34+ import to.bitkit.ext.label
3535import to.bitkit.models.widget.PricePreferences
3636import to.bitkit.ui.components.BodySSB
3737import to.bitkit.ui.components.Caption13Up
@@ -217,9 +217,6 @@ private fun SelectableRow(
217217 }
218218}
219219
220- @Composable
221- fun GraphPeriod.label (): String = stringResource(labelRes())
222-
223220@Preview(showSystemUi = true )
224221@Composable
225222private fun Preview () {
Original file line number Diff line number Diff line change @@ -196,9 +196,9 @@ fun PricePreviewContent(
196196
197197@Composable
198198private fun WidgetCarousel (
199- modifier : Modifier = Modifier ,
200199 pricePreferences : PricePreferences ,
201200 priceDTO : PriceDTO ,
201+ modifier : Modifier = Modifier ,
202202) {
203203 val pagerState = rememberPagerState(pageCount = { PAGE_COUNT })
204204
You can’t perform that action at this time.
0 commit comments