diff --git a/CHANGELOG.md b/CHANGELOG.md index 7975903..f41974a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.27.3 +- Others + - Import `package:flutter/widgets.dart` instead of `package:flutter/material.dart` so the package no longer depends on the Material library, compatible with apps migrated to `material_ui` in Flutter 3.47 by @LinXunFeng in [#156](https://github.com/fluttercandies/flutter_scrollview_observer/issues/156). + ## 1.27.2 - ListViewObserver - Support `SliverPrototypeExtentList` (`prototypeItem` of `ListView` and `ReorderableListView`) by @LinXunFeng in [#158](https://github.com/fluttercandies/flutter_scrollview_observer/issues/158). diff --git a/lib/src/common/models/observer_handle_contexts_result_model.dart b/lib/src/common/models/observer_handle_contexts_result_model.dart index 8dbda8d..1f66f81 100644 --- a/lib/src/common/models/observer_handle_contexts_result_model.dart +++ b/lib/src/common/models/observer_handle_contexts_result_model.dart @@ -4,7 +4,7 @@ * @Date: 2023-08-12 16:01:29 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:scrollview_observer/src/common/models/observe_model.dart'; class ObserverHandleContextsResultModel { diff --git a/lib/src/common/models/observer_index_position_model.dart b/lib/src/common/models/observer_index_position_model.dart index c16fd8c..b036d8d 100644 --- a/lib/src/common/models/observer_index_position_model.dart +++ b/lib/src/common/models/observer_index_position_model.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:scrollview_observer/src/common/typedefs.dart'; class ObserverIndexPositionModel { diff --git a/lib/src/common/observer_controller.dart b/lib/src/common/observer_controller.dart index c367820..f56a6ff 100644 --- a/lib/src/common/observer_controller.dart +++ b/lib/src/common/observer_controller.dart @@ -6,7 +6,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter/rendering.dart'; import 'package:scrollview_observer/scrollview_observer.dart'; import 'package:scrollview_observer/src/common/models/observe_find_child_model.dart'; diff --git a/lib/src/common/observer_listener.dart b/lib/src/common/observer_listener.dart index 5e9dfb7..5e9c65d 100644 --- a/lib/src/common/observer_listener.dart +++ b/lib/src/common/observer_listener.dart @@ -6,7 +6,7 @@ import 'dart:collection'; -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:scrollview_observer/src/common/models/observe_model.dart'; import 'package:scrollview_observer/src/common/observer_typedef.dart'; diff --git a/lib/src/common/observer_notification_result.dart b/lib/src/common/observer_notification_result.dart index 9a5a48b..0199479 100644 --- a/lib/src/common/observer_notification_result.dart +++ b/lib/src/common/observer_notification_result.dart @@ -4,7 +4,7 @@ * @Date: 2023-08-12 20:09:46 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:scrollview_observer/src/common/models/observe_model.dart'; import 'package:scrollview_observer/src/common/models/observer_handle_contexts_result_model.dart'; import 'package:scrollview_observer/src/common/typedefs.dart'; diff --git a/lib/src/common/observer_typedef.dart b/lib/src/common/observer_typedef.dart index f5d962a..63677a9 100644 --- a/lib/src/common/observer_typedef.dart +++ b/lib/src/common/observer_typedef.dart @@ -4,7 +4,7 @@ * @Date: 2022-12-04 15:57:38 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:scrollview_observer/src/common/models/observe_model.dart'; import 'package:scrollview_observer/src/common/models/observe_scroll_to_index_result_model.dart'; import 'package:scrollview_observer/src/sliver/models/sliver_viewport_observe_model.dart'; diff --git a/lib/src/common/observer_widget.dart b/lib/src/common/observer_widget.dart index 3bddf0e..300385a 100644 --- a/lib/src/common/observer_widget.dart +++ b/lib/src/common/observer_widget.dart @@ -8,7 +8,7 @@ import 'dart:async'; import 'dart:collection'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter/rendering.dart'; import 'package:scrollview_observer/src/common/models/observer_handle_contexts_result_model.dart'; diff --git a/lib/src/common/observer_widget_scope.dart b/lib/src/common/observer_widget_scope.dart index d66fbc5..c2bb21d 100644 --- a/lib/src/common/observer_widget_scope.dart +++ b/lib/src/common/observer_widget_scope.dart @@ -4,7 +4,7 @@ * @Date: 2024-10-19 11:49:39 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:scrollview_observer/scrollview_observer.dart'; import 'package:scrollview_observer/src/common/observer_controller.dart'; diff --git a/lib/src/common/observer_widget_tag_manager.dart b/lib/src/common/observer_widget_tag_manager.dart index 54bb3cc..b7f5cd3 100644 --- a/lib/src/common/observer_widget_tag_manager.dart +++ b/lib/src/common/observer_widget_tag_manager.dart @@ -4,7 +4,7 @@ * @Date: 2024-11-03 14:40:40 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; class ObserverWidgetTagManager extends InheritedWidget { final Map _tagMap = {}; diff --git a/lib/src/gridview/grid_observer_controller.dart b/lib/src/gridview/grid_observer_controller.dart index 97c9233..1909ac1 100644 --- a/lib/src/gridview/grid_observer_controller.dart +++ b/lib/src/gridview/grid_observer_controller.dart @@ -3,7 +3,7 @@ * @Repo: https://github.com/LinXunFeng/flutter_scrollview_observer * @Date: 2022-07-20 00:32:40 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter/rendering.dart'; import 'package:scrollview_observer/scrollview_observer.dart'; import 'package:scrollview_observer/src/common/models/observer_handle_contexts_result_model.dart'; diff --git a/lib/src/gridview/grid_observer_view.dart b/lib/src/gridview/grid_observer_view.dart index 25adcca..cb497cd 100644 --- a/lib/src/gridview/grid_observer_view.dart +++ b/lib/src/gridview/grid_observer_view.dart @@ -3,7 +3,7 @@ * @Repo: https://github.com/LinXunFeng/flutter_scrollview_observer * @Date: 2022-08-08 00:20:03 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter/rendering.dart'; import 'package:scrollview_observer/src/common/observer_widget.dart'; diff --git a/lib/src/listview/list_observer_controller.dart b/lib/src/listview/list_observer_controller.dart index e236674..221d8d2 100644 --- a/lib/src/listview/list_observer_controller.dart +++ b/lib/src/listview/list_observer_controller.dart @@ -3,7 +3,7 @@ * @Repo: https://github.com/LinXunFeng/flutter_scrollview_observer * @Date: 2022-07-20 00:32:40 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter/rendering.dart'; import 'package:scrollview_observer/scrollview_observer.dart'; import 'package:scrollview_observer/src/common/models/observer_handle_contexts_result_model.dart'; diff --git a/lib/src/listview/list_observer_view.dart b/lib/src/listview/list_observer_view.dart index 790ee82..74e753a 100644 --- a/lib/src/listview/list_observer_view.dart +++ b/lib/src/listview/list_observer_view.dart @@ -3,7 +3,7 @@ * @Repo: https://github.com/LinXunFeng/flutter_scrollview_observer * @Date: 2022-08-08 00:20:03 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter/rendering.dart'; import 'package:scrollview_observer/src/common/observer_typedef.dart'; diff --git a/lib/src/notification.dart b/lib/src/notification.dart index cb6baec..3575b77 100644 --- a/lib/src/notification.dart +++ b/lib/src/notification.dart @@ -3,7 +3,7 @@ * @Repo: https://github.com/LinXunFeng/flutter_scrollview_observer * @Date: 2022-05-28 12:37:41 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:scrollview_observer/src/common/observer_controller.dart'; class ScrollViewOnceObserveNotification extends Notification { diff --git a/lib/src/observer_core.dart b/lib/src/observer_core.dart index d289e60..6a65d6b 100644 --- a/lib/src/observer_core.dart +++ b/lib/src/observer_core.dart @@ -6,7 +6,7 @@ import 'dart:math'; import 'package:flutter/foundation.dart'; -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter/rendering.dart'; import 'gridview/models/gridview_observe_displaying_child_model.dart'; diff --git a/lib/src/sliver/models/sliver_observer_observe_result_model.dart b/lib/src/sliver/models/sliver_observer_observe_result_model.dart index 617082a..7839665 100644 --- a/lib/src/sliver/models/sliver_observer_observe_result_model.dart +++ b/lib/src/sliver/models/sliver_observer_observe_result_model.dart @@ -4,7 +4,7 @@ * @Date: 2023-08-12 16:18:26 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:scrollview_observer/src/common/models/observe_model.dart'; import 'package:scrollview_observer/src/common/models/observer_handle_contexts_result_model.dart'; import 'package:scrollview_observer/src/sliver/models/sliver_viewport_observe_model.dart'; diff --git a/lib/src/sliver/models/sliver_viewport_observe_displaying_child_model.dart b/lib/src/sliver/models/sliver_viewport_observe_displaying_child_model.dart index af72828..ea3e200 100644 --- a/lib/src/sliver/models/sliver_viewport_observe_displaying_child_model.dart +++ b/lib/src/sliver/models/sliver_viewport_observe_displaying_child_model.dart @@ -3,7 +3,7 @@ * @Repo: https://github.com/LinXunFeng/flutter_scrollview_observer * @Date: 2023-05-14 10:51:42 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter/rendering.dart'; class SliverViewportObserveDisplayingChildModel { diff --git a/lib/src/sliver/sliver_observer_controller.dart b/lib/src/sliver/sliver_observer_controller.dart index 500366c..6200c2f 100644 --- a/lib/src/sliver/sliver_observer_controller.dart +++ b/lib/src/sliver/sliver_observer_controller.dart @@ -3,7 +3,7 @@ * @Repo: https://github.com/LinXunFeng/flutter_scrollview_observer * @Date: 2022-08-08 00:20:03 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:scrollview_observer/scrollview_observer.dart'; import 'package:scrollview_observer/src/common/observer_controller.dart'; import 'package:scrollview_observer/src/common/typedefs.dart'; diff --git a/lib/src/sliver/sliver_observer_listener.dart b/lib/src/sliver/sliver_observer_listener.dart index 338d9be..0adcf9c 100644 --- a/lib/src/sliver/sliver_observer_listener.dart +++ b/lib/src/sliver/sliver_observer_listener.dart @@ -6,7 +6,7 @@ import 'dart:collection'; -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:scrollview_observer/src/common/observer_typedef.dart'; diff --git a/lib/src/sliver/sliver_observer_view.dart b/lib/src/sliver/sliver_observer_view.dart index 479bbca..f9608b9 100644 --- a/lib/src/sliver/sliver_observer_view.dart +++ b/lib/src/sliver/sliver_observer_view.dart @@ -6,7 +6,7 @@ import 'dart:collection'; -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter/rendering.dart'; import 'package:scrollview_observer/src/common/models/observe_model.dart'; diff --git a/lib/src/utils/src/chat/chat_observer_scroll_physics.dart b/lib/src/utils/src/chat/chat_observer_scroll_physics.dart index b76ad28..bec2f62 100644 --- a/lib/src/utils/src/chat/chat_observer_scroll_physics.dart +++ b/lib/src/utils/src/chat/chat_observer_scroll_physics.dart @@ -4,7 +4,7 @@ * @Date: 2022-09-27 23:12:45 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'chat_observer_scroll_physics_mixin.dart'; import 'chat_scroll_observer.dart'; diff --git a/lib/src/utils/src/chat/chat_observer_scroll_physics_mixin.dart b/lib/src/utils/src/chat/chat_observer_scroll_physics_mixin.dart index 08885b4..7863fb5 100644 --- a/lib/src/utils/src/chat/chat_observer_scroll_physics_mixin.dart +++ b/lib/src/utils/src/chat/chat_observer_scroll_physics_mixin.dart @@ -3,7 +3,7 @@ * @Repo: https://github.com/LinXunFeng/flutter_scrollview_observer * @Date: 2022-09-29 22:47:10 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:scrollview_observer/scrollview_observer.dart'; import 'package:scrollview_observer/src/common/typedefs.dart'; diff --git a/lib/src/utils/src/chat/chat_scroll_observer.dart b/lib/src/utils/src/chat/chat_scroll_observer.dart index fdb2cf7..a59b2da 100644 --- a/lib/src/utils/src/chat/chat_scroll_observer.dart +++ b/lib/src/utils/src/chat/chat_scroll_observer.dart @@ -4,7 +4,7 @@ * @Date: 2022-09-27 23:01:58 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter/rendering.dart'; import 'package:scrollview_observer/scrollview_observer.dart'; import 'package:scrollview_observer/src/common/typedefs.dart'; diff --git a/lib/src/utils/src/chat/chat_scroll_observer_model.dart b/lib/src/utils/src/chat/chat_scroll_observer_model.dart index 264489e..373144a 100644 --- a/lib/src/utils/src/chat/chat_scroll_observer_model.dart +++ b/lib/src/utils/src/chat/chat_scroll_observer_model.dart @@ -3,7 +3,7 @@ * @Repo: https://github.com/LinXunFeng/flutter_scrollview_observer * @Date: 2023-05-13 10:33:00 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:scrollview_observer/src/common/models/observe_displaying_child_model_mixin.dart'; import 'package:scrollview_observer/src/utils/src/chat/chat_scroll_observer.dart'; diff --git a/lib/src/utils/src/nested_scroll_util.dart b/lib/src/utils/src/nested_scroll_util.dart index 5b29dd9..b20f951 100644 --- a/lib/src/utils/src/nested_scroll_util.dart +++ b/lib/src/utils/src/nested_scroll_util.dart @@ -4,7 +4,7 @@ * @Date: 2023-12-04 20:15:33 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter/rendering.dart'; import 'package:scrollview_observer/scrollview_observer.dart'; import 'package:scrollview_observer/src/common/typedefs.dart'; diff --git a/lib/src/utils/src/observer_utils.dart b/lib/src/utils/src/observer_utils.dart index 033942f..b26567f 100644 --- a/lib/src/utils/src/observer_utils.dart +++ b/lib/src/utils/src/observer_utils.dart @@ -4,7 +4,7 @@ * @Date: 2022-08-21 00:53:44 */ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter/rendering.dart'; import 'package:scrollview_observer/src/common/models/observe_model.dart'; import 'package:scrollview_observer/src/gridview/models/gridview_observe_displaying_child_model.dart'; @@ -18,7 +18,7 @@ class ObserverUtils { /// Calculate current extent of [RenderSliverPersistentHeader] base on /// target layout offset. - /// Such as [SliverAppBar] + /// Such as `SliverAppBar` /// /// You must pass either [key] or [context] static double calcPersistentHeaderExtent({ diff --git a/lib/src/utils/src/slivers.dart b/lib/src/utils/src/slivers.dart index dc4c88a..5c4a0a6 100644 --- a/lib/src/utils/src/slivers.dart +++ b/lib/src/utils/src/slivers.dart @@ -1,4 +1,4 @@ -import 'package:flutter/material.dart'; +import 'package:flutter/widgets.dart'; import 'package:flutter/rendering.dart'; class SliverObserveContext extends SliverPadding { diff --git a/pubspec.yaml b/pubspec.yaml index c91f258..d5075b3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: scrollview_observer description: A widget for observing data related to the child widgets being displayed in a ScrollView. -version: 1.27.2 +version: 1.27.3 homepage: https://github.com/fluttercandies/flutter_scrollview_observer environment: