Skip to content

Add ability to change lineBrush color on event level #62

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
DRSchlaubi wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Add ability to change lineBrush color on event level #62

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40ad0fc
Add lione colors to event style
DRSchlaubi Jun 4, 2025
df4cb34
Fix line coloring
DRSchlaubi Jun 4, 2025
a015f09
Run spottlessApply
DRSchlaubi Nov 30, 2025
e4d17ac
Fix JetLimeExtendedEvent lineBrush
DRSchlaubi Nov 30, 2025
92d8c65
Resolve requested changes
DRSchlaubi Dec 2, 2025
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
26 changes: 15 additions & 11 deletions jetlime/src/commonMain/kotlin/com/pushpal/jetlime/JetLimeEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ internal fun VerticalEvent(
) {
val verticalAlignment = remember { jetLimeStyle.lineVerticalAlignment }
val radiusAnimFactor by calculateRadiusAnimFactor(style)
val lineBrush = remember(style, jetLimeStyle) { style.lineBrush ?: jetLimeStyle.lineBrush }

Box(
modifier = modifier
.wrapContentSize()
Expand Down Expand Up @@ -151,7 +153,7 @@ internal fun VerticalEvent(
// Upward connector only for CENTER placement (connects from top of item to point center)
if (style.pointPlacement == PointPlacement.CENTER && style.position.isNotStart()) {
drawLine(
brush = jetLimeStyle.lineBrush,
brush = lineBrush,
start = Offset(x = xOffset, y = 0f),
end = Offset(x = xOffset, y = yOffset),
strokeWidth = jetLimeStyle.lineThickness.toPx(),
Expand All @@ -163,7 +165,7 @@ internal fun VerticalEvent(
// Upward segment (skip for first item)
if (style.position.isNotStart()) {
drawLine(
brush = jetLimeStyle.lineBrush,
brush = lineBrush,
start = Offset(x = xOffset, y = 0f),
end = Offset(x = xOffset, y = yOffset),
strokeWidth = jetLimeStyle.lineThickness.toPx(),
Expand All @@ -173,7 +175,7 @@ internal fun VerticalEvent(
// Downward segment (skip for last item)
if (style.position.isNotEnd()) {
drawLine(
brush = jetLimeStyle.lineBrush,
brush = lineBrush,
start = Offset(x = xOffset, y = yOffset),
end = Offset(x = xOffset, y = this.size.height),
strokeWidth = jetLimeStyle.lineThickness.toPx(),
Expand All @@ -184,7 +186,7 @@ internal fun VerticalEvent(
// END placement: draw upward segment (skip first) from top to end point; draw downward only if not last (from point to bottom)
if (style.position.isNotStart()) {
drawLine(
brush = jetLimeStyle.lineBrush,
brush = lineBrush,
start = Offset(x = xOffset, y = 0f),
end = Offset(x = xOffset, y = yOffset),
strokeWidth = jetLimeStyle.lineThickness.toPx(),
Expand All @@ -193,7 +195,7 @@ internal fun VerticalEvent(
}
if (style.position.isNotEnd()) {
drawLine(
brush = jetLimeStyle.lineBrush,
brush = lineBrush,
start = Offset(x = xOffset, y = yOffset),
end = Offset(x = xOffset, y = this.size.height),
strokeWidth = jetLimeStyle.lineThickness.toPx(),
Expand All @@ -208,7 +210,7 @@ internal fun VerticalEvent(
this.size.height + yShift
}
drawLine(
brush = jetLimeStyle.lineBrush,
brush = lineBrush,
start = Offset(x = xOffset, y = yOffset),
end = Offset(x = xOffset, y = endY),
strokeWidth = jetLimeStyle.lineThickness.toPx(),
Expand Down Expand Up @@ -333,6 +335,8 @@ internal fun HorizontalEvent(
val radiusAnimFactor by calculateRadiusAnimFactor(style)
val layoutDirection = LocalLayoutDirection.current
val isRtl = layoutDirection == LayoutDirection.Rtl
val lineBrush = remember(style, jetLimeStyle) { style.lineBrush ?: jetLimeStyle.lineBrush }

Box(
modifier = modifier
.wrapContentSize()
Expand Down Expand Up @@ -369,7 +373,7 @@ internal fun HorizontalEvent(
val startX = if (isRtl) this.size.width else 0f
val endX = xOffset
drawLine(
brush = jetLimeStyle.lineBrush,
brush = lineBrush,
start = Offset(x = startX, y = yOffset),
end = Offset(x = endX, y = yOffset),
strokeWidth = jetLimeStyle.lineThickness.toPx(),
Expand All @@ -381,7 +385,7 @@ internal fun HorizontalEvent(
val startX = xOffset
val endX = if (isRtl) 0f else this.size.width
drawLine(
brush = jetLimeStyle.lineBrush,
brush = lineBrush,
start = Offset(x = startX, y = yOffset),
end = Offset(x = endX, y = yOffset),
strokeWidth = jetLimeStyle.lineThickness.toPx(),
Expand All @@ -394,7 +398,7 @@ internal fun HorizontalEvent(
val startX = if (isRtl) this.size.width else 0f
val endX = xOffset
drawLine(
brush = jetLimeStyle.lineBrush,
brush = lineBrush,
start = Offset(x = startX, y = yOffset),
end = Offset(x = endX, y = yOffset),
strokeWidth = jetLimeStyle.lineThickness.toPx(),
Expand All @@ -405,7 +409,7 @@ internal fun HorizontalEvent(
val startX = xOffset
val endX = if (isRtl) 0f else this.size.width
drawLine(
brush = jetLimeStyle.lineBrush,
brush = lineBrush,
start = Offset(x = startX, y = yOffset),
end = Offset(x = endX, y = yOffset),
strokeWidth = jetLimeStyle.lineThickness.toPx(),
Expand All @@ -419,7 +423,7 @@ internal fun HorizontalEvent(
val startX = xOffset
val endX = if (isRtl) 0f - xShift else this.size.width + xShift
drawLine(
brush = jetLimeStyle.lineBrush,
brush = lineBrush,
start = Offset(x = startX, y = yOffset),
end = Offset(x = endX, y = yOffset),
strokeWidth = jetLimeStyle.lineThickness.toPx(),
Expand Down
4 changes: 4 additions & 0 deletions jetlime/src/commonMain/kotlin/com/pushpal/jetlime/JetLimeEventDefaults.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import androidx.compose.animation.core.infiniteRepeatable
import androidx.compose.animation.core.tween
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -70,6 +71,7 @@ object JetLimeEventDefaults {
* @param pointAnimation The animation for the point, if any.
* @param pointStrokeWidth The stroke width of the point. Defaults to [PointStrokeWidth].
* @param pointStrokeColor The stroke color of the point. Defaults to the primary color from MaterialTheme's color scheme.
* @param lineBrush the [Brush] for drawing the line to the next event

Copilot AI Dec 3, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The documentation for lineBrush parameter should clarify that passing null (the default) will use the lineBrush from the JetLimeStyle. Consider updating to: "The [Brush] for drawing the line to the next event. If null (default), uses the lineBrush from JetLimeStyle."

Suggested change
* @param lineBrush the [Brush] for drawing the line to the next event
* @param lineBrush The [Brush] for drawing the line to the next event. If null (default), uses the `lineBrush` from `JetLimeStyle`.

Copilot uses AI. Check for mistakes.
* @return A [JetLimeEventStyle] object configured with the given parameters.
*/
@Composable
Expand All @@ -83,6 +85,7 @@ object JetLimeEventDefaults {
pointAnimation: EventPointAnimation? = null,
pointStrokeWidth: Dp = PointStrokeWidth,
pointStrokeColor: Color = MaterialTheme.colorScheme.primary,
lineBrush: Brush? = null,

Copilot AI Dec 3, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new lineBrush property lacks test coverage. Consider adding a Compose UI test in JetLimeColumnTest.kt or JetLimeRowTest.kt that verifies the custom lineBrush is applied correctly to events. This would ensure the feature works as intended and prevent regressions.

Copilot uses AI. Check for mistakes.
): JetLimeEventStyle = JetLimeEventStyle(
pointPlacement = pointPlacement,
pointType = pointType,
Expand All @@ -92,6 +95,7 @@ object JetLimeEventDefaults {
pointAnimation = pointAnimation,
pointStrokeWidth = pointStrokeWidth,
pointStrokeColor = pointStrokeColor,
lineBrush = lineBrush,
).apply {
this.position = position
}
Expand Down
2 changes: 2 additions & 0 deletions jetlime/src/commonMain/kotlin/com/pushpal/jetlime/JetLimeEventStyle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ package com.pushpal.jetlime

import androidx.compose.runtime.Immutable
import androidx.compose.runtime.Stable
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.Dp

Expand All @@ -52,6 +53,7 @@ class JetLimeEventStyle internal constructor(
val pointAnimation: EventPointAnimation?,
val pointStrokeWidth: Dp,
val pointStrokeColor: Color,
val lineBrush: Brush?,

Copilot AI Dec 2, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The lineBrush property is not included in the equals() method comparison. This could lead to two JetLimeEventStyle instances being considered equal even when they have different lineBrush values, causing unexpected behavior in collections or when checking equality.

Add the following check before the final return statement:

if (lineBrush != other.lineBrush) return false

Copilot uses AI. Check for mistakes.

Copilot AI Dec 2, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The lineBrush property is not included in the hashCode() calculation. This breaks the general contract between equals() and hashCode(): objects that are equal must have the same hash code. This could cause issues when using JetLimeEventStyle instances in hash-based collections like HashMap or HashSet.

Add the following line before the return statement in hashCode():

result = 31 * result + (lineBrush?.hashCode() ?: 0)

Copilot uses AI. Check for mistakes.

Copilot AI Dec 2, 2025

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The lineBrush property is missing from the class-level KDoc documentation. The documentation comment at the top of the class (lines 33-45) should include a @property lineBrush entry to describe this new property.

Add the following to the class KDoc:

* @property lineBrush The brush used for drawing the connecting line to the next event, or null to use the default from JetLimeStyle.

Copilot uses AI. Check for mistakes.
) {

/** The position of the event in the UI component. */
Expand Down
7 changes: 4 additions & 3 deletions jetlime/src/commonMain/kotlin/com/pushpal/jetlime/JetLimeExtendedEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ fun JetLimeExtendedEvent(
val radiusAnimFactor by calculateRadiusAnimFactor(style)
val layoutDirection = LocalLayoutDirection.current
val isRtl = layoutDirection == LayoutDirection.Rtl
val lineBrush = remember(style, jetLimeStyle) { style.lineBrush ?: jetLimeStyle.lineBrush }
Comment thread
DRSchlaubi marked this conversation as resolved.

BoxWithConstraints(modifier = modifier) {
var logicalTimelineXOffset by remember { mutableFloatStateOf(0f) }
Expand Down Expand Up @@ -227,7 +228,7 @@ fun JetLimeExtendedEvent(
if (style.pointPlacement == PointPlacement.START) {
if (style.position.isNotEnd()) {
drawLine(
brush = jetLimeStyle.lineBrush,
brush = lineBrush,
start = Offset(x = timelineXOffset, y = yOffset),
end = Offset(
x = timelineXOffset,
Expand All @@ -241,7 +242,7 @@ fun JetLimeExtendedEvent(
// CENTER or END: draw upward (except first) and downward (except last) segments
if (style.position.isNotStart()) {
drawLine(
brush = jetLimeStyle.lineBrush,
brush = lineBrush,
start = Offset(x = timelineXOffset, y = 0f),
end = Offset(x = timelineXOffset, y = yOffset),
strokeWidth = jetLimeStyle.lineThickness.toPx(),
Expand All @@ -250,7 +251,7 @@ fun JetLimeExtendedEvent(
}
if (style.position.isNotEnd()) {
drawLine(
brush = jetLimeStyle.lineBrush,
brush = lineBrush,
start = Offset(x = timelineXOffset, y = yOffset),
end = Offset(x = timelineXOffset, y = this.size.height),
strokeWidth = jetLimeStyle.lineThickness.toPx(),
Expand Down