Merge pull request #1 from chalin/patch-0305-json

Fix `toJsonString()`

Author: adarshaj

Chapter_05/lib/recipe.dart

@@ -1,7 +1,5 @@
 library recipe;
 
-import 'dart:convert';
-
 class Recipe {
   String id;
   String name;
@@ -14,22 +12,17 @@ class Recipe {
   Recipe(this.id, this.name, this.category, this.ingredients, this.directions,
       this.rating, this.imgUrl);
 
-  String toJsonString() {
-    Map data = {
-                "id" : id,
-                "name" : name,
-                "category" : category,
-                "ingredients" : ingredients,
-                "directions" : directions,
-                "rating" : rating,
-                "imgUrl" : imgUrl
-    };
-    return JSON.encode(data);
-  }
+  Map<String, dynamic> toJson() => <String, dynamic>{
+    "id": id,
+    "name": name,
+    "category": category,
+    "ingredients": ingredients,
+    "directions": directions,
+    "rating": rating,
+    "imgUrl": imgUrl
+  };
 
-  factory Recipe.fromJsonMap(Map json) {
-    return new Recipe(json['id'], json['name'], json['category'],
-        json['ingredients'], json['directions'], json['rating'],
-        json['imgUrl']);
-  }
+  factory Recipe.fromJsonMap(Map<String, dynamic> json) => new Recipe(json['id'], json['name'],
+      json['category'], json['ingredients'], json['directions'], json['rating'],
+      json['imgUrl']);
 }

Chapter_06/lib/service/recipe.dart

@@ -1,7 +1,5 @@
 library recipe;
 
-import 'dart:convert';
-
 class Recipe {
   String id;
   String name;
@@ -14,22 +12,17 @@ class Recipe {
   Recipe(this.id, this.name, this.category, this.ingredients, this.directions,
       this.rating, this.imgUrl);
 
-  String toJsonString() {
-    Map data = {
-                "id" : id,
-                "name" : name,
-                "category" : category,
-                "ingredients" : ingredients,
-                "directions" : directions,
-                "rating" : rating,
-                "imgUrl" : imgUrl
-    };
-    return JSON.encode(data);
-  }
+  Map<String, dynamic> toJson() => <String, dynamic>{
+    "id": id,
+    "name": name,
+    "category": category,
+    "ingredients": ingredients,
+    "directions": directions,
+    "rating": rating,
+    "imgUrl": imgUrl
+  };
 
-  factory Recipe.fromJsonMap(Map json) {
-    return new Recipe(json['id'], json['name'], json['category'],
-        json['ingredients'], json['directions'], json['rating'],
-        json['imgUrl']);
-  }
+  factory Recipe.fromJsonMap(Map<String, dynamic> json) => new Recipe(json['id'], json['name'],
+      json['category'], json['ingredients'], json['directions'], json['rating'],
+      json['imgUrl']);
 }

Chapter_07/lib/service/recipe.dart

@@ -1,7 +1,5 @@
 library recipe;
 
-import 'dart:convert';
-
 class Recipe {
   String id;
   String name;
@@ -14,22 +12,17 @@ class Recipe {
   Recipe(this.id, this.name, this.category, this.ingredients, this.directions,
       this.rating, this.imgUrl);
 
-  String toJsonString() {
-    Map data = {
-                "id" : id,
-                "name" : name,
-                "category" : category,
-                "ingredients" : ingredients,
-                "directions" : directions,
-                "rating" : rating,
-                "imgUrl" : imgUrl
-    };
-    return JSON.encode(data);
-  }
+  Map<String, dynamic> toJson() => <String, dynamic>{
+    "id": id,
+    "name": name,
+    "category": category,
+    "ingredients": ingredients,
+    "directions": directions,
+    "rating": rating,
+    "imgUrl": imgUrl
+  };
 
-  factory Recipe.fromJsonMap(Map json) {
-    return new Recipe(json['id'], json['name'], json['category'],
-        json['ingredients'], json['directions'], json['rating'],
-        json['imgUrl']);
-  }
+  factory Recipe.fromJsonMap(Map<String, dynamic> json) => new Recipe(json['id'], json['name'],
+      json['category'], json['ingredients'], json['directions'], json['rating'],
+      json['imgUrl']);
 }