Skip to content

Commit 07e7991

Browse files
move magic number to constant
1 parent 8b96252 commit 07e7991

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

YChartsLib/src/main/java/co/yml/charts/ui/piechart/PieChartConstants.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ object PieChartConstants {
1010
const val TOTAL_ANGLE = 360
1111
const val ONE_HUNDRED = 100
1212
const val DESCRIPTION = "Double tap to know the chart in detail"
13+
const val NO_SELECTED_SLICE = -1
1314
}

YChartsLib/src/main/java/co/yml/charts/ui/piechart/charts/DonutPieChart.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import co.yml.charts.common.components.accessibility.AccessibilityBottomSheetDia
3131
import co.yml.charts.common.components.accessibility.SliceInfo
3232
import co.yml.charts.common.extensions.collectIsTalkbackEnabledAsState
3333
import co.yml.charts.common.model.PlotType
34+
import co.yml.charts.ui.piechart.PieChartConstants.NO_SELECTED_SLICE
3435
import co.yml.charts.ui.piechart.models.PieChartConfig
3536
import co.yml.charts.ui.piechart.models.PieChartData
3637
import co.yml.charts.ui.piechart.utils.convertTouchEventPointToAngle
@@ -39,7 +40,6 @@ import co.yml.charts.ui.piechart.utils.sweepAngles
3940
import kotlinx.coroutines.launch
4041
import kotlin.math.roundToInt
4142

42-
4343
/**
4444
* Compose function for Drawing Donut chart
4545
* @param modifier : All modifier related property
@@ -72,7 +72,7 @@ fun DonutPieChart(
7272
}
7373

7474
var activePie by rememberSaveable {
75-
mutableStateOf(-1)
75+
mutableStateOf(NO_SELECTED_SLICE)
7676
}
7777
val accessibilitySheetState =
7878
rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden)
@@ -92,7 +92,7 @@ fun DonutPieChart(
9292
) {
9393
val boxModifier = if (pieChartConfig.isClickOnSliceEnabled) {
9494
modifier
95-
.aspectRatio(1f)
95+
.aspectRatio(ratio = 1f)
9696
.background(pieChartConfig.backgroundColor)
9797
.semantics {
9898
contentDescription = pieChartConfig.accessibilityConfig.chartDescription
@@ -148,7 +148,7 @@ fun DonutPieChart(
148148
activePie = if (activePie != index)
149149
index
150150
else
151-
-1
151+
NO_SELECTED_SLICE
152152
onSliceClick(pieChartData.slices[index])
153153
return@detectTapGestures
154154
}

YChartsLib/src/main/java/co/yml/charts/ui/piechart/charts/PieChart.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import co.yml.charts.common.extensions.collectIsTalkbackEnabledAsState
3838
import co.yml.charts.common.extensions.getTextHeight
3939
import co.yml.charts.common.model.PlotType
4040
import co.yml.charts.ui.piechart.PieChartConstants.MINIMUM_PERCENTAGE_FOR_SLICE_LABELS
41+
import co.yml.charts.ui.piechart.PieChartConstants.NO_SELECTED_SLICE
4142
import co.yml.charts.ui.piechart.models.PieChartConfig
4243
import co.yml.charts.ui.piechart.models.PieChartData
4344
import co.yml.charts.ui.piechart.utils.convertTouchEventPointToAngle
@@ -80,7 +81,7 @@ fun PieChart(
8081
}
8182

8283
var activePie by rememberSaveable {
83-
mutableStateOf(-1)
84+
mutableStateOf(NO_SELECTED_SLICE)
8485
}
8586
val accessibilitySheetState =
8687
rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden)
@@ -98,7 +99,7 @@ fun PieChart(
9899
) {
99100
val boxModifier = if (pieChartConfig.isClickOnSliceEnabled) {
100101
modifier
101-
.aspectRatio(1f)
102+
.aspectRatio(ratio = 1f)
102103
.background(pieChartConfig.backgroundColor)
103104
.semantics {
104105
contentDescription = pieChartConfig.accessibilityConfig.chartDescription
@@ -152,7 +153,7 @@ fun PieChart(
152153
activePie = if (activePie != index)
153154
index
154155
else
155-
-1
156+
NO_SELECTED_SLICE
156157
onSliceClick(pieChartData.slices[index])
157158
return@detectTapGestures
158159
}

0 commit comments

Comments
 (0)