diff --git a/covas_mobile/lib/pages/ListItemMenu.dart b/covas_mobile/lib/pages/ListItemMenu.dart index a9b362f..9db6a1e 100644 --- a/covas_mobile/lib/pages/ListItemMenu.dart +++ b/covas_mobile/lib/pages/ListItemMenu.dart @@ -153,21 +153,10 @@ class _MyHomePageState extends State { }); } - void _decrementFetchCount() { - setState(() { - if (_fetchCount > 0 && filteredPosts.isNotEmpty) { - _fetchCount--; - } - }); - } - void _scrollListener() { if (_scrollController.position.pixels == _scrollController.position.maxScrollExtent) { _incrementFetchCount(); - } else if (_scrollController.position.pixels == - _scrollController.position.minScrollExtent) { - _decrementFetchCount(); } _fetchData(); } @@ -475,13 +464,19 @@ class _MyHomePageState extends State { if (response.statusCode == 200) { final List body = json.decode(utf8.decode(response.bodyBytes)); print("results fetch : ${body}"); + print("fetch count : ${_fetchCount}"); // Update state after getting the response setState(() { - if (body.isNotEmpty) { + if ((body.isNotEmpty) || (_fetchCount > 0)) { + if (body.isEmpty) { + _fetchCount = 0; + } // If we have results, map them to Events - filteredPosts = body - .map((e) => Events.fromJson(e as Map)) - .toList(); + filteredPosts.addAll( + body + .map((e) => Events.fromJson(e as Map)) + .toList(), + ); } else { // If no results, clear filteredPosts filteredPosts.clear();