diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
index d8abe1b9..ccdae4db 100644
--- a/.fvm/fvm_config.json
+++ b/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.13.9",
+  "flutterSdkVersion": "3.19.0",
   "flavors": {}
 }
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index e47cb81d..71a0b9d3 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -44,7 +44,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.restaurantour"
-        minSdkVersion flutter.minSdkVersion
+        minSdkVersion 21
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 6cb1ae9c..dff75452 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
    <application
         android:label="restaurantour"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher">
+        android:icon="@mipmap/launcher_icon">
         <activity
             android:name=".MainActivity"
             android:exported="true"
diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png
new file mode 100644
index 00000000..a78f6c79
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png
new file mode 100644
index 00000000..d955138e
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-v21/background.png b/android/app/src/main/res/drawable-v21/background.png
new file mode 100644
index 00000000..753fa66f
Binary files /dev/null and b/android/app/src/main/res/drawable-v21/background.png differ
diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml
index f74085f3..3cc4948a 100644
--- a/android/app/src/main/res/drawable-v21/launch_background.xml
+++ b/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+    </item>
 </layer-list>
diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png
new file mode 100644
index 00000000..57c33fe7
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png
new file mode 100644
index 00000000..c87e1042
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png
new file mode 100644
index 00000000..49210126
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable/background.png b/android/app/src/main/res/drawable/background.png
new file mode 100644
index 00000000..753fa66f
Binary files /dev/null and b/android/app/src/main/res/drawable/background.png differ
diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml
index 304732f8..3cc4948a 100644
--- a/android/app/src/main/res/drawable/launch_background.xml
+++ b/android/app/src/main/res/drawable/launch_background.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
-
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+    <item>
+        <bitmap android:gravity="fill" android:src="@drawable/background"/>
+    </item>
+    <item>
+        <bitmap android:gravity="center" android:src="@drawable/splash"/>
+    </item>
 </layer-list>
