format code

Author: peng8350

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 2.0.0
+### Breaking Changes:
+* Remove onOffsetChange in SmartRefresher,autoLoad in RefreshConfiguration,scrollController in RefreshController
+* add argument to onTwoLevel(callback when closed)
+
+### features
+* migrate null-safety
+* add needCallback in requestRefresh and requestLoading for avoiding the callback of onRefresh or onLoading
+
+### Bug fix
+* In NestedScrollView+ClampingScrollPhysics(Android ScrollBehaviour),header can be seen when fling to top.
+* unMounted widget used crash error when fast rebuild in requestRefresh
+
+### Other
+* Add assert to avoid invalid usage
+
+
+
 ## 1.6.5
 * fix check full page logic.
 * fix crash "locking up a deactive widget is unsafe".

README.md

@@ -13,9 +13,7 @@
 a widget provided to the flutter scroll component drop-down refresh and pull up load.support android and ios.
 If you are Chinese,click here([中文文档](https://github.com/peng8350/flutter_pulltorefresh/blob/master/README_CN.md))
 
-[Download Demo(Android)](demo.apk):
 
-![qrCode](arts/qr_code.png)
 
 ## Features
 * pull up load and pull down refresh

README_CN.md

@@ -12,9 +12,6 @@
 ## 介绍
 一个提供上拉加载和下拉刷新的组件,同时支持Android和Ios<br>
 
-[下载Demo(Android)](demo.apk):
-
-![二维码](arts/qr_code.png)
 
 
 ## 特性

arts/qr_code.png

@@ -58,7 +58,6 @@ class RefreshReorderableListView extends StatefulWidget {
 
   final Function onRefresh, onLoading;
 
-
   final RefreshController refreshController;
 
   /// Creates a reorderable list.

demo.apk

@@ -130,7 +130,7 @@ class _TwoLevelExampleState extends State<TwoLevelExample> {
                       _refreshController1.refreshCompleted();
                     },
                     onTwoLevel: (bool isOpen) {
-                      print("twoLevel opening:"+isOpen.toString());
+                      print("twoLevel opening:" + isOpen.toString());
                     },
                   );
                 },
@@ -164,15 +164,15 @@ class _TwoLevelExampleState extends State<TwoLevelExample> {
                   _refreshController2.refreshCompleted();
                 },
                 onTwoLevel: (bool isOpen) {
-                  if(isOpen){
+                  if (isOpen) {
                     print("Asd");
                     _refreshController2.position.hold(() {});
                     Navigator.of(context)
                         .push(MaterialPageRoute(
-                        builder: (c) => Scaffold(
-                          appBar: AppBar(),
-                          body: Text("二楼刷新"),
-                        )))
+                            builder: (c) => Scaffold(
+                                  appBar: AppBar(),
+                                  body: Text("二楼刷新"),
+                                )))
                         .whenComplete(() {
                       _refreshController2.twoLevelComplete(
                           duration: Duration(microseconds: 1));

example/lib/other/refresh_recordable_listview.dart

@@ -25,8 +25,9 @@ class Test3State extends State<Test3> with TickerProviderStateMixin {
       children: <Widget>[
         FlatButton(
             onPressed: () {
-
-              _refreshController.requestRefresh(needCallback: false).then((value) async {
+              _refreshController
+                  .requestRefresh(needCallback: false)
+                  .then((value) async {
                 print("requestRefresh");
                 await Future.delayed(const Duration(milliseconds: 5000));
                 _refreshController.refreshCompleted();
@@ -35,7 +36,9 @@ class Test3State extends State<Test3> with TickerProviderStateMixin {
             child: Text("请求刷新")),
         FlatButton(
             onPressed: () {
-              _refreshController.requestLoading(needCallback: false).then((value) async {
+              _refreshController
+                  .requestLoading(needCallback: false)
+                  .then((value) async {
                 print("requestLoading");
                 await Future.delayed(const Duration(milliseconds: 5000));
                 _refreshController.loadComplete();

example/lib/ui/example/useStage/twolevel_refresh.dart

@@ -334,13 +334,13 @@ class _WaterDropMaterialHeaderState extends _MaterialClassicHeaderState {
       ),
       height: 100.0,
     );
-  }}
+  }
+}
 
 class _WaterPainter extends CustomPainter {
   final Color? color;
   final Animation<Offset>? listener;
 
-
   Offset get offset => listener!.value;
   final double? ratio;
 

example/lib/ui/test/Test3.dart

@@ -1,5 +1,5 @@
 /*
-    Author: Jpeng
+    Author: JPeng
     Email: [email protected]
     createTime:2018-05-14 15:39
  */
@@ -247,8 +247,8 @@ abstract class RefreshIndicatorState<T extends RefreshIndicator>
         if (!mounted) return;
         floating = false;
         if (mode == RefreshStatus.completed || mode == RefreshStatus.failed) {
-          refresherState
-              !.setCanDrag(configuration!.enableScrollWhenRefreshCompleted);
+          refresherState!
+              .setCanDrag(configuration!.enableScrollWhenRefreshCompleted);
         }
         update();
         /*
@@ -576,8 +576,6 @@ mixin IndicatorStateMixin<T extends StatefulWidget, V> on State<T> {
   RefreshConfiguration? configuration;
   SmartRefresherState? refresherState;
 
-
-
   bool _floating = false;
 
   set floating(floating) => _floating = floating;
@@ -592,7 +590,7 @@ mixin IndicatorStateMixin<T extends StatefulWidget, V> on State<T> {
 
   ScrollActivity? get activity => _position!.activity;
 
-  // it doesn't support get the ScrollController as the listener, because it will cause "multiple scrollview use one ScollController"
+  // it doesn't support get the ScrollController as the listener, because it will cause "multiple scrollview use one ScrollController"
   // error,only replace the ScrollPosition to listen the offset
   ScrollPosition? _position;
 

lib/src/indicator/material_indicator.dart

@@ -192,13 +192,15 @@ class RefreshPhysics extends ScrollPhysics {
     double topExtra = 0.0;
     double? bottomExtra = 0.0;
     if (enablePullDown) {
-      final RenderSliverRefresh sliverHeader = viewportRender!.firstChild as RenderSliverRefresh;
+      final RenderSliverRefresh sliverHeader =
+          viewportRender!.firstChild as RenderSliverRefresh;
       topExtra = sliverHeader.hasLayoutExtent
           ? 0.0
           : sliverHeader.refreshIndicatorLayoutExtent;
     }
     if (enablePullUp) {
-      final RenderSliverLoading? sliverFooter = viewportRender!.lastChild as RenderSliverLoading?;
+      final RenderSliverLoading? sliverFooter =
+          viewportRender!.lastChild as RenderSliverLoading?;
       bottomExtra = (!notFull && sliverFooter!.geometry!.scrollExtent != 0) ||
               (notFull &&
                   controller!.footerStatus == LoadStatus.noMore &&
@@ -291,9 +293,10 @@ class RefreshPhysics extends ScrollPhysics {
         velocity: velocity * 0.91,
         // TODO(abarth): We should move this constant closer to the drag end.
         leadingExtent: position.minScrollExtent,
-        trailingExtent: controller!.headerMode!.value == RefreshStatus.twoLeveling
-            ? 0.0
-            : position.maxScrollExtent,
+        trailingExtent:
+            controller!.headerMode!.value == RefreshStatus.twoLeveling
+                ? 0.0
+                : position.maxScrollExtent,
         tolerance: tolerance,
       );
     }