Return On Update Successfull

nextcloud-bot · Aug 14, 2020 · 83da98c · 83da98c
1 parent 90d8eeb
commit 83da98c
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 21 deletions.
diff --git a/lib/src/blocs/recipe/recipe_bloc.dart b/lib/src/blocs/recipe/recipe_bloc.dart
@@ -32,8 +32,8 @@ class RecipeBloc extends Bloc<RecipeEvent, RecipeState> {
       RecipeUpdated recipeUpdated) async* {
     try {
       yield RecipeUpdateInProgress();
-      await dataRepository.updateRecipe(recipeUpdated.recipe);
-      yield RecipeUpdateSuccess();
+      int recipeId = await dataRepository.updateRecipe(recipeUpdated.recipe);
+      yield RecipeUpdateSuccess(recipeId);
     } catch (_) {
       yield RecipeUpdateFailure(_.toString());
     }

diff --git a/lib/src/blocs/recipe/recipe_state.dart b/lib/src/blocs/recipe/recipe_state.dart
@@ -42,6 +42,13 @@ class RecipeUpdateFailure extends RecipeFailure {
   RecipeUpdateFailure(String errorMsg) : super(errorMsg);
 }
 
-class RecipeUpdateSuccess extends RecipeState {}
+class RecipeUpdateSuccess extends RecipeState {
+  final int recipeId;
+
+  const RecipeUpdateSuccess(this.recipeId);
+
+  @override
+  List<Object> get props => [recipeId];
+}
 
 class RecipeUpdateInProgress extends RecipeState {}
diff --git a/lib/src/screens/recipe_edit_screen.dart b/lib/src/screens/recipe_edit_screen.dart
@@ -11,22 +11,35 @@ class RecipeEditScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: BlocListener<RecipeBloc, RecipeState>(
-            listener: (BuildContext context, RecipeState state) {
-              if (state is RecipeUpdateFailure) {
-                Scaffold.of(context).showSnackBar(
-                  SnackBar(
-                    content: Text("Update Failed: ${state.errorMsg}"),
-                    backgroundColor: Colors.red,
-                  ),
-                );
-              }
-            },
-            child: Text("Edit Recipe")),
+    return WillPopScope(
+      onWillPop: () {
+        RecipeBloc recipeBloc = BlocProvider.of<RecipeBloc>(context);
+        if (recipeBloc.state is RecipeUpdateFailure) {
+          recipeBloc.add(RecipeLoaded(recipeId: recipe.id));
+        }
+        return Future(() => true);
+      },
+      child: Scaffold(
+        appBar: AppBar(
+          title: BlocListener<RecipeBloc, RecipeState>(
+              listener: (BuildContext context, RecipeState state) {
+                if (state is RecipeUpdateFailure) {
+                  Scaffold.of(context).showSnackBar(
+                    SnackBar(
+                      content: Text("Update Failed: ${state.errorMsg}"),
+                      backgroundColor: Colors.red,
+                    ),
+                  );
+                } else if (state is RecipeUpdateSuccess) {
+                  BlocProvider.of<RecipeBloc>(context)
+                      .add(RecipeLoaded(recipeId: state.recipeId));
+                  Navigator.pop(context);
+                }
+              },
+              child: Text("Edit Recipe")),
+        ),
+        body: RecipeForm(recipe),
       ),
-      body: RecipeForm(recipe),
     );
   }
 }
diff --git a/lib/src/services/data_repository.dart b/lib/src/services/data_repository.dart
@@ -37,8 +37,8 @@ class DataRepository {
     return recipeProvider.fetchRecipe(id);
   }
 
-  Future<void> updateRecipe(Recipe recipe) {
-    recipeProvider.updateRecipe(recipe);
+  Future<int> updateRecipe(Recipe recipe) {
+    return recipeProvider.updateRecipe(recipe);
   }
 
   Future<List<Category>> fetchCategories() {

diff --git a/lib/src/services/recipe_provider.dart b/lib/src/services/recipe_provider.dart
@@ -29,7 +29,7 @@ class RecipeProvider {
     }
   }
 
-  Future<void> updateRecipe(Recipe recipe) async {
+  Future<int> updateRecipe(Recipe recipe) async {
     AppAuthentication appAuthentication =
         UserRepository().currentAppAuthentication;
 
@@ -42,6 +42,7 @@ class RecipeProvider {
               headers: {
                 "authorization": appAuthentication.basicAuth,
               }));
+      return response.data;
     } catch (e) {
       throw Exception(e);
     }