From 8996ffef6783ce283bb11dce68e466f35b73046f Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 18 Dec 2018 21:20:42 +0200
Subject: [PATCH] Tasks

---
 lib/main.dart                            | 16 +++++++---------
 lib/ui/project/view/project_view.dart    |  2 +-
 lib/ui/project/view/project_view_vm.dart |  5 +++--
 lib/ui/task/edit/task_edit_vm.dart       |  1 -
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index e7b3a9232..3a3bca8f4 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -81,8 +81,7 @@ void main() async {
         ..addAll(createStoreInvoicesMiddleware())
         ..addAll(createStorePersistenceMiddleware())
         // STARTER: middleware - do not remove comment
-..addAll(createStoreTasksMiddleware())
-
+        ..addAll(createStoreTasksMiddleware())
         ..addAll(createStoreProjectsMiddleware())
         ..addAll(createStorePaymentsMiddleware())
         ..addAll(createStoreQuotesMiddleware())
@@ -255,13 +254,12 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
             InvoiceEditScreen.route: (context) => InvoiceEditScreen(),
             InvoiceEmailScreen.route: (context) => InvoiceEmailScreen(),
             // STARTER: routes - do not remove comment
-TaskScreen.route: (context) {
-widget.store.dispatch(LoadTasks());
-return TaskScreen();
-},
-TaskViewScreen.route: (context) => TaskViewScreen(),
-TaskEditScreen.route: (context) => TaskEditScreen(),
-
+            TaskScreen.route: (context) {
+              widget.store.dispatch(LoadTasks());
+              return TaskScreen();
+            },
+            TaskViewScreen.route: (context) => TaskViewScreen(),
+            TaskEditScreen.route: (context) => TaskEditScreen(),
             ProjectScreen.route: (context) {
               widget.store.dispatch(LoadProjects());
               return ProjectScreen();
diff --git a/lib/ui/project/view/project_view.dart b/lib/ui/project/view/project_view.dart
index b9d7cd42c..396ca3e3a 100644
--- a/lib/ui/project/view/project_view.dart
+++ b/lib/ui/project/view/project_view.dart
@@ -112,7 +112,7 @@ class _ProjectViewState extends State<ProjectView> {
         ),
         floatingActionButton: FloatingActionButton(
           backgroundColor: Theme.of(context).primaryColorDark,
-          onPressed: viewModel.onAddTaskPressed,
+          onPressed: () => viewModel.onAddTaskPressed(context),
           child: Icon(
             Icons.add,
             color: Colors.white,
diff --git a/lib/ui/project/view/project_view_vm.dart b/lib/ui/project/view/project_view_vm.dart
index 97d7b114e..b1afa1d00 100644
--- a/lib/ui/project/view/project_view_vm.dart
+++ b/lib/ui/project/view/project_view_vm.dart
@@ -73,7 +73,8 @@ class ProjectViewVM {
         onRefreshed: (context) => _handleRefresh(context),
         onClientPressed: (BuildContext context) => store
             .dispatch(ViewClient(clientId: project.clientId, context: context)),
-        onAddTaskPressed: () => store.dispatch(EditTask(
+        onAddTaskPressed: (context) => store.dispatch(EditTask(
+          context: context,
             task: TaskEntity().rebuild((b) => b
               ..projectId = project.id
               ..clientId = project.clientId))),
@@ -111,7 +112,7 @@ class ProjectViewVM {
   final Function(BuildContext) onEditPressed;
   final Function(BuildContext) onClientPressed;
   final Function onBackPressed;
-  final Function onAddTaskPressed;
+  final Function(BuildContext) onAddTaskPressed;
   final Function(BuildContext) onRefreshed;
   final bool isSaving;
   final bool isLoading;
diff --git a/lib/ui/task/edit/task_edit_vm.dart b/lib/ui/task/edit/task_edit_vm.dart
index c4ccfba3d..792e44257 100644
--- a/lib/ui/task/edit/task_edit_vm.dart
+++ b/lib/ui/task/edit/task_edit_vm.dart
@@ -11,7 +11,6 @@ import 'package:invoiceninja_flutter/ui/task/task_screen.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 import 'package:redux/redux.dart';
 import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart';
-import 'package:invoiceninja_flutter/ui/task/view/task_view_vm.dart';
 import 'package:invoiceninja_flutter/redux/task/task_actions.dart';
 import 'package:invoiceninja_flutter/data/models/task_model.dart';
 import 'package:invoiceninja_flutter/ui/task/edit/task_edit.dart';