Revert "Revert "Added a callback so that the RefreshIndicator won't stop early""

This reverts commit 3cc01f64 because apparently this is the correct way to do it, as sneaky as it seems. See brianegan/flutter_redux#6 (comment)

Author: IncPlusPlus

lib/actions/actions.dart

@@ -1,5 +1,7 @@
 library actions;
 
+import 'dart:async';
+
 import 'package:betterstatmobile/models/models.dart';
 import 'package:built_redux/built_redux.dart';
 import 'package:built_value/built_value.dart';
@@ -10,7 +12,7 @@ part 'actions.g.dart';
 abstract class AppActions implements ReduxActions {
   ActionDispatcher<Schedule> addScheduleAction;
   ActionDispatcher<String> deleteScheduleAction;
-  ActionDispatcher<Null> fetchSchedulesAction;
+  ActionDispatcher<Completer<Null>> fetchSchedulesAction;
   ActionDispatcher<List<Schedule>> loadSchedulesSuccess;
   ActionDispatcher<Object> loadSchedulesFailure;
   ActionDispatcher<AppTab> updateTabAction;

lib/containers/schedules_tab.dart

@@ -1,18 +1,22 @@
+import 'dart:async';
+
 import 'package:betterstatmobile/actions/actions.dart';
 import 'package:betterstatmobile/models/models.dart';
 import 'package:betterstatmobile/presentation/schedule_list.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_built_redux/flutter_built_redux.dart';
 
-class SchedulesTab extends StoreConnector<AppState, AppActions, List<Schedule>> {
+class SchedulesTab
+    extends StoreConnector<AppState, AppActions, List<Schedule>> {
   SchedulesTab({Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context, List<Schedule> state, AppActions actions) {
     return ScheduleList(
       schedules: state,
-      onRefresh: () async {
-        await actions.fetchSchedulesAction();
+      onRefresh: (Completer<Null> completer) {
+        actions.fetchSchedulesAction(completer);
+        return completer.future;
       },
       onRemove: (schedule) {
         actions.deleteScheduleAction(schedule.id);
@@ -25,4 +29,4 @@ class SchedulesTab extends StoreConnector<AppState, AppActions, List<Schedule>>
 
   @override
   List<Schedule> connect(AppState state) => state.schedulesSelector;
-}
+}

lib/main.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:betterstatmobile/actions/actions.dart';
 import 'package:betterstatmobile/containers/add_schedule.dart';
 import 'package:betterstatmobile/localization.dart';
@@ -41,7 +43,7 @@ class BetterstatAppState extends State<BetterstatApp> {
   void initState() {
     store = widget.store;
 
-    store.actions.fetchSchedulesAction();
+    store.actions.fetchSchedulesAction(Completer<Null>());
 
     super.initState();
   }

lib/middleware/store_schedules_middleware.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:betterstatmobile/repository/SchedulesRepository.dart';
 import 'package:built_redux/built_redux.dart';
 import 'package:betterstatmobile/actions/actions.dart';
@@ -10,7 +12,7 @@ Middleware<AppState, AppStateBuilder, AppActions>
 ]) {
   return (MiddlewareBuilder<AppState, AppStateBuilder, AppActions>()
         ..add(AppActionsNames.fetchSchedulesAction,
-            createFetchSchedules(repository))
+            createFetchSchedules<Completer<Null>>(repository))
         ..add(AppActionsNames.addScheduleAction,
             createSaveSchedule<Schedule>(repository))
 //        ..add(AppActionsNames.loadSchedulesSuccess,
@@ -42,6 +44,7 @@ MiddlewareHandler<AppState, AppStateBuilder, AppActions, T>
     repository.saveSchedule(pl.updatedSchedule, pl.id);
   };
 }
+
 MiddlewareHandler<AppState, AppStateBuilder, AppActions, T>
     createSaveSchedule<T>(SchedulesRepository repository) {
   return (MiddlewareApi<AppState, AppStateBuilder, AppActions> api,
@@ -52,16 +55,15 @@ MiddlewareHandler<AppState, AppStateBuilder, AppActions, T>
   };
 }
 
-MiddlewareHandler<AppState, AppStateBuilder, AppActions, Null>
-    createFetchSchedules(SchedulesRepository repository) {
+MiddlewareHandler<AppState, AppStateBuilder, AppActions, T>
+    createFetchSchedules<T>(SchedulesRepository repository) {
   return (MiddlewareApi<AppState, AppStateBuilder, AppActions> api,
-      ActionHandler next, Action<Null> action) {
-    if (api.state.isLoading) {
-      repository.loadSchedules().then((schedules) {
-        return api.actions.loadSchedulesSuccess(schedules);
-      }).catchError(api.actions.loadSchedulesFailure);
-    }
-
+      ActionHandler next, Action<T> action) {
+    repository.loadSchedules().then((schedules) {
+      var loadingCallback = action.payload as Completer<Null>;
+      loadingCallback.complete();
+      return api.actions.loadSchedulesSuccess(schedules);
+    }).catchError(api.actions.loadSchedulesFailure);
     next(action);
   };
 }

lib/presentation/schedule_list.dart

@@ -2,6 +2,8 @@
 // Use of this source code is governed by the MIT license that can be found
 // in the LICENSE file.
 
+import 'dart:async';
+
 import 'package:betterstatmobile/containers/app_loading.dart';
 import 'package:betterstatmobile/containers/schedule_details.dart';
 import 'package:betterstatmobile/localization.dart';
@@ -18,7 +20,7 @@ class ScheduleList extends StatelessWidget {
   final List<Schedule> schedules;
   final Function(Schedule) onRemove;
   final Function(Schedule) onUndoRemove;
-  final Function() onRefresh;
+  Future<Null> Function(Completer<Null>) onRefresh;
 
   ScheduleList({
     @required this.schedules,
@@ -30,33 +32,42 @@ class ScheduleList extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return AppLoading(builder: (context, loading) {
-      return loading
-          ? Center(
-              key: BetterstatKeys.schedulesLoading,
-              child: CircularProgressIndicator(
-                key: BetterstatKeys.statsLoading,
-              ))
-          : RefreshIndicator(
+      return RefreshIndicator(
         key: _refreshIndicatorKey,
-            onRefresh: () async {await onRefresh();},
-            child: Container(
-                child: ListView.builder(
-                  key: BetterstatKeys.scheduleList,
-                  itemCount: schedules.length,
-                  itemBuilder: (BuildContext context, int index) {
-                    final schedule = schedules[index];
+        onRefresh: () => onRefresh(Completer<Null>()),
+        child: Container(
+          child: ListView.builder(
+            key: BetterstatKeys.scheduleList,
+            itemCount: schedules.length,
+            itemBuilder: (BuildContext context, int index) {
+              final schedule = schedules[index];
 
-                    return ScheduleItem(
-                      schedule: schedule,
-                      onTap: () => {},
-                    );
-                  },
-                ),
-              ),
-          );
+              return ScheduleItem(
+                schedule: schedule,
+                onTap: () => {},
+              );
+            },
+          ),
+        ),
+      );
     });
   }
 
+  Future waitWhile(bool Function() test,
+      [Duration pollInterval = Duration.zero]) {
+    var completer = Completer();
+    void check() {
+      if (!test()) {
+        completer.complete();
+      } else {
+        Timer(pollInterval, check);
+      }
+    }
+
+    check();
+    return completer.future;
+  }
+
   void _removeSchedule(BuildContext context, Schedule schedule) {
     onRemove(schedule);
 
@@ -90,7 +101,8 @@ class ScheduleList extends StatelessWidget {
             key: BetterstatKeys.snackbar,
             duration: Duration(seconds: 2),
             content: Text(
-              BetterstatLocalizations.of(context).scheduleDeleted(schedule.name),
+              BetterstatLocalizations.of(context)
+                  .scheduleDeleted(schedule.name),
               maxLines: 1,
               overflow: TextOverflow.ellipsis,
             ),

lib/reducers/reducers.dart

@@ -10,7 +10,8 @@ var reducerBuilder = ReducerBuilder<AppState, AppStateBuilder>()
   ..add(AppActionsNames.loadSchedulesSuccess, schedulesLoaded)
   ..add(AppActionsNames.loadSchedulesFailure, schedulesLoadFailed);
 
-void addSchedule(AppState state, Action<Schedule> action, AppStateBuilder builder) {
+void addSchedule(
+    AppState state, Action<Schedule> action, AppStateBuilder builder) {
   builder.schedules.add(action.payload);
 }
 
@@ -27,6 +28,7 @@ void schedulesLoaded(
     AppState state, Action<List<Schedule>> action, AppStateBuilder builder) {
   builder
     ..isLoading = false
+    ..schedules.clear()
     ..schedules.addAll(action.payload);
 }
 
@@ -39,6 +41,7 @@ void schedulesLoadFailed(
 
 void updateSchedule(AppState state, Action<UpdateScheduleActionPayload> action,
     AppStateBuilder builder) {
-  builder.schedules.map((schedule) =>
-      schedule.id == action.payload.id ? action.payload.updatedSchedule : schedule);
-}
+  builder.schedules.map((schedule) => schedule.id == action.payload.id
+      ? action.payload.updatedSchedule
+      : schedule);
+}