fix: list scaffold refresh feature

pd4d10 · Mar 2, 2019 · 0c54611 · 0c54611
1 parent 003a8e9
commit 0c54611
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/lib/scaffolds/list.dart b/lib/scaffolds/list.dart
@@ -131,7 +131,7 @@ class _ListScaffoldState<T, K> extends State<ListScaffold<T, K>> {
       return SliverToBoxAdapter(
         child: ErrorReload(text: error, onTap: _refresh),
       );
-    } else if (loading) {
+    } else if (loading && items.isEmpty) {
       return SliverToBoxAdapter(child: Loading(more: false));
     } else if (items.isEmpty) {
       return SliverToBoxAdapter(child: EmptyWidget());
@@ -148,7 +148,7 @@ class _ListScaffoldState<T, K> extends State<ListScaffold<T, K>> {
   Widget _buildBody(BuildContext context) {
     if (error.isNotEmpty) {
       return ErrorReload(text: error, onTap: _refresh);
-    } else if (loading) {
+    } else if (loading && items.isEmpty) {
       return Loading(more: false);
     } else if (items.isEmpty) {
       return EmptyWidget();
@@ -166,7 +166,7 @@ class _ListScaffoldState<T, K> extends State<ListScaffold<T, K>> {
     switch (SettingsProvider.of(context).theme) {
       case ThemeMap.cupertino:
         List<Widget> slivers = [
-          CupertinoSliverRefreshControl(onRefresh: widget.onRefresh)
+          CupertinoSliverRefreshControl(onRefresh: _refresh)
         ];
         // if (widget.header != null) {
         //   slivers.add(SliverToBoxAdapter(child: widget.header));
@@ -207,7 +207,7 @@ class _ListScaffoldState<T, K> extends State<ListScaffold<T, K>> {
             //       ],
           ),
           body: RefreshIndicator(
-            onRefresh: widget.onRefresh,
+            onRefresh: _refresh,
             child: _buildBody(context),
           ),
         );

diff --git a/lib/scaffolds/long_list.dart b/lib/scaffolds/long_list.dart
@@ -170,6 +170,7 @@ class _LongListScaffoldState<T, K> extends State<LongListScaffold<T, K>> {
       return SliverToBoxAdapter(
           child: ErrorReload(text: error, onTap: _refresh));
     } else if (loading) {
+      // TODO:
       return SliverToBoxAdapter(child: Loading(more: false));
     } else {
       return SliverList(
@@ -184,7 +185,7 @@ class _LongListScaffoldState<T, K> extends State<LongListScaffold<T, K>> {
     switch (SettingsProvider.of(context).theme) {
       case ThemeMap.cupertino:
         List<Widget> slivers = [
-          CupertinoSliverRefreshControl(onRefresh: widget.onRefresh)
+          CupertinoSliverRefreshControl(onRefresh: _refresh)
         ];
         if (payload != null) {
           slivers.add(
@@ -220,7 +221,7 @@ class _LongListScaffoldState<T, K> extends State<LongListScaffold<T, K>> {
                 : [widget.trailingBuilder(payload.header)],
           ),
           body: RefreshIndicator(
-            onRefresh: widget.onRefresh,
+            onRefresh: _refresh,
             child: CustomScrollView(slivers: slivers),
           ),
         );