New CalendarFormat - CalendarFormat.day

example/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
  archiveVersion = 1;
  classes = {
  };
- objectVersion = 50;
+ objectVersion = 54;
  objects = {
 
 /* Begin PBXBuildFile section */
@@ -127,7 +127,7 @@
  97C146E61CF9000F007C117D /* Project object */ = {
  isa = PBXProject;
  attributes = {
- LastUpgradeCheck = 1300;
+ LastUpgradeCheck = 1430;
  ORGANIZATIONNAME = "";
  TargetAttributes = {
  97C146ED1CF9000F007C117D = {
@@ -171,10 +171,12 @@
 /* Begin PBXShellScriptBuildPhase section */
  3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
  isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
  buildActionMask = 2147483647;
  files = (
  );
  inputPaths = (
+ "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
  );
  name = "Thin Binary";
  outputPaths = (
@@ -185,6 +187,7 @@
  };
  9740EEB61CF901F6004384FC /* Run Script */ = {
  isa = PBXShellScriptBuildPhase;
+ alwaysOutOfDate = 1;
  buildActionMask = 2147483647;
  files = (
  );

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1300"
+ LastUpgradeVersion = "1430"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"

example/ios/Runner/Info.plist

@@ -43,5 +43,7 @@
  <false/>
  <key>CADisableMinimumFrameDurationOnPhone</key>
  <true/>
+ <key>UIApplicationSupportsIndirectInputEvents</key>
+ <true/>
 </dict>
 </plist>

example/lib/pages/basics_example.dart

@@ -12,19 +12,19 @@ class TableBasicsExample extends StatefulWidget {
 }
 
 class _TableBasicsExampleState extends State<TableBasicsExample> {
- CalendarFormat _calendarFormat = CalendarFormat.month;
+ CalendarFormat _calendarFormat = CalendarFormat.day;
  DateTime _focusedDay = DateTime.now();
  DateTime? _selectedDay;
 
  @override
  Widget build(BuildContext context) {
  return Scaffold(
  appBar: AppBar(
- title: Text('TableCalendar - Basics'),
+ title: Text('TableCalendar - Basics ${_focusedDay.day}'),
  ),
  body: TableCalendar(
  firstDay: kFirstDay,
- lastDay: kLastDay,
+ lastDay: DateTime.now(),
  focusedDay: _focusedDay,
  calendarFormat: _calendarFormat,
  selectedDayPredicate: (day) {

example/pubspec.lock

@@ -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: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+ url: "https://pub.dev"
  source: hosted
- version: "1.16.0"
+ version: "1.18.0"
  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:
@@ -64,42 +71,48 @@ packages:
  dependency: transitive
  description:
  name: intl
- url: "https://pub.dartlang.org"
+ sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
+ url: "https://pub.dev"
  source: hosted
  version: "0.18.0"
  matcher:
  dependency: transitive
  description:
  name: matcher
- url: "https://pub.dartlang.org"
+ sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+ url: "https://pub.dev"
  source: hosted
- version: "0.12.12"
+ version: "0.12.16"
  material_color_utilities:
  dependency: transitive
  description:
  name: material_color_utilities
- url: "https://pub.dartlang.org"
+ sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+ url: "https://pub.dev"
  source: hosted
- version: "0.1.5"
+ version: "0.5.0"
  meta:
  dependency: transitive
  description:
  name: meta
- url: "https://pub.dartlang.org"
+ sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+ url: "https://pub.dev"
  source: hosted
- version: "1.8.0"
+ version: "1.10.0"
  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:
@@ -111,30 +124,34 @@ packages:
  dependency: transitive
  description:
  name: source_span
- url: "https://pub.dartlang.org"
+ sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+ url: "https://pub.dev"
  source: hosted
- version: "1.9.0"
+ version: "1.10.0"
  stack_trace:
  dependency: transitive
  description:
  name: stack_trace
- url: "https://pub.dartlang.org"
+ sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+ url: "https://pub.dev"
  source: hosted
- version: "1.10.0"
+ version: "1.11.1"
  stream_channel:
  dependency: transitive
  description:
  name: stream_channel
- url: "https://pub.dartlang.org"
+ sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+ url: "https://pub.dev"
  source: hosted
- version: "2.1.0"
+ version: "2.1.2"
  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:
@@ -146,23 +163,34 @@ 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: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+ url: "https://pub.dev"
  source: hosted
- version: "0.4.12"
+ version: "0.6.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"
+ web:
+ dependency: transitive
+ description:
+ name: web
+ sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.3.0"
 sdks:
- dart: ">=2.17.0-0 <3.0.0"
+ dart: ">=3.2.0-194.0.dev <4.0.0"
  flutter: ">=1.17.0"

lib/src/shared/utils.dart

@@ -18,7 +18,7 @@ typedef TextFormatter = String Function(DateTime date, dynamic locale);
 enum AvailableGestures { none, verticalSwipe, horizontalSwipe, all }
 
 /// Formats that the calendar can display.
-enum CalendarFormat { month, twoWeeks, week }
+enum CalendarFormat { month, twoWeeks, week, day }
 
 /// Days of the week that the calendar can start with.
 enum StartingDayOfWeek {

lib/src/table_calendar.dart

@@ -220,6 +220,8 @@ class TableCalendar<T> extends StatefulWidget {
  CalendarFormat.month: 'Month',
  CalendarFormat.twoWeeks: '2 weeks',
  CalendarFormat.week: 'Week',
+ CalendarFormat.day: 'Day',
+
  },
  this.headerVisible = true,
  this.daysOfWeekVisible = true,

lib/src/table_calendar_base.dart

@@ -70,6 +70,7 @@ class TableCalendarBase extends StatefulWidget {
  CalendarFormat.month: 'Month',
  CalendarFormat.twoWeeks: '2 weeks',
  CalendarFormat.week: 'Week',
+ CalendarFormat.day: 'Day',
  },
  this.onVerticalSwipe,
  this.onPageChanged,
@@ -148,7 +149,6 @@ class _TableCalendarBaseState extends State<TableCalendarBase> {
  void _updatePage({bool shouldAnimate = false}) {
  final currentIndex = _calculateFocusedPage(
  widget.calendarFormat, widget.firstDay, _focusedDay);
-
  final endIndex = _calculateFocusedPage(
  widget.calendarFormat, widget.firstDay, widget.lastDay);
 
@@ -273,6 +273,8 @@ class _TableCalendarBaseState extends State<TableCalendarBase> {
  return _getTwoWeekCount(startDay, focusedDay);
  case CalendarFormat.week:
  return _getWeekCount(startDay, focusedDay);
+ case CalendarFormat.day:
+ return _getDaysCount(startDay, focusedDay) ;
  default:
  return _getMonthCount(startDay, focusedDay);
  }
@@ -289,6 +291,11 @@ class _TableCalendarBaseState extends State<TableCalendarBase> {
  return last.difference(_firstDayOfWeek(first)).inDays ~/ 7;
  }
 
+ int _getDaysCount(DateTime first, DateTime last) {
+
+ return last.difference(first).inDays;
+ }
+
  int _getTwoWeekCount(DateTime first, DateTime last) {
  return last.difference(_firstDayOfWeek(first)).inDays ~/ 14;
  }
@@ -298,6 +305,8 @@ class _TableCalendarBaseState extends State<TableCalendarBase> {
  return 2;
  } else if (format == CalendarFormat.week) {
  return 1;
+ } else if (format == CalendarFormat.day) {
+ return 1;
  } else if (widget.sixWeekMonthsEnforced) {
  return 6;
  }