From 7f4880330bd04dcfe70943decb96dad794489f44 Mon Sep 17 00:00:00 2001 From: fujidaiti Date: Thu, 18 Apr 2024 22:25:15 +0900 Subject: [PATCH] Prefer to import separate libraries --- package/lib/src/draggable/draggable_sheet.dart | 11 ++++++++++- package/lib/src/foundation/sheet_activity.dart | 3 ++- .../lib/src/foundation/sheet_content_scaffold.dart | 5 ++++- package/lib/src/foundation/sheet_extent.dart | 7 ++++++- package/lib/src/modal/cupertino.dart | 2 +- package/lib/src/navigation/navigation_routes.dart | 8 +++++++- package/lib/src/scrollable/scrollable_sheet.dart | 7 ++++++- 7 files changed, 36 insertions(+), 7 deletions(-) diff --git a/package/lib/src/draggable/draggable_sheet.dart b/package/lib/src/draggable/draggable_sheet.dart index 30f5d93d..f4363f70 100644 --- a/package/lib/src/draggable/draggable_sheet.dart +++ b/package/lib/src/draggable/draggable_sheet.dart @@ -1,5 +1,14 @@ import 'package:flutter/widgets.dart'; -import '../../smooth_sheets.dart'; + +import '../foundation/framework.dart'; +import '../foundation/keyboard_dismissible.dart'; +import '../foundation/physics.dart'; +import '../foundation/sheet_activity.dart'; +import '../foundation/sheet_controller.dart'; +import '../foundation/sheet_extent.dart'; +import '../foundation/theme.dart'; +import '../scrollable/scrollable_sheet.dart'; +import 'sheet_draggable.dart'; /// A sheet that can be dragged. /// diff --git a/package/lib/src/foundation/sheet_activity.dart b/package/lib/src/foundation/sheet_activity.dart index d70d6c2c..bfe809b8 100644 --- a/package/lib/src/foundation/sheet_activity.dart +++ b/package/lib/src/foundation/sheet_activity.dart @@ -4,7 +4,8 @@ import 'dart:math'; import 'package:flutter/gestures.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter/widgets.dart'; -import '../../smooth_sheets.dart'; +import 'notifications.dart'; +import 'sheet_extent.dart'; import 'sheet_status.dart'; abstract class SheetActivity extends ChangeNotifier { diff --git a/package/lib/src/foundation/sheet_content_scaffold.dart b/package/lib/src/foundation/sheet_content_scaffold.dart index f429452c..9f2e7587 100644 --- a/package/lib/src/foundation/sheet_content_scaffold.dart +++ b/package/lib/src/foundation/sheet_content_scaffold.dart @@ -2,7 +2,10 @@ import 'dart:math'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import '../../smooth_sheets.dart'; + +import '../draggable/sheet_draggable.dart'; +import 'framework.dart'; +import 'sheet_extent.dart'; class SheetContentScaffold extends StatelessWidget { const SheetContentScaffold({ diff --git a/package/lib/src/foundation/sheet_extent.dart b/package/lib/src/foundation/sheet_extent.dart index c3788406..18d6f0cd 100644 --- a/package/lib/src/foundation/sheet_extent.dart +++ b/package/lib/src/foundation/sheet_extent.dart @@ -1,7 +1,12 @@ import 'package:flutter/widgets.dart'; -import '../../smooth_sheets.dart'; +import '../draggable/draggable_sheet.dart'; import '../internal/double_utils.dart'; +import '../scrollable/scrollable_sheet.dart'; +import '../scrollable/scrollable_sheet_extent.dart'; +import 'physics.dart'; +import 'sheet_activity.dart'; +import 'sheet_controller.dart'; import 'sheet_status.dart'; /// A representation of a visible height of the sheet. diff --git a/package/lib/src/modal/cupertino.dart b/package/lib/src/modal/cupertino.dart index 9d5256c8..2df35c82 100644 --- a/package/lib/src/modal/cupertino.dart +++ b/package/lib/src/modal/cupertino.dart @@ -3,7 +3,7 @@ import 'dart:math'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; -import '../../smooth_sheets.dart'; + import '../internal/double_utils.dart'; import 'modal_sheet.dart'; diff --git a/package/lib/src/navigation/navigation_routes.dart b/package/lib/src/navigation/navigation_routes.dart index 4ac56306..b5ec3671 100644 --- a/package/lib/src/navigation/navigation_routes.dart +++ b/package/lib/src/navigation/navigation_routes.dart @@ -1,6 +1,12 @@ import 'package:flutter/material.dart'; -import '../../smooth_sheets.dart'; +import '../draggable/draggable_sheet.dart'; +import '../draggable/sheet_draggable.dart'; +import '../foundation/physics.dart'; +import '../foundation/sheet_extent.dart'; import '../scrollable/scrollable_sheet.dart'; +import '../scrollable/scrollable_sheet_extent.dart'; +import 'navigation_route.dart'; +import 'navigation_sheet.dart'; class ScrollableNavigationSheetRoute extends NavigationSheetRoute with NavigationSheetRouteMixin { diff --git a/package/lib/src/scrollable/scrollable_sheet.dart b/package/lib/src/scrollable/scrollable_sheet.dart index a71123e0..5ed0262e 100644 --- a/package/lib/src/scrollable/scrollable_sheet.dart +++ b/package/lib/src/scrollable/scrollable_sheet.dart @@ -1,7 +1,12 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:meta/meta.dart'; -import '../../smooth_sheets.dart'; +import '../foundation/framework.dart'; +import '../foundation/keyboard_dismissible.dart'; +import '../foundation/physics.dart'; +import '../foundation/sheet_controller.dart'; +import '../foundation/sheet_extent.dart'; +import '../foundation/theme.dart'; import 'scrollable_sheet_extent.dart'; class ScrollableSheet extends StatelessWidget {