Fixed: loading status (#5)

Author: TechGeekD

lib/redux/actions.dart

@@ -1,4 +1,3 @@
-export 'package:flutter_todo_redux/redux/app/loader_actions.dart';
 export 'package:flutter_todo_redux/redux/app/navigate_actions.dart';
 
 export 'package:flutter_todo_redux/redux/home/home_actions.dart';

lib/redux/app/loader_actions.dart

@@ -1,3 +1,4 @@
+import 'package:flutter_todo_redux/models/loading_status.dart';
 import 'package:flutter_todo_redux/models/user.dart';
 
 class AuthenticateAction {
@@ -31,3 +32,14 @@ class AuthenticationUserListAction {
     return "AuthenticationUserListAction {userList: $userList}";
   }
 }
+
+class AuthenticationLoadingStatusAction {
+  AuthenticationLoadingStatusAction({this.loadingStatus});
+
+  final LoadingStatus loadingStatus;
+
+  @override
+  String toString() {
+    return "AuthenticationLoadingStatusAction {loadingStatus: $loadingStatus}";
+  }
+}

lib/redux/app/loader_reducer.dart

@@ -1,9 +1,21 @@
 import 'package:redux/redux.dart';
 import 'package:flutter/widgets.dart';
 
-import 'package:flutter_todo_redux/redux/actions.dart';
+import 'package:flutter_todo_redux/redux/actions.dart'
+    show
+        HasAuthenticatedAction,
+        AuthenticateAction,
+        UnAuthenticateAction,
+        AuthenticateSuccessAction,
+        AuthenticateFailedAction,
+        LoadAuthenticationUserListAction,
+        AuthenticationUserListAction,
+        AuthenticationLoadingStatusAction,
+        NavigateAction;
 import 'package:flutter_todo_redux/redux/app/app_state.dart';
 
+import 'package:flutter_todo_redux/models/loading_status.dart';
+
 import 'package:flutter_todo_redux/repository/auth_repository.dart';
 import 'package:flutter_todo_redux/repository/user_repository.dart';
 
@@ -35,17 +47,21 @@ Middleware<AppState> _createHasAuthedMiddleware({
   @required AuthRepository repository,
 }) {
   return (Store store, action, NextDispatcher next) async {
-    store.dispatch(LoaderAction(isLoading: true));
+    store.dispatch(AuthenticationLoadingStatusAction(
+        loadingStatus: LoadingStatus.loading));
 
     final bool hasAuthed = await repository.hasAuthenticated();
 
     if (hasAuthed) {
+      store.dispatch(AuthenticationLoadingStatusAction(
+          loadingStatus: LoadingStatus.success));
       return store.dispatch(AuthenticateSuccessAction());
     }
 
     store.dispatch(NavigateAction(routeName: LoginPage.routeName));
+    store.dispatch(
+        AuthenticationLoadingStatusAction(loadingStatus: LoadingStatus.error));
 
-    store.dispatch(LoaderAction(isLoading: false));
     next(action);
   };
 }
@@ -54,20 +70,26 @@ Middleware<AppState> _createAuthMiddleware({
   @required AuthRepository repository,
 }) {
   return (Store store, action, NextDispatcher next) async {
-    store.dispatch(LoaderAction(isLoading: true));
+    store.dispatch(AuthenticationLoadingStatusAction(
+        loadingStatus: LoadingStatus.loading));
 
     await repository
         .authenticateUser(
-          username: action.username,
-          password: action.password,
-        )
-        .then((user) => store.dispatch(AuthenticateSuccessAction()))
-        .catchError((error) {
+      username: action.username,
+      password: action.password,
+    )
+        .then((user) {
+      store.dispatch(AuthenticationLoadingStatusAction(
+          loadingStatus: LoadingStatus.success));
+
+      store.dispatch(AuthenticateSuccessAction());
+    }).catchError((error) {
       print('Error: $error');
+      store.dispatch(AuthenticationLoadingStatusAction(
+          loadingStatus: LoadingStatus.error));
       return store.dispatch(AuthenticateFailedAction());
     });
 
-    store.dispatch(LoaderAction(isLoading: false));
     next(action);
   };
 }
@@ -76,14 +98,16 @@ Middleware<AppState> _createUnAuthMiddleware({
   @required AuthRepository repository,
 }) {
   return (Store store, action, NextDispatcher next) async {
-    store.dispatch(LoaderAction(isLoading: true));
+    store.dispatch(AuthenticationLoadingStatusAction(
+        loadingStatus: LoadingStatus.loading));
 
     final bool auth = await repository.unAuthenticateUser();
     if (!auth) {
-      return store.dispatch(NavigateAction(routeName: LoginPage.routeName));
+      store.dispatch(NavigateAction(routeName: LoginPage.routeName));
+      store.dispatch(AuthenticationLoadingStatusAction(
+          loadingStatus: LoadingStatus.success));
     }
 
-    store.dispatch(LoaderAction(isLoading: false));
     next(action);
   };
 }
@@ -110,16 +134,19 @@ Middleware<AppState> _createLoadAuthUserListMiddleware({
   @required UsersRepository repository,
 }) {
   return (Store store, action, NextDispatcher next) async {
-    store.dispatch(LoaderAction(isLoading: true));
+    store.dispatch(AuthenticationLoadingStatusAction(
+        loadingStatus: LoadingStatus.loading));
 
     await repository.getUsersList().then((userList) {
-      return store.dispatch(AuthenticationUserListAction(userList: userList));
+      store.dispatch(AuthenticationLoadingStatusAction(
+          loadingStatus: LoadingStatus.success));
+      store.dispatch(AuthenticationUserListAction(userList: userList));
     }).catchError((error) {
+      store.dispatch(AuthenticationLoadingStatusAction(
+          loadingStatus: LoadingStatus.error));
       print('Error: $error');
     });
 
-    store.dispatch(LoaderAction(isLoading: false));
-
     next(action);
   };
 }

lib/redux/app/loading_reducer.dart

@@ -1,10 +1,12 @@
 import 'package:redux/redux.dart';
 import 'package:flutter_todo_redux/redux/actions.dart'
-    show AuthenticationUserListAction;
+    show AuthenticationUserListAction, AuthenticationLoadingStatusAction;
 import 'package:flutter_todo_redux/redux/auth/auth_state.dart';
 
 final authReducer = combineReducers<AuthState>([
   TypedReducer<AuthState, AuthenticationUserListAction>(_setUserList),
+  TypedReducer<AuthState, AuthenticationLoadingStatusAction>(
+      _setAuthenticationLoadingStatus)
 ]);
 
 AuthState _setUserList(
@@ -13,3 +15,10 @@ AuthState _setUserList(
 ) {
   return state.copyWith(userList: action.userList);
 }
+
+AuthState _setAuthenticationLoadingStatus(
+  AuthState state,
+  AuthenticationLoadingStatusAction action,
+) {
+  return state.copyWith(loadingStatus: action.loadingStatus);
+}

lib/redux/auth/auth_actions.dart

@@ -1,3 +1,4 @@
+import 'package:flutter_todo_redux/models/loading_status.dart';
 import 'package:flutter_todo_redux/models/todo.dart';
 
 class IncrementCountAction {}
@@ -56,3 +57,14 @@ class AddTodoAction {
     return 'AddTodoAction{todo: $todo}';
   }
 }
+
+class HomeLoadingStatusAction {
+  HomeLoadingStatusAction({this.loadingStatus});
+
+  final LoadingStatus loadingStatus;
+
+  @override
+  String toString() {
+    return "HomeLoadingStatusAction {loadingStatus: $loadingStatus}";
+  }
+}

lib/redux/auth/auth_middleware.dart

@@ -1,9 +1,15 @@
 import 'package:redux/redux.dart';
 
 import 'package:flutter_todo_redux/redux/actions.dart'
-    show LoaderAction, LoadTodosAction, TodosLoadedAction, TodosNotLoadedAction;
+    show
+        LoadTodosAction,
+        TodosLoadedAction,
+        TodosNotLoadedAction,
+        HomeLoadingStatusAction;
 import 'package:flutter_todo_redux/redux/app/app_state.dart';
 
+import 'package:flutter_todo_redux/models/loading_status.dart';
+
 import 'package:flutter_todo_redux/repository/todos_repository.dart';
 
 // import 'package:path_provider/path_provider.dart';
@@ -40,22 +46,26 @@ List<Middleware<AppState>> createStoreTodosMiddleware([
 
 Middleware<AppState> _createLoadTodos(TodosRepository repository) {
   return (Store<AppState> store, action, NextDispatcher next) async {
-    store.dispatch(LoaderAction(isLoading: true));
+    store.dispatch(
+        HomeLoadingStatusAction(loadingStatus: LoadingStatus.loading));
 
     await repository.loadTodos().then(
       (todos) {
-        return store.dispatch(
+        store.dispatch(
           TodosLoadedAction(
             todos,
           ),
         );
+        store.dispatch(
+            HomeLoadingStatusAction(loadingStatus: LoadingStatus.success));
       },
     ).catchError((error) {
       print('Error: $error');
+      store.dispatch(
+          HomeLoadingStatusAction(loadingStatus: LoadingStatus.error));
       return store.dispatch(TodosNotLoadedAction());
     });
 
-    store.dispatch(LoaderAction(isLoading: false));
     next(action);
   };
 }

lib/redux/auth/auth_reducer.dart

@@ -5,7 +5,8 @@ import 'package:flutter_todo_redux/redux/actions.dart'
         UpdateTodoAction,
         DeleteTodoAction,
         IncrementCountAction,
-        DecrememtCountAction;
+        DecrememtCountAction,
+        HomeLoadingStatusAction;
 import 'package:flutter_todo_redux/redux/home/home_state.dart';
 
 import 'package:flutter_todo_redux/models/todo.dart';
@@ -16,6 +17,7 @@ final homeReducer = combineReducers<HomeState>([
   TypedReducer<HomeState, DeleteTodoAction>(_deleteTodo),
   TypedReducer<HomeState, IncrementCountAction>(_incrementCount),
   TypedReducer<HomeState, DecrememtCountAction>(_decrememtCount),
+  TypedReducer<HomeState, HomeLoadingStatusAction>(_setHomeLoadingStatus),
 ]);
 
 HomeState _setLoadedTodos(HomeState state, TodosLoadedAction action) {
@@ -45,3 +47,10 @@ HomeState _incrementCount(HomeState state, IncrementCountAction action) {
 HomeState _decrememtCount(HomeState state, DecrememtCountAction action) {
   return state.copyWith(count: state.count - 1);
 }
+
+HomeState _setHomeLoadingStatus(
+  HomeState state,
+  HomeLoadingStatusAction action,
+) {
+  return state.copyWith(loadingStatus: action.loadingStatus);
+}

lib/redux/home/home_actions.dart

@@ -1,6 +1,4 @@
 export 'package:flutter_todo_redux/redux/app/app_reducer.dart';
-export 'package:flutter_todo_redux/redux/app/loading_reducer.dart';
-export 'package:flutter_todo_redux/redux/app/loader_reducer.dart';
 
 export 'package:flutter_todo_redux/redux/home/home_reducer.dart';
 export 'package:flutter_todo_redux/redux/auth/auth_reducer.dart';

lib/redux/home/home_middleware.dart

@@ -45,7 +45,6 @@ class _HomePageState extends State<HomePage> {
   Widget build(BuildContext context) {
     Store<AppState> store = StoreProvider.of<AppState>(context);
     listenStore = store.onChange.listen((_store) async {
-      await Future.delayed(Duration(seconds: 3));
       if (_store.homeState.loadingStatus != loadingStatus) {
         setState(() {
           loadingStatus = _store.homeState.loadingStatus;
@@ -57,7 +56,7 @@ class _HomePageState extends State<HomePage> {
       appBar: AppBar(
         title: Text(widget.title),
         actions: <Widget>[
-          if (loadingStatus == LoadingStatus.loading)
+          if (store.state.homeState.loadingStatus == LoadingStatus.loading)
             Icon(
               Icons.network_check,
               color: Colors.white,