Skip to content

Commit b66d98e

Browse files
committed
refactor: remove dead code
1 parent e6758a7 commit b66d98e

2 files changed

Lines changed: 13 additions & 30 deletions

File tree

app/src/main/java/to/bitkit/services/MigrationService.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,14 +1123,10 @@ class MigrationService @Inject constructor(
11231123
else -> GraphPeriod.ONE_DAY
11241124
}
11251125

1126-
val showSource = priceJson["showSource"]?.jsonPrimitive?.content
1127-
?.toBooleanStrictOrNull() ?: false
1128-
11291126
widgetsStore.updatePricePreferences(
11301127
PricePreferences(
11311128
enabledPairs = selectedPairs,
11321129
period = period,
1133-
showSource = showSource
11341130
)
11351131
)
11361132
}.onFailure {

app/src/main/java/to/bitkit/ui/screens/widgets/price/PriceCard.kt

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.height
1414
import androidx.compose.foundation.layout.padding
1515
import androidx.compose.material3.MaterialTheme
1616
import androidx.compose.material3.ShapeDefaults
17-
import androidx.compose.material3.Text
1817
import androidx.compose.runtime.Composable
1918
import androidx.compose.runtime.remember
2019
import androidx.compose.ui.Alignment
@@ -25,10 +24,8 @@ import androidx.compose.ui.layout.ContentScale
2524
import androidx.compose.ui.platform.LocalInspectionMode
2625
import androidx.compose.ui.platform.testTag
2726
import androidx.compose.ui.res.painterResource
28-
import androidx.compose.ui.text.font.FontWeight
2927
import androidx.compose.ui.tooling.preview.Preview
3028
import androidx.compose.ui.unit.dp
31-
import androidx.compose.ui.unit.sp
3229
import ir.ehsannarmani.compose_charts.LineChart
3330
import ir.ehsannarmani.compose_charts.models.DividerProperties
3431
import ir.ehsannarmani.compose_charts.models.DrawStyle
@@ -44,8 +41,11 @@ import to.bitkit.data.dto.price.PriceDTO
4441
import to.bitkit.data.dto.price.PriceWidgetData
4542
import to.bitkit.data.dto.price.TradingPair
4643
import to.bitkit.models.widget.PricePreferences
44+
import to.bitkit.ui.components.BodySSB
4745
import to.bitkit.ui.components.Caption13Up
46+
import to.bitkit.ui.components.Display34
4847
import to.bitkit.ui.components.HorizontalSpacer
48+
import to.bitkit.ui.components.Title
4949
import to.bitkit.ui.theme.AppThemeSurface
5050
import to.bitkit.ui.theme.Colors
5151

@@ -56,8 +56,7 @@ fun PriceCard(
5656
priceDTO: PriceDTO,
5757
) {
5858
val widgetData = remember(pricePreferences.enabledPairs, priceDTO.widgets) {
59-
priceDTO.widgets.firstOrNull { it.pair in pricePreferences.enabledPairs }
60-
?: priceDTO.widgets.firstOrNull()
59+
priceDTO.resolveWidget(pricePreferences)
6160
} ?: return
6261

6362
Box(
@@ -85,22 +84,16 @@ fun PriceCard(
8584
.testTag("PriceWidgetRow-${widgetData.pair.displayName}")
8685
)
8786
HorizontalSpacer(16.dp)
88-
Text(
87+
Title(
8988
text = widgetData.change.formatted,
9089
color = if (widgetData.change.isPositive) Colors.Green else Colors.Red,
91-
fontSize = 22.sp,
92-
lineHeight = 26.sp,
93-
fontWeight = FontWeight.Bold,
9490
modifier = Modifier.testTag("price_card_pair_change_${widgetData.pair}")
9591
)
9692
}
9793

98-
Text(
94+
Display34(
9995
text = "${widgetData.pair.symbol} ${widgetData.price}",
10096
color = Colors.White,
101-
fontSize = 34.sp,
102-
lineHeight = 34.sp,
103-
fontWeight = FontWeight.Bold,
10497
modifier = Modifier
10598
.fillMaxWidth()
10699
.testTag("price_card_pair_price_${widgetData.pair}")
@@ -124,8 +117,7 @@ fun PriceCardSmall(
124117
priceDTO: PriceDTO,
125118
) {
126119
val widgetData = remember(pricePreferences.enabledPairs, priceDTO.widgets) {
127-
priceDTO.widgets.firstOrNull { it.pair in pricePreferences.enabledPairs }
128-
?: priceDTO.widgets.firstOrNull()
120+
priceDTO.resolveWidget(pricePreferences)
129121
} ?: return
130122

131123
Box(
@@ -157,22 +149,16 @@ fun PriceCardSmall(
157149
color = Colors.White64,
158150
)
159151
}
160-
Text(
152+
Title(
161153
text = "${widgetData.pair.symbol} ${widgetData.price}",
162154
color = Colors.White,
163-
fontSize = 22.sp,
164-
lineHeight = 26.sp,
165-
fontWeight = FontWeight.Bold,
166155
modifier = Modifier
167156
.fillMaxWidth()
168157
.testTag("price_card_small_pair_price_${widgetData.pair}")
169158
)
170-
Text(
159+
BodySSB(
171160
text = widgetData.change.formatted,
172161
color = if (widgetData.change.isPositive) Colors.Green else Colors.Red,
173-
fontSize = 15.sp,
174-
lineHeight = 20.sp,
175-
fontWeight = FontWeight.SemiBold,
176162
modifier = Modifier.testTag("price_card_small_pair_change_${widgetData.pair}")
177163
)
178164
}
@@ -188,6 +174,9 @@ fun PriceCardSmall(
188174
}
189175
}
190176

177+
private fun PriceDTO.resolveWidget(prefs: PricePreferences): PriceWidgetData? =
178+
widgets.firstOrNull { it.pair in prefs.enabledPairs } ?: widgets.firstOrNull()
179+
191180
@Composable
192181
fun ChartComponent(
193182
widgetData: PriceWidgetData,
@@ -264,9 +253,7 @@ private fun FullBlockCardPreview() {
264253
.padding(16.dp)
265254
) {
266255
PriceCard(
267-
pricePreferences = PricePreferences(
268-
showSource = true,
269-
),
256+
pricePreferences = PricePreferences(),
270257
priceDTO = PriceDTO(
271258
widgets = listOf(
272259
PriceWidgetData(

0 commit comments

Comments
 (0)