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.

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

Today Button Added #809

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
98 changes: 63 additions & 35 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,49 +5,56 @@ packages:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
url: "https://pub.dev"
source: hosted
version: "2.9.0"
version: "2.11.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.dartlang.org"
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
url: "https://pub.dev"
source: hosted
version: "1.2.1"
version: "1.3.0"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
url: "https://pub.dev"
source: hosted
version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
url: "https://pub.dev"
source: hosted
version: "1.16.0"
version: "1.17.1"
cupertino_icons:
dependency: "direct main"
description:
name: cupertino_icons
url: "https://pub.dartlang.org"
sha256: caac504f942f41dfadcf45229ce8c47065b93919a12739f20d6173a883c5ec73
url: "https://pub.dev"
source: hosted
version: "1.0.2"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
url: "https://pub.dev"
source: hosted
version: "1.3.1"
flutter:
Expand All @@ -64,42 +71,56 @@ packages:
dependency: transitive
description:
name: intl
url: "https://pub.dartlang.org"
sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
url: "https://pub.dev"
source: hosted
version: "0.18.0"
js:
dependency: transitive
description:
name: js
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
url: "https://pub.dev"
source: hosted
version: "0.6.7"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
url: "https://pub.dev"
source: hosted
version: "0.12.12"
version: "0.12.15"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
url: "https://pub.dev"
source: hosted
version: "0.1.5"
version: "0.2.0"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
url: "https://pub.dev"
source: hosted
version: "1.8.0"
version: "1.9.1"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
url: "https://pub.dev"
source: hosted
version: "1.8.2"
version: "1.8.3"
simple_gesture_detector:
dependency: transitive
description:
name: simple_gesture_detector
url: "https://pub.dartlang.org"
sha256: "86d08f85f1f58583b7b4b941d989f48ea6ce08c1724a1d10954a277c2ec36592"
url: "https://pub.dev"
source: hosted
version: "0.2.0"
sky_engine:
Expand All @@ -111,30 +132,34 @@ packages:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
url: "https://pub.dev"
source: hosted
version: "1.9.0"
version: "1.9.1"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "1.2.0"
table_calendar:
dependency: "direct main"
description:
Expand All @@ -146,23 +171,26 @@ packages:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
url: "https://pub.dev"
source: hosted
version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
url: "https://pub.dev"
source: hosted
version: "0.4.12"
version: "0.5.1"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
url: "https://pub.dev"
source: hosted
version: "2.1.2"
version: "2.1.4"
sdks:
dart: ">=2.17.0-0 <3.0.0"
dart: ">=3.0.0-0 <4.0.0"
flutter: ">=1.17.0"
23 changes: 23 additions & 0 deletions lib/src/customization/header_style.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ class HeaderStyle {
/// Responsible for FormatButton visibility.
final bool formatButtonVisible;

/// Responsible for TodayButton visibility.
final bool todayButtonVisible;

/// Controls the text inside FormatButton.
/// * `true` - the button will show next CalendarFormat
/// * `false` - the button will show current CalendarFormat
Expand All @@ -37,6 +40,14 @@ class HeaderStyle {
/// Background `Decoration` for FormatButton.
final BoxDecoration formatButtonDecoration;

final String todayButtonText;

/// Style for TodayButton `Text`.
final TextStyle todayButtonTextStyle;

/// Background `Decoration` for TodayButton.
final BoxDecoration todayButtonDecoration;

/// Internal padding of the whole header.
final EdgeInsets headerPadding;

Expand All @@ -46,6 +57,9 @@ class HeaderStyle {
/// Internal padding of FormatButton.
final EdgeInsets formatButtonPadding;

/// Internal padding of TodayButton.
final EdgeInsets todayButtonPadding;

/// Internal padding of left chevron.
/// Determines how much of ripple animation is visible during taps.
final EdgeInsets leftChevronPadding;
Expand Down Expand Up @@ -81,7 +95,16 @@ class HeaderStyle {

/// Creates a `HeaderStyle` used by `TableCalendar` widget.
const HeaderStyle({
this.todayButtonText = 'Today',
this.titleCentered = false,
this.todayButtonVisible = false,
this.todayButtonTextStyle = const TextStyle(fontSize: 14.0),
this.todayButtonDecoration = const BoxDecoration(
border: const Border.fromBorderSide(BorderSide()),
borderRadius: const BorderRadius.all(Radius.circular(12.0)),
),
this.todayButtonPadding =
const EdgeInsets.symmetric(horizontal: 10.0, vertical: 4.0),
this.formatButtonVisible = true,
this.formatButtonShowsNext = true,
this.titleTextFormatter,
Expand Down
30 changes: 30 additions & 0 deletions lib/src/table_calendar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,35 @@ class _TableCalendarState<T> extends State<TableCalendar<T>> {
);
}

void _jumpToPage(int page) {
_pageController.animateToPage(
page,
duration: widget.pageAnimationDuration,
curve: widget.pageAnimationCurve,
);
}

void _onTodayButtonTap() {
_jumpToPage(_differencePageIndex);

widget.onDaySelected?.call(_currentDay, _focusedDay.value);
}

int get differenceInMounth => _currentDay.month - _focusedDay.value.month;

int get differenceInWeek =>
(_currentDay.difference(_focusedDay.value).inDays / 7).floor();

int get _differencePageIndex =>
_pageController.page!.toInt() +
{
CalendarFormat.month: differenceInMounth,
CalendarFormat.week: differenceInWeek,
CalendarFormat.twoWeeks: (differenceInWeek / 2).floor(),
}[widget.calendarFormat]!;

DateTime get _currentDay => DateTime.now();

@override
Widget build(BuildContext context) {
return Column(
Expand All @@ -462,6 +491,7 @@ class _TableCalendarState<T> extends State<TableCalendar<T>> {
onHeaderLongPress: () =>
widget.onHeaderLongPressed?.call(value),
headerStyle: widget.headerStyle,
onTodayButtonTap: _onTodayButtonTap,
availableCalendarFormats: widget.availableCalendarFormats,
calendarFormat: widget.calendarFormat,
locale: widget.locale,
Expand Down
Loading