Skip to content

Commit

Permalink
Add IgnorePointer to live indicator to allow to press event
Browse files Browse the repository at this point in the history
Without IgnorePointer, because the live indicator is on top of the events it won't allow to press the events.
  • Loading branch information
MartimTSilva authored and apurva010 committed May 9, 2024
1 parent b8b29ae commit 739ff20
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 23 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
- # [1.1.1] (UnReleased)
- Added showWeekTileBorder field whether to show border for header in month view. [#306](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/306)
- Fixed an issue related to hiding day, which is not in the current month in MonthView. [#328](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/328)
- Added header title for full day events in week view. [#308](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/308)
- Added support for double tapping gestures on any event in day, week, and month view. [#195](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/195)
- Added support to set end time of day and week view. [#298](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/298)
- Added support for horizontal scroll physics of week and month view page. [#314](https://github.com/SimformSolutionsPvtLtd/flutter_calendar_view/issues/314)
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,13 @@ WeekView(
hourLinePainter: (lineColor, lineHeight, offset, minuteHeight, showVerticalLine, verticalLineOffset) {
return //Your custom painter.
},
weekPageHeaderBuilder: WeekHeader.hidden // To hide week header
weekPageHeaderBuilder: WeekHeader.hidden, // To hide week header
fullDayHeaderTitle: 'All day', // To set full day events header title
fullDayHeaderTextConfig: FullDayHeaderTextConfig(
textAlign: TextAlign.center,
textOverflow: TextOverflow.ellipsis,
maxLines: 2,
), // To set full day events header text config
);
```

Expand Down
13 changes: 13 additions & 0 deletions lib/src/components/week_view_components.dart
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,16 @@ class WeekPageHeader extends CalendarPageHeader {
"${secondaryDate != null ? "${secondaryDate.day} / "
"${secondaryDate.month} / ${secondaryDate.year}" : ""}";
}

class FullDayHeaderTextConfig {
/// Set full day events header text config
const FullDayHeaderTextConfig({
this.textAlign = TextAlign.center,
this.maxLines = 2,
this.textOverflow = TextOverflow.ellipsis,
});

final TextAlign textAlign;
final int maxLines;
final TextOverflow textOverflow;
}
48 changes: 29 additions & 19 deletions lib/src/week_view/_internal_week_view_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
import 'package:flutter/material.dart';

import '../components/_internal_components.dart';
import '../components/week_view_components.dart';
import '../components/event_scroll_notifier.dart';
import '../enumerations.dart';
import '../event_arrangers/event_arrangers.dart';
import '../event_controller.dart';
import '../modals.dart';
import '../painters.dart';
import '../typedefs.dart';
import '../constants.dart';

/// A single page for week view.
class InternalWeekViewPage<T extends Object?> extends StatelessWidget {
Expand Down Expand Up @@ -146,7 +146,10 @@ class InternalWeekViewPage<T extends Object?> extends StatelessWidget {
final int endHour;

/// Title of the full day events row
final String? fullDayHeaderTitle;
final String fullDayHeaderTitle;

/// Defines full day events header text config
final FullDayHeaderTextConfig fullDayHeaderTextConfig;

/// A single page for week view.
const InternalWeekViewPage({
Expand Down Expand Up @@ -191,7 +194,8 @@ class InternalWeekViewPage<T extends Object?> extends StatelessWidget {
required this.emulateVerticalOffsetBy,
required this.onTileDoubleTap,
required this.endHour,
this.fullDayHeaderTitle,
this.fullDayHeaderTitle = '',
required this.fullDayHeaderTextConfig,
}) : super(key: key);

@override
Expand Down Expand Up @@ -237,36 +241,42 @@ class InternalWeekViewPage<T extends Object?> extends StatelessWidget {
child: Container(
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(color: hourIndicatorSettings.color, width: 2),
bottom: BorderSide(
color: hourIndicatorSettings.color,
width: 2,
),
),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Container(
width: timeLineWidth + hourIndicatorSettings.offset,
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 2.0, horizontal: 1),
if (fullDayHeaderTitle.isNotEmpty)
Container(
width: timeLineWidth + hourIndicatorSettings.offset,
padding: const EdgeInsets.symmetric(
vertical: 2,
horizontal: 1,
),
child: Text(
fullDayHeaderTitle ?? "",
textAlign: TextAlign.center,
maxLines: 2,
overflow: TextOverflow.ellipsis,
fullDayHeaderTitle,
textAlign: fullDayHeaderTextConfig.textAlign,
maxLines: fullDayHeaderTextConfig.maxLines,
overflow: fullDayHeaderTextConfig.textOverflow,
),
),
),
...List.generate(
filteredDates.length,
(index) {
final fullDayEventList = controller.getFullDayEvent(filteredDates[index]);
(index) {
final fullDayEventList =
controller.getFullDayEvent(filteredDates[index]);
return Container(
width: weekTitleWidth,
child: fullDayEventList.isEmpty
? null
: fullDayEventBuilder.call(
fullDayEventList,
dates[index],
),
fullDayEventList,
dates[index],
),
);
},
)
Expand Down
14 changes: 11 additions & 3 deletions lib/src/week_view/week_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,10 @@ class WeekView<T extends Object?> extends StatefulWidget {
final ScrollPhysics? pageViewPhysics;

/// Title of the full day events row
final String? fullDayHeaderTitle;
final String fullDayHeaderTitle;

/// Defines full day events header text config
final FullDayHeaderTextConfig? fullDayHeaderTextConfig;

/// Main widget for week view.
const WeekView({
Expand Down Expand Up @@ -289,7 +292,8 @@ class WeekView<T extends Object?> extends StatefulWidget {
this.pageViewPhysics,
this.onEventDoubleTap,
this.endHour = Constants.hoursADay,
this.fullDayHeaderTitle,
this.fullDayHeaderTitle = '',
this.fullDayHeaderTextConfig,
}) : assert(!(onHeaderTitleTap != null && weekPageHeaderBuilder != null),
"can't use [onHeaderTitleTap] & [weekPageHeaderBuilder] simultaneously"),
assert((timeLineOffset) >= 0,
Expand Down Expand Up @@ -331,7 +335,7 @@ class WeekViewState<T extends Object?> extends State<WeekView<T>> {
late DateTime _currentWeek;
late int _totalWeeks;
late int _currentIndex;
late String? _fullDayHeaderTitle;
late String _fullDayHeaderTitle;

late EventArranger<T> _eventArranger;

Expand All @@ -351,6 +355,7 @@ class WeekViewState<T extends Object?> extends State<WeekView<T>> {
late WeekNumberBuilder _weekNumberBuilder;
late FullDayEventBuilder<T> _fullDayEventBuilder;
late DetectorBuilder _weekDetectorBuilder;
late FullDayHeaderTextConfig _fullDayHeaderTextConfig;

late double _weekTitleWidth;
late int _totalDaysInWeek;
Expand Down Expand Up @@ -394,6 +399,8 @@ class WeekViewState<T extends Object?> extends State<WeekView<T>> {

_assignBuilders();
_fullDayHeaderTitle = widget.fullDayHeaderTitle;
_fullDayHeaderTextConfig =
widget.fullDayHeaderTextConfig ?? FullDayHeaderTextConfig();
}

@override
Expand Down Expand Up @@ -540,6 +547,7 @@ class WeekViewState<T extends Object?> extends State<WeekView<T>> {
showWeekDayAtBottom: widget.showWeekDayAtBottom,
endHour: _endHour,
fullDayHeaderTitle: _fullDayHeaderTitle,
fullDayHeaderTextConfig: _fullDayHeaderTextConfig,
),
);
},
Expand Down

0 comments on commit 739ff20

Please sign in to comment.