Skip to content
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

Jump to bottom

Add Bottom to LabelPosition for Cartesian Charts #721

Merged
merged 4 commits into from
May 27, 2024
Merged

Add Bottom to LabelPosition for Cartesian Charts #721

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46c56ad
Add Bottom to LabelPosition for Cartesian Charts
L-Andrade May 22, 2024
f56e3fd
Bottom insets for LabelPosition.Bottom and ask for super's insets in …
L-Andrade May 23, 2024
27cb551
Fix ktlint errors
L-Andrade May 23, 2024
f7a95bc
Review feedback, fixes insets for Marker for AroundPoint and AbovePoint
L-Andrade May 27, 2024
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
10 changes: 7 additions & 3 deletions sample/src/main/java/com/patrykandpatrick/vico/sample/showcase/Marker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,18 @@ internal fun rememberMarker(
horizontalDimensions: HorizontalDimensions,
) {
with(context) {
outInsets.top =
super.getInsets(context, outInsets, horizontalDimensions)
val shadowClipping =
(
CLIPPING_FREE_SHADOW_RADIUS_MULTIPLIER * LABEL_BACKGROUND_SHADOW_RADIUS_DP -
LABEL_BACKGROUND_SHADOW_DY_DP
)
.pixels
patrickmichalik marked this conversation as resolved.
Show resolved Hide resolved
if (labelPosition == LabelPosition.AroundPoint) return
outInsets.top += label.getHeight(context) + labelBackgroundShape.tickSizeDp.pixels
when (labelPosition) {
LabelPosition.Top -> outInsets.top += shadowClipping
LabelPosition.Bottom -> outInsets.bottom += shadowClipping
LabelPosition.AroundPoint, LabelPosition.AbovePoint -> Unit
}
patrickmichalik marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
Expand Down
74 changes: 50 additions & 24 deletions ...e/src/main/java/com/patrykandpatrick/vico/core/cartesian/marker/DefaultCartesianMarker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,29 +122,39 @@ public open class DefaultCartesianMarker(
val tickPosition: MarkerCorneredShape.TickPosition
val y: Float
val verticalPosition: VerticalPosition
if (labelPosition == LabelPosition.Top) {
tickPosition = MarkerCorneredShape.TickPosition.Bottom
y = context.chartBounds.top - label.tickSizeDp.pixels
verticalPosition = VerticalPosition.Top
} else {
val topPointY =
targets.minOf { target ->
when (target) {
is CandlestickCartesianLayerMarkerTarget -> target.highCanvasY
is ColumnCartesianLayerMarkerTarget ->
target.columns.minOf(ColumnCartesianLayerMarkerTarget.Column::canvasY)
is LineCartesianLayerMarkerTarget ->
target.points.minOf(LineCartesianLayerMarkerTarget.Point::canvasY)
else -> error("Unexpected `CartesianMarker.Target` implementation.")
when (labelPosition) {
LabelPosition.Top -> {
tickPosition = MarkerCorneredShape.TickPosition.Bottom
y = context.chartBounds.top - label.tickSizeDp.pixels
verticalPosition = VerticalPosition.Top
}

LabelPosition.Bottom -> {
tickPosition = MarkerCorneredShape.TickPosition.Top
y = context.chartBounds.bottom + label.tickSizeDp.pixels
verticalPosition = VerticalPosition.Bottom
}

LabelPosition.AroundPoint, LabelPosition.AbovePoint -> {
val topPointY =
targets.minOf { target ->
when (target) {
is CandlestickCartesianLayerMarkerTarget -> target.highCanvasY
is ColumnCartesianLayerMarkerTarget ->
target.columns.minOf(ColumnCartesianLayerMarkerTarget.Column::canvasY)
is LineCartesianLayerMarkerTarget ->
target.points.minOf(LineCartesianLayerMarkerTarget.Point::canvasY)
else -> error("Unexpected `CartesianMarker.Target` implementation.")
}
}
}
val flip =
labelPosition == LabelPosition.AroundPoint &&
topPointY - labelBounds.height() - label.tickSizeDp.pixels < context.chartBounds.top
tickPosition =
if (flip) MarkerCorneredShape.TickPosition.Top else MarkerCorneredShape.TickPosition.Bottom
y = topPointY + (if (flip) 1 else -1) * label.tickSizeDp.pixels
verticalPosition = if (flip) VerticalPosition.Bottom else VerticalPosition.Top
val flip =
labelPosition == LabelPosition.AroundPoint &&
topPointY - labelBounds.height() - label.tickSizeDp.pixels < context.chartBounds.top
tickPosition =
if (flip) MarkerCorneredShape.TickPosition.Top else MarkerCorneredShape.TickPosition.Bottom
y = topPointY + (if (flip) 1 else -1) * label.tickSizeDp.pixels
verticalPosition = if (flip) VerticalPosition.Bottom else VerticalPosition.Top
}
}
extraStore[MarkerCorneredShape.tickPositionKey] = tickPosition

Expand Down Expand Up @@ -181,8 +191,19 @@ public open class DefaultCartesianMarker(
outInsets: Insets,
horizontalDimensions: HorizontalDimensions,
) {
if (labelPosition == LabelPosition.AroundPoint) return
with(context) { outInsets.top = label.getHeight(context) + label.tickSizeDp.pixels }
when (labelPosition) {
LabelPosition.Top, LabelPosition.AbovePoint ->
with(context) {
outInsets.top = label.getHeight(context) + label.tickSizeDp.pixels
}

LabelPosition.Bottom ->
with(context) {
outInsets.bottom = label.getHeight(context) + label.tickSizeDp.pixels
}

LabelPosition.AroundPoint -> Unit // Will be inside the chart
}
patrickmichalik marked this conversation as resolved.
Show resolved Hide resolved
}

/** Specifies the position of a [DefaultCartesianMarker]’s label. */
Expand All @@ -192,6 +213,11 @@ public open class DefaultCartesianMarker(
*/
Top,

/**
* Positions the label at the bottom of the [CartesianChart]. Sufficient room is made.
*/
Bottom,

/**
* Positions the label above the topmost marked point or, if there isn’t enough room, below it.
*/
Expand Down
Loading