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

Feature Added: Dashed lines (Feature Request #7) #37

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+119 −10
Open

Feature Added: Dashed lines (Feature Request #7) #37

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
1 change: 1 addition & 0 deletions example/lib/src/showcase_timeline_tile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class ShowcaseTimelineTile extends StatelessWidget {
final example = examples[index];

return TimelineTile(
isDotted: true,
alignment: TimelineAlign.manual,
lineXY: 0.1,
isFirst: index == 0,
Expand Down
6 changes: 3 additions & 3 deletions example/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.5.0"
version: "2.6.1"
boolean_selector:
dependency: transitive
description:
Expand Down Expand Up @@ -211,7 +211,7 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
version: "1.8.1"
stack_trace:
dependency: transitive
description:
Expand Down Expand Up @@ -246,7 +246,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.19"
version: "0.3.0"
timeline_tile:
dependency: "direct main"
description:
Expand Down
122 changes: 115 additions & 7 deletions lib/src/tile.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ class TimelineTile extends StatelessWidget {
this.hasIndicator = true,
this.isFirst = false,
this.isLast = false,
this.isDotted = false,
this.dashWidth = 9.0,
this.dashSpace = 5.0,
this.indicatorStyle = const IndicatorStyle(width: 25),
this.beforeLineStyle = const LineStyle(),
LineStyle? afterLineStyle,
Expand All @@ -65,6 +68,16 @@ class TimelineTile extends StatelessWidget {
/// It defaults to [TimelineAxis.vertical]
final TimelineAxis axis;

///True if the line is dotted.
///It defaults to false
final bool isDotted;

///Sets the width of the dashed line. Defaults to 9.
final double dashWidth;

///Sets the space between the dashed lines. Defaults to 5
final double dashSpace;

/// The alignment used on the line. See [TimelineAlign].
/// It defaults to [TimelineAlign.start]
final TimelineAlign alignment;
Expand Down Expand Up @@ -125,12 +138,15 @@ class TimelineTile extends StatelessWidget {
),
_Indicator(
axis: axis,
isDotted: isDotted,
beforeLineStyle: beforeLineStyle,
afterLineStyle: afterLineStyle,
indicatorStyle: indicatorStyle,
hasIndicator: hasIndicator,
isLast: isLast,
isFirst: isFirst,
dashSpace: dashSpace,
dashWidth: dashWidth,
),
if (endCrossAxisSpace > 0)
SizedBox(
Expand Down Expand Up @@ -232,11 +248,20 @@ class _Indicator extends StatelessWidget {
required this.hasIndicator,
required this.isFirst,
required this.isLast,
required this.isDotted,
required this.dashSpace,
required this.dashWidth,
});

/// See [TimelineTile.axis]
final TimelineAxis axis;

final bool isDotted;

final double dashWidth;

final double dashSpace;

/// See [TimelineTile.beforeLineStyle]
final LineStyle beforeLineStyle;

Expand Down Expand Up @@ -291,6 +316,9 @@ class _Indicator extends StatelessWidget {
paintIndicator: renderDefaultIndicator,
isFirst: isFirst,
isLast: isLast,
isDotted: isDotted,
dashSpace: dashSpace,
dashWidth: dashWidth,
);

return CustomPaint(
Expand Down Expand Up @@ -362,14 +390,19 @@ class _TimelinePainter extends CustomPainter {
this.paintIndicator = true,
this.isFirst = false,
this.isLast = false,
required this.isDotted,
required this.dashWidth,
required this.dashSpace,
required IndicatorStyle indicatorStyle,
required LineStyle beforeLineStyle,
required LineStyle afterLineStyle,
}) : beforeLinePaint = Paint()
..color = beforeLineStyle.color
// ..color = Colors.red
..strokeWidth = beforeLineStyle.thickness,
afterLinePaint = Paint()
..color = afterLineStyle.color
// ..color = Colors.blue
..strokeWidth = afterLineStyle.thickness,
indicatorPaint =
!paintIndicator ? null : (Paint()..color = indicatorStyle.color),
Expand Down Expand Up @@ -401,11 +434,13 @@ class _TimelinePainter extends CustomPainter {
iconSize = indicatorStyle.iconStyle != null
? indicatorStyle.iconStyle?.fontSize
: null;

/// The axis used to render the line at the [TimelineAxis.vertical]
/// or [TimelineAxis.horizontal].
final TimelineAxis axis;

final bool isDotted;
final double dashWidth, dashSpace;

/// Value from 0.0 to 1.0 indicating the percentage in which the indicator
/// should be positioned on the line, either on Y if [TimelineAxis.vertical]
/// or X if [TimelineAxis.horizontal].
Expand Down Expand Up @@ -541,7 +576,26 @@ class _TimelinePainter extends CustomPainter {
: position.firstSpace.end,
centerAxis,
);
canvas.drawLine(beginTopLine, endTopLine, beforeLinePaint);

if (isDotted) {
if ( axis == TimelineAxis.vertical ) {
double startY = 0;
while (startY <= endTopLine.dy - dashSpace / 2) {
canvas.drawLine(Offset(centerAxis, startY),
Offset(centerAxis, startY + dashWidth), beforeLinePaint);
startY += dashWidth + dashSpace;
}
} else {
double startX = 0;
while (startX <= endTopLine.dx - dashSpace / 2) {
canvas.drawLine(Offset(startX, centerAxis),
Offset(startX + dashWidth, centerAxis), beforeLinePaint);
startX += dashWidth + dashSpace;
}
}
} else {
canvas.drawLine(beginTopLine, endTopLine, beforeLinePaint);
}
}

if (!isLast) {
Expand All @@ -561,7 +615,25 @@ class _TimelinePainter extends CustomPainter {
final endBottomLine = axis == TimelineAxis.vertical
? Offset(centerAxis, position.secondSpace.end)
: Offset(position.secondSpace.end, centerAxis);
canvas.drawLine(beginBottomLine, endBottomLine, afterLinePaint);

if(isDotted == true) {
if(axis == TimelineAxis.vertical) {
double startY = beginBottomLine.dy;

while (startY <= endBottomLine.dy - (dashWidth + dashSpace)) {
canvas.drawLine(Offset(centerAxis, startY), Offset(centerAxis, startY+dashWidth), afterLinePaint);
startY += dashWidth + dashSpace;
}
} else {
double startX = beginBottomLine.dx;
while (startX <= beginBottomLine.dx - (dashWidth + dashSpace)) {
canvas.drawLine(Offset(startX, centerAxis), Offset(startX+dashWidth, centerAxis), afterLinePaint);
startX += dashWidth + dashSpace;
}
}
} else {
canvas.drawLine(beginBottomLine, endBottomLine, afterLinePaint);
}
}
}

Expand All @@ -577,12 +649,30 @@ class _TimelinePainter extends CustomPainter {
final lineSize =
axis == TimelineAxis.vertical ? endTopLine.dy : endTopLine.dx;
// if the line size is less or equal than 0, the line shouldn't be rendered
if (lineSize > 0) {
canvas.drawLine(beginTopLine, endTopLine, beforeLinePaint);
if (lineSize>0) {
if (isDotted) {
if(axis == TimelineAxis.vertical) {
double startY = 0;
while (startY <= endTopLine.dy-dashSpace/2) {
canvas.drawLine(Offset(centerAxis, startY), Offset(centerAxis, startY+dashWidth), beforeLinePaint);
startY += dashWidth + dashSpace;
}
} else {
double startX = 0;
while (startX <= endTopLine.dx-dashSpace/2) {
canvas.drawLine(Offset(startX, centerAxis), Offset(startX+dashWidth ,centerAxis), beforeLinePaint);
startX += dashWidth + dashSpace;
}
}
} else {
canvas.drawLine(beginTopLine, endTopLine, beforeLinePaint);
}
}
}

void _drawAfterLine(Canvas canvas, double centerAxis, AxisPosition position) {


final beginBottomLine = axis == TimelineAxis.vertical
? Offset(centerAxis, position.secondSpace.start)
: Offset(position.secondSpace.start, centerAxis);
Expand All @@ -594,8 +684,26 @@ class _TimelinePainter extends CustomPainter {
? endBottomLine.dy - beginBottomLine.dy
: endBottomLine.dx - beginBottomLine.dx;
// if the line size is less or equal than 0, the line shouldn't be rendered
if (lineSize > 0) {
canvas.drawLine(beginBottomLine, endBottomLine, afterLinePaint);
if (lineSize>0) {
if(isDotted == true) {
if(axis == TimelineAxis.vertical) {
double startY = beginBottomLine.dy;

while (startY <= endBottomLine.dy - (dashWidth + dashSpace)) {
canvas.drawLine(Offset(centerAxis, startY), Offset(centerAxis, startY+dashWidth), afterLinePaint);
startY += dashWidth + dashSpace;
}
} else {
double startX = beginBottomLine.dx;
while (startX <= beginBottomLine.dx - (dashWidth + dashSpace)) {
canvas.drawLine(Offset(startX, centerAxis), Offset(startX+dashWidth, centerAxis), afterLinePaint);
startX += dashWidth + dashSpace;
}
}
} else {
canvas.drawLine(beginBottomLine, endBottomLine, afterLinePaint);
}
}
}
}