Gitea
/
git-touch-android-ios-app
mirror of https://github.com/git-touch/git-touch
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: list scaffold refresh feature

This commit is contained in:
Rongjian Zhang 2019-03-02 16:51:28 +08:00
parent 003a8e9fbe
commit 0c54611345
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/scaffolds/list.dart
View File

@ -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),
),
);

5
lib/scaffolds/long_list.dart
View File

@ -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),
),
);