This commit is contained in:
Hillel Coren 2018-12-13 21:21:58 +02:00
parent dc1472570c
commit 455ddf5f1b
2 changed files with 29 additions and 17 deletions

View File

@ -6,8 +6,10 @@ import 'package:invoiceninja_flutter/data/models/client_model.dart';
import 'package:invoiceninja_flutter/data/models/entities.dart'; import 'package:invoiceninja_flutter/data/models/entities.dart';
import 'package:invoiceninja_flutter/redux/client/client_actions.dart'; import 'package:invoiceninja_flutter/redux/client/client_actions.dart';
import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart';
import 'package:invoiceninja_flutter/ui/app/snackbar_row.dart'; import 'package:invoiceninja_flutter/ui/app/snackbar_row.dart';
import 'package:invoiceninja_flutter/ui/project/project_screen.dart'; import 'package:invoiceninja_flutter/ui/project/project_screen.dart';
import 'package:invoiceninja_flutter/ui/project/view/project_view_vm.dart';
import 'package:invoiceninja_flutter/utils/localization.dart'; import 'package:invoiceninja_flutter/utils/localization.dart';
import 'package:redux/redux.dart'; import 'package:redux/redux.dart';
import 'package:invoiceninja_flutter/redux/project/project_actions.dart'; import 'package:invoiceninja_flutter/redux/project/project_actions.dart';
@ -81,16 +83,18 @@ class ProjectEditVM {
final Completer<Null> completer = new Completer<Null>(); final Completer<Null> completer = new Completer<Null>();
store.dispatch( store.dispatch(
SaveProjectRequest(completer: completer, project: project)); SaveProjectRequest(completer: completer, project: project));
return completer.future.then((_) { return completer.future.then((savedProject) {
/* if (project.isNew) {
Scaffold.of(context).showSnackBar(SnackBar( Navigator.of(context).pushReplacementNamed(ProjectViewScreen.route);
content: IconMessage( } else {
message: project.isNew Navigator.of(context).pop(savedProject);
? 'Successfully Created Project' }
: 'Successfully Updated Project', }).catchError((Object error) {
), showDialog<ErrorDialog>(
duration: Duration(seconds: 3))); context: context,
*/ builder: (BuildContext context) {
return ErrorDialog(error);
});
}); });
}, },
); );

View File

@ -5,6 +5,8 @@ import 'package:flutter_redux/flutter_redux.dart';
import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart'; import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
import 'package:invoiceninja_flutter/ui/stub/stub_screen.dart'; import 'package:invoiceninja_flutter/ui/stub/stub_screen.dart';
import 'package:redux/redux.dart'; import 'package:redux/redux.dart';
import 'package:invoiceninja_flutter/ui/app/dialogs/error_dialog.dart';
import 'package:invoiceninja_flutter/ui/stub/view/stub_view_vm.dart';
import 'package:invoiceninja_flutter/redux/stub/stub_actions.dart'; import 'package:invoiceninja_flutter/redux/stub/stub_actions.dart';
import 'package:invoiceninja_flutter/data/models/stub_model.dart'; import 'package:invoiceninja_flutter/data/models/stub_model.dart';
import 'package:invoiceninja_flutter/ui/stub/edit/stub_edit.dart'; import 'package:invoiceninja_flutter/ui/stub/edit/stub_edit.dart';
@ -59,13 +61,19 @@ class StubEditVM {
final Completer<Null> completer = new Completer<Null>(); final Completer<Null> completer = new Completer<Null>();
store.dispatch(SaveStubRequest(completer: completer, stub: stub)); store.dispatch(SaveStubRequest(completer: completer, stub: stub));
return completer.future.then((_) { return completer.future.then((_) {
Scaffold.of(context).showSnackBar(SnackBar( return completer.future.then((savedStub) {
content: IconMessage( if (stub.isNew) {
message: stub.isNew Navigator.of(context).pushReplacementNamed(StubViewScreen.route);
? 'Successfully Created Stub' } else {
: 'Successfully Updated Stub', Navigator.of(context).pop(savedStub);
), }
duration: Duration(seconds: 3))); }).catchError((Object error) {
showDialog<ErrorDialog>(
context: context,
builder: (BuildContext context) {
return ErrorDialog(error);
});
});
}); });
}, },
); );