diff --git a/ready/example/lib/dashboard.dart b/ready/example/lib/dashboard.dart index 16b9b99..20c6ee8 100644 --- a/ready/example/lib/dashboard.dart +++ b/ready/example/lib/dashboard.dart @@ -8,7 +8,8 @@ import 'responsive.dart'; class DashBoardExample extends StatelessWidget { final ValueChanged onModeChanged; - const DashBoardExample({Key? key, required this.onModeChanged}) : super(key: key); + const DashBoardExample({Key? key, required this.onModeChanged}) + : super(key: key); @override Widget build(BuildContext context) { diff --git a/ready/example/pubspec.lock b/ready/example/pubspec.lock index 02cc853..9ced3ae 100644 --- a/ready/example/pubspec.lock +++ b/ready/example/pubspec.lock @@ -162,7 +162,7 @@ packages: path: ".." relative: true source: path - version: "0.0.1-dev.2" + version: "0.0.1-dev.3" sky_engine: dependency: transitive description: flutter diff --git a/ready/lib/src/dashboard/drawer.dart b/ready/lib/src/dashboard/drawer.dart index 4364462..6c722dc 100644 --- a/ready/lib/src/dashboard/drawer.dart +++ b/ready/lib/src/dashboard/drawer.dart @@ -73,7 +73,9 @@ class _DrawerIcon extends StatelessWidget { }, icon: AnimatedIcon( icon: AnimatedIcons.menu_arrow, - progress: Tween(begin: hasDrawer ? 1.0 : 0.0, end: hasDrawer ? 0.0 : 1.0).animate(expansion), + progress: + Tween(begin: hasDrawer ? 1.0 : 0.0, end: hasDrawer ? 0.0 : 1.0) + .animate(expansion), ), ); } @@ -97,10 +99,14 @@ class _DashBoardDrawerState extends State<_DashBoardDrawer> { } List expaded(List items) { - return items.expand((element) => element.subItems.isEmpty ? [element] : expaded(element.subItems)).toList(); + return items + .expand((element) => + element.subItems.isEmpty ? [element] : expaded(element.subItems)) + .toList(); } - Widget buildTile(BuildContext context, DashboardItem item, DashboardItem selected, List expanded) { + Widget buildTile(BuildContext context, DashboardItem item, + DashboardItem selected, List expanded) { if (item.builder != null) { var child = ListTile( onTap: () { @@ -113,7 +119,8 @@ class _DashBoardDrawerState extends State<_DashBoardDrawer> { }, selected: item == selected, title: Text(item.label), - leading: selected == item ? (item.selectedIcon ?? item.icon) : item.icon, + leading: + selected == item ? (item.selectedIcon ?? item.icon) : item.icon, ); return child; } else { @@ -124,13 +131,15 @@ class _DashBoardDrawerState extends State<_DashBoardDrawer> { initiallyExpanded: inner.any((element) => element == selected), leading: item.icon, children: [ - for (var sub in item.subItems) buildTile(context, sub, selected, expanded), + for (var sub in item.subItems) + buildTile(context, sub, selected, expanded), ], ); } } - Widget _tilelistView(BuildContext context, List items, DrawerOptions options) { + Widget _tilelistView( + BuildContext context, List items, DrawerOptions options) { var expanded = expaded(items); return TabControllerLisner( builder: (int index) { @@ -157,7 +166,8 @@ class _DashBoardDrawerState extends State<_DashBoardDrawer> { SliverList( delegate: SliverChildListDelegate([ ...options.headers, - for (var item in items) buildTile(context, item, selectedItem, expanded), + for (var item in items) + buildTile(context, item, selectedItem, expanded), ])), if (options.footer != null) SliverFillRemaining( @@ -191,7 +201,8 @@ class _DrawerHeader extends SliverPersistentHeaderDelegate { required this.statusBar, }); @override - Widget build(BuildContext context, double shrinkOffset, bool overlapsContent) { + Widget build( + BuildContext context, double shrinkOffset, bool overlapsContent) { return SafeArea( child: Row( crossAxisAlignment: CrossAxisAlignment.stretch, diff --git a/ready/lib/src/ready_list/ready_list.dart b/ready/lib/src/ready_list/ready_list.dart index ecf9f6b..cc54f3d 100644 --- a/ready/lib/src/ready_list/ready_list.dart +++ b/ready/lib/src/ready_list/ready_list.dart @@ -22,7 +22,6 @@ part 'refresh_indecators.dart'; class ReadyList> extends StatefulWidget implements ReadyListConfigOptions { final ScrollController? scrollController; - final ReadyListWidgetBuilder? innerHeaderSlivers; final ReadyListWidgetBuilder? headerSlivers; final ReadyListWidgetBuilder? footerSlivers; final ReadyListWidgetBuilder? innerFooterSlivers; @@ -71,7 +70,6 @@ class ReadyList> this.scrollController, this.headerSlivers, this.innerFooterSlivers, - this.innerHeaderSlivers, this.footerSlivers, required ReadyListWidgetBuilder slivers, required this.controller, @@ -104,7 +102,6 @@ class ReadyList> this.scrollController, this.headerSlivers, this.innerFooterSlivers, - this.innerHeaderSlivers, this.footerSlivers, required ReadyListItemBuilder buildItem, ReorderOptions? reorderOptions, @@ -141,7 +138,6 @@ class ReadyList> this.scrollController, this.headerSlivers, this.innerFooterSlivers, - this.innerHeaderSlivers, this.footerSlivers, required ReadyListItemBuilder buildItem, GridDelegateCallback gridDelegate = Grids.columns_2, @@ -306,8 +302,6 @@ class _ReadyListState> if (widget.topLevelHeaderSlivers != null) ...widget.topLevelHeaderSlivers!, if (widget.headerSlivers != null) ...widget.headerSlivers!(state), - if (widget.innerHeaderSlivers != null) - ...widget.innerHeaderSlivers!(state), if (widget._slivers != null) ...state.when( empty: () => [ diff --git a/ready/lib/src/responsive_data_table/_options.dart b/ready/lib/src/responsive_data_table/_options.dart index 368b1db..66cdecf 100644 --- a/ready/lib/src/responsive_data_table/_options.dart +++ b/ready/lib/src/responsive_data_table/_options.dart @@ -109,9 +109,6 @@ class ListOptions implements ReadyListConfigOptions { /// [ReadyList.headerSlivers] final ReadyListWidgetBuilder? headerSlivers; - /// [ReadyList.innerHeaderSlivers] - final ReadyListWidgetBuilder? innerHeaderSlivers; - /// [ReadyList.footerSlivers] final ReadyListWidgetBuilder? footerSlivers; @@ -157,7 +154,6 @@ class ListOptions implements ReadyListConfigOptions { this.trailing, this.scrollController, this.headerSlivers, - this.innerHeaderSlivers, this.footerSlivers, this.innerFooterSlivers, this.placeholdersConfig, @@ -185,7 +181,6 @@ class ListOptions implements ReadyListConfigOptions { required ListItemBuilder builder, this.scrollController, this.headerSlivers, - this.innerHeaderSlivers, this.footerSlivers, this.innerFooterSlivers, this.placeholdersConfig, diff --git a/ready/lib/src/responsive_data_table/responsive_data_table.dart b/ready/lib/src/responsive_data_table/responsive_data_table.dart index 0c642c3..78bd540 100644 --- a/ready/lib/src/responsive_data_table/responsive_data_table.dart +++ b/ready/lib/src/responsive_data_table/responsive_data_table.dart @@ -248,7 +248,6 @@ class __ResponsiveDataTableState> .copyWith(dividerColor: Colors.transparent), child: ReadyList.grid( scrollController: listOptions.scrollController, - innerHeaderSlivers: listOptions.innerHeaderSlivers, footerSlivers: listOptions.footerSlivers, innerFooterSlivers: listOptions.innerFooterSlivers, placeholdersConfig: listOptions.placeholdersConfig, diff --git a/ready/pubspec.yaml b/ready/pubspec.yaml index e7764eb..938a1c1 100644 --- a/ready/pubspec.yaml +++ b/ready/pubspec.yaml @@ -1,6 +1,6 @@ name: ready description: Package that contains complete list solution and admin dashboard -version: 0.0.1-dev.2 +version: 0.0.1-dev.3 homepage: https://github.com/mo-ah-dawood/ready environment: