Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
format
Browse files Browse the repository at this point in the history
rmpt committed Feb 3, 2024
1 parent 4ff6295 commit 21ec792
Showing 6 changed files with 101 additions and 103 deletions.
4 changes: 2 additions & 2 deletions lib/src/components/common_components.dart
Original file line number Diff line number Diff line change
@@ -54,9 +54,9 @@ class CalendarPageHeader extends StatelessWidget {
this.onPreviousDay,
this.secondaryDate,
@Deprecated("Use Header Style to provide background")
this.backgroundColor = Constants.headerBackground,
this.backgroundColor = Constants.headerBackground,
@Deprecated("Use Header Style to provide icon color")
this.iconColor = Constants.black,
this.iconColor = Constants.black,
this.headerStyle = const HeaderStyle(),
}) : super(key: key);

58 changes: 28 additions & 30 deletions lib/src/day_view/day_view.dart
Original file line number Diff line number Diff line change
@@ -438,10 +438,10 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
valueListenable: _scrollConfiguration,
builder: (_, __, ___) => InternalDayViewPage<T>(
key: ValueKey(
_hourHeight.toString() + date.toString()),
_hourHeight.toString() + date.toString()),
width: _width,
liveTimeIndicatorSettings:
_liveTimeIndicatorSettings,
_liveTimeIndicatorSettings,
timeLineBuilder: _timeLineBuilder,
dayDetectorBuilder: _dayDetectorBuilder,
eventTileBuilder: _eventTileBuilder,
@@ -453,7 +453,7 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
onDateLongPress: widget.onDateLongPress,
onDateTap: widget.onDateTap,
showLiveLine: widget.showLiveTimeLineInAllDays ||
date.compareWithoutTime(DateTime.now()),
date.compareWithoutTime(DateTime.now()),
timeLineOffset: widget.timeLineOffset,
timeLineWidth: _timeLineWidth,
verticalLineOffset: widget.verticalLineOffset,
@@ -469,12 +469,12 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
showHalfHours: widget.showHalfHours,
showQuarterHours: widget.showQuarterHours,
halfHourIndicatorSettings:
_halfHourIndicatorSettings,
_halfHourIndicatorSettings,
startHour: _startHour,
quarterHourIndicatorSettings:
_quarterHourIndicatorSettings,
_quarterHourIndicatorSettings,
emulateVerticalOffsetBy:
widget.emulateVerticalOffsetBy,
widget.emulateVerticalOffsetBy,
),
);
},
@@ -719,31 +719,29 @@ class DayViewState<T extends Object?> extends State<DayView<T>> {
FullDayEventView(events: events, date: date);

HourLinePainter _defaultHourLinePainter(
Color lineColor,
double lineHeight,
double offset,
double minuteHeight,
bool showVerticalLine,
double verticalLineOffset,
LineStyle lineStyle,
double dashWidth,
double dashSpaceWidth,
double emulateVerticalOffsetBy,
int startHour
) {
Color lineColor,
double lineHeight,
double offset,
double minuteHeight,
bool showVerticalLine,
double verticalLineOffset,
LineStyle lineStyle,
double dashWidth,
double dashSpaceWidth,
double emulateVerticalOffsetBy,
int startHour) {
return HourLinePainter(
lineColor: lineColor,
lineHeight: lineHeight,
offset: offset,
minuteHeight: minuteHeight,
verticalLineOffset: verticalLineOffset,
showVerticalLine: showVerticalLine,
lineStyle: lineStyle,
dashWidth: dashWidth,
dashSpaceWidth: dashSpaceWidth,
emulateVerticalOffsetBy: emulateVerticalOffsetBy,
startHour: startHour
);
lineColor: lineColor,
lineHeight: lineHeight,
offset: offset,
minuteHeight: minuteHeight,
verticalLineOffset: verticalLineOffset,
showVerticalLine: showVerticalLine,
lineStyle: lineStyle,
dashWidth: dashWidth,
dashSpaceWidth: dashSpaceWidth,
emulateVerticalOffsetBy: emulateVerticalOffsetBy,
startHour: startHour);
}

/// Called when user change page using any gesture or inbuilt functions.
18 changes: 9 additions & 9 deletions lib/src/modals.dart
Original file line number Diff line number Diff line change
@@ -17,15 +17,15 @@ class HourIndicatorSettings {
final int startHour;

/// Settings for hour lines
const HourIndicatorSettings({
this.height = 1.0,
this.offset = 0.0,
this.color = Colors.grey,
this.lineStyle = LineStyle.solid,
this.dashWidth = 4,
this.dashSpaceWidth = 4,
this.startHour = 0
}) : assert(height >= 0, "Height must be greater than or equal to 0.");
const HourIndicatorSettings(
{this.height = 1.0,
this.offset = 0.0,
this.color = Colors.grey,
this.lineStyle = LineStyle.solid,
this.dashWidth = 4,
this.dashSpaceWidth = 4,
this.startHour = 0})
: assert(height >= 0, "Height must be greater than or equal to 0.");

factory HourIndicatorSettings.none() => HourIndicatorSettings(
color: Colors.transparent,
23 changes: 11 additions & 12 deletions lib/src/typedefs.dart
Original file line number Diff line number Diff line change
@@ -73,17 +73,16 @@ typedef EventFilter<T extends Object?> = List<CalendarEventData<T>> Function(
DateTime date, List<CalendarEventData<T>> events);

typedef CustomHourLinePainter = CustomPainter Function(
Color lineColor,
double lineHeight,
double offset,
double minuteHeight,
bool showVerticalLine,
double verticalLineOffset,
LineStyle lineStyle,
double dashWidth,
double dashSpaceWidth,
double emulateVerticalOffsetBy,
int startHour
);
Color lineColor,
double lineHeight,
double offset,
double minuteHeight,
bool showVerticalLine,
double verticalLineOffset,
LineStyle lineStyle,
double dashWidth,
double dashSpaceWidth,
double emulateVerticalOffsetBy,
int startHour);

typedef TestPredicate<T> = bool Function(T element);
43 changes: 21 additions & 22 deletions lib/src/week_view/_internal_week_view_page.dart
Original file line number Diff line number Diff line change
@@ -249,32 +249,31 @@ class InternalWeekViewPage<T extends Object?> extends StatelessWidget {
child: Stack(
children: [
CustomPaint(
size: Size(width, height),
painter: HourLinePainter(
lineColor: hourIndicatorSettings.color,
lineHeight: hourIndicatorSettings.height,
offset: timeLineWidth + hourIndicatorSettings.offset,
minuteHeight: heightPerMinute,
verticalLineOffset: verticalLineOffset,
showVerticalLine: showVerticalLine,
startHour: startHour,
emulateVerticalOffsetBy: emulateVerticalOffsetBy)
),
size: Size(width, height),
painter: HourLinePainter(
lineColor: hourIndicatorSettings.color,
lineHeight: hourIndicatorSettings.height,
offset:
timeLineWidth + hourIndicatorSettings.offset,
minuteHeight: heightPerMinute,
verticalLineOffset: verticalLineOffset,
showVerticalLine: showVerticalLine,
startHour: startHour,
emulateVerticalOffsetBy: emulateVerticalOffsetBy)),
if (showHalfHours)
CustomPaint(
size: Size(width, height),
painter: HalfHourLinePainter(
lineColor: halfHourIndicatorSettings.color,
lineHeight: halfHourIndicatorSettings.height,
offset:
timeLineWidth + halfHourIndicatorSettings.offset,
minuteHeight: heightPerMinute,
lineStyle: halfHourIndicatorSettings.lineStyle,
dashWidth: halfHourIndicatorSettings.dashWidth,
dashSpaceWidth:
halfHourIndicatorSettings.dashSpaceWidth,
startHour: halfHourIndicatorSettings.startHour
),
lineColor: halfHourIndicatorSettings.color,
lineHeight: halfHourIndicatorSettings.height,
offset: timeLineWidth +
halfHourIndicatorSettings.offset,
minuteHeight: heightPerMinute,
lineStyle: halfHourIndicatorSettings.lineStyle,
dashWidth: halfHourIndicatorSettings.dashWidth,
dashSpaceWidth:
halfHourIndicatorSettings.dashSpaceWidth,
startHour: halfHourIndicatorSettings.startHour),
),
if (showQuarterHours)
CustomPaint(
58 changes: 30 additions & 28 deletions lib/src/week_view/week_view.dart
Original file line number Diff line number Diff line change
@@ -499,7 +499,8 @@ class WeekViewState<T extends Object?> extends State<WeekView<T>> {
startHour: _startHour,
showHalfHours: widget.showHalfHours,
showQuarterHours: widget.showQuarterHours,
emulateVerticalOffsetBy: widget.emulateVerticalOffsetBy,
emulateVerticalOffsetBy:
widget.emulateVerticalOffsetBy,
showWeekDayAtBottom: widget.showWeekDayAtBottom,
),
);
@@ -606,11 +607,14 @@ class WeekViewState<T extends Object?> extends State<WeekView<T>> {
void _assignBuilders() {
_timeLineBuilder = widget.timeLineBuilder ?? _defaultTimeLineBuilder;
_eventTileBuilder = widget.eventTileBuilder ?? _defaultEventTileBuilder;
_weekHeaderBuilder = widget.weekPageHeaderBuilder ?? _defaultWeekPageHeaderBuilder;
_weekHeaderBuilder =
widget.weekPageHeaderBuilder ?? _defaultWeekPageHeaderBuilder;
_weekDayBuilder = widget.weekDayBuilder ?? _defaultWeekDayBuilder;
_weekDetectorBuilder = widget.weekDetectorBuilder ?? _defaultPressDetectorBuilder;
_weekDetectorBuilder =
widget.weekDetectorBuilder ?? _defaultPressDetectorBuilder;
_weekNumberBuilder = widget.weekNumberBuilder ?? _defaultWeekNumberBuilder;
_fullDayEventBuilder = widget.fullDayEventBuilder ?? _defaultFullDayEventBuilder;
_fullDayEventBuilder =
widget.fullDayEventBuilder ?? _defaultFullDayEventBuilder;
_hourLinePainter = widget.hourLinePainter ?? _defaultHourLinePainter;
}

@@ -830,31 +834,29 @@ class WeekViewState<T extends Object?> extends State<WeekView<T>> {
}

HourLinePainter _defaultHourLinePainter(
Color lineColor,
double lineHeight,
double offset,
double minuteHeight,
bool showVerticalLine,
double verticalLineOffset,
LineStyle lineStyle,
double dashWidth,
double dashSpaceWidth,
double emulateVerticalOffsetBy,
int startHour
) {
Color lineColor,
double lineHeight,
double offset,
double minuteHeight,
bool showVerticalLine,
double verticalLineOffset,
LineStyle lineStyle,
double dashWidth,
double dashSpaceWidth,
double emulateVerticalOffsetBy,
int startHour) {
return HourLinePainter(
lineColor: lineColor,
lineHeight: lineHeight,
offset: offset,
minuteHeight: minuteHeight,
verticalLineOffset: verticalLineOffset,
showVerticalLine: showVerticalLine,
lineStyle: lineStyle,
dashWidth: dashWidth,
dashSpaceWidth: dashSpaceWidth,
emulateVerticalOffsetBy: emulateVerticalOffsetBy,
startHour: startHour
);
lineColor: lineColor,
lineHeight: lineHeight,
offset: offset,
minuteHeight: minuteHeight,
verticalLineOffset: verticalLineOffset,
showVerticalLine: showVerticalLine,
lineStyle: lineStyle,
dashWidth: dashWidth,
dashSpaceWidth: dashSpaceWidth,
emulateVerticalOffsetBy: emulateVerticalOffsetBy,
startHour: startHour);
}

/// Called when user change page using any gesture or inbuilt functions.

0 comments on commit 21ec792

Please sign in to comment.