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 8, 2024
1 parent 81adb3e commit d286176
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 29 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
- # [1.1.1] (UnReleased)
- 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
56 changes: 30 additions & 26 deletions lib/src/week_view/_internal_week_view_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ 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 +145,7 @@ class InternalWeekViewPage<T extends Object?> extends StatelessWidget {
final int endHour;

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

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

@override
Expand Down Expand Up @@ -237,36 +236,39 @@ 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),
child: Text(
fullDayHeaderTitle ?? "",
textAlign: TextAlign.center,
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
padding: const EdgeInsets.symmetric(
vertical: 2,
horizontal: 1,
),
child: Text(
fullDayHeaderTitle,
textAlign: TextAlign.center,
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
),
...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 Expand Up @@ -398,14 +400,16 @@ class InternalWeekViewPage<T extends Object?> extends StatelessWidget {
endHour: endHour,
),
if (showLiveLine && liveTimeIndicatorSettings.height > 0)
LiveTimeIndicator(
liveTimeIndicatorSettings: liveTimeIndicatorSettings,
width: width,
height: height,
heightPerMinute: heightPerMinute,
timeLineWidth: timeLineWidth,
startHour: startHour,
endHour: endHour,
IgnorePointer(
child: LiveTimeIndicator(
liveTimeIndicatorSettings: liveTimeIndicatorSettings,
width: width,
height: height,
heightPerMinute: heightPerMinute,
timeLineWidth: timeLineWidth,
startHour: startHour,
endHour: endHour,
),
),
],
),
Expand Down
6 changes: 3 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,7 @@ class WeekView<T extends Object?> extends StatefulWidget {
final ScrollPhysics? pageViewPhysics;

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

/// Main widget for week view.
const WeekView({
Expand Down Expand Up @@ -289,7 +289,7 @@ class WeekView<T extends Object?> extends StatefulWidget {
this.pageViewPhysics,
this.onEventDoubleTap,
this.endHour = Constants.hoursADay,
this.fullDayHeaderTitle,
this.fullDayHeaderTitle = '',
}) : assert(!(onHeaderTitleTap != null && weekPageHeaderBuilder != null),
"can't use [onHeaderTitleTap] & [weekPageHeaderBuilder] simultaneously"),
assert((timeLineOffset) >= 0,
Expand Down Expand Up @@ -331,7 +331,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 Down

0 comments on commit d286176

Please sign in to comment.