diff --git a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png
new file mode 100644
index 00000000..3b72cc42
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png
new file mode 100644
index 00000000..988749ee
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png
new file mode 100644
index 00000000..7413224c
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png
new file mode 100644
index 00000000..1cbfdc7c
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png
new file mode 100644
index 00000000..d2623387
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png differ
diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml
new file mode 100644
index 00000000..a3653cb1
--- /dev/null
+++ b/android/app/src/main/res/values-night-v31/styles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 3db14bb5..5eb2eda1 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -5,6 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
new file mode 100644
index 00000000..d0a68e92
--- /dev/null
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+         
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index d460d1e9..0fdc7036 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -5,6 +5,10 @@
         <!-- Show a splash screen on the activity. Automatically removed when
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
+        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
diff --git a/android/build.gradle b/android/build.gradle
index 24047dce..ce647a43 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -26,6 +26,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 bc6a58af..cfe88f69 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.6.1-all.zip
diff --git a/assets/fonts/Lora/Lora-Bold.ttf b/assets/fonts/Lora/Lora-Bold.ttf
new file mode 100644
index 00000000..530c9e11
Binary files /dev/null and b/assets/fonts/Lora/Lora-Bold.ttf differ
diff --git a/assets/fonts/Lora/Lora-BoldItalic.ttf b/assets/fonts/Lora/Lora-BoldItalic.ttf
new file mode 100644
index 00000000..6bcc76b0
Binary files /dev/null and b/assets/fonts/Lora/Lora-BoldItalic.ttf differ
diff --git a/assets/fonts/Lora/Lora-Italic.ttf b/assets/fonts/Lora/Lora-Italic.ttf
new file mode 100644
index 00000000..d93bc5fc
Binary files /dev/null and b/assets/fonts/Lora/Lora-Italic.ttf differ
diff --git a/assets/fonts/Lora/Lora-Medium.ttf b/assets/fonts/Lora/Lora-Medium.ttf
new file mode 100644
index 00000000..85ca5a27
Binary files /dev/null and b/assets/fonts/Lora/Lora-Medium.ttf differ
diff --git a/assets/fonts/Lora/Lora-MediumItalic.ttf b/assets/fonts/Lora/Lora-MediumItalic.ttf
new file mode 100644
index 00000000..42208fbe
Binary files /dev/null and b/assets/fonts/Lora/Lora-MediumItalic.ttf differ
diff --git a/assets/fonts/Lora/Lora-Regular.ttf b/assets/fonts/Lora/Lora-Regular.ttf
new file mode 100644
index 00000000..2b1dab45
Binary files /dev/null and b/assets/fonts/Lora/Lora-Regular.ttf differ
diff --git a/assets/fonts/Lora/Lora-SemiBold.ttf b/assets/fonts/Lora/Lora-SemiBold.ttf
new file mode 100644
index 00000000..3a7c6d75
Binary files /dev/null and b/assets/fonts/Lora/Lora-SemiBold.ttf differ
diff --git a/assets/fonts/Lora/Lora-SemiBoldItalic.ttf b/assets/fonts/Lora/Lora-SemiBoldItalic.ttf
new file mode 100644
index 00000000..16c8254d
Binary files /dev/null and b/assets/fonts/Lora/Lora-SemiBoldItalic.ttf differ
diff --git a/assets/fonts/OFL.txt b/assets/fonts/OFL.txt
new file mode 100644
index 00000000..3f0fcd61
--- /dev/null
+++ b/assets/fonts/OFL.txt
@@ -0,0 +1,93 @@
+Copyright 2011 The Lora Project Authors (https://github.com/cyrealtype/Lora-Cyrillic), with Reserved Font Name "Lora".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+https://openfontlicense.org
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/assets/fonts/OpenSans-VariableFont_wdth,wght.ttf b/assets/fonts/OpenSans-VariableFont_wdth,wght.ttf
new file mode 100644
index 00000000..ac587b48
Binary files /dev/null and b/assets/fonts/OpenSans-VariableFont_wdth,wght.ttf differ
diff --git a/assets/fonts/Open_Sans/OpenSans-Bold.ttf b/assets/fonts/Open_Sans/OpenSans-Bold.ttf
new file mode 100644
index 00000000..98c74e0a
Binary files /dev/null and b/assets/fonts/Open_Sans/OpenSans-Bold.ttf differ
diff --git a/assets/fonts/Open_Sans/OpenSans-BoldItalic.ttf b/assets/fonts/Open_Sans/OpenSans-BoldItalic.ttf
new file mode 100644
index 00000000..85589283
Binary files /dev/null and b/assets/fonts/Open_Sans/OpenSans-BoldItalic.ttf differ
diff --git a/assets/fonts/Open_Sans/OpenSans-ExtraBold.ttf b/assets/fonts/Open_Sans/OpenSans-ExtraBold.ttf
new file mode 100644
index 00000000..4eb33935
Binary files /dev/null and b/assets/fonts/Open_Sans/OpenSans-ExtraBold.ttf differ
diff --git a/assets/fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf b/assets/fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf
new file mode 100644
index 00000000..75789b42
Binary files /dev/null and b/assets/fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf differ
diff --git a/assets/fonts/Open_Sans/OpenSans-Italic.ttf b/assets/fonts/Open_Sans/OpenSans-Italic.ttf
new file mode 100644
index 00000000..29ff6938
Binary files /dev/null and b/assets/fonts/Open_Sans/OpenSans-Italic.ttf differ
diff --git a/assets/fonts/Open_Sans/OpenSans-Light.ttf b/assets/fonts/Open_Sans/OpenSans-Light.ttf
new file mode 100644
index 00000000..ea175cc3
Binary files /dev/null and b/assets/fonts/Open_Sans/OpenSans-Light.ttf differ
diff --git a/assets/fonts/Open_Sans/OpenSans-LightItalic.ttf b/assets/fonts/Open_Sans/OpenSans-LightItalic.ttf
new file mode 100644
index 00000000..edbfe0b7
Binary files /dev/null and b/assets/fonts/Open_Sans/OpenSans-LightItalic.ttf differ
diff --git a/assets/fonts/Open_Sans/OpenSans-Medium.ttf b/assets/fonts/Open_Sans/OpenSans-Medium.ttf
new file mode 100644
index 00000000..ae716936
Binary files /dev/null and b/assets/fonts/Open_Sans/OpenSans-Medium.ttf differ
diff --git a/assets/fonts/Open_Sans/OpenSans-MediumItalic.ttf b/assets/fonts/Open_Sans/OpenSans-MediumItalic.ttf
new file mode 100644
index 00000000..6d1e09b2
Binary files /dev/null and b/assets/fonts/Open_Sans/OpenSans-MediumItalic.ttf differ
diff --git a/assets/fonts/Open_Sans/OpenSans-Regular.ttf b/assets/fonts/Open_Sans/OpenSans-Regular.ttf
new file mode 100644
index 00000000..67803bb6
Binary files /dev/null and b/assets/fonts/Open_Sans/OpenSans-Regular.ttf differ
diff --git a/assets/fonts/Open_Sans/OpenSans-SemiBold.ttf b/assets/fonts/Open_Sans/OpenSans-SemiBold.ttf
new file mode 100644
index 00000000..e5ab4644
Binary files /dev/null and b/assets/fonts/Open_Sans/OpenSans-SemiBold.ttf differ
diff --git a/assets/fonts/Open_Sans/OpenSans-SemiBoldItalic.ttf b/assets/fonts/Open_Sans/OpenSans-SemiBoldItalic.ttf
new file mode 100644
index 00000000..cd23e154
Binary files /dev/null and b/assets/fonts/Open_Sans/OpenSans-SemiBoldItalic.ttf differ
diff --git a/assets/images/profile-icon.png b/assets/images/profile-icon.png
new file mode 100644
index 00000000..392de681
Binary files /dev/null and b/assets/images/profile-icon.png differ
diff --git a/assets/images/superformula_logo.jpeg b/assets/images/superformula_logo.jpeg
new file mode 100644
index 00000000..cbc278fa
Binary files /dev/null and b/assets/images/superformula_logo.jpeg differ
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
index 9625e105..7c569640 100644
--- a/ios/Flutter/AppFrameworkInfo.plist
+++ b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>
diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig
index 592ceee8..ec97fc6f 100644
--- a/ios/Flutter/Debug.xcconfig
+++ b/ios/Flutter/Debug.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig
index 592ceee8..c4855bfe 100644
--- a/ios/Flutter/Release.xcconfig
+++ b/ios/Flutter/Release.xcconfig
@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
diff --git a/ios/Podfile b/ios/Podfile
new file mode 100644
index 00000000..1ac99b85
--- /dev/null
+++ b/ios/Podfile
@@ -0,0 +1,44 @@
+# Uncomment this line to define a global platform for your project
+# platform :ios, '12.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+  # target 'RunnerTests' do
+  #   inherit! :search_paths
+  # end
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_ios_build_settings(target)
+  end
+end
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
new file mode 100644
index 00000000..067c6532
--- /dev/null
+++ b/ios/Podfile.lock
@@ -0,0 +1,42 @@
+PODS:
+  - Flutter (1.0.0)
+  - flutter_native_splash (0.0.1):
+    - Flutter
+  - fluttertoast (0.0.2):
+    - Flutter
+    - Toast
+  - shared_preferences_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - Toast (4.0.0)
+
+DEPENDENCIES:
+  - Flutter (from `Flutter`)
+  - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
+  - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+
+SPEC REPOS:
+  trunk:
+    - Toast
+
+EXTERNAL SOURCES:
+  Flutter:
+    :path: Flutter
+  flutter_native_splash:
+    :path: ".symlinks/plugins/flutter_native_splash/ios"
+  fluttertoast:
+    :path: ".symlinks/plugins/fluttertoast/ios"
+  shared_preferences_foundation:
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+
+SPEC CHECKSUMS:
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
+  flutter_native_splash: 52501b97d1c0a5f898d687f1646226c1f93c56ef
+  fluttertoast: 31b00dabfa7fb7bacd9e7dbee580d7a2ff4bf265
+  shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
+  Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
+
+PODFILE CHECKSUM: 075ddf6b19cdcced44581bd8fbdfb58404a78f8a
+
+COCOAPODS: 1.14.3
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 73cf3f6d..b3817323 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -13,6 +13,7 @@
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		B2810EDB9F874331432CC302 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 237A0599BF7829E5F2507DCA /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -31,7 +32,10 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		15EBC34C8E2CEE891B444EF6 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		237A0599BF7829E5F2507DCA /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		63823ED26C4BF5B45D832673 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -42,6 +46,7 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		A547E6E8FBE693AB3E2FB3E2 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -49,12 +54,24 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B2810EDB9F874331432CC302 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		31CC7CC053A67291CF3918A5 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				A547E6E8FBE693AB3E2FB3E2 /* Pods-Runner.debug.xcconfig */,
+				15EBC34C8E2CEE891B444EF6 /* Pods-Runner.release.xcconfig */,
+				63823ED26C4BF5B45D832673 /* Pods-Runner.profile.xcconfig */,
+			);
+			name = Pods;
+			path = Pods;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -72,6 +89,8 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
+				31CC7CC053A67291CF3918A5 /* Pods */,
+				BF5B96056CC84909F64F9AD5 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -98,6 +117,14 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
+		BF5B96056CC84909F64F9AD5 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				237A0599BF7829E5F2507DCA /* Pods_Runner.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -105,12 +132,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				DFB7701A8EA2D749CA4FEB08 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				618C19F986E793A53B7317DE /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -127,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -185,6 +214,23 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		618C19F986E793A53B7317DE /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -200,6 +246,28 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		DFB7701A8EA2D749CA4FEB08 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -275,7 +343,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -291,6 +359,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 68W572FS8C;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -352,7 +421,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -401,7 +470,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -419,6 +488,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 68W572FS8C;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -441,6 +511,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 68W572FS8C;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index a6b826db..5e31d3d3 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata
index 1d526a16..21a3cc14 100644
--- a/ios/Runner.xcworkspace/contents.xcworkspacedata
+++ b/ios/Runner.xcworkspace/contents.xcworkspacedata
@@ -4,4 +4,7 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png
index dc9ada47..2a21e1cc 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
index 28c6bf03..dd3464c7 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
index 2ccbfd96..09f9cc9e 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
index f091b6b0..12a0dfde 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
index 4cde1211..881c9e25 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
index d0ef06e7..291246e6 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
index dcdc2306..91116fef 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
index 2ccbfd96..09f9cc9e 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
index c8f9ed8f..e0b9a118 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
index a6d6b860..11ae202b 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png
new file mode 100644
index 00000000..d955138e
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png
new file mode 100644
index 00000000..57c33fe7
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png
new file mode 100644
index 00000000..f22199a6
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png
new file mode 100644
index 00000000..2dff098d
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
index a6d6b860..11ae202b 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
index 75b2d164..5806fab8 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png
new file mode 100644
index 00000000..3b72cc42
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png
new file mode 100644
index 00000000..1cbfdc7c
Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
index c4df70d3..57f1fe82 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
index 6a84f41e..b4f9f82a 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
index d0e1f585..870b0268 100644
Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
new file mode 100644
index 00000000..9f447e1b
--- /dev/null
+++ b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "background.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png
new file mode 100644
index 00000000..753fa66f
Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
index 0bedcf2f..00cabce8 100644
--- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -1,23 +1,23 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "LaunchImage@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
index 9da19eac..d955138e 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
index 9da19eac..57c33fe7 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
index 9da19eac..c87e1042 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ
diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard
index f2e259c7..7a9e4896 100644
--- a/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -16,13 +16,19 @@
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                            </imageView>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
+                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="3T2-ad-Qdv"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="RPx-PI-7Xg"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="SdS-ul-q2q"/>
+                            <constraint firstAttribute="trailing" secondItem="tWc-Dq-wcI" secondAttribute="trailing" id="Swv-Gf-Rwn"/>
+                            <constraint firstAttribute="trailing" secondItem="YRO-k0-Ey4" secondAttribute="trailing" id="TQA-XW-tRk"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="duK-uY-Gun"/>
+                            <constraint firstItem="tWc-Dq-wcI" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="kV7-tw-vXt"/>
+                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="xPn-NY-SIU"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -32,6 +38,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="LaunchImage" width="168" height="185"/>
+        <image name="LaunchImage" width="200" height="200"/>
+        <image name="LaunchBackground" width="1" height="1"/>
     </resources>
 </document>
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 986e41cb..2e047c89 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -1,51 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>Restaurantour</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>restaurantour</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(FLUTTER_BUILD_NAME)</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>$(FLUTTER_BUILD_NUMBER)</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIMainStoryboardFile</key>
-	<string>Main</string>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<true/>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
-</dict>
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>$(DEVELOPMENT_LANGUAGE)</string>
+		<key>CFBundleDisplayName</key>
+		<string>Restaurantour</string>
+		<key>CFBundleExecutable</key>
+		<string>$(EXECUTABLE_NAME)</string>
+		<key>CFBundleIdentifier</key>
+		<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundleName</key>
+		<string>restaurantour</string>
+		<key>CFBundlePackageType</key>
+		<string>APPL</string>
+		<key>CFBundleShortVersionString</key>
+		<string>$(FLUTTER_BUILD_NAME)</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleVersion</key>
+		<string>$(FLUTTER_BUILD_NUMBER)</string>
+		<key>LSRequiresIPhoneOS</key>
+		<true/>
+		<key>UILaunchStoryboardName</key>
+		<string>LaunchScreen</string>
+		<key>UIMainStoryboardFile</key>
+		<string>Main</string>
+		<key>UISupportedInterfaceOrientations</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UISupportedInterfaceOrientations~ipad</key>
+		<array>
+			<string>UIInterfaceOrientationPortrait</string>
+			<string>UIInterfaceOrientationPortraitUpsideDown</string>
+			<string>UIInterfaceOrientationLandscapeLeft</string>
+			<string>UIInterfaceOrientationLandscapeRight</string>
+		</array>
+		<key>UIViewControllerBasedStatusBarAppearance</key>
+		<true/>
+		<key>CADisableMinimumFrameDurationOnPhone</key>
+		<true/>
+		<key>UIApplicationSupportsIndirectInputEvents</key>
+		<true/>
+		<key>UIStatusBarHidden</key>
+		<false/>
+	</dict>
 </plist>
diff --git a/lib/config/routes/routes.dart b/lib/config/routes/routes.dart
new file mode 100644
index 00000000..da979054
--- /dev/null
+++ b/lib/config/routes/routes.dart
@@ -0,0 +1,25 @@
+import 'package:flutter/material.dart';
+import 'package:restaurantour/features/restaurant_tour/models/restaurant.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/detail_restaurant/detail_restaurant.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/home_restaurant/home_restaurant.dart';
+
+class AppRoutes {
+  static Route onGenerateRoute(RouteSettings settings) {
+    switch (settings.name) {
+      case '/':
+        return _materialRoute(const HomeResturant());
+      case '/detail-restaurant':
+        return _materialRoute(
+          DetailRestaurant(
+            restaurant: settings.arguments as Restaurant,
+          ),
+        );
+      default:
+        return _materialRoute(const HomeResturant());
+    }
+  }
+
+  static Route<dynamic> _materialRoute(Widget view) {
+    return MaterialPageRoute(builder: (_) => view);
+  }
+}
diff --git a/lib/core/resources/helper.dart b/lib/core/resources/helper.dart
new file mode 100644
index 00000000..0a9f9840
--- /dev/null
+++ b/lib/core/resources/helper.dart
@@ -0,0 +1,14 @@
+import 'package:flutter/material.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:restaurantour/theme/style.dart';
+
+showToast(String text, {bool error = false}) {
+  Fluttertoast.showToast(
+    msg: text,
+    toastLength: Toast.LENGTH_SHORT,
+    timeInSecForIosWeb: 1,
+    backgroundColor: error ? Colors.red : accentColor,
+    textColor: Colors.white,
+    fontSize: 16.0,
+  );
+}
diff --git a/lib/features/restaurant_tour/bloc/favorites_bloc/favorites_bloc.dart b/lib/features/restaurant_tour/bloc/favorites_bloc/favorites_bloc.dart
new file mode 100644
index 00000000..2860c882
--- /dev/null
+++ b/lib/features/restaurant_tour/bloc/favorites_bloc/favorites_bloc.dart
@@ -0,0 +1,104 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:bloc/bloc.dart';
+import 'package:meta/meta.dart';
+import 'package:restaurantour/core/resources/helper.dart';
+import 'package:restaurantour/features/restaurant_tour/models/restaurant.dart';
+import 'package:restaurantour/features/restaurant_tour/repositories/favorites_repository.dart';
+import 'package:restaurantour/injection_container.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+part 'favorites_event.dart';
+part 'favorites_state.dart';
+
+class FavoritesBloc extends Bloc<FavoritesEvent, FavoritesState> {
+  FavoritesBloc() : super(FavoritesLoading()) {
+    on<LoadFavoritesEvent>(_onLoadRestaurantEvent);
+    on<SaveFavoriteRestaurantEvent>(_onSaveFavoriteRestaurantEvent);
+    on<RemoveFavoriteRestaurantEvent>(_onRemoveFavoriteRestaurantEvent);
+  }
+
+  FutureOr<void> _onLoadRestaurantEvent(
+    LoadFavoritesEvent event,
+    Emitter<FavoritesState> emit,
+  ) {
+    emit(FavoritesLoading());
+    try {
+      final List<Restaurant> favoritesRestaurants =
+          sl<FavoritesRepository>().loadFavorites();
+
+      emit(FavoritesLoaded(favoritesRestaurants: favoritesRestaurants));
+    } catch (e) {
+      emit(
+        FavoritesNotLoaded(
+          error:
+              'Could not load your favorite restaurants, please try again later',
+        ),
+      );
+    }
+  }
+
+  Future<FutureOr<void>> _onSaveFavoriteRestaurantEvent(
+    SaveFavoriteRestaurantEvent event,
+    Emitter<FavoritesState> emit,
+  ) async {
+    if (state is FavoritesLoaded) {
+      final List<Restaurant> favoritesRestaurants =
+          (state as FavoritesLoaded).favoritesRestaurants;
+
+      emit(FavoritesLoading());
+      try {
+        favoritesRestaurants.add(event.restaurant);
+
+        List<String> favoriteStrings = favoritesRestaurants
+            .map((restaurant) => json.encode(restaurant.toJson()))
+            .toList();
+
+        await sl<SharedPreferences>()
+            .setStringList('favoritesList', favoriteStrings);
+
+        showToast('Restaurant favorited successfully');
+
+        emit(FavoritesLoaded(favoritesRestaurants: favoritesRestaurants));
+      } catch (e) {
+        showToast(
+          'Could not save your favorite restaurants, please try again later',
+          error: true,
+        );
+      }
+    }
+  }
+
+  Future<FutureOr<void>> _onRemoveFavoriteRestaurantEvent(
+    RemoveFavoriteRestaurantEvent event,
+    Emitter<FavoritesState> emit,
+  ) async {
+    if (state is FavoritesLoaded) {
+      final List<Restaurant> favoritesRestaurants =
+          (state as FavoritesLoaded).favoritesRestaurants;
+
+      emit(FavoritesLoading());
+      try {
+        favoritesRestaurants
+            .removeWhere((element) => element.id == event.restaurant.id);
+
+        List<String> favoriteStrings = favoritesRestaurants
+            .map((restaurant) => json.encode(restaurant.toJson()))
+            .toList();
+
+        await sl<SharedPreferences>()
+            .setStringList('favoritesList', favoriteStrings);
+
+        showToast('Restaurant removed successfully');
+
+        emit(FavoritesLoaded(favoritesRestaurants: favoritesRestaurants));
+      } catch (e) {
+        showToast(
+          'Could not remove your favorite restaurants, please try again later',
+          error: true,
+        );
+      }
+    }
+  }
+}
diff --git a/lib/features/restaurant_tour/bloc/favorites_bloc/favorites_event.dart b/lib/features/restaurant_tour/bloc/favorites_bloc/favorites_event.dart
new file mode 100644
index 00000000..2378a2ae
--- /dev/null
+++ b/lib/features/restaurant_tour/bloc/favorites_bloc/favorites_event.dart
@@ -0,0 +1,18 @@
+part of 'favorites_bloc.dart';
+
+@immutable
+abstract class FavoritesEvent {}
+
+class LoadFavoritesEvent extends FavoritesEvent {}
+
+class SaveFavoriteRestaurantEvent extends FavoritesEvent {
+  final Restaurant restaurant;
+
+  SaveFavoriteRestaurantEvent(this.restaurant);
+}
+
+class RemoveFavoriteRestaurantEvent extends FavoritesEvent {
+  final Restaurant restaurant;
+
+  RemoveFavoriteRestaurantEvent(this.restaurant);
+}
diff --git a/lib/features/restaurant_tour/bloc/favorites_bloc/favorites_state.dart b/lib/features/restaurant_tour/bloc/favorites_bloc/favorites_state.dart
new file mode 100644
index 00000000..0b476879
--- /dev/null
+++ b/lib/features/restaurant_tour/bloc/favorites_bloc/favorites_state.dart
@@ -0,0 +1,18 @@
+part of 'favorites_bloc.dart';
+
+@immutable
+abstract class FavoritesState {}
+
+class FavoritesLoading extends FavoritesState {}
+
+class FavoritesLoaded extends FavoritesState {
+  final List<Restaurant> favoritesRestaurants;
+
+  FavoritesLoaded({required this.favoritesRestaurants});
+}
+
+class FavoritesNotLoaded extends FavoritesState {
+  final String? error;
+
+  FavoritesNotLoaded({this.error});
+}
diff --git a/lib/features/restaurant_tour/bloc/restaurant_bloc/restaurant_bloc.dart b/lib/features/restaurant_tour/bloc/restaurant_bloc/restaurant_bloc.dart
new file mode 100644
index 00000000..40e0a23f
--- /dev/null
+++ b/lib/features/restaurant_tour/bloc/restaurant_bloc/restaurant_bloc.dart
@@ -0,0 +1,43 @@
+import 'dart:async';
+
+import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:meta/meta.dart';
+import 'package:restaurantour/features/restaurant_tour/models/restaurant.dart';
+import 'package:restaurantour/features/restaurant_tour/repositories/dummy_repository.dart';
+import 'package:restaurantour/features/restaurant_tour/repositories/yelp_repository.dart';
+import 'package:restaurantour/injection_container.dart';
+
+part 'restaurant_event.dart';
+part 'restaurant_state.dart';
+
+class RestaurantBloc extends Bloc<RestaurantEvent, RestaurantState> {
+  DummyRepository? dummyRepository;
+  RestaurantBloc({this.dummyRepository}) : super(RestaurantLoading()) {
+    on<LoadRestaurantsEvent>(_onLoadRestaurantEvent);
+  }
+
+  Future<FutureOr<void>> _onLoadRestaurantEvent(
+    LoadRestaurantsEvent event,
+    Emitter<RestaurantState> emit,
+  ) async {
+    emit(RestaurantLoading());
+    try {
+      RestaurantQueryResult? result = dummyRepository != null
+          ? await dummyRepository!.getRestaurants()
+          : await sl<YelpRepository>().getRestaurants();
+      if (result != null) {
+        emit(RestaurantLoaded(restaurants: result.restaurants));
+      } else {
+        emit(RestaurantLoaded());
+      }
+    } catch (e) {
+      // We could use here error messages from backend
+      emit(
+        RestaurantNotLoaded(
+          error: 'Could not load the restaurants, please try again later',
+        ),
+      );
+    }
+  }
+}
diff --git a/lib/features/restaurant_tour/bloc/restaurant_bloc/restaurant_event.dart b/lib/features/restaurant_tour/bloc/restaurant_bloc/restaurant_event.dart
new file mode 100644
index 00000000..0f76de88
--- /dev/null
+++ b/lib/features/restaurant_tour/bloc/restaurant_bloc/restaurant_event.dart
@@ -0,0 +1,6 @@
+part of 'restaurant_bloc.dart';
+
+@immutable
+abstract class RestaurantEvent {}
+
+class LoadRestaurantsEvent extends RestaurantEvent {}
diff --git a/lib/features/restaurant_tour/bloc/restaurant_bloc/restaurant_state.dart b/lib/features/restaurant_tour/bloc/restaurant_bloc/restaurant_state.dart
new file mode 100644
index 00000000..c585b898
--- /dev/null
+++ b/lib/features/restaurant_tour/bloc/restaurant_bloc/restaurant_state.dart
@@ -0,0 +1,21 @@
+part of 'restaurant_bloc.dart';
+
+@immutable
+abstract class RestaurantState extends Equatable {
+  @override
+  List<Object> get props => [];
+}
+
+class RestaurantLoading extends RestaurantState {}
+
+class RestaurantLoaded extends RestaurantState {
+  final List<Restaurant>? restaurants;
+
+  RestaurantLoaded({this.restaurants});
+}
+
+class RestaurantNotLoaded extends RestaurantState {
+  final String? error;
+
+  RestaurantNotLoaded({this.error});
+}
diff --git a/lib/models/restaurant.dart b/lib/features/restaurant_tour/models/restaurant.dart
similarity index 100%
rename from lib/models/restaurant.dart
rename to lib/features/restaurant_tour/models/restaurant.dart
diff --git a/lib/models/restaurant.g.dart b/lib/features/restaurant_tour/models/restaurant.g.dart
similarity index 100%
rename from lib/models/restaurant.g.dart
rename to lib/features/restaurant_tour/models/restaurant.g.dart
diff --git a/lib/features/restaurant_tour/presentation/detail_restaurant/detail_restaurant.dart b/lib/features/restaurant_tour/presentation/detail_restaurant/detail_restaurant.dart
new file mode 100644
index 00000000..ef7c1617
--- /dev/null
+++ b/lib/features/restaurant_tour/presentation/detail_restaurant/detail_restaurant.dart
@@ -0,0 +1,203 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:restaurantour/features/restaurant_tour/models/restaurant.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/widgets/column_builder.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/widgets/divider_detail.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/widgets/favorited_button.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/widgets/open_now_widget.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/widgets/star_rating.dart';
+import 'package:restaurantour/theme/style.dart';
+
+class DetailRestaurant extends StatelessWidget {
+  final Restaurant restaurant;
+  const DetailRestaurant({Key? key, required this.restaurant})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        leading: IconButton(
+          icon: const Icon(Icons.arrow_back_rounded),
+          color: defaultTextColor,
+          onPressed: () {
+            Navigator.pop(context);
+          },
+        ),
+        title: Text(
+          restaurant.name ?? '',
+          style: titleStyle,
+        ),
+        actions: [FavoritedButton(restaurant)],
+        backgroundColor: backgroundColor,
+      ),
+      body: ListView(
+        children: [
+          Hero(
+            tag: 'hero-image:${restaurant.id}',
+            child: Image.network(restaurant.heroImage),
+          ),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 25.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(height: 20.0),
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        Text(
+                          restaurant.price ?? '',
+                          style: captionStyle,
+                        ),
+                        const SizedBox(width: 5.0),
+                        Text(
+                          restaurant.categories?.first.title ?? '',
+                          style: captionStyle,
+                        ),
+                      ],
+                    ),
+                    OpenNowWidget(restaurant.isOpen),
+                  ],
+                ),
+                const SizedBox(height: 15.0),
+                const DividerDetail(),
+                const SizedBox(height: 15.0),
+                const Text(
+                  'Address',
+                  style: captionStyle,
+                ),
+                const SizedBox(height: 15.0),
+                Row(
+                  children: [
+                    Expanded(
+                      child: Text(
+                        restaurant.location?.formattedAddress ?? '',
+                        style: contentSubtitleStyle,
+                      ),
+                    ),
+                    const Spacer(),
+                  ],
+                ),
+                const SizedBox(height: 15.0),
+                const DividerDetail(),
+                const SizedBox(height: 15.0),
+                const Text(
+                  'Overall Rating',
+                  style: captionStyle,
+                ),
+                const SizedBox(height: 15.0),
+                Row(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.end,
+                  children: [
+                    Text(
+                      restaurant.rating != null
+                          ? restaurant.rating.toString()
+                          : '',
+                      style: bigTitleStyle,
+                    ),
+                    const SizedBox(width: 2.5),
+                    const Padding(
+                      padding: EdgeInsets.only(bottom: 5),
+                      child: Icon(
+                        Icons.star,
+                        color: starColor,
+                        size: 18.0,
+                      ),
+                    ),
+                  ],
+                ),
+                const SizedBox(height: 15.0),
+                const DividerDetail(),
+                const SizedBox(height: 15.0),
+                Text(
+                  '${restaurant.reviews != null ? restaurant.reviews?.length.toString() : 0} Reviews',
+                  style: captionStyle,
+                ),
+                const SizedBox(height: 15.0),
+                ReviewTile(restaurant: restaurant),
+              ],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+class ReviewTile extends StatelessWidget {
+  const ReviewTile({
+    Key? key,
+    required this.restaurant,
+  }) : super(key: key);
+
+  final Restaurant restaurant;
+
+  @override
+  Widget build(BuildContext context) {
+    if (restaurant.reviews != null) {
+      return ColumnBuilder(
+        itemCount: restaurant.reviews!.length,
+        itemBuilder: (context, index) {
+          final Review review = restaurant.reviews![index];
+
+          return Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              StarRating(
+                rating: review.rating != null ? review.rating!.toDouble() : 0.0,
+                starSize: 15.0,
+              ),
+              const SizedBox(height: 5.0),
+              Text(getReviewText(), style: contentStyle),
+              const SizedBox(height: 5.0),
+              Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  CircleAvatar(
+                    foregroundImage: review.user?.imageUrl != null
+                        ? Image.network(review.user!.imageUrl!).image
+                        : Image.asset('assets/images/profile-icon.png').image,
+                    backgroundColor: backgroundColor,
+                  ),
+                  const SizedBox(width: 10.0),
+                  Text(
+                    review.user?.name ?? '',
+                    style: captionStyle,
+                  ),
+                ],
+              ),
+              const SizedBox(height: 5.0),
+              if (index < (restaurant.reviews!.length - 1))
+                const DividerDetail(),
+              const SizedBox(height: 5.0),
+            ],
+          );
+        },
+      );
+    }
+    return Container();
+  }
+
+  String getReviewText() {
+    final random = Random();
+    final randomNumber = random.nextInt(3);
+
+    switch (randomNumber) {
+      case 0:
+        return 'Review text goes here. Review text goes here. This is a review that is 2 lines long.';
+      case 1:
+        return 'Review text goes here. Review text goes here. This is a review. This is a review that is 3 lines long.';
+      case 2:
+        return 'Review text goes here. Review text goes here. Review text goes here. This is a review. This is a review. This is a review that is 4 lines long.';
+      default:
+        return '';
+    }
+  }
+}
diff --git a/lib/features/restaurant_tour/presentation/home_restaurant/home_restaurant.dart b/lib/features/restaurant_tour/presentation/home_restaurant/home_restaurant.dart
new file mode 100644
index 00000000..c7d42151
--- /dev/null
+++ b/lib/features/restaurant_tour/presentation/home_restaurant/home_restaurant.dart
@@ -0,0 +1,163 @@
+// ignore_for_file: prefer_const_constructors, prefer_const_literals_to_create_immutables
+
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:restaurantour/features/restaurant_tour/bloc/favorites_bloc/favorites_bloc.dart';
+import 'package:restaurantour/features/restaurant_tour/bloc/restaurant_bloc/restaurant_bloc.dart';
+import 'package:restaurantour/features/restaurant_tour/models/restaurant.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/widgets/restaurant_card.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/widgets/restaurant_card_shimmer.dart';
+import 'package:restaurantour/theme/style.dart';
+
+class HomeResturant extends StatelessWidget {
+  const HomeResturant({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return DefaultTabController(
+      length: 2,
+      child: Scaffold(
+        appBar: AppBar(
+          title: Column(
+            children: [
+              Text(
+                'RestaurantTour',
+                style: titleStyle,
+              ),
+            ],
+          ),
+          centerTitle: true,
+          bottom: PreferredSize(
+            preferredSize: Size.fromHeight(50.0),
+            child: Center(
+              child: TabBar(
+                tabAlignment: TabAlignment.center,
+                indicatorSize: TabBarIndicatorSize.label,
+                labelColor: defaultTextColor,
+                labelStyle: buttonStyle,
+                indicatorColor: accentColor,
+                unselectedLabelColor: secondaryTextColor,
+                unselectedLabelStyle: buttonStyle,
+                tabs: [
+                  Tab(
+                    text: "All Restaurants",
+                  ),
+                  Tab(
+                    text: "My Favorites",
+                  ),
+                ],
+              ),
+            ),
+          ),
+          backgroundColor: Colors.white,
+          elevation: 2.5,
+        ),
+        backgroundColor: backgroundColor,
+        body: SafeArea(
+          child: BlocBuilder<RestaurantBloc, RestaurantState>(
+            builder: (context, restaurantState) {
+              return BlocBuilder<FavoritesBloc, FavoritesState>(
+                builder: (context, favoritesState) {
+                  return TabBarView(
+                    children: [
+                      getAllRestaurantsWidget(restaurantState),
+                      getFavoritesWidget(favoritesState),
+                    ],
+                  );
+                },
+              );
+            },
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget getAllRestaurantsWidget(RestaurantState state) {
+    if (state is RestaurantLoading) {
+      return ListView.builder(
+        itemCount: 10,
+        itemBuilder: ((context, index) {
+          return Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 5.0),
+            child: RestaurantCardShimmer(),
+          );
+        }),
+      );
+    } else if (state is RestaurantLoaded) {
+      if (state.restaurants?.isNotEmpty ?? false) {
+        final List<Restaurant> restaurants = state.restaurants!;
+        return ListView.builder(
+          itemCount: restaurants.length,
+          itemBuilder: ((context, index) {
+            return Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 5.0),
+              child: RestaurantCard(restaurant: restaurants[index]),
+            );
+          }),
+        );
+      } else {
+        return Center(
+          child: Text(
+            'There are not restaurants available, please try again later',
+            style: titleStyle,
+            textAlign: TextAlign.center,
+          ),
+        );
+      }
+    } else {
+      return Center(
+        child: Text(
+          (state as RestaurantNotLoaded).error ??
+              'Could not load the restaurants, please try again later',
+          style: titleStyle,
+          textAlign: TextAlign.center,
+        ),
+      );
+    }
+  }
+}
+
+Widget getFavoritesWidget(FavoritesState state) {
+  if (state is FavoritesLoading) {
+    return ListView.builder(
+      itemCount: 5,
+      itemBuilder: ((context, index) {
+        return Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 5.0),
+          child: RestaurantCardShimmer(),
+        );
+      }),
+    );
+  } else if (state is FavoritesLoaded) {
+    if (state.favoritesRestaurants.isNotEmpty) {
+      final List<Restaurant> restaurants = state.favoritesRestaurants;
+      return ListView.builder(
+        itemCount: restaurants.length,
+        itemBuilder: ((context, index) {
+          return Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 5.0),
+            child: RestaurantCard(restaurant: restaurants[index]),
+          );
+        }),
+      );
+    } else {
+      return Center(
+        child: Text(
+          "You don't have any favorite restaurants added yet",
+          style: titleStyle,
+          textAlign: TextAlign.center,
+        ),
+      );
+    }
+  } else {
+    return Center(
+      child: Text(
+        (state as FavoritesNotLoaded).error ??
+            'Could not load your favorite restaurants, please try again later',
+        style: titleStyle,
+        textAlign: TextAlign.center,
+      ),
+    );
+  }
+}
diff --git a/lib/features/restaurant_tour/presentation/widgets/column_builder.dart b/lib/features/restaurant_tour/presentation/widgets/column_builder.dart
new file mode 100644
index 00000000..9a828ee3
--- /dev/null
+++ b/lib/features/restaurant_tour/presentation/widgets/column_builder.dart
@@ -0,0 +1,30 @@
+import 'package:flutter/material.dart';
+
+class ColumnBuilder extends StatelessWidget {
+  final IndexedWidgetBuilder itemBuilder;
+  final MainAxisAlignment mainAxisAlignment;
+  final MainAxisSize mainAxisSize;
+  final CrossAxisAlignment crossAxisAlignment;
+  final VerticalDirection verticalDirection;
+  final int itemCount;
+
+  const ColumnBuilder({
+    Key? key,
+    required this.itemBuilder,
+    required this.itemCount,
+    this.mainAxisAlignment = MainAxisAlignment.start,
+    this.mainAxisSize = MainAxisSize.max,
+    this.crossAxisAlignment = CrossAxisAlignment.center,
+    this.verticalDirection = VerticalDirection.down,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: List.generate(
+        itemCount,
+        (index) => itemBuilder(context, index),
+      ).toList(),
+    );
+  }
+}
diff --git a/lib/features/restaurant_tour/presentation/widgets/divider_detail.dart b/lib/features/restaurant_tour/presentation/widgets/divider_detail.dart
new file mode 100644
index 00000000..912c95d4
--- /dev/null
+++ b/lib/features/restaurant_tour/presentation/widgets/divider_detail.dart
@@ -0,0 +1,14 @@
+import 'package:flutter/material.dart';
+import 'package:restaurantour/theme/style.dart';
+
+class DividerDetail extends StatelessWidget {
+  const DividerDetail({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return const Divider(
+      thickness: 1.5,
+      color: dividerColor,
+    );
+  }
+}
diff --git a/lib/features/restaurant_tour/presentation/widgets/favorited_button.dart b/lib/features/restaurant_tour/presentation/widgets/favorited_button.dart
new file mode 100644
index 00000000..81faa430
--- /dev/null
+++ b/lib/features/restaurant_tour/presentation/widgets/favorited_button.dart
@@ -0,0 +1,40 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:restaurantour/features/restaurant_tour/bloc/favorites_bloc/favorites_bloc.dart';
+import 'package:restaurantour/features/restaurant_tour/models/restaurant.dart';
+import 'package:restaurantour/theme/style.dart';
+
+class FavoritedButton extends StatelessWidget {
+  final Restaurant restaurant;
+  const FavoritedButton(this.restaurant, {Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<FavoritesBloc, FavoritesState>(
+      builder: (context, state) {
+        if (state is FavoritesLoaded) {
+          final bool isFav = state.favoritesRestaurants.any(
+            (restaurantElement) => restaurantElement.id == restaurant.id,
+          );
+
+          return IconButton(
+            icon: Icon(
+              isFav ? Icons.favorite_rounded : Icons.favorite_border_rounded,
+            ),
+            color: isFav ? accentColor : defaultTextColor,
+            onPressed: () {
+              if (isFav) {
+                BlocProvider.of<FavoritesBloc>(context)
+                    .add(RemoveFavoriteRestaurantEvent(restaurant));
+              } else {
+                BlocProvider.of<FavoritesBloc>(context)
+                    .add(SaveFavoriteRestaurantEvent(restaurant));
+              }
+            },
+          );
+        }
+        return Container();
+      },
+    );
+  }
+}
diff --git a/lib/features/restaurant_tour/presentation/widgets/open_now_widget.dart b/lib/features/restaurant_tour/presentation/widgets/open_now_widget.dart
new file mode 100644
index 00000000..89e4f19a
--- /dev/null
+++ b/lib/features/restaurant_tour/presentation/widgets/open_now_widget.dart
@@ -0,0 +1,44 @@
+import 'package:flutter/material.dart';
+import 'package:restaurantour/theme/style.dart';
+
+class OpenNowWidget extends StatelessWidget {
+  final bool isOpen;
+  const OpenNowWidget(this.isOpen, {Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    if (isOpen) {
+      return Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const Text(
+            'Open Now',
+            style: overlineStyle,
+          ),
+          const SizedBox(width: 5.0),
+          Container(
+            height: 10.0,
+            width: 10.0,
+            decoration:
+                const BoxDecoration(shape: BoxShape.circle, color: openColor),
+          ),
+        ],
+      );
+    } else {
+      return Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const Text(
+            'Closed',
+            style: overlineStyle,
+          ),
+          const SizedBox(width: 5.0),
+          Container(
+            decoration:
+                const BoxDecoration(shape: BoxShape.circle, color: closeColor),
+          ),
+        ],
+      );
+    }
+  }
+}
diff --git a/lib/features/restaurant_tour/presentation/widgets/restaurant_card.dart b/lib/features/restaurant_tour/presentation/widgets/restaurant_card.dart
new file mode 100644
index 00000000..0ad0a566
--- /dev/null
+++ b/lib/features/restaurant_tour/presentation/widgets/restaurant_card.dart
@@ -0,0 +1,123 @@
+import 'package:flutter/material.dart';
+import 'package:restaurantour/features/restaurant_tour/models/restaurant.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/widgets/open_now_widget.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/widgets/restaurant_card_shimmer.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/widgets/star_rating.dart';
+import 'package:restaurantour/theme/style.dart';
+
+class RestaurantCard extends StatelessWidget {
+  final Restaurant restaurant;
+  final bool isTest;
+  const RestaurantCard({
+    Key? key,
+    required this.restaurant,
+    this.isTest = false,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return InkWell(
+      onTap: () {
+        Navigator.pushNamed(
+          context,
+          '/detail-restaurant',
+          arguments: restaurant,
+        );
+      },
+      child: SizedBox(
+        height: 125.0,
+        child: Card(
+          shape: RoundedRectangleBorder(
+            borderRadius: BorderRadius.circular(
+              8.0,
+            ),
+          ),
+          child: Padding(
+            padding: const EdgeInsets.all(10.0),
+            child: Row(
+              children: [
+                Flexible(
+                  flex: 2,
+                  fit: FlexFit.tight,
+                  child: AspectRatio(
+                    aspectRatio: 1,
+                    child: ClipRRect(
+                      borderRadius: BorderRadius.circular(8.0),
+                      child: Hero(
+                        tag: 'hero-image:${restaurant.id}',
+                        child: isTest
+                            ? const Placeholder()
+                            : Image.network(
+                                restaurant.heroImage,
+                                fit: BoxFit.cover,
+                                loadingBuilder:
+                                    ((context, child, loadingProgress) {
+                                  if (loadingProgress == null) return child;
+                                  return const ShimmerBox(
+                                    width: 80.0,
+                                    height: 80.0,
+                                  );
+                                }),
+                              ),
+                      ),
+                    ),
+                  ),
+                ),
+                const SizedBox(
+                  width: 10.0,
+                ),
+                Flexible(
+                  flex: 4,
+                  fit: FlexFit.tight,
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Text(
+                        restaurant.name ?? '',
+                        maxLines: 2,
+                        overflow: TextOverflow.ellipsis,
+                        style: subtitleStyle,
+                      ),
+                      Column(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          Row(
+                            children: [
+                              Text(
+                                restaurant.price ?? '',
+                                style: captionStyle,
+                              ),
+                              const SizedBox(width: 5.0),
+                              Text(
+                                restaurant.categories?.first.title ?? '',
+                                style: captionStyle,
+                              ),
+                            ],
+                          ),
+                          const SizedBox(height: 5.0),
+                          Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            children: [
+                              restaurant.rating != null
+                                  ? StarRating(
+                                      rating: restaurant.rating!,
+                                      starSize: 15.0,
+                                    )
+                                  : Container(),
+                              OpenNowWidget(restaurant.isOpen),
+                            ],
+                          ),
+                        ],
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/features/restaurant_tour/presentation/widgets/restaurant_card_shimmer.dart b/lib/features/restaurant_tour/presentation/widgets/restaurant_card_shimmer.dart
new file mode 100644
index 00000000..ed3130f0
--- /dev/null
+++ b/lib/features/restaurant_tour/presentation/widgets/restaurant_card_shimmer.dart
@@ -0,0 +1,101 @@
+import 'package:flutter/material.dart';
+import 'package:shimmer/shimmer.dart';
+
+class RestaurantCardShimmer extends StatelessWidget {
+  const RestaurantCardShimmer({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 125.0,
+      child: Card(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(8.0),
+        ),
+        child: const Padding(
+          padding: EdgeInsets.all(10.0),
+          child: Row(
+            children: [
+              ShimmerBox(
+                width: 80.0,
+                height: 80.0,
+              ),
+              SizedBox(
+                width: 10.0,
+              ),
+              Expanded(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    ShimmerBox(
+                      height: 20.0,
+                      width: double.infinity,
+                    ),
+                    ShimmerBox(
+                      height: 20.0,
+                      width: double.infinity,
+                    ),
+                    Column(
+                      mainAxisSize: MainAxisSize.min,
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        ShimmerBox(
+                          height: 20.0,
+                          width: 40.0,
+                        ),
+                        SizedBox(height: 5.0),
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: [
+                            ShimmerBox(
+                              width: 80.0,
+                              height: 20.0,
+                            ),
+                            ShimmerBox(
+                              width: 50.0,
+                              height: 20.0,
+                            ),
+                          ],
+                        ),
+                      ],
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class ShimmerBox extends StatelessWidget {
+  final double width;
+  final double height;
+
+  const ShimmerBox({
+    required this.width,
+    required this.height,
+    Key? key,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: width,
+      height: height,
+      child: Shimmer.fromColors(
+        baseColor: Colors.grey[300]!,
+        highlightColor: Colors.grey[100]!,
+        child: DecoratedBox(
+          decoration: BoxDecoration(
+            color: Colors.grey[300],
+            borderRadius: BorderRadius.circular(8.0),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/features/restaurant_tour/presentation/widgets/star_rating.dart b/lib/features/restaurant_tour/presentation/widgets/star_rating.dart
new file mode 100644
index 00000000..cfe76783
--- /dev/null
+++ b/lib/features/restaurant_tour/presentation/widgets/star_rating.dart
@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import 'package:restaurantour/theme/style.dart';
+
+class StarRating extends StatelessWidget {
+  final double rating;
+  final double starSize;
+
+  const StarRating({Key? key, required this.rating, this.starSize = 30.0})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    int numberOfStars = rating.round();
+
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: List.generate(numberOfStars, (index) {
+        return Icon(
+          Icons.star,
+          color: starColor,
+          size: starSize,
+        );
+      }),
+    );
+  }
+}
diff --git a/lib/features/restaurant_tour/repositories/dummy_repository.dart b/lib/features/restaurant_tour/repositories/dummy_repository.dart
new file mode 100644
index 00000000..64d6704c
--- /dev/null
+++ b/lib/features/restaurant_tour/repositories/dummy_repository.dart
@@ -0,0 +1,1216 @@
+import 'package:restaurantour/features/restaurant_tour/models/restaurant.dart';
+import 'dart:convert';
+
+class DummyRepository {
+  final bool success;
+  DummyRepository({this.success = true});
+
+  Future<RestaurantQueryResult?> getRestaurants({int offset = 0}) async {
+    if (!success) {
+      throw (Error());
+    }
+    String cleanedJsonString = cleanInvalidCharacters(jsonString);
+    Map<String, dynamic> jsonMap = json.decode(cleanedJsonString);
+    return RestaurantQueryResult.fromJson(jsonMap['data']['search']);
+  }
+}
+
+String cleanInvalidCharacters(String jsonString) {
+  return jsonString.replaceAll(RegExp(r'[\x00-\x1F\x7F-\x9F]'), '');
+}
+
+const jsonString = '''
+{
+  "data": {
+    "search": {
+      "total": 6185,
+      "business": [
+        {
+          "id": "vHz2RLtfUMVRPFmd7VBEHA",
+          "name": "Gordon Ramsay Hell's Kitchen",
+          "price": "\$\$\$",
+          "rating": 4.4,
+          "photos": [
+            "https://s3-media2.fl.yelpcdn.com/bphoto/q771KjLzI5y638leJsnJnQ/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "DKtLdByPmlwZET_b4BM3gQ",
+              "rating": 5,
+              "user": {
+                "id": "dW0QJVcKiX7crMd1lYWTkg",
+                "image_url": "https://s3-media3.fl.yelpcdn.com/photo/yhQgs5pEXcKaSRxVaY9z6w/o.jpg",
+                "name": "Misty C."
+              }
+            },
+            {
+              "id": "PdS4Fv6RKyBQ1nB0L0wpsg",
+              "rating": 5,
+              "user": {
+                "id": "TVnNlNYw5uFp-D-lv9REXA",
+                "image_url": null,
+                "name": "Chubby T."
+              }
+            },
+            {
+              "id": "9rADlcW-gfmu-F_bHK6WOw",
+              "rating": 3,
+              "user": {
+                "id": "YKh3b-qojo4vjtHEZoIjKA",
+                "image_url": null,
+                "name": "Jeheon L."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "New American",
+              "alias": "newamerican"
+            },
+            {
+              "title": "Seafood",
+              "alias": "seafood"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "3570 Las Vegas Blvd S\nLas Vegas, NV 89109"
+          }
+        },
+        {
+          "id": "faPVqws-x-5k2CQKDNtHxw",
+          "name": "Yardbird",
+          "price": "\$\$",
+          "rating": 4.5,
+          "photos": [
+            "https://s3-media1.fl.yelpcdn.com/bphoto/xYJaanpF3Dl1OovhmpqAYw/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "jF_ltrsWELOE3J62CfjVOA",
+              "rating": 5,
+              "user": {
+                "id": "L6R9AgLVcYZRex-zD2dyGQ",
+                "image_url": null,
+                "name": "Rodil A."
+              }
+            },
+            {
+              "id": "IN-fzeDTSemdZjOlBSW-Xw",
+              "rating": 5,
+              "user": {
+                "id": "goYizeAZdZbQhZZE5QOe8w",
+                "image_url": null,
+                "name": "Cliff G."
+              }
+            },
+            {
+              "id": "x9RWVj4xZdV_oep2i6c1sA",
+              "rating": 5,
+              "user": {
+                "id": "PY9912npDSkcfO3He7bosQ",
+                "image_url": null,
+                "name": "Hiyori G."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "Southern",
+              "alias": "southern"
+            },
+            {
+              "title": "New American",
+              "alias": "newamerican"
+            },
+            {
+              "title": "Cocktail Bars",
+              "alias": "cocktailbars"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "3355 Las Vegas Blvd S\nLas Vegas, NV 89109"
+          }
+        },
+        {
+          "id": "QXV3L_QFGj8r6nWX2kS2hA",
+          "name": "Nacho Daddy",
+          "price": "\$\$",
+          "rating": 4.4,
+          "photos": [
+            "https://s3-media4.fl.yelpcdn.com/bphoto/pu9doqMplB5x5SEs8ikW6w/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "DQ2H8OgyBTbe6jN5LqGXdA",
+              "rating": 5,
+              "user": {
+                "id": "oufmvIs63kYDNT4LFy-mzA",
+                "image_url": "https://s3-media1.fl.yelpcdn.com/photo/FgemZl9aSNbb6EPcAG-jbw/o.jpg",
+                "name": "Nastacia M."
+              }
+            },
+            {
+              "id": "0u-2PXiNc_ugmyUwOx8B5w",
+              "rating": 5,
+              "user": {
+                "id": "LcN1aD-HHqCNlWzqTPfl6g",
+                "image_url": null,
+                "name": "Nataly E."
+              }
+            },
+            {
+              "id": "81RGgDCGWK9DOF8xf9wTBA",
+              "rating": 4,
+              "user": {
+                "id": "ade13lGTtnC25U57AKRW_A",
+                "image_url": null,
+                "name": "Michael m."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "New American",
+              "alias": "newamerican"
+            },
+            {
+              "title": "Mexican",
+              "alias": "mexican"
+            },
+            {
+              "title": "Breakfast & Brunch",
+              "alias": "breakfast_brunch"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "3663 Las Vegas Blvd\nSte 595\nLas Vegas, NV 89109"
+          }
+        },
+        {
+          "id": "2iTsRqUsPGRH1li1WVRvKQ",
+          "name": "Carson Kitchen",
+          "price": "\$\$",
+          "rating": 4.5,
+          "photos": [
+            "https://s3-media2.fl.yelpcdn.com/bphoto/LhaPvLHIrsHu8ZMLgV04OQ/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "sZVa1-2TWjgJEnKGJYYB4Q",
+              "rating": 5,
+              "user": {
+                "id": "Poe6Ka98uk2V3FTH25gmVQ",
+                "image_url": null,
+                "name": "Cynthia D."
+              }
+            },
+            {
+              "id": "5t4my7iYtsLNUO8x-SSUsw",
+              "rating": 5,
+              "user": {
+                "id": "37DUcB2WAP5CF99T1bLsGw",
+                "image_url": "https://s3-media3.fl.yelpcdn.com/photo/24vNaKwJjGmhdl-B5tedhw/o.jpg",
+                "name": "Justin G."
+              }
+            },
+            {
+              "id": "1PKEZpeVRgb05RihejOJIw",
+              "rating": 3,
+              "user": {
+                "id": "z6EDB2Y_ArgnhYOaL68KhA",
+                "image_url": "https://s3-media1.fl.yelpcdn.com/photo/8N1nVMkzR8jachxvpswCKg/o.jpg",
+                "name": "Chastina S."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "New American",
+              "alias": "newamerican"
+            },
+            {
+              "title": "Desserts",
+              "alias": "desserts"
+            },
+            {
+              "title": "Cocktail Bars",
+              "alias": "cocktailbars"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "124 S 6th St\nSte 100\nLas Vegas, NV 89101"
+          }
+        },
+        {
+          "id": "syhA1ugJpyNLaB0MiP19VA",
+          "name": "888 Japanese BBQ",
+          "price": "\$\$\$",
+          "rating": 4.8,
+          "photos": [
+            "https://s3-media1.fl.yelpcdn.com/bphoto/V_zmwCUG1o_vR29xfkb-ng/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "QKuvkV1Tb-d14-Hfo6KkGw",
+              "rating": 4,
+              "user": {
+                "id": "R_DrrfxzKvQtVpgIv1KXjw",
+                "image_url": "https://s3-media3.fl.yelpcdn.com/photo/FHwSndIBTpNLIoU99Qsozg/o.jpg",
+                "name": "Grace D."
+              }
+            },
+            {
+              "id": "LKSWKmpe4p6XwM2_GTK_tg",
+              "rating": 5,
+              "user": {
+                "id": "xcF1SCYEtj9OK3TwYqV5Qg",
+                "image_url": "https://s3-media2.fl.yelpcdn.com/photo/esVhZkLVrWtuXBPgJ6sUjw/o.jpg",
+                "name": "felicia J."
+              }
+            },
+            {
+              "id": "foPmGbRnFmALLevmXgGN6w",
+              "rating": 5,
+              "user": {
+                "id": "o14GLSjW4a6L_5dofmfbTw",
+                "image_url": "https://s3-media1.fl.yelpcdn.com/photo/7lpT74I1nVghDStisoT9mQ/o.jpg",
+                "name": "Yichu W."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "Barbeque",
+              "alias": "bbq"
+            },
+            {
+              "title": "Japanese",
+              "alias": "japanese"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "3550 S Decatur Blvd\nLas Vegas, NV 89103"
+          }
+        },
+        {
+          "id": "nUpz0YiBsOK7ff9k3vUJ3A",
+          "name": "Buddy V's Ristorante",
+          "price": "\$\$",
+          "rating": 4.2,
+          "photos": [
+            "https://s3-media1.fl.yelpcdn.com/bphoto/gLHjQg0bjGjr_Jus-BXqDA/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "Ei37fwQISHjcW7Flq0lM0g",
+              "rating": 5,
+              "user": {
+                "id": "p9Yn8XDkIcCawrOBHfE5iA",
+                "image_url": "https://s3-media1.fl.yelpcdn.com/photo/o-9aQP_ZN2xTxhVlkq5lUw/o.jpg",
+                "name": "Vanessa H."
+              }
+            },
+            {
+              "id": "rDt1nlgRtI3ASYYz_cwbrQ",
+              "rating": 4,
+              "user": {
+                "id": "wKRaCZvy046AldtzflczaQ",
+                "image_url": null,
+                "name": "Linda H."
+              }
+            },
+            {
+              "id": "VwUtf3nVQsdobgRiOIxKqw",
+              "rating": 5,
+              "user": {
+                "id": "pCQ8urlykb8VRNm5IjJSWg",
+                "image_url": "https://s3-media4.fl.yelpcdn.com/photo/o36eZXAvfV5y7Ww-LyGkig/o.jpg",
+                "name": "Ian M."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "Italian",
+              "alias": "italian"
+            },
+            {
+              "title": "American",
+              "alias": "tradamerican"
+            },
+            {
+              "title": "Wine Bars",
+              "alias": "wine_bars"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "3327 S Las Vegas Blvd\nLas Vegas, NV 89109"
+          }
+        },
+        {
+          "id": "gOOfBSBZlffCkQ7dr7cpdw",
+          "name": "CHICA",
+          "price": "\$\$",
+          "rating": 4.3,
+          "photos": [
+            "https://s3-media2.fl.yelpcdn.com/bphoto/FxmtjuzPDiL7vx5KyceWuQ/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "lW4yyq9CTIsMKM_YaD2t6Q",
+              "rating": 5,
+              "user": {
+                "id": "qtV2u7-cR0ueiOcObwm8EQ",
+                "image_url": null,
+                "name": "Petra R."
+              }
+            },
+            {
+              "id": "NQeiKHUZ4u-TLNTO3zenBQ",
+              "rating": 5,
+              "user": {
+                "id": "_gzc2WONOcCNF8k2wobRQw",
+                "image_url": "https://s3-media1.fl.yelpcdn.com/photo/1zjnSzZGFSp1FqscHxqyug/o.jpg",
+                "name": "Raymond S."
+              }
+            },
+            {
+              "id": "MH5snphDmYvF_o9xnwYf_Q",
+              "rating": 1,
+              "user": {
+                "id": "GLOgZ5VkXdVr_272gJhr2g",
+                "image_url": "https://s3-media2.fl.yelpcdn.com/photo/fgPFqwN3Wni_6X2d3Ags2A/o.jpg",
+                "name": "Carlos G."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "Latin American",
+              "alias": "latin"
+            },
+            {
+              "title": "Breakfast & Brunch",
+              "alias": "breakfast_brunch"
+            },
+            {
+              "title": "Cocktail Bars",
+              "alias": "cocktailbars"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "3355 South Las Vegas Blvd\nSte 106\nLas Vegas, NV 89109"
+          }
+        },
+        {
+          "id": "rdE9gg0WB7Z8kRytIMSapg",
+          "name": "Lazy Dog Restaurant & Bar",
+          "price": "\$\$",
+          "rating": 4.5,
+          "photos": [
+            "https://s3-media2.fl.yelpcdn.com/bphoto/_Wz-fNXawmbBinSf9Ev15g/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "DdLrH47JOtFWBgERXSQdiw",
+              "rating": 5,
+              "user": {
+                "id": "5stRmR9p3vREwvtS-S81zg",
+                "image_url": null,
+                "name": "Rick H."
+              }
+            },
+            {
+              "id": "OAgIc_8QG6rS5o7nVBFipg",
+              "rating": 5,
+              "user": {
+                "id": "lhEdvKMSzT9NvP0AsZ8PeA",
+                "image_url": null,
+                "name": "Cameron L."
+              }
+            },
+            {
+              "id": "GSY-WHs9PHayK6BTQD7QyA",
+              "rating": 5,
+              "user": {
+                "id": "quXARBB0TFNxwHrTFPle4A",
+                "image_url": "https://s3-media2.fl.yelpcdn.com/photo/UnVkj8_uayckUSyOnxSeYg/o.jpg",
+                "name": "Renée H."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "New American",
+              "alias": "newamerican"
+            },
+            {
+              "title": "Comfort Food",
+              "alias": "comfortfood"
+            },
+            {
+              "title": "Burgers",
+              "alias": "burgers"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "6509 S Las Vegas Blvd\nLas Vegas, NV 89119"
+          }
+        },
+        {
+          "id": "I6EDDi4-Eq_XlFghcDCUhw",
+          "name": "Joe's Seafood Prime Steak & Stone Crab",
+          "price": "\$\$\$",
+          "rating": 4.4,
+          "photos": [
+            "https://s3-media1.fl.yelpcdn.com/bphoto/I1GDdV1mWUJM5HTP1PIX6A/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "ccaHPa-J9zx7FORUUGDbjA",
+              "rating": 5,
+              "user": {
+                "id": "tQDSfuYHzrQyUhC0GT5mGA",
+                "image_url": "https://s3-media4.fl.yelpcdn.com/photo/XweFm7ELT2clB3MYpxeA5Q/o.jpg",
+                "name": "Cindy R."
+              }
+            },
+            {
+              "id": "usmjsEE_lsLNsyWVl16P2g",
+              "rating": 4,
+              "user": {
+                "id": "TFh8SgmdlGor2sdv7V70rQ",
+                "image_url": "https://s3-media4.fl.yelpcdn.com/photo/HUaAs1PDjnmtqGLbiqnrlQ/o.jpg",
+                "name": "R R."
+              }
+            },
+            {
+              "id": "wFpymrx6ROYU-ZXR5cnUxQ",
+              "rating": 5,
+              "user": {
+                "id": "vMehw15-3PXzhvx0XYXEVA",
+                "image_url": "https://s3-media2.fl.yelpcdn.com/photo/lxbYBzWHqDOUAZoWw5Rwhg/o.jpg",
+                "name": "Nick K. W."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "Seafood",
+              "alias": "seafood"
+            },
+            {
+              "title": "Steakhouses",
+              "alias": "steak"
+            },
+            {
+              "title": "Wine Bars",
+              "alias": "wine_bars"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "3500 Las Vegas Blvd S\nLas Vegas, NV 89109"
+          }
+        },
+        {
+          "id": "UidEFF1WpnU4duev4fjPlQ",
+          "name": "Therapy ",
+          "price": "\$\$",
+          "rating": 4.3,
+          "photos": [
+            "https://s3-media3.fl.yelpcdn.com/bphoto/otaMuPtauoEb6qZzmHlAlQ/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "PsR_yQOXt_w8PUkTGlBjkA",
+              "rating": 5,
+              "user": {
+                "id": "VmSDPCypfNRYJL6iMXqQZQ",
+                "image_url": null,
+                "name": "Zoe C."
+              }
+            },
+            {
+              "id": "t5KE0YZKeRGxX8TLl17SVw",
+              "rating": 5,
+              "user": {
+                "id": "xhC7iVSHkf9pdXu2NVDAhA",
+                "image_url": null,
+                "name": "Grant W."
+              }
+            },
+            {
+              "id": "49zIJLuJkZRj460MfGAj6A",
+              "rating": 5,
+              "user": {
+                "id": "Qb_YdQd6IdogNBzCnSu5bw",
+                "image_url": "https://s3-media1.fl.yelpcdn.com/photo/SyE0UJtWlVo9I1BKZbzrfA/o.jpg",
+                "name": "Jessamyn C."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "Bars",
+              "alias": "bars"
+            },
+            {
+              "title": "New American",
+              "alias": "newamerican"
+            },
+            {
+              "title": "Dance Clubs",
+              "alias": "danceclubs"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "518 Fremont St\nLas Vegas, NV 89101"
+          }
+        },
+        {
+          "id": "igHYkXZMLAc9UdV5VnR_AA",
+          "name": "Echo & Rig",
+          "price": "\$\$\$",
+          "rating": 4.4,
+          "photos": [
+            "https://s3-media4.fl.yelpcdn.com/bphoto/dHsa2oVRGjMgMshhwHeOHQ/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "mn7IIjhoZ7OIXIYXO2ECMg",
+              "rating": 5,
+              "user": {
+                "id": "iV6nUA_XZsTxsptV5VMa3w",
+                "image_url": null,
+                "name": "Aesha N."
+              }
+            },
+            {
+              "id": "Kway0p9xVVZ85Tr5GsUj-w",
+              "rating": 5,
+              "user": {
+                "id": "8q3lZfEw5QcuvEXZGwT0Iw",
+                "image_url": "https://s3-media2.fl.yelpcdn.com/photo/QM8Ges1at0vJ2rdDcl7igw/o.jpg",
+                "name": "Keeana G."
+              }
+            },
+            {
+              "id": "3PP0gq6SAXgj2JRt7ukahg",
+              "rating": 2,
+              "user": {
+                "id": "tnSVm_tdM5zthKgmGF5d1A",
+                "image_url": "https://s3-media2.fl.yelpcdn.com/photo/_So9EeiKMtNsNNysegLVHQ/o.jpg",
+                "name": "Elizabeth H."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "Steakhouses",
+              "alias": "steak"
+            },
+            {
+              "title": "Butcher",
+              "alias": "butcher"
+            },
+            {
+              "title": "Tapas/Small Plates",
+              "alias": "tapasmallplates"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "440 S Rampart Blvd\nLas Vegas, NV 89145"
+          }
+        },
+        {
+          "id": "4JNXUYY8wbaaDmk3BPzlWw",
+          "name": "Mon Ami Gabi",
+          "price": "\$\$\$",
+          "rating": 4.2,
+          "photos": [
+            "https://s3-media2.fl.yelpcdn.com/bphoto/cZ75DtuiHsOU-4W3vLsFKA/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "nWWGiAcfUV4fMTG1iZwLDg",
+              "rating": 4,
+              "user": {
+                "id": "WG7jNZ6T2s74xaCVvAqrNQ",
+                "image_url": null,
+                "name": "Jayton W."
+              }
+            },
+            {
+              "id": "9U8FJ8JAqpVKqIzvSrNwbw",
+              "rating": 5,
+              "user": {
+                "id": "HGgsNBaaUprlK8kbGN1Xmg",
+                "image_url": "https://s3-media2.fl.yelpcdn.com/photo/ct4hxqGIHJKP4wssXduKuQ/o.jpg",
+                "name": "Lisa C."
+              }
+            },
+            {
+              "id": "lcQCPO_F7R0vIUQTbkE2Zw",
+              "rating": 4,
+              "user": {
+                "id": "OLn8EvPsu4hNug8V5PF2jA",
+                "image_url": "https://s3-media1.fl.yelpcdn.com/photo/xpr7Du-c8rZ9G4Tc00M7ig/o.jpg",
+                "name": "Rachel S."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "French",
+              "alias": "french"
+            },
+            {
+              "title": "Steakhouses",
+              "alias": "steak"
+            },
+            {
+              "title": "Breakfast & Brunch",
+              "alias": "breakfast_brunch"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "3655 Las Vegas Blvd S\nLas Vegas, NV 89109"
+          }
+        },
+        {
+          "id": "JPfi__QJAaRzmfh5aOyFEw",
+          "name": "Shang Artisan Noodle",
+          "price": "\$\$",
+          "rating": 4.6,
+          "photos": [
+            "https://s3-media3.fl.yelpcdn.com/bphoto/TqV2TDWH-7Wje5B9Oh1EZw/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "to7hZMQ5ait363QdwZWObQ",
+              "rating": 4,
+              "user": {
+                "id": "mjSQELtcLOf55ij-JQagvw",
+                "image_url": null,
+                "name": "Eric Y."
+              }
+            },
+            {
+              "id": "1kR1sYXsQ-P34OUX_7dfTA",
+              "rating": 5,
+              "user": {
+                "id": "46MOzJsXEi6bNeiiKdf87g",
+                "image_url": null,
+                "name": "Renee S."
+              }
+            },
+            {
+              "id": "BM4hmLR1nzafikmIdjTVSA",
+              "rating": 5,
+              "user": {
+                "id": "QCfSyRowk0f6Po78n-R91Q",
+                "image_url": null,
+                "name": "Eileen L."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "Noodles",
+              "alias": "noodles"
+            },
+            {
+              "title": "Chinese",
+              "alias": "chinese"
+            },
+            {
+              "title": "Soup",
+              "alias": "soup"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "4983 W Flamingo Rd\nSte B\nLas Vegas, NV 89103"
+          }
+        },
+        {
+          "id": "3kdSl5mo9dWC4clrQjEDGg",
+          "name": "Egg & I",
+          "price": "\$\$",
+          "rating": 4.5,
+          "photos": [
+            "https://s3-media1.fl.yelpcdn.com/bphoto/z4rdxoc6xaM4dmdPovPBDg/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "zLTki3FhRtLazq8lITHsPw",
+              "rating": 5,
+              "user": {
+                "id": "rfc-7fqA9cOElpRh1LRLcw",
+                "image_url": null,
+                "name": "Steven C."
+              }
+            },
+            {
+              "id": "ryqGTnDkY5U0ZuFdg1S1fQ",
+              "rating": 5,
+              "user": {
+                "id": "SlUAUp7am-X8RhfZ_HWf_w",
+                "image_url": null,
+                "name": "Corey C."
+              }
+            },
+            {
+              "id": "2gnSQ6VigIFCXhIjcUR3Kg",
+              "rating": 5,
+              "user": {
+                "id": "3LOAOpov-lnr7Ock1n4m6w",
+                "image_url": null,
+                "name": "Ted S."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "Breakfast & Brunch",
+              "alias": "breakfast_brunch"
+            },
+            {
+              "title": "Burgers",
+              "alias": "burgers"
+            },
+            {
+              "title": "American",
+              "alias": "tradamerican"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "4533 W Sahara Ave\nSte 5\nLas Vegas, NV 89102"
+          }
+        },
+        {
+          "id": "QCCVxVRt1amqv0AaEWSKkg",
+          "name": "Esther's Kitchen",
+          "price": "\$\$",
+          "rating": 4.5,
+          "photos": [
+            "https://s3-media1.fl.yelpcdn.com/bphoto/wEM4F2jy0hnBdNfdAum0Sw/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "b0Bwi2FF8nyW2E-d2qJK9g",
+              "rating": 5,
+              "user": {
+                "id": "ftzzjBJJfmFyYJPtOrFLfQ",
+                "image_url": null,
+                "name": "Jenny W."
+              }
+            },
+            {
+              "id": "kId4p0bjBjRQ6DauiNLQCQ",
+              "rating": 5,
+              "user": {
+                "id": "Hr9JnLMtc6fDHg-2u-yz3Q",
+                "image_url": null,
+                "name": "Dulce O."
+              }
+            },
+            {
+              "id": "0RfeOhMMWDxrhYFloB_k4A",
+              "rating": 5,
+              "user": {
+                "id": "fqM92Mu8KXJPHESO50pxOQ",
+                "image_url": null,
+                "name": "Pam S."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "Italian",
+              "alias": "italian"
+            },
+            {
+              "title": "Pizza",
+              "alias": "pizza"
+            },
+            {
+              "title": "Cocktail Bars",
+              "alias": "cocktailbars"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "1130 S Casino Center Blvd\nLas Vegas, NV 89104"
+          }
+        },
+        {
+          "id": "kRgAf6j2y1eR0wOFdzFAuw",
+          "name": "Firefly Tapas Kitchen & Bar",
+          "price": "\$\$",
+          "rating": 4.4,
+          "photos": [
+            "https://s3-media1.fl.yelpcdn.com/bphoto/enFKR6NTTy2Ik3r_2ru2bA/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "LbkgwPV7IRaAnPEFdoay7w",
+              "rating": 5,
+              "user": {
+                "id": "RrsZdpnOOL5GRyQjgyfZOw",
+                "image_url": "https://s3-media2.fl.yelpcdn.com/photo/LE7vNIJIB1CyY1klpIdxeA/o.jpg",
+                "name": "Jenna B."
+              }
+            },
+            {
+              "id": "6DH8eBd4Nl8rc1sBXOgLfQ",
+              "rating": 5,
+              "user": {
+                "id": "NHhJTn0glStWUpsmKXBsqQ",
+                "image_url": "https://s3-media3.fl.yelpcdn.com/photo/1yYQKZTg-Vjtm1UrnJpZ9Q/o.jpg",
+                "name": "Flo L."
+              }
+            },
+            {
+              "id": "KivjLlbvIOvkBkAlNusw2A",
+              "rating": 5,
+              "user": {
+                "id": "ECGDB_iT52XusSjguckdqQ",
+                "image_url": "https://s3-media1.fl.yelpcdn.com/photo/7kiIHBHTxcMUGmeELKGoeQ/o.jpg",
+                "name": "Sara F."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "Tapas/Small Plates",
+              "alias": "tapasmallplates"
+            },
+            {
+              "title": "Tapas Bars",
+              "alias": "tapas"
+            },
+            {
+              "title": "Breakfast & Brunch",
+              "alias": "breakfast_brunch"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "335 Hughes Center Dr\nLas Vegas, NV 89169"
+          }
+        },
+        {
+          "id": "mU3vlAVzTxgmZUu6F4XixA",
+          "name": "Momofuku",
+          "price": "\$\$",
+          "rating": 4.1,
+          "photos": [
+            "https://s3-media1.fl.yelpcdn.com/bphoto/mB1g53Nqa62Q04u4oNuCSw/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "DlbQl5FMwXKcaiA-M8PAFA",
+              "rating": 5,
+              "user": {
+                "id": "KKijecFeQInjpAQuoLQbDg",
+                "image_url": null,
+                "name": "Stephanie A."
+              }
+            },
+            {
+              "id": "U7c-C8eg2ZNVWfjACbIgWg",
+              "rating": 5,
+              "user": {
+                "id": "QGOtNZfasBwWCuawKjypYA",
+                "image_url": "https://s3-media2.fl.yelpcdn.com/photo/-mfiJS-obVFrxo6Sq9679A/o.jpg",
+                "name": "Jacqueline T."
+              }
+            },
+            {
+              "id": "znqKryxfPlF9y8YlRdcMdQ",
+              "rating": 4,
+              "user": {
+                "id": "LpnrjmrUDyQvZodldeN_PQ",
+                "image_url": "https://s3-media3.fl.yelpcdn.com/photo/34--QaXFpBuOUU5-UtzCYw/o.jpg",
+                "name": "Sandee L."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "New American",
+              "alias": "newamerican"
+            },
+            {
+              "title": "Asian Fusion",
+              "alias": "asianfusion"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "2 Boulevard Tower\nLevel\nBoulevard Tower\nLas Vegas, NV 89109"
+          }
+        },
+        {
+          "id": "JDZ6_yycNQFTpUZzLIKHUg",
+          "name": "El Dorado Cantina - Las Vegas Strip",
+          "price": "\$\$",
+          "rating": 4.4,
+          "photos": [
+            "https://s3-media2.fl.yelpcdn.com/bphoto/XUohVZ4cdk13GWrUmnQKYQ/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "i2gXEIKJ045uUEdaZbZ_Zw",
+              "rating": 5,
+              "user": {
+                "id": "LhyepAmUttTm5suU_MoECQ",
+                "image_url": "https://s3-media1.fl.yelpcdn.com/photo/v-Pi6w7g8CdyzTr_6_IsEQ/o.jpg",
+                "name": "Cheyenne L."
+              }
+            },
+            {
+              "id": "nDUQX9fBRtfi0VTLrStN6g",
+              "rating": 5,
+              "user": {
+                "id": "zPf0o5w4LH5vm5iF2Clpkg",
+                "image_url": "https://s3-media3.fl.yelpcdn.com/photo/-reqGCP7l1tqB2KndJ-8LA/o.jpg",
+                "name": "Christina K."
+              }
+            },
+            {
+              "id": "AP26RnkWGgAfF-b3I3euTg",
+              "rating": 3,
+              "user": {
+                "id": "HITN4vuuhFZpSIlf4QsRvA",
+                "image_url": "https://s3-media2.fl.yelpcdn.com/photo/zmSlyTiInVxB0gS_K0vGyQ/o.jpg",
+                "name": "J D."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "Mexican",
+              "alias": "mexican"
+            },
+            {
+              "title": "Bars",
+              "alias": "bars"
+            },
+            {
+              "title": "Latin American",
+              "alias": "latin"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "3025 Sammy Davis Jr Dr\nLas Vegas, NV 89109"
+          }
+        },
+        {
+          "id": "SVGApDPNdpFlEjwRQThCxA",
+          "name": "Juan's Flaming Fajitas & Cantina - Tropicana",
+          "price": "\$\$",
+          "rating": 4.6,
+          "photos": [
+            "https://s3-media3.fl.yelpcdn.com/bphoto/a8L9bQZ2XW8etXLomKKdDw/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "TxbNbQv2DoMeywUXbQHydQ",
+              "rating": 5,
+              "user": {
+                "id": "x32HGKzoObj52o__-bijhA",
+                "image_url": "https://s3-media4.fl.yelpcdn.com/photo/Ls_-sU2FfDSbCNklOdR5kw/o.jpg",
+                "name": "Denise P."
+              }
+            },
+            {
+              "id": "J9wqFeaGz0VG_WG8wiPb8g",
+              "rating": 4,
+              "user": {
+                "id": "KZL0ZNkfmiTD7w6lHwCqwQ",
+                "image_url": "https://s3-media2.fl.yelpcdn.com/photo/kszIPpS89yAmpCFVkYlcaQ/o.jpg",
+                "name": "Patil K."
+              }
+            },
+            {
+              "id": "2oiRbUc1EpJ9ueikWf12ug",
+              "rating": 4,
+              "user": {
+                "id": "P8PgQ9hyIuxQ0tXOARgrKQ",
+                "image_url": "https://s3-media1.fl.yelpcdn.com/photo/7dv9EDT4q2ok4OOZEb3Skg/o.jpg",
+                "name": "Ken M."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "Mexican",
+              "alias": "mexican"
+            },
+            {
+              "title": "Breakfast & Brunch",
+              "alias": "breakfast_brunch"
+            },
+            {
+              "title": "Cocktail Bars",
+              "alias": "cocktailbars"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "9640 W Tropicana\nSte 101\nLas Vegas, NV 89147"
+          }
+        },
+        {
+          "id": "FNe5PPA9pyj8FjcDefCBpg",
+          "name": "Weera Thai Restaurant - Sahara",
+          "price": "\$\$",
+          "rating": 4.4,
+          "photos": [
+            "https://s3-media2.fl.yelpcdn.com/bphoto/TOPFVZGJtaLJI_-Vyq078A/o.jpg"
+          ],
+          "reviews": [
+            {
+              "id": "YT85zfksHELt4t8gDzXlWw",
+              "rating": 5,
+              "user": {
+                "id": "Xxq21QW-gOTdXNSGPnV6SQ",
+                "image_url": null,
+                "name": "April G."
+              }
+            },
+            {
+              "id": "Zrq_gHaC3jOHb7HlfgB5Nw",
+              "rating": 5,
+              "user": {
+                "id": "fYSCSR584ih459jjWBY-4Q",
+                "image_url": null,
+                "name": "Jessica L."
+              }
+            },
+            {
+              "id": "MIWlggOXTgzMs_XZBchc8g",
+              "rating": 3,
+              "user": {
+                "id": "Ia60oLQ-5xWXgyDTZNMkYg",
+                "image_url": null,
+                "name": "Adela B."
+              }
+            }
+          ],
+          "categories": [
+            {
+              "title": "Thai",
+              "alias": "thai"
+            },
+            {
+              "title": "Bars",
+              "alias": "bars"
+            }
+          ],
+          "hours": [
+            {
+              "is_open_now": true
+            }
+          ],
+          "location": {
+            "formatted_address": "3839 W Sahara Ave\nSte 7-9\nLas Vegas, NV 89102"
+          }
+        }
+      ]
+    }
+  }
+}
+''';
diff --git a/lib/features/restaurant_tour/repositories/favorites_repository.dart b/lib/features/restaurant_tour/repositories/favorites_repository.dart
new file mode 100644
index 00000000..b7de99af
--- /dev/null
+++ b/lib/features/restaurant_tour/repositories/favorites_repository.dart
@@ -0,0 +1,32 @@
+import 'dart:convert';
+
+import 'package:restaurantour/features/restaurant_tour/models/restaurant.dart';
+import 'package:restaurantour/injection_container.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class FavoritesRepository {
+  FavoritesRepository();
+
+  List<Restaurant> loadFavorites() {
+    List<String>? result =
+        sl<SharedPreferences>().getStringList('favoritesList');
+
+    if (result != null) {
+      Iterable l = result
+          .map((item) => json.decode(item))
+          .cast<Map<String, dynamic>>()
+          .toList();
+      return l.map((model) => Restaurant.fromJson(model)).toList();
+    }
+    return [];
+  }
+
+  Future<void> saveFavorites(List<Restaurant> favorites) async {
+    List<String> favoriteStrings = favorites
+        .map((restaurant) => json.encode(restaurant.toJson()))
+        .toList();
+
+    await sl<SharedPreferences>()
+        .setStringList('favoritesList', favoriteStrings);
+  }
+}
diff --git a/lib/repositories/yelp_repository.dart b/lib/features/restaurant_tour/repositories/yelp_repository.dart
similarity index 87%
rename from lib/repositories/yelp_repository.dart
rename to lib/features/restaurant_tour/repositories/yelp_repository.dart
index f251d7b4..cbee95f8 100644
--- a/lib/repositories/yelp_repository.dart
+++ b/lib/features/restaurant_tour/repositories/yelp_repository.dart
@@ -1,8 +1,10 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
-import 'package:restaurantour/models/restaurant.dart';
+import 'package:restaurantour/features/restaurant_tour/models/restaurant.dart';
 
-const _apiKey = '<PUT YOUR API KEY HERE>';
+const _apiKey =
+    // 'XwtYYNAyjLinimPxNBejp7RQrwpmoNJROqcWNe9ATgdLTAUxaWjGOMRXJUTTVknNZAKPtWQJ7T--axaZAIyWWwEKEuTwhTxK_OZPXF76inU4isZVBBQgVwWfWw3MZXYx';
+    'L72HyuIheAzS2Udbq1a48QJWGU9nwd9P0jKSFAbxppNm9ir0zYCThJhP6YceYIMcdlbbnD4ha3mPzy57AOEwpiPHRcctyhzAqIEO7EUzHYTjNa9fNZf84Z05k9PPZXYx';
 
 class YelpRepository {
   late Dio dio;
diff --git a/lib/injection_container.dart b/lib/injection_container.dart
new file mode 100644
index 00000000..f923fc2f
--- /dev/null
+++ b/lib/injection_container.dart
@@ -0,0 +1,16 @@
+import 'package:get_it/get_it.dart';
+import 'package:restaurantour/features/restaurant_tour/repositories/favorites_repository.dart';
+import 'package:restaurantour/features/restaurant_tour/repositories/yelp_repository.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+final sl = GetIt.instance;
+
+Future<void> initializeDependencies() async {
+  // Repository
+  sl.registerSingleton<YelpRepository>(YelpRepository());
+  sl.registerSingleton<FavoritesRepository>(FavoritesRepository());
+
+  // Shared Preferences
+  final sharedPreferences = await SharedPreferences.getInstance();
+  sl.registerSingleton<SharedPreferences>(sharedPreferences);
+}
diff --git a/lib/main.dart b/lib/main.dart
index c6ce7473..1fedc103 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,7 +1,21 @@
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:restaurantour/repositories/yelp_repository.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:restaurantour/config/routes/routes.dart';
+import 'package:restaurantour/features/restaurant_tour/bloc/favorites_bloc/favorites_bloc.dart';
+import 'package:restaurantour/features/restaurant_tour/bloc/restaurant_bloc/restaurant_bloc.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/home_restaurant/home_restaurant.dart';
+import 'package:restaurantour/injection_container.dart';
+
+Future<void> main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+  await initializeDependencies();
+  LicenseRegistry.addLicense(() async* {
+    final license = await rootBundle.loadString('google_fonts/OFL.txt');
+    yield LicenseEntryWithLineBreaks(['google_fonts'], license);
+  });
 
-void main() {
   runApp(const Restaurantour());
 }
 
@@ -11,46 +25,22 @@ class Restaurantour extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
-      title: 'RestauranTour',
-      theme: ThemeData(
-        visualDensity: VisualDensity.adaptivePlatformDensity,
-      ),
-      home: const HomePage(),
-    );
-  }
-}
-
-class HomePage extends StatelessWidget {
-  const HomePage({Key? key}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Center(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: [
-            const Text('Restaurantour'),
-            ElevatedButton(
-              child: const Text('Fetch Restaurants'),
-              onPressed: () async {
-                final yelpRepo = YelpRepository();
-
-                try {
-                  final result = await yelpRepo.getRestaurants();
-                  if (result != null) {
-                    print('Fetched ${result.restaurants!.length} restaurants');
-                  } else {
-                    print('No restaurants fetched');
-                  }
-                } catch (e) {
-                  print('Failed to fetch restaurants: $e');
-                }
-              },
-            ),
-          ],
+    return MultiBlocProvider(
+      providers: [
+        BlocProvider<RestaurantBloc>(
+          create: (context) => RestaurantBloc()..add(LoadRestaurantsEvent()),
+        ),
+        BlocProvider<FavoritesBloc>(
+          create: (context) => FavoritesBloc()..add(LoadFavoritesEvent()),
+        ),
+      ],
+      child: MaterialApp(
+        title: 'RestauranTour',
+        onGenerateRoute: AppRoutes.onGenerateRoute,
+        theme: ThemeData(
+          visualDensity: VisualDensity.adaptivePlatformDensity,
         ),
+        home: const HomeResturant(),
       ),
     );
   }
diff --git a/lib/theme/style.dart b/lib/theme/style.dart
new file mode 100644
index 00000000..084f6eaa
--- /dev/null
+++ b/lib/theme/style.dart
@@ -0,0 +1,70 @@
+import 'package:flutter/material.dart';
+
+const Color defaultTextColor = Color(0xFF000000);
+const Color secondaryTextColor = Color(0xFF606060);
+const Color dividerColor = Color(0xFFEEEEEE);
+const Color accentColor = Color(0xFF000000);
+const Color backgroundColor = Color(0xFFFAFAFA);
+const Color starColor = Color(0xFFFFB800);
+const Color openColor = Color(0xFF5CD313);
+const Color closeColor = Color(0xFFEA5E5E);
+
+const TextStyle bigTitleStyle = TextStyle(
+  fontWeight: FontWeight.w700,
+  color: defaultTextColor,
+  fontSize: 30.0,
+  fontFamily: 'Lora',
+);
+
+const TextStyle titleStyle = TextStyle(
+  fontWeight: FontWeight.w700,
+  color: defaultTextColor,
+  fontSize: 18.0,
+  fontFamily: 'Lora',
+);
+
+const TextStyle subtitleStyle = TextStyle(
+  fontWeight: FontWeight.w600,
+  color: defaultTextColor,
+  height: 1.5,
+  fontSize: 16.0,
+  fontFamily: 'Lora',
+);
+
+const TextStyle contentSubtitleStyle = TextStyle(
+  fontWeight: FontWeight.w600,
+  color: defaultTextColor,
+  height: 1.5,
+  fontSize: 14.0,
+  fontFamily: 'OpenSans',
+);
+
+const TextStyle contentStyle = TextStyle(
+  fontWeight: FontWeight.w400,
+  color: defaultTextColor,
+  height: 1.5,
+  fontSize: 16.0,
+  fontFamily: 'OpenSans',
+);
+
+const TextStyle buttonStyle = TextStyle(
+  fontWeight: FontWeight.w600,
+  color: defaultTextColor,
+  fontSize: 14.0,
+  fontFamily: 'OpenSans',
+);
+
+const TextStyle captionStyle = TextStyle(
+  fontWeight: FontWeight.w400,
+  color: defaultTextColor,
+  fontSize: 12.0,
+  fontFamily: 'OpenSans',
+);
+
+const TextStyle overlineStyle = TextStyle(
+  fontWeight: FontWeight.w400,
+  color: defaultTextColor,
+  fontStyle: FontStyle.italic,
+  fontSize: 12.0,
+  fontFamily: 'OpenSans',
+);
diff --git a/pubspec.lock b/pubspec.lock
index 0b052c68..d8888034 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,26 +5,42 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a
+      sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
       url: "https://pub.dev"
     source: hosted
-    version: "61.0.0"
+    version: "67.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562
+      sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
       url: "https://pub.dev"
     source: hosted
-    version: "5.13.0"
+    version: "6.4.1"
+  ansicolor:
+    dependency: transitive
+    description:
+      name: ansicolor
+      sha256: "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.4.10"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: "0bd9a99b6eb96f07af141f0eb53eace8983e8e5aa5de59777aca31684680ef22"
+      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.2"
   async:
     dependency: transitive
     description:
@@ -33,6 +49,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.11.0"
+  bloc:
+    dependency: transitive
+    description:
+      name: bloc
+      sha256: f53a110e3b48dcd78136c10daa5d51512443cea5e1348c9d80a320095fa2db9e
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.1.3"
+  bloc_test:
+    dependency: "direct dev"
+    description:
+      name: bloc_test
+      sha256: "55a48f69e0d480717067c5377c8485a3fcd41f1701a820deef72fa0f4ee7215f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.1.6"
   boolean_selector:
     dependency: transitive
     description:
@@ -45,10 +77,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777"
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.4.1"
   build_config:
     dependency: transitive
     description:
@@ -61,18 +93,18 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65"
+      sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.0.1"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20"
+      sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.4.2"
   build_runner:
     dependency: "direct dev"
     description:
@@ -85,10 +117,10 @@ packages:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: f4d6244cc071ba842c296cb1c4ee1b31596b9f924300647ac7a1445493471a3f
+      sha256: "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799"
       url: "https://pub.dev"
     source: hosted
-    version: "7.2.3"
+    version: "7.3.0"
   built_collection:
     dependency: transitive
     description:
@@ -101,10 +133,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: b6c9911b2d670376918d5b8779bc27e0e612a94ec3ff0343689e991d8d0a3b8a
+      sha256: a3ec2e0f967bc47f69f95009bb93db936288d61d5343b9436e378b28a2f830c6
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.4"
+    version: "8.9.0"
   characters:
     dependency: transitive
     description:
@@ -113,22 +145,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
-  charcode:
+  checked_yaml:
     dependency: transitive
     description:
-      name: charcode
-      sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306
+      name: checked_yaml
+      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
-  checked_yaml:
+    version: "2.0.3"
+  cli_util:
     dependency: transitive
     description:
-      name: checked_yaml
-      sha256: dd007e4fb8270916820a0d66e24f619266b60773cddd082c6439341645af2659
+      name: cli_util
+      sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "0.4.1"
   clock:
     dependency: transitive
     description:
@@ -157,18 +189,34 @@ packages:
     dependency: transitive
     description:
       name: convert
-      sha256: f08428ad63615f96a27e34221c65e1a451439b5f26030f78d790f461c686d65d
+      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.1"
+  coverage:
+    dependency: transitive
+    description:
+      name: coverage
+      sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "1.7.2"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: cf75650c66c0316274e21d7c43d3dea246273af5955bd94e8184837cd577575c
+      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.0.3"
+  csslib:
+    dependency: transitive
+    description:
+      name: csslib
+      sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -181,10 +229,18 @@ packages:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
+      sha256: "40ae61a5d43feea6d24bd22c0537a6629db858963b99b4bc1c3db80676f32368"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.4"
+  diff_match_patch:
+    dependency: transitive
+    description:
+      name: diff_match_patch
+      sha256: "2efc9e6e8f449d0abe15be240e2c2a3bcd977c8d126cfd70598aee60af35c0a4"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.1"
   dio:
     dependency: "direct main"
     description:
@@ -193,6 +249,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.4.0"
+  equatable:
+    dependency: "direct main"
+    description:
+      name: equatable
+      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.5"
   fake_async:
     dependency: transitive
     description:
@@ -201,27 +265,51 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: b69516f2c26a5bcac4eee2e32512e1a5205ab312b3536c1c1227b2b942b5f9ad
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.2"
+    version: "7.0.0"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      sha256: "6a2ef17156f4dc49684f9d99aaf4a93aba8ac49f5eac861755f5730ddf6e2e4e"
+      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   flutter:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_bloc:
+    dependency: "direct main"
+    description:
+      name: flutter_bloc
+      sha256: "87325da1ac757fcc4813e6b34ed5dd61169973871fdf181d6c2109dd6935ece1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.1.4"
+  flutter_launcher_icons:
+    dependency: "direct dev"
+    description:
+      name: flutter_launcher_icons
+      sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.13.1"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -230,6 +318,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.4"
+  flutter_native_splash:
+    dependency: "direct dev"
+    description:
+      name: flutter_native_splash
+      sha256: "558f10070f03ee71f850a78f7136ab239a67636a294a44a06b6b7345178edb1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.10"
   flutter_svg:
     dependency: "direct main"
     description:
@@ -243,6 +339,19 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  fluttertoast:
+    dependency: "direct main"
+    description:
+      name: fluttertoast
+      sha256: dfdde255317af381bfc1c486ed968d5a43a2ded9c931e87cbecd88767d6a71c1
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.2.4"
   frontend_server_client:
     dependency: transitive
     description:
@@ -251,14 +360,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.2.0"
+  get_it:
+    dependency: "direct main"
+    description:
+      name: get_it
+      sha256: e6017ce7fdeaf218dc51a100344d8cb70134b80e28b760f8bb23c242437bafd7
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.6.7"
   glob:
     dependency: transitive
     description:
       name: glob
-      sha256: "8321dd2c0ab0683a91a51307fa844c6db4aa8e3981219b78961672aaab434658"
+      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.2"
   graphs:
     dependency: transitive
     description:
@@ -267,38 +384,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.3.1"
+  html:
+    dependency: transitive
+    description:
+      name: html
+      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.15.4"
   http_multi_server:
     dependency: transitive
     description:
       name: http_multi_server
-      sha256: bfb651625e251a88804ad6d596af01ea903544757906addcb2dcdf088b5ea185
+      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.1"
+    version: "3.2.1"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      sha256: e362d639ba3bc07d5a71faebb98cde68c05bfbcfbbb444b60b6f60bb67719185
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.2"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.1.7"
   io:
     dependency: transitive
     description:
       name: io
-      sha256: "0d4c73c3653ab85bf696d51a9657604c900a370549196a91f33e4c39af760852"
+      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   js:
     dependency: transitive
     description:
       name: js
-      sha256: d9bdfd70d828eeb352390f81b18d6a354ef2044aa28ef25682079797fa7cd174
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.3"
+    version: "0.6.7"
   json_annotation:
     dependency: "direct main"
     description:
@@ -315,6 +448,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.7.1"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.0"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   lints:
     dependency: transitive
     description:
@@ -327,58 +484,90 @@ packages:
     dependency: transitive
     description:
       name: logging
-      sha256: "293ae2d49fd79d4c04944c3a26dfd313382d5f52e821ec57119230ae16031ad4"
+      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.2.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      sha256: fd5f81041e6a9fc9b9d7fa2cb8a01123f9f5d5d49136e06cb9dc7d33689529f4
+      sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.5"
+  mockito:
+    dependency: "direct dev"
+    description:
+      name: mockito
+      sha256: "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.4.4"
+  mocktail:
+    dependency: transitive
+    description:
+      name: mocktail
+      sha256: c4b5007d91ca4f67256e720cb1b6d704e79a510183a12fa551021f652577dce6
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.3"
+  nested:
+    dependency: transitive
+    description:
+      name: nested
+      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
+  node_preamble:
+    dependency: transitive
+    description:
+      name: node_preamble
+      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      sha256: a4d5ede5ca9c3d88a2fef1147a078570c861714c806485c596b109819135bc12
+      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_parsing:
     dependency: transitive
     description:
@@ -387,6 +576,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.1"
+  path_provider_linux:
+    dependency: transitive
+    description:
+      name: path_provider_linux
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  path_provider_windows:
+    dependency: transitive
+    description:
+      name: path_provider_windows
+      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
   petitparser:
     dependency: transitive
     description:
@@ -395,46 +608,158 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.2"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.4"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.8"
+  pointycastle:
+    dependency: transitive
+    description:
+      name: pointycastle
+      sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.7.4"
   pool:
     dependency: transitive
     description:
       name: pool
-      sha256: "05955e3de2683e1746222efd14b775df7131139e07695dc8e24650f6b4204504"
+      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "1.5.1"
+  provider:
+    dependency: transitive
+    description:
+      name: provider
+      sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.1"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: b5a5fcc6425ea43704852ba4453ba94b08c2226c63418a260240c3a054579014
+      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.4"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: "3686efe4a4613a4449b1a4ae08670aadbd3376f2e78d93e3f8f0919db02a7256"
+      sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.3"
+  shared_preferences:
+    dependency: "direct main"
+    description:
+      name: shared_preferences
+      sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.2"
+  shared_preferences_android:
+    dependency: transitive
+    description:
+      name: shared_preferences_android
+      sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  shared_preferences_foundation:
+    dependency: transitive
+    description:
+      name: shared_preferences_foundation
+      sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.5"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
+  shared_preferences_platform_interface:
+    dependency: transitive
+    description:
+      name: shared_preferences_platform_interface
+      sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
+  shared_preferences_web:
+    dependency: transitive
+    description:
+      name: shared_preferences_web
+      sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.2"
+  shared_preferences_windows:
+    dependency: transitive
+    description:
+      name: shared_preferences_windows
+      sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
   shelf:
     dependency: transitive
     description:
       name: shelf
-      sha256: c240984c924796e055e831a0a36db23be8cb04f170b26df572931ab36418421d
+      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.4.1"
+  shelf_packages_handler:
+    dependency: transitive
+    description:
+      name: shelf_packages_handler
+      sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.2"
+  shelf_static:
+    dependency: transitive
+    description:
+      name: shelf_static
+      sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: fd84910bf7d58db109082edf7326b75322b8f186162028482f53dc892f00332d
+      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.4"
+  shimmer:
+    dependency: "direct main"
+    description:
+      name: shimmer
+      sha256: "5f88c883a22e9f9f299e5ba0e4f7e6054857224976a5d9f839d4ebdc94a14ac9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -456,6 +781,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.4"
+  source_map_stack_trace:
+    dependency: transitive
+    description:
+      name: source_map_stack_trace
+      sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  source_maps:
+    dependency: transitive
+    description:
+      name: source_maps
+      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.12"
   source_span:
     dependency: transitive
     description:
@@ -484,10 +825,10 @@ packages:
     dependency: transitive
     description:
       name: stream_transform
-      sha256: ed464977cb26a1f41537e177e190c67223dbd9f4f683489b6ab2e5d211ec564e
+      sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
@@ -504,6 +845,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
+  test:
+    dependency: transitive
+    description:
+      name: test
+      sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.24.9"
   test_api:
     dependency: transitive
     description:
@@ -512,46 +861,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.1"
+  test_core:
+    dependency: transitive
+    description:
+      name: test_core
+      sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.9"
   timing:
     dependency: transitive
     description:
       name: timing
-      sha256: c386d07d7f5efc613479a7c4d9d64b03710b03cfaa7e8ad5f2bfb295a1f0dfad
+      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      sha256: "53bdf7e979cfbf3e28987552fd72f637e63f3c8724c9e56d9246942dc2fa36ee"
+      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.2"
+  universal_io:
+    dependency: transitive
+    description:
+      name: universal_io
+      sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.2"
   vector_graphics:
     dependency: transitive
     description:
       name: vector_graphics
-      sha256: "18f6690295af52d081f6808f2f7c69f0eed6d7e23a71539d75f4aeb8f0062172"
+      sha256: "4ac59808bbfca6da38c99f415ff2d3a5d7ca0a6b4809c71d9cf30fba5daf9752"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.9+2"
+    version: "1.1.10+1"
   vector_graphics_codec:
     dependency: transitive
     description:
       name: vector_graphics_codec
-      sha256: "531d20465c10dfac7f5cd90b60bbe4dd9921f1ec4ca54c83ebb176dbacb7bb2d"
+      sha256: f3247e7ab0ec77dc759263e68394990edc608fb2b480b80db8aa86ed09279e33
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.9+2"
+    version: "1.1.10+1"
   vector_graphics_compiler:
     dependency: transitive
     description:
       name: vector_graphics_compiler
-      sha256: "03012b0a33775c5530576b70240308080e1d5050f0faf000118c20e6463bc0ad"
+      sha256: "18489bdd8850de3dd7ca8a34e0c446f719ec63e2bab2e7a8cc66a9028dd76c5a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.9+2"
+    version: "1.1.10+1"
   vector_math:
     dependency: transitive
     description:
@@ -560,30 +925,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      url: "https://pub.dev"
+    source: hosted
+    version: "13.0.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      sha256: e42dfcc48f67618344da967b10f62de57e04bae01d9d3af4c2596f3712a88c99
+      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   web:
     dependency: transitive
     description:
       name: web
-      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05"
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.2"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: "0c2ada1b1aeb2ad031ca81872add6be049b8cb479262c6ad3c4b0f9c24eaab2f"
+      sha256: "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.4.3"
+  webkit_inspection_protocol:
+    dependency: transitive
+    description:
+      name: webkit_inspection_protocol
+      sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
+  win32:
+    dependency: transitive
+    description:
+      name: win32
+      sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.2.0"
+  xdg_directories:
+    dependency: transitive
+    description:
+      name: xdg_directories
+      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
   xml:
     dependency: transitive
     description:
@@ -596,10 +993,10 @@ packages:
     dependency: transitive
     description:
       name: yaml
-      sha256: "3cee79b1715110341012d27756d9bae38e650588acd38d3f3c610822e1337ace"
+      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.2"
 sdks:
-  dart: ">=3.2.0 <4.0.0"
-  flutter: ">=3.7.0-0"
+  dart: ">=3.3.0-279.1.beta <4.0.0"
+  flutter: ">=3.16.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index be3055e0..2df1a610 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,11 +1,10 @@
 name: restaurantour
 description: Flutter developer coding challenge starter project.
 
-publish_to: 'none'
+publish_to: "none"
 
 version: 1.0.0+1
 
-
 environment:
   sdk: ">=2.12.0 <3.0.0"
 
@@ -17,6 +16,24 @@ dependencies:
   json_annotation: ^4.8.1
   flutter_svg: ^2.0.9
 
+  # state management
+  flutter_bloc: ^8.1.4
+
+  # service locator
+  get_it: ^7.6.4
+
+  # shimer
+  shimmer: ^3.0.0
+
+  # for local DB
+  shared_preferences: ^2.2.2
+
+  # toast
+  fluttertoast: ^8.2.4
+
+  # comparing dart objects
+  equatable: ^2.0.5
+
 dev_dependencies:
   flutter_test:
     sdk: flutter
@@ -24,7 +41,83 @@ dev_dependencies:
   build_runner: ^2.4.8
   json_serializable: ^6.7.1
 
+  # for bloc testing
+  bloc_test: ^9.1.6
+  mockito: ^5.4.4
+
+  # Logo
+  flutter_launcher_icons: "^0.13.1"
+
+  # Splash
+  flutter_native_splash: ^2.3.7
+
+flutter_launcher_icons:
+  android: "launcher_icon"
+  ios: true
+  image_path: "assets/images/superformula_logo.jpeg"
+  min_sdk_android: 21
+  remove_alpha_ios: true
+flutter_native_splash:
+  color: "#232323"
+  image: "assets/images/superformula_logo.jpeg"
+  web: false
+
 flutter:
   uses-material-design: true
-#  assets:
-#    - assets/svg/
\ No newline at end of file
+  assets:
+    - assets/images/
+  #    - assets/svg/
+
+  fonts:
+    - family: Lora
+      fonts:
+        - asset: assets/fonts/Lora/Lora-Regular.ttf
+        - asset: assets/fonts/Lora/Lora-Medium.ttf
+          weight: 500
+        - asset: assets/fonts/Lora/Lora-SemiBold.ttf
+          weight: 600
+        - asset: assets/fonts/Lora/Lora-Bold.ttf
+          weight: 700
+        - asset: assets/fonts/Lora/Lora-Italic.ttf
+          style: italic
+        - asset: assets/fonts/Lora/Lora-MediumItalic.ttf
+          weight: 500
+          style: italic
+        - asset: assets/fonts/Lora/Lora-SemiBoldItalic.ttf
+          weight: 600
+          style: italic
+        - asset: assets/fonts/Lora/Lora-BoldItalic.ttf
+          weight: 700
+          style: italic
+    - family: OpenSans
+      fonts:
+        - asset: assets/fonts/Open_Sans/OpenSans-Light.ttf
+          weight: 300
+        - asset: assets/fonts/Open_Sans/OpenSans-Regular.ttf
+          weight: 400
+        - asset: assets/fonts/Open_Sans/OpenSans-Medium.ttf
+          weight: 500
+        - asset: assets/fonts/Open_Sans/OpenSans-SemiBold.ttf
+          weight: 600
+        - asset: assets/fonts/Open_Sans/OpenSans-Bold.ttf
+          weight: 700
+        - asset: assets/fonts/Open_Sans/OpenSans-ExtraBold.ttf
+          weight: 800
+        - asset: assets/fonts/Open_Sans/OpenSans-LightItalic.ttf
+          weight: 300
+          style: italic
+        - asset: assets/fonts/Open_Sans/OpenSans-Italic.ttf
+          weight: 400
+          style: italic
+        - asset: assets/fonts/Open_Sans/OpenSans-MediumItalic.ttf
+          weight: 500
+          style: italic
+        - asset: assets/fonts/Open_Sans/OpenSans-SemiBoldItalic.ttf
+          weight: 600
+          style: italic
+        - asset: assets/fonts/Open_Sans/OpenSans-BoldItalic.ttf
+          weight: 700
+          style: italic
+        - asset: assets/fonts/Open_Sans/OpenSans-ExtraBoldItalic.ttf
+          weight: 800
+          style: italic
diff --git a/test/blocs/restaurant/restaurant_bloc_test.dart b/test/blocs/restaurant/restaurant_bloc_test.dart
new file mode 100644
index 00000000..ddebb258
--- /dev/null
+++ b/test/blocs/restaurant/restaurant_bloc_test.dart
@@ -0,0 +1,48 @@
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mocktail/mocktail.dart';
+import 'package:bloc_test/bloc_test.dart';
+import 'package:restaurantour/features/restaurant_tour/bloc/restaurant_bloc/restaurant_bloc.dart';
+import 'package:restaurantour/features/restaurant_tour/repositories/dummy_repository.dart';
+import 'package:restaurantour/features/restaurant_tour/repositories/yelp_repository.dart';
+
+class MockYelpRepository extends Mock implements YelpRepository {}
+
+void main() {
+  group('restaurant bloc', () {
+    // ignore: unused_local_variable
+    late RestaurantBloc restaurantBloc;
+    late DummyRepository dummyRepository;
+
+    blocTest<RestaurantBloc, RestaurantState>(
+      'emits Loaded state when successful.',
+      build: () {
+        dummyRepository = DummyRepository();
+        return restaurantBloc =
+            RestaurantBloc(dummyRepository: dummyRepository);
+      },
+      act: (bloc) async {
+        bloc.add(LoadRestaurantsEvent());
+      },
+      expect: () => [
+        RestaurantLoading(),
+        RestaurantLoaded(),
+      ],
+    );
+
+    blocTest<RestaurantBloc, RestaurantState>(
+      'emits NotLoaded state when it could not load.',
+      build: () {
+        dummyRepository = DummyRepository(success: false);
+        return restaurantBloc =
+            RestaurantBloc(dummyRepository: dummyRepository);
+      },
+      act: (bloc) async {
+        bloc.add(LoadRestaurantsEvent());
+      },
+      expect: () => [
+        RestaurantLoading(),
+        RestaurantNotLoaded(),
+      ],
+    );
+  });
+}
diff --git a/test/widget_test.dart b/test/widget_test.dart
index 83fbeae4..5c8ef8a5 100644
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -1,20 +1,45 @@
-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility that Flutter provides. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
+import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:mockito/mockito.dart';
+import 'package:restaurantour/features/restaurant_tour/models/restaurant.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/widgets/open_now_widget.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/widgets/restaurant_card.dart';
+import 'package:restaurantour/features/restaurant_tour/presentation/widgets/star_rating.dart';
 
-import 'package:restaurantour/main.dart';
+class MockNavigatorObserver extends Mock implements NavigatorObserver {}
 
 void main() {
-  testWidgets('Page loads', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(const Restaurantour());
+  testWidgets(
+    'RestaurantCard displays restaurant details',
+    (WidgetTester tester) async {
+      final mockObserver = MockNavigatorObserver();
+
+      Restaurant testRestaurant = Restaurant(
+        id: '1',
+        name: 'Test Restaurant',
+        price: '\$\$',
+        categories: [Category(title: 'Test Category')],
+        photos: [''],
+        rating: 4.5,
+        hours: [
+          const Hours(isOpenNow: true),
+        ],
+      );
+
+      await tester.pumpWidget(
+        MaterialApp(
+          navigatorObservers: [mockObserver],
+          home: Scaffold(
+            body: RestaurantCard(restaurant: testRestaurant, isTest: true),
+          ),
+        ),
+      );
 
-    // Verify that tests will run
-    expect(find.text('Fetch Restaurants'), findsOneWidget);
-  });
+      expect(find.text('Test Restaurant'), findsOneWidget);
+      expect(find.text('\$\$'), findsOneWidget);
+      expect(find.text('Test Category'), findsOneWidget);
+      expect(find.byType(StarRating), findsOneWidget);
+      expect(find.byType(OpenNowWidget), findsOneWidget);
+    },
+  );
 }