diff --git a/lib/screens/progress_creation_screen.dart b/lib/screens/progress_creation_screen.dart index e3aaac5..6f0afb1 100644 --- a/lib/screens/progress_creation_screen.dart +++ b/lib/screens/progress_creation_screen.dart @@ -39,7 +39,7 @@ class _ProgressCreationScreenState extends State { TimeProgress(_nameController.text, pickedStartTime, pickedEndTime); StoreProvider.of(context) .dispatch(AddTimeProgressAction(tpToCreate)); - Navigator.pushNamed(context, HomeScreen.routeName); + Navigator.pop(context); } on TimeProgressInvalidNameException catch (e) { setState(() { _validName = false; @@ -150,7 +150,7 @@ class _ProgressCreationScreenState extends State { heroTag: "cancelTimeProgressCreationBTN", child: Icon(Icons.cancel), onPressed: () { - Navigator.pushNamed(context, HomeScreen.routeName); + Navigator.pop(context); }, ), ) diff --git a/lib/screens/progress_detail_screen.dart b/lib/screens/progress_detail_screen.dart index da96821..9ae1ddb 100644 --- a/lib/screens/progress_detail_screen.dart +++ b/lib/screens/progress_detail_screen.dart @@ -5,7 +5,6 @@ import 'package:time_progress_tracker/actions/actions.dart'; import 'package:time_progress_tracker/models/app_exceptions.dart'; import 'package:time_progress_tracker/models/app_state.dart'; import 'package:time_progress_tracker/models/time_progress.dart'; -import 'package:time_progress_tracker/screens/home_screen.dart'; import 'package:time_progress_tracker/selectors/time_progress_selectors.dart'; import 'package:time_progress_tracker/widgets/app_yes_no_dialog_widget.dart'; import 'package:time_progress_tracker/widgets/progress_detail_widgets/progress_detail_circular_percent_widget.dart'; @@ -110,7 +109,7 @@ class _ProgressDetailScreenState extends State { void _onDeleteTimeProgress(Store store, String id) { store.dispatch(DeleteTimeProgressAction(id)); - Navigator.popAndPushNamed(context, HomeScreen.routeName); + Navigator.pop(context); } void _onCloseDialog() { diff --git a/pubspec.yaml b/pubspec.yaml index 4a6a9d7..cb5574e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 0.0.8+8 +version: 0.0.9+9 environment: sdk: ">=2.7.0 <3.0.0"