Merge pull request #12 from Iconica-Development/1.3.0

feat: add ability to offset hours so table can span across midnight

Author: Gorter-dev

CHANGELOG.md

@@ -22,3 +22,7 @@
 ## [1.2.1] - 7 November 2023
 
 * Fixed the assert on the [scrollTriggerOffset] and [scrollJumpToOffset].
+
+## [1.3.0] - 8 November 2023
+
+* Add the option for setting an offset for the hours so that the first hour is not 00:00 but 08:00 for example and the last hour can be after 24:00.

example/.gitignore

@@ -19,7 +19,7 @@ migrate_working_dir/
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.
-#.vscode/
+.vscode/
 
 # Flutter/Dart/Pub related
 **/doc/api/
@@ -45,3 +45,6 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+pubspec.lock
+.metadata

example/.metadata

@@ -149,9 +149,10 @@ class _TimetableDemoState extends State<TimetableDemo> {
             child: Timetable(
               onOverScroll: () {},
               onUnderScroll: () {},
+              hoursOffset: 6,
               size: Size(size.width, size.height * 0.64),
               tableDirection: _horizontal ? Axis.horizontal : Axis.vertical,
-              startHour: 3,
+              startHour: 0,
               endHour: 24,
               timeBlocks: blocks,
               scrollController: _scrollController,

example/lib/main.dart

@@ -25,6 +25,7 @@ class Timetable extends StatefulWidget {
     this.initialScrollTime,
     this.scrollController,
     this.scrollPhysics,
+    this.hoursOffset = 0,
     this.startHour = 0,
     this.endHour = 24,
     this.blockDimension = 50,
@@ -55,6 +56,10 @@ class Timetable extends StatefulWidget {
   /// Hour at which the timetable ends.
   final int endHour;
 
+  /// The time offset to increase all hour labels with
+  /// this is used to make the timetable start at a different time and go past midnight.
+  final int hoursOffset;
+
   /// The time blocks that will be displayed in the timetable.
   final List<TimeBlock> timeBlocks;
 
@@ -170,6 +175,7 @@ class _TimetableState extends State<Timetable> {
           alignment: Alignment.topLeft,
           children: [
             table.Table(
+              hoursOffset: widget.hoursOffset,
               tableDirection: widget.tableDirection,
               startHour: widget.startHour,
               endHour: widget.endHour,

example/pubspec.lock

@@ -10,13 +10,14 @@ class Table extends StatelessWidget {
   const Table({
     required this.startHour,
     required this.endHour,
+    this.hoursOffset = 0,
     this.size,
     this.tableDirection = Axis.vertical,
     this.hourDimension = 80,
     this.tableOffset = 20,
     this.theme = const TableTheme(),
-    Key? key,
-  }) : super(key: key);
+    super.key,
+  });
 
   /// The [Axis] in which the table is layed out.
   final Axis tableDirection;
@@ -30,6 +31,9 @@ class Table extends StatelessWidget {
   /// The hour the table ends at.
   final int endHour;
 
+  /// The time offset to increase all hour labels with
+  final int hoursOffset;
+
   /// The length in pixel of a single hour in the table.
   final double hourDimension;
 
@@ -55,7 +59,7 @@ class Table extends StatelessWidget {
                   Column(
                     children: [
                       Text(
-                        '${((i == 24) ? '00' : i.toString()).padLeft(2, '0')}'
+                        '${(((i + hoursOffset) == 24) ? '00' : ((i + hoursOffset) % 24).toString()).padLeft(2, '0')}'
                         ':00',
                         style: theme.timeStyle ??
                             Theme.of(context).textTheme.bodyLarge,
@@ -124,7 +128,7 @@ class Table extends StatelessWidget {
                 Row(
                   children: [
                     Text(
-                      '${i.toString().padLeft(2, '0')}:00',
+                      '${((i + hoursOffset) % 24).toString().padLeft(2, '0')}:00',
                       style: theme.timeStyle ??
                           Theme.of(context).textTheme.bodyLarge,
                     ),

lib/src/timetable.dart

@@ -1,6 +1,6 @@
 name: flutter_timetable
 description: Flutter package to create a Timetable Widget that display blocks of widgets inside a timetable.
-version: 1.2.1
+version: 1.3.0
 repository: https://github.com/Iconica-Development/timetable
 
 environment: