From 72d41d419d4938e478bc6771a8161b98054fdca7 Mon Sep 17 00:00:00 2001
From: athulacaj <athuljacobacaj@gmail.com>
Date: Mon, 9 Oct 2023 23:04:31 +0530
Subject: [PATCH] support to new version of flutter and nullsafety

---
 android/app/build.gradle                      |   4 +-
 android/app/src/main/AndroidManifest.xml      |   1 +
 android/build.gradle                          |  13 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 lib/models/core/recipe.dart                   |  53 +-
 lib/models/helper/recipe_helper.dart          | 502 ++++++++++++------
 lib/views/screens/bookmarks_page.dart         |  36 +-
 lib/views/screens/explore_page.dart           |  44 +-
 lib/views/screens/full_screen_image.dart      |   5 +-
 lib/views/screens/newly_posted_page.dart      |   9 +-
 lib/views/screens/profile_page.dart           |  32 +-
 lib/views/screens/recipe_detail_page.dart     | 110 ++--
 lib/views/screens/search_page.dart            |  47 +-
 lib/views/widgets/category_card.dart          |  11 +-
 lib/views/widgets/custom_app_bar.dart         |  14 +-
 .../widgets/custom_bottom_navigation_bar.dart |  38 +-
 lib/views/widgets/custom_text_field.dart      |  14 +-
 lib/views/widgets/dummy_search_bar.dart       |  11 +-
 lib/views/widgets/featured_recipe_card.dart   |  12 +-
 lib/views/widgets/ingridient_tile.dart        |  16 +-
 .../widgets/modals/search_filter_modal.dart   |  32 +-
 lib/views/widgets/popular_recipe_card.dart    |  32 +-
 lib/views/widgets/recipe_tile.dart            |  11 +-
 .../widgets/recommendation_recipe_card.dart   |  10 +-
 lib/views/widgets/review_tile.dart            |  18 +-
 lib/views/widgets/step_tile.dart              |  22 +-
 lib/views/widgets/user_info_tile.dart         |  20 +-
 pubspec.lock                                  | 128 +++--
 pubspec.yaml                                  |   2 +-
 29 files changed, 841 insertions(+), 408 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 111818a..2e1ae3a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -36,7 +36,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.hungry"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 8cc47aa..3a6851b 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/android/build.gradle b/android/build.gradle
