Skip to content

Add toggle for scalar values visibility in RadarChart #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Develoferr wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Add toggle for scalar values visibility in RadarChart #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions chart/src/commonMain/kotlin/com/aay/compose/radarChart/DrawAxisData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ internal fun DrawScope.drawAxisData(
radarLabels: List<String>,
scalarValue: Double,
scalarSteps: Int,
unit: String
unit: String,
showScalarValues: Boolean
) {

val labelsEndPoints = radarChartConfig.labelsPoints
Expand All @@ -31,18 +32,21 @@ internal fun DrawScope.drawAxisData(
val labelHeight = textMeasurer.measure(AnnotatedString("M")).size.height


for (step in 0 until scalarSteps) {
drawText(
textMeasurer = textMeasurer,
text = (scalarStep * step).toString() + " " + unit,
style = scalarValuesStyle,
topLeft = Offset(
nextStartPoints[step].x + 5.toDp().toPx(),
nextStartPoints[step].y - textVerticalOffset
if (showScalarValues) {
for (step in 0 until scalarSteps) {
drawText(
textMeasurer = textMeasurer,
text = (scalarStep * step).toString() + " " + unit,
style = scalarValuesStyle,
topLeft = Offset(
nextStartPoints[step].x + 5.toDp().toPx(),
nextStartPoints[step].y - textVerticalOffset
)
)
)
}
}


for (line in labelsEndPoints.indices) {
drawText(
textMeasurer = textMeasurer,
Expand Down
5 changes: 4 additions & 1 deletion chart/src/commonMain/kotlin/com/aay/compose/radarChart/RadarChart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import com.aay.compose.radarChart.model.Polygon
* @param scalarValue Scalar value to determine the scale of the radar chart.
* @param scalarValuesStyle TextStyle for configuring the appearance of scalar value labels.
* @param polygons List of polygons to be displayed on the radar chart.
* @param showScalarValues Flag to determine whether to display scalar values on the radar chart (default is true).
* @param modifier Modifier for configuring the layout and appearance of the radar chart.
*
* @see Polygon
Expand All @@ -37,6 +38,7 @@ fun RadarChart(
scalarValue: Double,
scalarValuesStyle: TextStyle,
polygons: List<Polygon>,
showScalarValues: Boolean = true,
modifier: Modifier = Modifier
) {

Expand Down Expand Up @@ -74,7 +76,8 @@ fun RadarChart(
radarLabels,
scalarValue,
scalarSteps,
polygons[0].unit
polygons[0].unit,
showScalarValues
)

}
Expand Down