index 9b6ed06..2c10c57 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,12 +1,15 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.8.0'
     repositories {
         google()
-        jcenter()
+          mavenCentral()
+        maven {
+            url 'https://maven.fabric.io/public'
+        }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -14,7 +17,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -24,6 +27,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index bc6a58a..6b66533 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/lib/models/core/recipe.dart b/lib/models/core/recipe.dart
index 26503fb..b673825 100644
--- a/lib/models/core/recipe.dart
+++ b/lib/models/core/recipe.dart
@@ -5,13 +5,21 @@ class Recipe {
   String time;
   String description;
 
-  List<Ingridient> ingridients;
-  List<TutorialStep> tutorial;
-  List<Review> reviews;
+  List<Ingridient>? ingridients;
+  List<TutorialStep>? tutorial;
+  List<Review>? reviews;
 
-  Recipe({this.title, this.photo, this.calories, this.time, this.description, this.ingridients, this.tutorial, this.reviews});
+  Recipe(
+      {required this.title,
+      required this.photo,
+      required this.calories,
+      required this.time,
+      required this.description,
+      this.ingridients,
+      this.tutorial,
+      this.reviews});
 
-  factory Recipe.fromJson(Map<String, Object> json) {
+  factory Recipe.fromJson(Map json) {
     return Recipe(
       title: json['title'],
       photo: json['photo'],
@@ -24,32 +32,35 @@ class Recipe {
 
 class TutorialStep {
   String step;
-  String description;
-  TutorialStep({this.step, this.description});
+  String? description;
+  TutorialStep({required this.step, this.description});
 
-  Map<String, Object> toMap() {
+  Map<String, dynamic> toMap() {
     return {
       'step': step,
-      'description': description,
+      'description': description ?? '',
     };
   }
 
-  factory TutorialStep.fromJson(Map<String, Object> json) => TutorialStep(
+  factory TutorialStep.fromJson(Map json) => TutorialStep(
         step: json['step'],
         description: json['description'],
       );
 
-  static List<TutorialStep> toList(List<Map<String, Object>> json) {
-    return List.from(json).map((e) => TutorialStep(step: e['step'], description: e['description'])).toList();
+  static List<TutorialStep> toList(List<Map<String, dynamic>> json) {
+    return List.from(json)
+        .map(
+            (e) => TutorialStep(step: e['step'], description: e['description']))
+        .toList();
   }
 }
 
 class Review {
   String username;
   String review;
-  Review({this.username, this.review});
+  Review({required this.username, required this.review});
 
-  factory Review.fromJson(Map<String, Object> json) => Review(
+  factory Review.fromJson(Map json) => Review(
         review: json['review'],
         username: json['username'],
       );
@@ -61,8 +72,10 @@ class Review {
     };
   }
 
-  static List<Review> toList(List<Map<String, Object>> json) {
-    return List.from(json).map((e) => Review(username: e['username'], review: e['review'])).toList();
+  static List<Review> toList(List<Map<String, dynamic>> json) {
+    return List.from(json)
+        .map((e) => Review(username: e['username'], review: e['review']))
+        .toList();
   }
 }
 
@@ -70,8 +83,8 @@ class Ingridient {
   String name;
   String size;
 
-  Ingridient({this.name, this.size});
-  factory Ingridient.fromJson(Map<String, Object> json) => Ingridient(
+  Ingridient({required this.name, required this.size});
+  factory Ingridient.fromJson(Map<String, dynamic> json) => Ingridient(
         name: json['name'],
         size: json['size'],
       );
@@ -84,6 +97,8 @@ class Ingridient {
   }
 
   static List<Ingridient> toList(List<Map<String, Object>> json) {
-    return List.from(json).map((e) => Ingridient(name: e['name'], size: e['size'])).toList();
+    return List.from(json)
+        .map((e) => Ingridient(name: e['name'], size: e['size']))
+        .toList();
   }
 }
diff --git a/lib/models/helper/recipe_helper.dart b/lib/models/helper/recipe_helper.dart
index 5477387..bc16f39 100644
--- a/lib/models/helper/recipe_helper.dart
+++ b/lib/models/helper/recipe_helper.dart
@@ -40,18 +40,19 @@ class RecipeHelper {
           ))
       .toList();
 
-  static List<Recipe> sweetFoodRecommendationRecipe = sweetFoodRecommendationRecipeRawData
-      .map((data) => Recipe(
-            title: data['title'],
-            photo: data['photo'],
-            calories: data['calories'],
-            time: data['time'],
-            description: data['description'],
-            reviews: Review.toList(data['reviews']),
-            tutorial: TutorialStep.toList(data['tutorial']),
-            ingridients: Ingridient.toList(data['ingridients']),
-          ))
-      .toList();
+  static List<Recipe> sweetFoodRecommendationRecipe =
+      sweetFoodRecommendationRecipeRawData
+          .map((data) => Recipe(
+                title: data['title'],
+                photo: data['photo'],
+                calories: data['calories'],
+                time: data['time'],
+                description: data['description'],
+                reviews: Review.toList(data['reviews']),
+                tutorial: TutorialStep.toList(data['tutorial']),
+                ingridients: Ingridient.toList(data['ingridients']),
+              ))
+          .toList();
 
   static Recipe popularRecipe = Recipe(
     title: popularRecipeRawData['title'],
@@ -91,12 +92,13 @@ class RecipeHelper {
       .toList();
 }
 
-var popularRecipeRawData = {
+Map popularRecipeRawData = {
   'title': 'Green Healthy Meat & Vegetable Pizza.',
   'photo': 'assets/images/popularnowpizza.jpg',
   'calories': '1500 Cal',
   'time': '25 min',
-  'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+  'description':
+      'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
   'ingridients': [
     {
       'name': 'Spinach',
@@ -149,30 +151,35 @@ var popularRecipeRawData = {
   'reviews': [
     {
       'username': '@username',
-      'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+      'review':
+          'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     },
     {
       'username': '@username',
-      'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+      'review':
+          'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     },
     {
       'username': '@username',
-      'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+      'review':
+          'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     },
     {
       'username': '@username',
-      'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+      'review':
+          'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     },
   ]
 };
 
-var featuredRecipeRawData = [
+List<Map<String, dynamic>> featuredRecipeRawData = [
   {
     'title': 'Green Leafy Vegetable Dish.',
     'photo': 'assets/images/featured2.jpg',
     'calories': '1500 Cal',
     'time': '25 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -225,19 +232,23 @@ var featuredRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -246,7 +257,8 @@ var featuredRecipeRawData = [
     'photo': 'assets/images/featured1.jpg',
     'calories': '870 Cal',
     'time': '32 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -299,19 +311,23 @@ var featuredRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -320,7 +336,8 @@ var featuredRecipeRawData = [
     'photo': 'assets/images/list1.jpg',
     'calories': '1500 Cal',
     'time': '25 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -373,19 +390,23 @@ var featuredRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -394,7 +415,8 @@ var featuredRecipeRawData = [
     'photo': 'assets/images/list2.jpg',
     'calories': '870 Cal',
     'time': '32 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -447,19 +469,23 @@ var featuredRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -468,7 +494,8 @@ var featuredRecipeRawData = [
     'photo': 'assets/images/list3.jpg',
     'calories': '870 Cal',
     'time': '32 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -521,31 +548,36 @@ var featuredRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   }
 ];
 
-var recommendationRecipeRawData = [
+List<Map<String, dynamic>> recommendationRecipeRawData = [
   {
     'title': 'Brown Chopstick Bowl',
     'photo': 'assets/images/recom2.jpg',
     'calories': '1500 Cal',
     'time': '25 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -598,19 +630,23 @@ var recommendationRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -619,7 +655,8 @@ var recommendationRecipeRawData = [
     'photo': 'assets/images/recom1.jpg',
     'calories': '870 Cal',
     'time': '32 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -672,31 +709,36 @@ var recommendationRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
 ];
 
-var newlyPostedRecipeRawData = [
+List<Map<String, dynamic>> newlyPostedRecipeRawData = [
   {
     'title': 'Healthy Vege Green Egg.',
     'photo': 'assets/images/list1.jpg',
     'calories': '1500 Cal',
     'time': '25 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -749,19 +791,23 @@ var newlyPostedRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -770,7 +816,8 @@ var newlyPostedRecipeRawData = [
     'photo': 'assets/images/list2.jpg',
     'calories': '870 Cal',
     'time': '32 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -823,19 +870,23 @@ var newlyPostedRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -844,7 +895,8 @@ var newlyPostedRecipeRawData = [
     'photo': 'assets/images/list3.jpg',
     'calories': '870 Cal',
     'time': '32 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -897,19 +949,23 @@ var newlyPostedRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -918,7 +974,8 @@ var newlyPostedRecipeRawData = [
     'photo': 'assets/images/list4.jpg',
     'calories': '1200 Cal',
     'time': '40 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -971,19 +1028,23 @@ var newlyPostedRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -992,7 +1053,8 @@ var newlyPostedRecipeRawData = [
     'photo': 'assets/images/list5.jpg',
     'calories': '1100 Cal',
     'time': '30 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -1045,19 +1107,23 @@ var newlyPostedRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -1066,7 +1132,8 @@ var newlyPostedRecipeRawData = [
     'photo': 'assets/images/list6.jpg',
     'calories': '1450 Cal',
     'time': '120 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -1119,19 +1186,23 @@ var newlyPostedRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -1140,7 +1211,8 @@ var newlyPostedRecipeRawData = [
     'photo': 'assets/images/sweetfood1.jpg',
     'calories': '1500 Cal',
     'time': '25 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -1193,19 +1265,23 @@ var newlyPostedRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -1214,7 +1290,8 @@ var newlyPostedRecipeRawData = [
     'photo': 'assets/images/sweetfood2.jpg',
     'calories': '870 Cal',
     'time': '32 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -1267,31 +1344,36 @@ var newlyPostedRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
 ];
 
-var sweetFoodRecommendationRecipeRawData = [
+List<Map<String, dynamic>> sweetFoodRecommendationRecipeRawData = [
   {
     'title': 'Pancake with Honey.',
     'photo': 'assets/images/sweetfood1.jpg',
     'calories': '1500 Cal',
     'time': '25 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -1344,19 +1426,23 @@ var sweetFoodRecommendationRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -1365,7 +1451,8 @@ var sweetFoodRecommendationRecipeRawData = [
     'photo': 'assets/images/sweetfood2.jpg',
     'calories': '870 Cal',
     'time': '32 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -1418,33 +1505,49 @@ var sweetFoodRecommendationRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
 ];
 
-var popularRecipeKeyword = ['Noodles', 'Bakso', 'Kwetiaw', 'Nasi Goreng', 'Spaghetti', 'Rujak', 'Chicken', 'Nugget', 'Ice Cream', 'Bakmi'];
+var popularRecipeKeyword = [
+  'Noodles',
+  'Bakso',
+  'Kwetiaw',
+  'Nasi Goreng',
+  'Spaghetti',
+  'Rujak',
+  'Chicken',
+  'Nugget',
+  'Ice Cream',
+  'Bakmi'
+];
 
-var recipeSearchResultRawData = [
+List<Map<String, dynamic>> recipeSearchResultRawData = [
   {
     'title': 'Healthy Vege Green Egg.',
     'photo': 'assets/images/list1.jpg',
     'calories': '1500 Cal',
     'time': '25 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -1497,19 +1600,23 @@ var recipeSearchResultRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -1518,7 +1625,8 @@ var recipeSearchResultRawData = [
     'photo': 'assets/images/list2.jpg',
     'calories': '870 Cal',
     'time': '32 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -1571,19 +1679,23 @@ var recipeSearchResultRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -1592,7 +1704,8 @@ var recipeSearchResultRawData = [
     'photo': 'assets/images/list4.jpg',
     'calories': '1200 Cal',
     'time': '40 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -1645,19 +1758,23 @@ var recipeSearchResultRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -1666,7 +1783,8 @@ var recipeSearchResultRawData = [
     'photo': 'assets/images/list5.jpg',
     'calories': '1100 Cal',
     'time': '30 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -1719,19 +1837,23 @@ var recipeSearchResultRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -1740,7 +1862,8 @@ var recipeSearchResultRawData = [
     'photo': 'assets/images/list6.jpg',
     'calories': '1450 Cal',
     'time': '120 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -1793,19 +1916,23 @@ var recipeSearchResultRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -1814,7 +1941,8 @@ var recipeSearchResultRawData = [
     'photo': 'assets/images/list3.jpg',
     'calories': '870 Cal',
     'time': '32 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -1867,31 +1995,36 @@ var recipeSearchResultRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
 ];
 
-var bookmarkedRecipeRawData = [
+List<Map<String, dynamic>> bookmarkedRecipeRawData = [
   {
     'title': 'Healthy Vege Green Egg.',
     'photo': 'assets/images/list1.jpg',
     'calories': '1500 Cal',
     'time': '25 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -1944,19 +2077,23 @@ var bookmarkedRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -1965,7 +2102,8 @@ var bookmarkedRecipeRawData = [
     'photo': 'assets/images/list2.jpg',
     'calories': '870 Cal',
     'time': '32 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -2018,19 +2156,23 @@ var bookmarkedRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -2039,7 +2181,8 @@ var bookmarkedRecipeRawData = [
     'photo': 'assets/images/list4.jpg',
     'calories': '1200 Cal',
     'time': '40 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -2092,19 +2235,23 @@ var bookmarkedRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -2113,7 +2260,8 @@ var bookmarkedRecipeRawData = [
     'photo': 'assets/images/list5.jpg',
     'calories': '1100 Cal',
     'time': '30 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -2166,19 +2314,23 @@ var bookmarkedRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -2187,7 +2339,8 @@ var bookmarkedRecipeRawData = [
     'photo': 'assets/images/list6.jpg',
     'calories': '1450 Cal',
     'time': '120 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -2240,19 +2393,23 @@ var bookmarkedRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
@@ -2261,7 +2418,8 @@ var bookmarkedRecipeRawData = [
     'photo': 'assets/images/list3.jpg',
     'calories': '870 Cal',
     'time': '32 min',
-    'description': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+    'description':
+        'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
     'ingridients': [
       {
         'name': 'Spinach',
@@ -2314,19 +2472,23 @@ var bookmarkedRecipeRawData = [
     'reviews': [
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
       {
         'username': '@username',
-        'review': 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+        'review':
+            'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
       },
     ]
   },
diff --git a/lib/views/screens/bookmarks_page.dart b/lib/views/screens/bookmarks_page.dart
index 4cf3510..7f7de9d 100644
--- a/lib/views/screens/bookmarks_page.dart
+++ b/lib/views/screens/bookmarks_page.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:hungry/models/core/recipe.dart';
 import 'package:hungry/models/helper/recipe_helper.dart';
@@ -19,11 +20,15 @@ class _BookmarksPageState extends State<BookmarksPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        brightness: Brightness.dark,
         backgroundColor: AppColor.primary,
         centerTitle: false,
         elevation: 0,
-        title: Text('Bookmarks', style: TextStyle(fontFamily: 'inter', fontWeight: FontWeight.w400, fontSize: 16)),
+        title: Text('Bookmarks',
+            style: TextStyle(
+                fontFamily: 'inter',
+                fontWeight: FontWeight.w400,
+                fontSize: 16)),
+        systemOverlayStyle: SystemUiOverlayStyle.dark,
       ),
       body: ListView(
         shrinkWrap: true,
@@ -48,25 +53,35 @@ class _BookmarksPageState extends State<BookmarksPage> {
                       child: Container(
                         height: 50,
                         margin: EdgeInsets.only(right: 15),
-                        decoration: BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.primarySoft),
+                        decoration: BoxDecoration(
+                            borderRadius: BorderRadius.circular(10),
+                            color: AppColor.primarySoft),
                         child: TextField(
                           controller: searchInputController,
                           onChanged: (value) {
                             print(searchInputController.text);
                             setState(() {});
                           },
-                          style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w400),
+                          style: TextStyle(
+                              color: Colors.white,
+                              fontSize: 16,
+                              fontWeight: FontWeight.w400),
                           maxLines: 1,
                           textInputAction: TextInputAction.search,
                           decoration: InputDecoration(
                             hintText: 'What do you want to eat?',
-                            hintStyle: TextStyle(color: Colors.white.withOpacity(0.2)),
-                            prefixIconConstraints: BoxConstraints(maxHeight: 20),
-                            contentPadding: EdgeInsets.symmetric(horizontal: 17),
+                            hintStyle:
+                                TextStyle(color: Colors.white.withOpacity(0.2)),
+                            prefixIconConstraints:
+                                BoxConstraints(maxHeight: 20),
+                            contentPadding:
+                                EdgeInsets.symmetric(horizontal: 17),
                             focusedBorder: InputBorder.none,
                             border: InputBorder.none,
                             prefixIcon: Visibility(
-                              visible: (searchInputController.text.isEmpty) ? true : false,
+                              visible: (searchInputController.text.isEmpty)
+                                  ? true
+                                  : false,
                               child: Container(
                                 margin: EdgeInsets.only(left: 10, right: 12),
                                 child: SvgPicture.asset(
@@ -87,7 +102,10 @@ class _BookmarksPageState extends State<BookmarksPage> {
                         showModalBottomSheet(
                             context: context,
                             backgroundColor: Colors.white,
-                            shape: RoundedRectangleBorder(borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20))),
+                            shape: RoundedRectangleBorder(
+                                borderRadius: BorderRadius.only(
+                                    topLeft: Radius.circular(20),
+                                    topRight: Radius.circular(20))),
                             builder: (context) {
                               return SearchFilterModal();
                             });
diff --git a/lib/views/screens/explore_page.dart b/lib/views/screens/explore_page.dart
index d997077..265add4 100644
--- a/lib/views/screens/explore_page.dart
+++ b/lib/views/screens/explore_page.dart
@@ -1,6 +1,7 @@
 import 'dart:ui';
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:hungry/models/core/recipe.dart';
 import 'package:hungry/models/helper/recipe_helper.dart';
@@ -12,26 +13,33 @@ import 'package:hungry/views/widgets/recommendation_recipe_card.dart';
 
 class ExplorePage extends StatelessWidget {
   final Recipe popularRecipe = RecipeHelper.popularRecipe;
-  final List<Recipe> sweetFoodRecommendationRecipe = RecipeHelper.sweetFoodRecommendationRecipe;
+  final List<Recipe> sweetFoodRecommendationRecipe =
+      RecipeHelper.sweetFoodRecommendationRecipe;
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
         backgroundColor: AppColor.primary,
-        brightness: Brightness.dark,
         elevation: 0,
         centerTitle: false,
-        title: Text('Explore Recipe', style: TextStyle(fontFamily: 'inter', fontWeight: FontWeight.w400, fontSize: 16)),
+        title: Text('Explore Recipe',
+            style: TextStyle(
+                fontFamily: 'inter',
+                fontWeight: FontWeight.w400,
+                fontSize: 16)),
         automaticallyImplyLeading: false,
         actions: [
           IconButton(
             onPressed: () {
-              Navigator.of(context).push(MaterialPageRoute(builder: (context) => SearchPage()));
+              Navigator.of(context)
+                  .push(MaterialPageRoute(builder: (context) => SearchPage()));
             },
-            icon: SvgPicture.asset('assets/icons/search.svg', color: Colors.white),
+            icon: SvgPicture.asset('assets/icons/search.svg',
+                color: Colors.white),
           ),
         ],
+        systemOverlayStyle: SystemUiOverlayStyle.dark,
       ),
       body: ListView(
         shrinkWrap: true,
@@ -47,12 +55,23 @@ class ExplorePage extends StatelessWidget {
               spacing: 16,
               runSpacing: 16,
               children: [
-                CategoryCard(title: 'Healthy', image: AssetImage('assets/images/healthy.jpg')),
-                CategoryCard(title: 'Drink', image: AssetImage('assets/images/drink.jpg')),
-                CategoryCard(title: 'Seafood', image: AssetImage('assets/images/seafood.jpg')),
-                CategoryCard(title: 'Desert', image: AssetImage('assets/images/desert.jpg')),
-                CategoryCard(title: 'Spicy', image: AssetImage('assets/images/spicy.jpg')),
-                CategoryCard(title: 'Meat', image: AssetImage('assets/images/meat.jpg')),
+                CategoryCard(
+                    title: 'Healthy',
+                    image: AssetImage('assets/images/healthy.jpg')),
+                CategoryCard(
+                    title: 'Drink',
+                    image: AssetImage('assets/images/drink.jpg')),
+                CategoryCard(
+                    title: 'Seafood',
+                    image: AssetImage('assets/images/seafood.jpg')),
+                CategoryCard(
+                    title: 'Desert',
+                    image: AssetImage('assets/images/desert.jpg')),
+                CategoryCard(
+                    title: 'Spicy',
+                    image: AssetImage('assets/images/spicy.jpg')),
+                CategoryCard(
+                    title: 'Meat', image: AssetImage('assets/images/meat.jpg')),
               ],
             ),
           ),
@@ -90,7 +109,8 @@ class ExplorePage extends StatelessWidget {
                       return SizedBox(width: 16);
                     },
                     itemBuilder: (context, index) {
-                      return RecommendationRecipeCard(data: sweetFoodRecommendationRecipe[index]);
+                      return RecommendationRecipeCard(
+                          data: sweetFoodRecommendationRecipe[index]);
                     },
                   ),
                 )
diff --git a/lib/views/screens/full_screen_image.dart b/lib/views/screens/full_screen_image.dart
index ffbc86a..8086217 100644
--- a/lib/views/screens/full_screen_image.dart
+++ b/lib/views/screens/full_screen_image.dart
@@ -1,15 +1,15 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 
 class FullScreenImage extends StatelessWidget {
   final Widget image;
-  FullScreenImage({@required this.image});
+  FullScreenImage({required this.image});
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: Colors.black,
       appBar: AppBar(
-        brightness: Brightness.dark,
         backgroundColor: Colors.black,
         elevation: 0,
         leading: IconButton(
@@ -18,6 +18,7 @@ class FullScreenImage extends StatelessWidget {
             Navigator.of(context).pop();
           },
         ),
+        systemOverlayStyle: SystemUiOverlayStyle.dark,
       ),
       body: Container(
         width: MediaQuery.of(context).size.width,
diff --git a/lib/views/screens/newly_posted_page.dart b/lib/views/screens/newly_posted_page.dart
index a90665f..b3644bc 100644
--- a/lib/views/screens/newly_posted_page.dart
+++ b/lib/views/screens/newly_posted_page.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:hungry/models/core/recipe.dart';
 import 'package:hungry/models/helper/recipe_helper.dart';
 import 'package:hungry/views/utils/AppColor.dart';
@@ -11,17 +12,21 @@ class NewlyPostedPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        brightness: Brightness.dark,
         backgroundColor: AppColor.primary,
         centerTitle: true,
         elevation: 0,
-        title: Text('Newly Posted', style: TextStyle(fontFamily: 'inter', fontWeight: FontWeight.w400, fontSize: 16)),
+        title: Text('Newly Posted',
+            style: TextStyle(
+                fontFamily: 'inter',
+                fontWeight: FontWeight.w400,
+                fontSize: 16)),
         leading: IconButton(
           icon: Icon(Icons.arrow_back_ios, color: Colors.white),
           onPressed: () {
             Navigator.of(context).pop();
           },
         ),
+        systemOverlayStyle: SystemUiOverlayStyle.dark,
       ),
       body: ListView.separated(
         padding: EdgeInsets.all(16),
diff --git a/lib/views/screens/profile_page.dart b/lib/views/screens/profile_page.dart
index debb55d..58af3de 100644
--- a/lib/views/screens/profile_page.dart
+++ b/lib/views/screens/profile_page.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:hungry/views/utils/AppColor.dart';
 import 'package:hungry/views/widgets/user_info_tile.dart';
@@ -8,11 +9,14 @@ class ProfilePage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        brightness: Brightness.dark,
         backgroundColor: AppColor.primary,
         elevation: 0,
         centerTitle: true,
-        title: Text('My Profile', style: TextStyle(fontFamily: 'inter', fontWeight: FontWeight.w400, fontSize: 16)),
+        title: Text('My Profile',
+            style: TextStyle(
+                fontFamily: 'inter',
+                fontWeight: FontWeight.w400,
+                fontSize: 16)),
         leading: IconButton(
           icon: Icon(Icons.arrow_back_ios, color: Colors.white),
           onPressed: () {
@@ -24,11 +28,18 @@ class ProfilePage extends StatelessWidget {
             onPressed: () {},
             child: Text(
               'Edit',
-              style: TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.w600),
+              style: TextStyle(
+                  color: Colors.white,
+                  fontSize: 14,
+                  fontWeight: FontWeight.w600),
             ),
-            style: TextButton.styleFrom(primary: Colors.white, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(100))),
+            style: TextButton.styleFrom(
+                foregroundColor: Colors.white,
+                shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(100))),
           ),
         ],
+        systemOverlayStyle: SystemUiOverlayStyle.dark,
       ),
       body: ListView(
         shrinkWrap: true,
@@ -54,15 +65,22 @@ class ProfilePage extends StatelessWidget {
                       color: Colors.grey,
                       borderRadius: BorderRadius.circular(100),
                       // Profile Picture
-                      image: DecorationImage(image: AssetImage('assets/images/profile.jpg'), fit: BoxFit.cover),
+                      image: DecorationImage(
+                          image: AssetImage('assets/images/profile.jpg'),
+                          fit: BoxFit.cover),
                     ),
                   ),
                   Row(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
-                      Text('Change Profile Picture', style: TextStyle(fontFamily: 'inter', fontWeight: FontWeight.w600, color: Colors.white)),
+                      Text('Change Profile Picture',
+                          style: TextStyle(
+                              fontFamily: 'inter',
+                              fontWeight: FontWeight.w600,
+                              color: Colors.white)),
                       SizedBox(width: 8),
-                      SvgPicture.asset('assets/icons/camera.svg', color: Colors.white),
+                      SvgPicture.asset('assets/icons/camera.svg',
+                          color: Colors.white),
                     ],
                   )
                 ],
diff --git a/lib/views/screens/recipe_detail_page.dart b/lib/views/screens/recipe_detail_page.dart
index e9a5b93..0772ba2 100644
--- a/lib/views/screens/recipe_detail_page.dart
+++ b/lib/views/screens/recipe_detail_page.dart
@@ -10,15 +10,16 @@ import 'package:hungry/views/widgets/step_tile.dart';
 
 class RecipeDetailPage extends StatefulWidget {
   final Recipe data;
-  RecipeDetailPage({@required this.data});
+  RecipeDetailPage({required this.data});
 
   @override
   _RecipeDetailPageState createState() => _RecipeDetailPageState();
 }
 
-class _RecipeDetailPageState extends State<RecipeDetailPage> with TickerProviderStateMixin {
-  TabController _tabController;
-  ScrollController _scrollController;
+class _RecipeDetailPageState extends State<RecipeDetailPage>
+    with TickerProviderStateMixin {
+  late TabController _tabController;
+  late ScrollController _scrollController;
 
   @override
   void initState() {
@@ -71,10 +72,13 @@ class _RecipeDetailPageState extends State<RecipeDetailPage> with TickerProvider
           duration: Duration(milliseconds: 200),
           child: AppBar(
             backgroundColor: Colors.transparent,
-            brightness: Brightness.dark,
             elevation: 0,
             centerTitle: true,
-            title: Text('Search Recipe', style: TextStyle(fontFamily: 'inter', fontWeight: FontWeight.w400, fontSize: 16)),
+            title: Text('Search Recipe',
+                style: TextStyle(
+                    fontFamily: 'inter',
+                    fontWeight: FontWeight.w400,
+                    fontSize: 16)),
             leading: IconButton(
               icon: Icon(Icons.arrow_back_ios, color: Colors.white),
               onPressed: () {
@@ -82,8 +86,12 @@ class _RecipeDetailPageState extends State<RecipeDetailPage> with TickerProvider
               },
             ),
             actions: [
-              IconButton(onPressed: () {}, icon: SvgPicture.asset('assets/icons/bookmark.svg', color: Colors.white)),
+              IconButton(
+                  onPressed: () {},
+                  icon: SvgPicture.asset('assets/icons/bookmark.svg',
+                      color: Colors.white)),
             ],
+            systemOverlayStyle: SystemUiOverlayStyle.dark,
           ),
         ),
       ),
@@ -154,12 +162,17 @@ class _RecipeDetailPageState extends State<RecipeDetailPage> with TickerProvider
           // Section 1 - Recipe Image
           GestureDetector(
             onTap: () {
-              Navigator.of(context).push(MaterialPageRoute(builder: (context) => FullScreenImage(image: Image.asset(widget.data.photo, fit: BoxFit.cover))));
+              Navigator.of(context).push(MaterialPageRoute(
+                  builder: (context) => FullScreenImage(
+                      image:
+                          Image.asset(widget.data.photo, fit: BoxFit.cover))));
             },
             child: Container(
               height: 280,
               width: MediaQuery.of(context).size.width,
-              decoration: BoxDecoration(image: DecorationImage(image: AssetImage(widget.data.photo), fit: BoxFit.cover)),
+              decoration: BoxDecoration(
+                  image: DecorationImage(
+                      image: AssetImage(widget.data.photo), fit: BoxFit.cover)),
               child: Container(
                 decoration: BoxDecoration(gradient: AppColor.linearBlackTop),
                 height: 280,
@@ -208,13 +221,20 @@ class _RecipeDetailPageState extends State<RecipeDetailPage> with TickerProvider
                   margin: EdgeInsets.only(bottom: 12, top: 16),
                   child: Text(
                     widget.data.title,
-                    style: TextStyle(color: Colors.white, fontSize: 18, fontWeight: FontWeight.w600, fontFamily: 'inter'),
+                    style: TextStyle(
+                        color: Colors.white,
+                        fontSize: 18,
+                        fontWeight: FontWeight.w600,
+                        fontFamily: 'inter'),
                   ),
                 ),
                 // Recipe Description
                 Text(
                   widget.data.description,
-                  style: TextStyle(color: Colors.white.withOpacity(0.9), fontSize: 14, height: 150 / 100),
+                  style: TextStyle(
+                      color: Colors.white.withOpacity(0.9),
+                      fontSize: 14,
+                      height: 150 / 100),
                 ),
               ],
             ),
@@ -233,7 +253,8 @@ class _RecipeDetailPageState extends State<RecipeDetailPage> with TickerProvider
               },
               labelColor: Colors.black,
               unselectedLabelColor: Colors.black.withOpacity(0.6),
-              labelStyle: TextStyle(fontFamily: 'inter', fontWeight: FontWeight.w500),
+              labelStyle:
+                  TextStyle(fontFamily: 'inter', fontWeight: FontWeight.w500),
               indicatorColor: Colors.black,
               tabs: [
                 Tab(
@@ -253,39 +274,42 @@ class _RecipeDetailPageState extends State<RecipeDetailPage> with TickerProvider
             index: _tabController.index,
             children: [
               // Ingridients
-              ListView.builder(
-                shrinkWrap: true,
-                padding: EdgeInsets.zero,
-                itemCount: widget.data.ingridients.length,
-                physics: NeverScrollableScrollPhysics(),
-                itemBuilder: (context, index) {
-                  return IngridientTile(
-                    data: widget.data.ingridients[index],
-                  );
-                },
-              ),
+              if (widget.data.ingridients != null)
+                ListView.builder(
+                  shrinkWrap: true,
+                  padding: EdgeInsets.zero,
+                  itemCount: widget.data.ingridients!.length,
+                  physics: NeverScrollableScrollPhysics(),
+                  itemBuilder: (context, index) {
+                    return IngridientTile(
+                      data: widget.data.ingridients![index],
+                    );
+                  },
+                ),
               // Tutorials
-              ListView.builder(
-                shrinkWrap: true,
-                padding: EdgeInsets.zero,
-                itemCount: widget.data.tutorial.length,
-                physics: NeverScrollableScrollPhysics(),
-                itemBuilder: (context, index) {
-                  return StepTile(
-                    data: widget.data.tutorial[index],
-                  );
-                },
-              ),
+              if (widget.data.tutorial != null)
+                ListView.builder(
+                  shrinkWrap: true,
+                  padding: EdgeInsets.zero,
+                  itemCount: widget.data.tutorial!.length,
+                  physics: NeverScrollableScrollPhysics(),
+                  itemBuilder: (context, index) {
+                    return StepTile(
+                      data: widget.data.tutorial![index],
+                    );
+                  },
+                ),
               // Reviews
-              ListView.builder(
-                shrinkWrap: true,
-                padding: EdgeInsets.zero,
-                itemCount: widget.data.reviews.length,
-                physics: NeverScrollableScrollPhysics(),
-                itemBuilder: (context, index) {
-                  return ReviewTile(data: widget.data.reviews[index]);
-                },
-              )
+              if (widget.data.reviews != null)
+                ListView.builder(
+                  shrinkWrap: true,
+                  padding: EdgeInsets.zero,
+                  itemCount: widget.data.reviews!.length,
+                  physics: NeverScrollableScrollPhysics(),
+                  itemBuilder: (context, index) {
+                    return ReviewTile(data: widget.data.reviews![index]);
+                  },
+                )
             ],
           ),
         ],
diff --git a/lib/views/screens/search_page.dart b/lib/views/screens/search_page.dart
index 890eeb6..a363cc4 100644
--- a/lib/views/screens/search_page.dart
+++ b/lib/views/screens/search_page.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:hungry/models/core/recipe.dart';
 import 'package:hungry/models/helper/recipe_helper.dart';
@@ -20,17 +21,21 @@ class _SearchPageState extends State<SearchPage> {
     print(searchInputController.text.isEmpty);
     return Scaffold(
       appBar: AppBar(
-        brightness: Brightness.dark,
         backgroundColor: AppColor.primary,
         elevation: 0,
         centerTitle: true,
-        title: Text('Search Recipe', style: TextStyle(fontFamily: 'inter', fontWeight: FontWeight.w400, fontSize: 16)),
+        title: Text('Search Recipe',
+            style: TextStyle(
+                fontFamily: 'inter',
+                fontWeight: FontWeight.w400,
+                fontSize: 16)),
         leading: IconButton(
           icon: Icon(Icons.arrow_back_ios, color: Colors.white),
           onPressed: () {
             Navigator.of(context).pop();
           },
         ),
+        systemOverlayStyle: SystemUiOverlayStyle.dark,
       ),
       body: ListView(
         shrinkWrap: true,
@@ -56,25 +61,35 @@ class _SearchPageState extends State<SearchPage> {
                         child: Container(
                           height: 50,
                           margin: EdgeInsets.only(right: 15),
-                          decoration: BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.primarySoft),
+                          decoration: BoxDecoration(
+                              borderRadius: BorderRadius.circular(10),
+                              color: AppColor.primarySoft),
                           child: TextField(
                             controller: searchInputController,
                             onChanged: (value) {
                               print(searchInputController.text);
                               setState(() {});
                             },
-                            style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w400),
+                            style: TextStyle(
+                                color: Colors.white,
+                                fontSize: 16,
+                                fontWeight: FontWeight.w400),
                             maxLines: 1,
                             textInputAction: TextInputAction.search,
                             decoration: InputDecoration(
                               hintText: 'What do you want to eat?',
-                              hintStyle: TextStyle(color: Colors.white.withOpacity(0.2)),
-                              prefixIconConstraints: BoxConstraints(maxHeight: 20),
-                              contentPadding: EdgeInsets.symmetric(horizontal: 17),
+                              hintStyle: TextStyle(
+                                  color: Colors.white.withOpacity(0.2)),
+                              prefixIconConstraints:
+                                  BoxConstraints(maxHeight: 20),
+                              contentPadding:
+                                  EdgeInsets.symmetric(horizontal: 17),
                               focusedBorder: InputBorder.none,
                               border: InputBorder.none,
                               prefixIcon: Visibility(
-                                visible: (searchInputController.text.isEmpty) ? true : false,
+                                visible: (searchInputController.text.isEmpty)
+                                    ? true
+                                    : false,
                                 child: Container(
                                   margin: EdgeInsets.only(left: 10, right: 12),
                                   child: SvgPicture.asset(
@@ -95,7 +110,10 @@ class _SearchPageState extends State<SearchPage> {
                           showModalBottomSheet(
                               context: context,
                               backgroundColor: Colors.white,
-                              shape: RoundedRectangleBorder(borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20))),
+                              shape: RoundedRectangleBorder(
+                                  borderRadius: BorderRadius.only(
+                                      topLeft: Radius.circular(20),
+                                      topRight: Radius.circular(20))),
                               builder: (context) {
                                 return SearchFilterModal();
                               });
@@ -132,14 +150,19 @@ class _SearchPageState extends State<SearchPage> {
                         alignment: Alignment.topCenter,
                         child: TextButton(
                           onPressed: () {
-                            searchInputController.text = popularRecipeKeyword[index];
+                            searchInputController.text =
+                                popularRecipeKeyword[index];
                           },
                           child: Text(
                             popularRecipeKeyword[index],
-                            style: TextStyle(color: Colors.white.withOpacity(0.7), fontWeight: FontWeight.w400),
+                            style: TextStyle(
+                                color: Colors.white.withOpacity(0.7),
+                                fontWeight: FontWeight.w400),
                           ),
                           style: OutlinedButton.styleFrom(
-                            side: BorderSide(color: Colors.white.withOpacity(0.15), width: 1),
+                            side: BorderSide(
+                                color: Colors.white.withOpacity(0.15),
+                                width: 1),
                           ),
                         ),
                       );
diff --git a/lib/views/widgets/category_card.dart b/lib/views/widgets/category_card.dart
index e14f4ce..e3ec8ff 100644
--- a/lib/views/widgets/category_card.dart
+++ b/lib/views/widgets/category_card.dart
@@ -4,12 +4,13 @@ class CategoryCard extends StatelessWidget {
   final String title;
   final ImageProvider image;
 
-  CategoryCard({@required this.title, @required this.image});
+  CategoryCard({required this.title, required this.image});
 
   @override
   Widget build(BuildContext context) {
     return Container(
-      width: ((MediaQuery.of(context).size.width - 16 - 16) / 2) - 8, // 16  = horizontal padding , /2 = because there is 2 box horizontal, -8 = distance between box, 8*2 = 16
+      width: ((MediaQuery.of(context).size.width - 16 - 16) / 2) -
+          8, // 16  = horizontal padding , /2 = because there is 2 box horizontal, -8 = distance between box, 8*2 = 16
       height: 60,
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(10),
@@ -23,7 +24,11 @@ class CategoryCard extends StatelessWidget {
         decoration: BoxDecoration(color: Color(0xFF062D2B).withOpacity(0.40)),
         child: Text(
           title,
-          style: TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w700, fontFamily: 'inter'),
+          style: TextStyle(
+              color: Colors.white,
+              fontSize: 16,
+              fontWeight: FontWeight.w700,
+              fontFamily: 'inter'),
         ),
       ),
     );
diff --git a/lib/views/widgets/custom_app_bar.dart b/lib/views/widgets/custom_app_bar.dart
index 3c5c7c5..c427c2a 100644
--- a/lib/views/widgets/custom_app_bar.dart
+++ b/lib/views/widgets/custom_app_bar.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:hungry/views/utils/AppColor.dart';
 
 class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
@@ -7,7 +8,11 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
   final ImageProvider profilePhoto;
   final Function profilePhotoOnPressed;
 
-  CustomAppBar({@required this.title, @required this.showProfilePhoto, this.profilePhoto, this.profilePhotoOnPressed});
+  CustomAppBar(
+      {required this.title,
+      required this.showProfilePhoto,
+      required this.profilePhoto,
+      required this.profilePhotoOnPressed});
 
   @override
   Size get preferredSize => Size.fromHeight(60);
@@ -15,7 +20,6 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
   @override
   Widget build(BuildContext context) {
     return AppBar(
-      brightness: Brightness.dark,
       backgroundColor: AppColor.primary,
       title: title,
       elevation: 0,
@@ -26,20 +30,22 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
             margin: EdgeInsets.only(right: 16),
             alignment: Alignment.center,
             child: IconButton(
-              onPressed: profilePhotoOnPressed,
+              onPressed: () => profilePhotoOnPressed(),
               icon: Container(
                 width: 32,
                 height: 32,
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(100),
                   color: Colors.white,
-                  image: DecorationImage(image: profilePhoto, fit: BoxFit.cover),
+                  image:
+                      DecorationImage(image: profilePhoto, fit: BoxFit.cover),
                 ),
               ),
             ),
           ),
         ),
       ],
+      systemOverlayStyle: SystemUiOverlayStyle.dark,
     );
   }
 }
diff --git a/lib/views/widgets/custom_bottom_navigation_bar.dart b/lib/views/widgets/custom_bottom_navigation_bar.dart
index 154387a..15a4130 100644
--- a/lib/views/widgets/custom_bottom_navigation_bar.dart
+++ b/lib/views/widgets/custom_bottom_navigation_bar.dart
@@ -5,11 +5,13 @@ import 'package:hungry/views/utils/AppColor.dart';
 // ignore: must_be_immutable
 class CustomBottomNavigationBar extends StatefulWidget {
   int selectedIndex;
-  Function onItemTapped;
-  CustomBottomNavigationBar({@required this.selectedIndex, @required this.onItemTapped});
+  void Function(int) onItemTapped;
+  CustomBottomNavigationBar(
+      {required this.selectedIndex, required this.onItemTapped});
 
   @override
-  _CustomBottomNavigationBarState createState() => _CustomBottomNavigationBarState();
+  _CustomBottomNavigationBarState createState() =>
+      _CustomBottomNavigationBarState();
 }
 
 class _CustomBottomNavigationBarState extends State<CustomBottomNavigationBar> {
@@ -30,14 +32,32 @@ class _CustomBottomNavigationBarState extends State<CustomBottomNavigationBar> {
             elevation: 0,
             items: [
               (widget.selectedIndex == 0)
-                  ? BottomNavigationBarItem(icon: SvgPicture.asset('assets/icons/home-filled.svg', color: AppColor.primary), label: '')
-                  : BottomNavigationBarItem(icon: SvgPicture.asset('assets/icons/home.svg', color: Colors.grey[600]), label: ''),
+                  ? BottomNavigationBarItem(
+                      icon: SvgPicture.asset('assets/icons/home-filled.svg',
+                          color: AppColor.primary),
+                      label: '')
+                  : BottomNavigationBarItem(
+                      icon: SvgPicture.asset('assets/icons/home.svg',
+                          color: Colors.grey[600]),
+                      label: ''),
               (widget.selectedIndex == 1)
-                  ? BottomNavigationBarItem(icon: SvgPicture.asset('assets/icons/discover-filled.svg', color: AppColor.primary, height: 28, width: 26), label: '')
-                  : BottomNavigationBarItem(icon: SvgPicture.asset('assets/icons/discover.svg', color: Colors.grey[600], height: 28, width: 26), label: ''),
+                  ? BottomNavigationBarItem(
+                      icon: SvgPicture.asset('assets/icons/discover-filled.svg',
+                          color: AppColor.primary, height: 28, width: 26),
+                      label: '')
+                  : BottomNavigationBarItem(
+                      icon: SvgPicture.asset('assets/icons/discover.svg',
+                          color: Colors.grey[600], height: 28, width: 26),
+                      label: ''),
               (widget.selectedIndex == 2)
-                  ? BottomNavigationBarItem(icon: SvgPicture.asset('assets/icons/bookmark-filled.svg', color: AppColor.primary), label: '')
-                  : BottomNavigationBarItem(icon: SvgPicture.asset('assets/icons/bookmark.svg', color: Colors.grey[600]), label: ''),
+                  ? BottomNavigationBarItem(
+                      icon: SvgPicture.asset('assets/icons/bookmark-filled.svg',
+                          color: AppColor.primary),
+                      label: '')
+                  : BottomNavigationBarItem(
+                      icon: SvgPicture.asset('assets/icons/bookmark.svg',
+                          color: Colors.grey[600]),
+                      label: ''),
             ],
           ),
         ),
diff --git a/lib/views/widgets/custom_text_field.dart b/lib/views/widgets/custom_text_field.dart
index 576da24..0bd7f13 100644
--- a/lib/views/widgets/custom_text_field.dart
+++ b/lib/views/widgets/custom_text_field.dart
@@ -4,14 +4,14 @@ import 'package:hungry/views/utils/AppColor.dart';
 class CustomTextField extends StatelessWidget {
   final String title;
   final String hint;
-  final TextEditingController controller;
+  final TextEditingController? controller;
   final bool obsecureText;
-  final EdgeInsetsGeometry padding;
-  final EdgeInsetsGeometry margin;
+  final EdgeInsetsGeometry? padding;
+  final EdgeInsetsGeometry? margin;
 
   CustomTextField({
-    @required this.title,
-    @required this.hint,
+    required this.title,
+    required this.hint,
     this.controller,
     this.obsecureText = false,
     this.padding,
@@ -38,7 +38,9 @@ class CustomTextField extends StatelessWidget {
             margin: EdgeInsets.only(top: 8),
             width: MediaQuery.of(context).size.width,
             height: 50,
-            decoration: BoxDecoration(color: AppColor.primaryExtraSoft, borderRadius: BorderRadius.circular(10)),
+            decoration: BoxDecoration(
+                color: AppColor.primaryExtraSoft,
+                borderRadius: BorderRadius.circular(10)),
             child: TextField(
               controller: controller,
               style: TextStyle(fontSize: 14),
diff --git a/lib/views/widgets/dummy_search_bar.dart b/lib/views/widgets/dummy_search_bar.dart
index 51ffb4e..0fcc755 100644
--- a/lib/views/widgets/dummy_search_bar.dart
+++ b/lib/views/widgets/dummy_search_bar.dart
@@ -3,8 +3,8 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:hungry/views/utils/AppColor.dart';
 
 class DummySearchBar extends StatelessWidget {
-  final Function routeTo;
-  DummySearchBar({@required this.routeTo});
+  final void Function() routeTo;
+  DummySearchBar({required this.routeTo});
 
   @override
   Widget build(BuildContext context) {
@@ -23,10 +23,13 @@ class DummySearchBar extends StatelessWidget {
                 height: 50,
                 margin: EdgeInsets.only(right: 15),
                 padding: EdgeInsets.symmetric(horizontal: 16),
-                decoration: BoxDecoration(borderRadius: BorderRadius.circular(10), color: AppColor.primarySoft),
+                decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(10),
+                    color: AppColor.primarySoft),
                 child: Row(
                   children: [
-                    SvgPicture.asset('assets/icons/search.svg', color: Colors.white, height: 18, width: 18),
+                    SvgPicture.asset('assets/icons/search.svg',
+                        color: Colors.white, height: 18, width: 18),
                     Container(
                       margin: EdgeInsets.only(left: 10),
                       child: Text(
diff --git a/lib/views/widgets/featured_recipe_card.dart b/lib/views/widgets/featured_recipe_card.dart
index a44dfa0..e067a64 100644
--- a/lib/views/widgets/featured_recipe_card.dart
+++ b/lib/views/widgets/featured_recipe_card.dart
@@ -7,13 +7,14 @@ import 'package:hungry/views/screens/recipe_detail_page.dart';
 
 class FeaturedRecipeCard extends StatelessWidget {
   final Recipe data;
-  FeaturedRecipeCard({@required this.data});
+  FeaturedRecipeCard({required this.data});
 
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: () {
-        Navigator.of(context).push(MaterialPageRoute(builder: (context) => RecipeDetailPage(data: data)));
+        Navigator.of(context).push(MaterialPageRoute(
+            builder: (context) => RecipeDetailPage(data: data)));
       },
       // Card Wrapper
       child: Container(
@@ -48,7 +49,12 @@ class FeaturedRecipeCard extends StatelessWidget {
                     data.title,
                     maxLines: 2,
                     overflow: TextOverflow.ellipsis,
-                    style: TextStyle(color: Colors.white, fontSize: 14, height: 150 / 100, fontWeight: FontWeight.w600, fontFamily: 'inter'),
+                    style: TextStyle(
+                        color: Colors.white,
+                        fontSize: 14,
+                        height: 150 / 100,
+                        fontWeight: FontWeight.w600,
+                        fontFamily: 'inter'),
                   ),
                   // Recipe Calories and Time
                   Container(
diff --git a/lib/views/widgets/ingridient_tile.dart b/lib/views/widgets/ingridient_tile.dart
index bf91705..286f5fd 100644
--- a/lib/views/widgets/ingridient_tile.dart
+++ b/lib/views/widgets/ingridient_tile.dart
@@ -3,14 +3,17 @@ import 'package:hungry/models/core/recipe.dart';
 
 class IngridientTile extends StatelessWidget {
   final Ingridient data;
-  IngridientTile({@required this.data});
+  IngridientTile({required this.data});
 
   @override
   Widget build(BuildContext context) {
     return Container(
       width: MediaQuery.of(context).size.width,
       padding: EdgeInsets.symmetric(horizontal: 16, vertical: 24),
-      decoration: BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey[350], width: 1))),
+      decoration: BoxDecoration(
+          border: Border(
+              bottom: BorderSide(
+                  color: const Color.fromARGB(255, 214, 214, 214), width: 1))),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
@@ -18,14 +21,19 @@ class IngridientTile extends StatelessWidget {
             flex: 9,
             child: Text(
               data.name,
-              style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, height: 150 / 100),
+              style: TextStyle(
+                  fontSize: 14, fontWeight: FontWeight.w600, height: 150 / 100),
             ),
           ),
           Flexible(
             flex: 3,
             child: Text(
               data.size,
-              style: TextStyle(fontSize: 16, fontWeight: FontWeight.w700, fontFamily: 'inter', color: Colors.grey[600]),
+              style: TextStyle(
+                  fontSize: 16,
+                  fontWeight: FontWeight.w700,
+                  fontFamily: 'inter',
+                  color: Colors.grey[600]),
             ),
           ),
         ],
diff --git a/lib/views/widgets/modals/search_filter_modal.dart b/lib/views/widgets/modals/search_filter_modal.dart
index 6acdd05..4caa4d3 100644
--- a/lib/views/widgets/modals/search_filter_modal.dart
+++ b/lib/views/widgets/modals/search_filter_modal.dart
@@ -11,7 +11,8 @@ class SearchFilterModal extends StatelessWidget {
           width: MediaQuery.of(context).size.width,
           height: 60,
           decoration: BoxDecoration(
-            borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20)),
+            borderRadius: BorderRadius.only(
+                topLeft: Radius.circular(20), topRight: Radius.circular(20)),
             color: AppColor.primaryExtraSoft,
           ),
           child: Row(
@@ -31,7 +32,10 @@ class SearchFilterModal extends StatelessWidget {
               ),
               Text(
                 'Sort by',
-                style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, fontFamily: 'inter'),
+                style: TextStyle(
+                    fontSize: 14,
+                    fontWeight: FontWeight.w600,
+                    fontFamily: 'inter'),
               ),
               GestureDetector(
                 onTap: () {
@@ -50,39 +54,51 @@ class SearchFilterModal extends StatelessWidget {
         ),
         // Sort By Option
         Container(
-          decoration: BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey[300]))),
+          decoration: BoxDecoration(
+              border: Border(
+                  bottom: BorderSide(
+                      color: const Color.fromARGB(255, 224, 224, 224)))),
           child: ListTileTheme(
             selectedColor: AppColor.primary,
             textColor: Colors.grey,
             child: ListTile(
               selected: true,
-              title: Text('Newest', style: TextStyle(fontWeight: FontWeight.w600)),
+              title:
+                  Text('Newest', style: TextStyle(fontWeight: FontWeight.w600)),
               contentPadding: EdgeInsets.symmetric(vertical: 8, horizontal: 16),
             ),
           ),
         ),
         // Sort By Option
         Container(
-          decoration: BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey[300]))),
+          decoration: BoxDecoration(
+              border: Border(
+                  bottom: BorderSide(
+                      color: const Color.fromARGB(255, 220, 220, 220)))),
           child: ListTileTheme(
             selectedColor: AppColor.primary,
             textColor: Colors.grey,
             child: ListTile(
               selected: false,
-              title: Text('Oldest', style: TextStyle(fontWeight: FontWeight.w600)),
+              title:
+                  Text('Oldest', style: TextStyle(fontWeight: FontWeight.w600)),
               contentPadding: EdgeInsets.symmetric(vertical: 8, horizontal: 16),
             ),
           ),
         ),
         // Sort By Option
         Container(
-          decoration: BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey[300]))),
+          decoration: BoxDecoration(
+              border: Border(
+                  bottom: BorderSide(
+                      color: const Color.fromARGB(255, 224, 224, 224)))),
           child: ListTileTheme(
             selectedColor: AppColor.primary,
             textColor: Colors.grey,
             child: ListTile(
               selected: false,
-              title: Text('Popular', style: TextStyle(fontWeight: FontWeight.w600)),
+              title: Text('Popular',
+                  style: TextStyle(fontWeight: FontWeight.w600)),
               contentPadding: EdgeInsets.symmetric(vertical: 8, horizontal: 16),
             ),
           ),
diff --git a/lib/views/widgets/popular_recipe_card.dart b/lib/views/widgets/popular_recipe_card.dart
index bef9799..35e6068 100644
--- a/lib/views/widgets/popular_recipe_card.dart
+++ b/lib/views/widgets/popular_recipe_card.dart
@@ -9,12 +9,13 @@ import 'package:hungry/views/utils/AppColor.dart';
 class PopularRecipeCard extends StatelessWidget {
   final Recipe data;
 
-  PopularRecipeCard({@required this.data});
+  PopularRecipeCard({required this.data});
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: () {
-        Navigator.of(context).push(MaterialPageRoute(builder: (context) => RecipeDetailPage(data: data)));
+        Navigator.of(context).push(MaterialPageRoute(
+            builder: (context) => RecipeDetailPage(data: data)));
       },
       child: Container(
         width: MediaQuery.of(context).size.width,
@@ -22,7 +23,10 @@ class PopularRecipeCard extends StatelessWidget {
         alignment: Alignment.bottomRight,
         padding: EdgeInsets.all(15),
         // Image
-        decoration: BoxDecoration(borderRadius: BorderRadius.circular(10), image: DecorationImage(image: AssetImage(data.photo), fit: BoxFit.cover)),
+        decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(10),
+            image: DecorationImage(
+                image: AssetImage(data.photo), fit: BoxFit.cover)),
         child: Column(
           mainAxisAlignment: MainAxisAlignment.end,
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -33,10 +37,15 @@ class PopularRecipeCard extends StatelessWidget {
               width: 95,
               alignment: Alignment.center,
               padding: EdgeInsets.symmetric(vertical: 5, horizontal: 10),
-              decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), color: AppColor.primary),
+              decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(5),
+                  color: AppColor.primary),
               child: Text(
                 'Popular Now !!',
-                style: TextStyle(color: Colors.white, fontSize: 10, fontWeight: FontWeight.w500),
+                style: TextStyle(
+                    color: Colors.white,
+                    fontSize: 10,
+                    fontWeight: FontWeight.w500),
               ),
             ),
             // Recipe Info Wrapper
@@ -59,7 +68,12 @@ class PopularRecipeCard extends StatelessWidget {
                         data.title,
                         maxLines: 2,
                         overflow: TextOverflow.ellipsis,
-                        style: TextStyle(color: Colors.white, fontSize: 14, height: 150 / 100, fontWeight: FontWeight.w600, fontFamily: 'inter'),
+                        style: TextStyle(
+                            color: Colors.white,
+                            fontSize: 14,
+                            height: 150 / 100,
+                            fontWeight: FontWeight.w600,
+                            fontFamily: 'inter'),
                       ),
                       // Recipe Calories and Time
                       Container(
@@ -76,7 +90,8 @@ class PopularRecipeCard extends StatelessWidget {
                               margin: EdgeInsets.only(left: 5),
                               child: Text(
                                 data.calories,
-                                style: TextStyle(color: Colors.white, fontSize: 10),
+                                style: TextStyle(
+                                    color: Colors.white, fontSize: 10),
                               ),
                             ),
                             SizedBox(width: 10),
@@ -85,7 +100,8 @@ class PopularRecipeCard extends StatelessWidget {
                               margin: EdgeInsets.only(left: 5),
                               child: Text(
                                 data.time,
-                                style: TextStyle(color: Colors.white, fontSize: 10),
+                                style: TextStyle(
+                                    color: Colors.white, fontSize: 10),
                               ),
                             ),
                           ],
diff --git a/lib/views/widgets/recipe_tile.dart b/lib/views/widgets/recipe_tile.dart
index 4be9840..b19fe27 100644
--- a/lib/views/widgets/recipe_tile.dart
+++ b/lib/views/widgets/recipe_tile.dart
@@ -6,13 +6,14 @@ import 'package:hungry/views/utils/AppColor.dart';
 
 class RecipeTile extends StatelessWidget {
   final Recipe data;
-  RecipeTile({@required this.data});
+  RecipeTile({required this.data});
 
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: () {
-        Navigator.of(context).push(MaterialPageRoute(builder: (context) => RecipeDetailPage(data: data)));
+        Navigator.of(context).push(MaterialPageRoute(
+            builder: (context) => RecipeDetailPage(data: data)));
       },
       child: Container(
         height: 90,
@@ -30,7 +31,8 @@ class RecipeTile extends StatelessWidget {
               decoration: BoxDecoration(
                 borderRadius: BorderRadius.circular(5),
                 color: Colors.blueGrey,
-                image: DecorationImage(image: AssetImage(data.photo), fit: BoxFit.cover),
+                image: DecorationImage(
+                    image: AssetImage(data.photo), fit: BoxFit.cover),
               ),
             ),
             // Recipe Info
@@ -47,7 +49,8 @@ class RecipeTile extends StatelessWidget {
                       margin: EdgeInsets.only(bottom: 12),
                       child: Text(
                         data.title,
-                        style: TextStyle(fontWeight: FontWeight.w600, fontFamily: 'inter'),
+                        style: TextStyle(
+                            fontWeight: FontWeight.w600, fontFamily: 'inter'),
                       ),
                     ),
                     // Recipe Calories and Time
diff --git a/lib/views/widgets/recommendation_recipe_card.dart b/lib/views/widgets/recommendation_recipe_card.dart
index e69ea78..371f546 100644
--- a/lib/views/widgets/recommendation_recipe_card.dart
+++ b/lib/views/widgets/recommendation_recipe_card.dart
@@ -5,12 +5,13 @@ import 'package:hungry/views/screens/recipe_detail_page.dart';
 
 class RecommendationRecipeCard extends StatelessWidget {
   final Recipe data;
-  RecommendationRecipeCard({@required this.data});
+  RecommendationRecipeCard({required this.data});
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
       onTap: () {
-        Navigator.of(context).push(MaterialPageRoute(builder: (context) => RecipeDetailPage(data: data)));
+        Navigator.of(context).push(MaterialPageRoute(
+            builder: (context) => RecipeDetailPage(data: data)));
       },
       child: Container(
         width: 180,
@@ -36,7 +37,10 @@ class RecommendationRecipeCard extends StatelessWidget {
               padding: EdgeInsets.only(left: 4),
               child: Text(
                 data.title,
-                style: TextStyle(fontSize: 14, fontWeight: FontWeight.w600, fontFamily: 'inter'),
+                style: TextStyle(
+                    fontSize: 14,
+                    fontWeight: FontWeight.w600,
+                    fontFamily: 'inter'),
                 maxLines: 1,
                 overflow: TextOverflow.ellipsis,
               ),
diff --git a/lib/views/widgets/review_tile.dart b/lib/views/widgets/review_tile.dart
index 5271ef0..f065856 100644
--- a/lib/views/widgets/review_tile.dart
+++ b/lib/views/widgets/review_tile.dart
@@ -3,14 +3,17 @@ import 'package:hungry/models/core/recipe.dart';
 
 class ReviewTile extends StatelessWidget {
   final Review data;
-  ReviewTile({@required this.data});
+  ReviewTile({required this.data});
 
   @override
   Widget build(BuildContext context) {
     return Container(
       width: MediaQuery.of(context).size.width,
       padding: EdgeInsets.symmetric(horizontal: 16, vertical: 20),
-      decoration: BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey[350], width: 1))),
+      decoration: BoxDecoration(
+          border: Border(
+              bottom: BorderSide(
+                  color: const Color.fromARGB(255, 214, 214, 214), width: 1))),
       child: Column(
         mainAxisAlignment: MainAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -18,14 +21,21 @@ class ReviewTile extends StatelessWidget {
           // Review username
           Text(
             data.username,
-            style: TextStyle(color: Colors.black, fontFamily: 'inter', fontSize: 16, fontWeight: FontWeight.w600),
+            style: TextStyle(
+                color: Colors.black,
+                fontFamily: 'inter',
+                fontSize: 16,
+                fontWeight: FontWeight.w600),
           ),
           // useer review
           Container(
             margin: EdgeInsets.only(top: 10),
             child: Text(
               data.review,
-              style: TextStyle(color: Colors.black.withOpacity(0.8), fontWeight: FontWeight.w500, height: 150 / 100),
+              style: TextStyle(
+                  color: Colors.black.withOpacity(0.8),
+                  fontWeight: FontWeight.w500,
+                  height: 150 / 100),
             ),
           )
         ],
diff --git a/lib/views/widgets/step_tile.dart b/lib/views/widgets/step_tile.dart
index fa6c246..84d7ec3 100644
--- a/lib/views/widgets/step_tile.dart
+++ b/lib/views/widgets/step_tile.dart
@@ -4,28 +4,38 @@ import 'package:hungry/models/core/recipe.dart';
 class StepTile extends StatelessWidget {
   final TutorialStep data;
 
-  StepTile({@required this.data});
+  StepTile({required this.data});
 
   @override
   Widget build(BuildContext context) {
     return Container(
       width: MediaQuery.of(context).size.width,
       padding: EdgeInsets.symmetric(horizontal: 16, vertical: 20),
-      decoration: BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey[350], width: 1))),
+      decoration: BoxDecoration(
+          border: Border(
+              bottom: BorderSide(
+                  color: Color.fromARGB(255, 214, 214, 214), width: 1))),
       child: Column(
         mainAxisAlignment: MainAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Text(
             data.step,
-            style: TextStyle(color: Colors.black, fontFamily: 'inter', fontSize: 16, fontWeight: FontWeight.w600),
+            style: TextStyle(
+                color: Colors.black,
+                fontFamily: 'inter',
+                fontSize: 16,
+                fontWeight: FontWeight.w600),
           ),
-          (data.description != null)
+          (data.description != null && data.description!.isNotEmpty)
               ? Container(
                   margin: EdgeInsets.only(top: 10),
                   child: Text(
-                    data.description,
-                    style: TextStyle(color: Colors.black.withOpacity(0.8), fontWeight: FontWeight.w500, height: 150 / 100),
+                    data.description ?? '',
+                    style: TextStyle(
+                        color: Colors.black.withOpacity(0.8),
+                        fontWeight: FontWeight.w500,
+                        height: 150 / 100),
                   ),
                 )
               : SizedBox(),
diff --git a/lib/views/widgets/user_info_tile.dart b/lib/views/widgets/user_info_tile.dart
index f485822..1b44b32 100644
--- a/lib/views/widgets/user_info_tile.dart
+++ b/lib/views/widgets/user_info_tile.dart
@@ -3,9 +3,14 @@ import 'package:hungry/views/utils/AppColor.dart';
 
 class UserInfoTile extends StatelessWidget {
   final String label, value;
-  final EdgeInsetsGeometry margin, padding;
-  final Color valueBackground;
-  UserInfoTile({@required this.label, @required this.value, this.padding, this.margin, this.valueBackground});
+  final EdgeInsetsGeometry? margin, padding;
+  final Color? valueBackground;
+  UserInfoTile(
+      {required this.label,
+      required this.value,
+      this.padding,
+      this.margin,
+      this.valueBackground});
 
   @override
   Widget build(BuildContext context) {
@@ -18,14 +23,19 @@ class UserInfoTile extends StatelessWidget {
         children: [
           Padding(
             padding: EdgeInsets.only(left: 20),
-            child: Text('$label', style: TextStyle(color: AppColor.primary, fontSize: 12)),
+            child: Text('$label',
+                style: TextStyle(color: AppColor.primary, fontSize: 12)),
           ),
           Container(
             margin: EdgeInsets.only(top: 6),
             width: MediaQuery.of(context).size.width,
             padding: EdgeInsets.all(16),
             color: valueBackground ?? AppColor.primaryExtraSoft,
-            child: Text('$value', style: TextStyle(fontSize: 16, fontWeight: FontWeight.w500, fontFamily: 'inter')),
+            child: Text('$value',
+                style: TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.w500,
+                    fontFamily: 'inter')),
           )
         ],
       ),
diff --git a/pubspec.lock b/pubspec.lock
index ea47f36..41d7395 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,58 +5,58 @@ packages:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.17.2"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      sha256: "486b7bc707424572cdf7bd7e812a0c146de3fd47ecadf070254cc60383f21dd8"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.3"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -66,7 +66,8 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_svg
-      url: "https://pub.dartlang.org"
+      sha256: "9ac1967e2f72a08af11b05b39167920f90d043cf67163d13a544a358c8f31afa"
+      url: "https://pub.dev"
     source: hosted
     version: "0.22.0"
   flutter_test:
@@ -78,42 +79,56 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.16"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.9.1"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.3"
   path_drawing:
     dependency: transitive
     description:
       name: path_drawing
-      url: "https://pub.dartlang.org"
+      sha256: b3e5edec6981a3679e57061fe045176646ac2b3e9f88770262ef1ac3673bab19
+      url: "https://pub.dev"
     source: hosted
     version: "0.5.1"
   path_parsing:
     dependency: transitive
     description:
       name: path_parsing
-      url: "https://pub.dartlang.org"
+      sha256: ee5c47c1058ad66b4a41746ec3996af9593d0858872807bcd64ac118f0700337
+      url: "https://pub.dev"
     source: hosted
     version: "0.2.1"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      url: "https://pub.dartlang.org"
+      sha256: "85e8f8b118afcccf948a9844d199e56260117400bd9b9982d87bf1d62ebc1690"
+      url: "https://pub.dev"
     source: hosted
     version: "4.1.0"
   sky_engine:
@@ -125,65 +140,74 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
-  typed_data:
+    version: "0.6.0"
+  vector_math:
     dependency: transitive
     description:
-      name: typed_data
-      url: "https://pub.dartlang.org"
+      name: vector_math
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
-  vector_math:
+    version: "2.1.4"
+  web:
     dependency: transitive
     description:
-      name: vector_math
-      url: "https://pub.dartlang.org"
+      name: web
+      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "0.1.4-beta"
   xml:
     dependency: transitive
     description:
       name: xml
-      url: "https://pub.dartlang.org"
+      sha256: "30498604ab00fc50286f8aaf7e077c496550b16ed2f325c14152244882314f03"
+      url: "https://pub.dev"
     source: hosted
     version: "5.1.2"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=3.1.0-185.0.dev <4.0.0"
   flutter: ">=1.24.0-7.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index f30d24d..31e1e8a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -18,7 +18,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   cupertino_icons: ^1.0.2