diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..2d72358
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,4 @@
+[*.{kt,kts}]
+insert_final_newline=false
+max_line_length=off
+ktlint_disabled_rules=no-wildcard-imports,import-ordering,trailing-comma,final-newline, package-name
\ No newline at end of file
diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml
new file mode 100644
index 0000000..62a1c91
--- /dev/null
+++ b/.github/workflows/pull-request-build.yml
@@ -0,0 +1,40 @@
+name: Build and test
+
+on:
+  pull_request:
+    branches:
+      [ main ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: setup JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+          cache: 'gradle'
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Cache Gradle
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Run ktlintFormat on the codebase
+        run: ./gradlew ktlintFormat
+
+      - name: Run ktlintCheck on the codebase
+        run: ./gradlew ktlintCheck
+
+      - name: Run Unit Tests
+        run: ./gradlew test
+
+      - name: Run debug Build
+        run: ./gradlew assembleDebug
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2cd4d77..61a3d27 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
@@ -26,6 +27,7 @@
             <option value="$PROJECT_DIR$/buildlogic" />
             <option value="$PROJECT_DIR$/buildlogic/convention" />
             <option value="$PROJECT_DIR$/data" />
+            <option value="$PROJECT_DIR$/designsystem" />
             <option value="$PROJECT_DIR$/domain" />
             <option value="$PROJECT_DIR$/presentation" />
           </set>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0ad17cb..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 44353bf..8091d4f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -35,6 +35,7 @@ android {
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
+        isCoreLibraryDesugaringEnabled = true
     }
     kotlinOptions {
         jvmTarget = "17"
@@ -44,9 +45,10 @@ android {
 dependencies {
     implementation(project(":presentation"))
     implementation(project(":designsystem"))
+    coreLibraryDesugaring(libs.android.desugarJdkLibs)
     debugImplementation(libs.leakcanary.android)
     implementation(libs.core.ktx)
     implementation(libs.timber)
     implementation(libs.lifecycle.runtime.ktx)
     implementation(libs.activity.compose)
-}
\ No newline at end of file
+}
diff --git a/app/src/androidTest/java/com/danielwaiguru/weatherapp/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/danielwaiguru/weatherapp/ExampleInstrumentedTest.kt
deleted file mode 100644
index 188dcd6..0000000
--- a/app/src/androidTest/java/com/danielwaiguru/weatherapp/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.danielwaiguru.weatherapp
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.danielwaiguru.weatherapp", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 72dd55d..f9177f3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
-        android:name=".WeatherApp"
+        android:name=".WeatherApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -16,7 +16,7 @@
         android:theme="@style/Theme.WeatherApp"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name=".activity.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.WeatherApp">
diff --git a/app/src/main/java/com/danielwaiguru/weatherapp/MainActivity.kt b/app/src/main/java/com/danielwaiguru/weatherapp/MainActivity.kt
deleted file mode 100644
index a599df0..0000000
--- a/app/src/main/java/com/danielwaiguru/weatherapp/MainActivity.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.danielwaiguru.weatherapp
-
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
-import com.danielwaiguru.weatherapp.designsystem.theme.WeatherAppTheme
-import dagger.hilt.android.AndroidEntryPoint
-
-@AndroidEntryPoint
-class MainActivity : ComponentActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContent {
-            WeatherAppTheme {
-                // A surface container using the 'background' color from the theme
-                Surface(
-                    modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colorScheme.background
-                ) {
-                    Greeting("Android")
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun Greeting(name: String, modifier: Modifier = Modifier) {
-    Text(
-        text = "Hello $name!",
-        modifier = modifier
-    )
-}
-
-@Preview(showBackground = true)
-@Composable
-fun GreetingPreview() {
-    com.danielwaiguru.weatherapp.designsystem.theme.WeatherAppTheme {
-        Greeting("Android")
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/danielwaiguru/weatherapp/WeatherApp.kt b/app/src/main/java/com/danielwaiguru/weatherapp/WeatherApplication.kt
similarity index 75%
rename from app/src/main/java/com/danielwaiguru/weatherapp/WeatherApp.kt
rename to app/src/main/java/com/danielwaiguru/weatherapp/WeatherApplication.kt
index 7ff405b..48b3987 100644
--- a/app/src/main/java/com/danielwaiguru/weatherapp/WeatherApp.kt
+++ b/app/src/main/java/com/danielwaiguru/weatherapp/WeatherApplication.kt
@@ -4,4 +4,4 @@ import android.app.Application
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class WeatherApp: Application()
\ No newline at end of file
+class WeatherApplication : Application()
diff --git a/app/src/main/java/com/danielwaiguru/weatherapp/activity/MainActivity.kt b/app/src/main/java/com/danielwaiguru/weatherapp/activity/MainActivity.kt
new file mode 100644
index 0000000..5d5249e
--- /dev/null
+++ b/app/src/main/java/com/danielwaiguru/weatherapp/activity/MainActivity.kt
@@ -0,0 +1,17 @@
+package com.danielwaiguru.weatherapp.activity
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import com.danielwaiguru.weatherapp.navigation.WeatherApp
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            WeatherApp()
+        }
+    }
+}
diff --git a/app/src/main/java/com/danielwaiguru/weatherapp/navigation/WeatherAppNvaigation.kt b/app/src/main/java/com/danielwaiguru/weatherapp/navigation/WeatherAppNvaigation.kt
new file mode 100644
index 0000000..3fa9aaf
--- /dev/null
+++ b/app/src/main/java/com/danielwaiguru/weatherapp/navigation/WeatherAppNvaigation.kt
@@ -0,0 +1,32 @@
+package com.danielwaiguru.weatherapp.navigation
+
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.rememberNavController
+import com.danielwaiguru.weatherapp.designsystem.theme.WeatherAppTheme
+import com.danielwaiguru.weatherapp.presentation.permissions.navigation.PermissionsScreenDestination
+import com.danielwaiguru.weatherapp.presentation.permissions.navigation.permissionsScreen
+import com.danielwaiguru.weatherapp.presentation.weather.navigation.weatherScreen
+
+@Composable
+fun WeatherApp() {
+    WeatherAppTheme {
+        val navController = rememberNavController()
+        Surface(
+            modifier = Modifier.fillMaxSize(),
+            color = MaterialTheme.colorScheme.background
+        ) {
+            NavHost(
+                navController = navController,
+                startDestination = PermissionsScreenDestination.route
+            ) {
+                permissionsScreen(navController = navController)
+                weatherScreen()
+            }
+        }
+    }
+}
diff --git a/app/src/test/java/com/danielwaiguru/weatherapp/ExampleUnitTest.kt b/app/src/test/java/com/danielwaiguru/weatherapp/ExampleUnitTest.kt
deleted file mode 100644
index 1740df3..0000000
--- a/app/src/test/java/com/danielwaiguru/weatherapp/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.danielwaiguru.weatherapp
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/build-logic/convention/src/main/java/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/java/AndroidLibraryConventionPlugin.kt
index 0eb1e18..549d5b2 100644
--- a/build-logic/convention/src/main/java/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/java/AndroidLibraryConventionPlugin.kt
@@ -37,6 +37,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
             dependencies {
                 add("androidTestImplementation", kotlin("test"))
                 add("testImplementation", kotlin("test"))
+                add("coreLibraryDesugaring", libs.findLibrary("android-desugarJdkLibs").get())
                 "implementation"(libs.findLibrary("timber").get())
             }
         }
diff --git a/build-logic/convention/src/main/java/com/danielwaiguru/weatherapp/convention/KotlinAndroid.kt b/build-logic/convention/src/main/java/com/danielwaiguru/weatherapp/convention/KotlinAndroid.kt
index 3c2c6ff..07d76f5 100644
--- a/build-logic/convention/src/main/java/com/danielwaiguru/weatherapp/convention/KotlinAndroid.kt
+++ b/build-logic/convention/src/main/java/com/danielwaiguru/weatherapp/convention/KotlinAndroid.kt
@@ -36,6 +36,7 @@ internal fun Project.configureKotlinAndroid(
         compileOptions {
             sourceCompatibility = JavaVersion.VERSION_17
             targetCompatibility = JavaVersion.VERSION_17
+            isCoreLibraryDesugaringEnabled = true
         }
 
         kotlinOptions {
diff --git a/build.gradle.kts b/build.gradle.kts
index c3e0ee6..1fbd011 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,5 +7,35 @@ plugins {
     alias(libs.plugins.org.jetbrains.kotlin.jvm) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.hilt) apply false
+    alias(libs.plugins.ktlint)
+    alias(libs.plugins.spotless)
+}
+true // Needed to make the Suppress annotation work for the plugins block
+
+allprojects {
+    apply(plugin = "org.jlleitschuh.gradle.ktlint")
+    ktlint {
+        android.set(true)
+        ignoreFailures.set(false)
+        reporters {
+            org.jlleitschuh.gradle.ktlint.reporter.ReporterType.CHECKSTYLE
+        }
+        filter {
+            exclude { element -> element.file.path.contains("generated/") }
+        }
+    }
+}
+
+subprojects {
+    apply(plugin = "com.diffplug.spotless")
+    spotless {
+        kotlin {
+            target("**/*.kt")
+            targetExclude("${project.rootDir}/build-logic/**/*.kt")
+        }
+        format("kts") {
+            target("**/*.kts")
+            targetExclude("**/build/**/*.kts")
+        }
+    }
 }
-true // Needed to make the Suppress annotation work for the plugins block
\ No newline at end of file
diff --git a/buildlogic/build/intermediates/ktLint/reporterProviders.bin b/buildlogic/build/intermediates/ktLint/reporterProviders.bin
new file mode 100644
index 0000000..11e8bd3
Binary files /dev/null and b/buildlogic/build/intermediates/ktLint/reporterProviders.bin differ
diff --git a/buildlogic/build/intermediates/ktLint/reporters.bin b/buildlogic/build/intermediates/ktLint/reporters.bin
new file mode 100644
index 0000000..4298a79
Binary files /dev/null and b/buildlogic/build/intermediates/ktLint/reporters.bin differ
diff --git a/buildlogic/convention/build/intermediates/ktLint/reporterProviders.bin b/buildlogic/convention/build/intermediates/ktLint/reporterProviders.bin
new file mode 100644
index 0000000..11e8bd3
Binary files /dev/null and b/buildlogic/convention/build/intermediates/ktLint/reporterProviders.bin differ
diff --git a/buildlogic/convention/build/intermediates/ktLint/reporters.bin b/buildlogic/convention/build/intermediates/ktLint/reporters.bin
new file mode 100644
index 0000000..4298a79
Binary files /dev/null and b/buildlogic/convention/build/intermediates/ktLint/reporters.bin differ
diff --git a/codeAnalysis.sh b/codeAnalysis.sh
new file mode 100755
index 0000000..2ede1e5
--- /dev/null
+++ b/codeAnalysis.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+./gradlew ktlintFormat && ./gradlew ktlintCheck && ./gradlew spotlessApply
+
+# Before use it, in the first time, you must guarantee some running permissions:
+# chmod +x codeAnalysis.sh
+#
+# After that, you just need to run:
+# ./codeAnalysis.sh
\ No newline at end of file
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index d67fe78..1501935 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -16,8 +16,8 @@ dependencies {
     implementation(project(":domain"))
     // Networking
     implementation(libs.bundles.network)
+    implementation(libs.play.services.location)
     // Chucker
     debugImplementation(libs.chucker.debug)
     releaseImplementation(libs.chucker)
-
-}
\ No newline at end of file
+}
diff --git a/data/schemas/com.danielwaiguru.weatherapp.data.sources.local.database.WeatherAppDatabase/1.json b/data/schemas/com.danielwaiguru.weatherapp.data.sources.local.database.WeatherAppDatabase/1.json
index a54bbe3..f5a6af9 100644
--- a/data/schemas/com.danielwaiguru.weatherapp.data.sources.local.database.WeatherAppDatabase/1.json
+++ b/data/schemas/com.danielwaiguru.weatherapp.data.sources.local.database.WeatherAppDatabase/1.json
@@ -2,11 +2,11 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "9dd3e8d8626a31c84a8a8a978d3d710a",
+    "identityHash": "ca1cb6d48bf56cefa11a6ab97f65bce2",
     "entities": [
       {
         "tableName": "current_weather",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`description` TEXT NOT NULL, `icon` TEXT NOT NULL, `id` INTEGER NOT NULL, `city` TEXT NOT NULL, `country` TEXT NOT NULL, `temp` REAL NOT NULL, `tempMin` REAL NOT NULL, `tempMax` REAL NOT NULL, `date` INTEGER NOT NULL, `lastUpdateAt` INTEGER NOT NULL, `latitude` REAL NOT NULL, `longitude` REAL NOT NULL, PRIMARY KEY(`id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`description` TEXT NOT NULL, `icon` TEXT NOT NULL, `id` INTEGER NOT NULL, `city` TEXT NOT NULL, `country` TEXT NOT NULL, `conditionId` INTEGER NOT NULL, `temp` REAL NOT NULL, `tempMin` REAL NOT NULL, `tempMax` REAL NOT NULL, `date` INTEGER NOT NULL, `lastUpdateAt` INTEGER NOT NULL, `latitude` REAL NOT NULL, `longitude` REAL NOT NULL, PRIMARY KEY(`id`))",
         "fields": [
           {
             "fieldPath": "description",
@@ -38,6 +38,12 @@
             "affinity": "TEXT",
             "notNull": true
           },
+          {
+            "fieldPath": "conditionId",
+            "columnName": "conditionId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
           {
             "fieldPath": "temp",
             "columnName": "temp",
@@ -92,19 +98,13 @@
       },
       {
         "tableName": "weather_forecast",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`icon` TEXT NOT NULL, `id` INTEGER NOT NULL, `date` INTEGER NOT NULL, `temp` REAL NOT NULL, `lastUpdatedAt` INTEGER NOT NULL, PRIMARY KEY(`id`))",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `date` INTEGER NOT NULL, `temp` REAL NOT NULL, `conditionId` INTEGER NOT NULL)",
         "fields": [
-          {
-            "fieldPath": "icon",
-            "columnName": "icon",
-            "affinity": "TEXT",
-            "notNull": true
-          },
           {
             "fieldPath": "id",
             "columnName": "id",
             "affinity": "INTEGER",
-            "notNull": true
+            "notNull": false
           },
           {
             "fieldPath": "date",
@@ -119,14 +119,14 @@
             "notNull": true
           },
           {
-            "fieldPath": "lastUpdatedAt",
-            "columnName": "lastUpdatedAt",
+            "fieldPath": "conditionId",
+            "columnName": "conditionId",
             "affinity": "INTEGER",
             "notNull": true
           }
         ],
         "primaryKey": {
-          "autoGenerate": false,
+          "autoGenerate": true,
           "columnNames": [
             "id"
           ]
@@ -138,7 +138,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '9dd3e8d8626a31c84a8a8a978d3d710a')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ca1cb6d48bf56cefa11a6ab97f65bce2')"
     ]
   }
 }
\ No newline at end of file
diff --git a/data/src/androidTest/java/com/danielwaiguru/weatherapp/data/ExampleInstrumentedTest.kt b/data/src/androidTest/java/com/danielwaiguru/weatherapp/data/ExampleInstrumentedTest.kt
index c766238..e7029b2 100644
--- a/data/src/androidTest/java/com/danielwaiguru/weatherapp/data/ExampleInstrumentedTest.kt
+++ b/data/src/androidTest/java/com/danielwaiguru/weatherapp/data/ExampleInstrumentedTest.kt
@@ -1,13 +1,11 @@
 package com.danielwaiguru.weatherapp.data
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.*
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -21,4 +19,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.danielwaiguru.weatherapp.data.test", appContext.packageName)
     }
-}
\ No newline at end of file
+}
diff --git a/data/src/main/AndroidManifest.xml b/data/src/main/AndroidManifest.xml
index a5918e6..bfdcc83 100644
--- a/data/src/main/AndroidManifest.xml
+++ b/data/src/main/AndroidManifest.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 </manifest>
\ No newline at end of file
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/AndroidLocationService.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/AndroidLocationService.kt
new file mode 100644
index 0000000..aae9d30
--- /dev/null
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/AndroidLocationService.kt
@@ -0,0 +1,102 @@
+package com.danielwaiguru.weatherapp.data
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.pm.PackageManager
+import android.location.LocationManager
+import com.danielwaiguru.weatherapp.domain.location.LocationService
+import com.danielwaiguru.weatherapp.domain.models.UserLocation
+import com.danielwaiguru.weatherapp.domain.utils.ResultWrapper
+import com.google.android.gms.location.LocationServices
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+import kotlin.coroutines.resume
+import kotlinx.coroutines.suspendCancellableCoroutine
+import timber.log.Timber
+
+internal class AndroidLocationService @Inject constructor(
+    @ApplicationContext private val context: Context
+) : LocationService {
+    private val locationManager by lazy {
+        context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+    }
+    private val fusedLocationProviderClient by lazy {
+        LocationServices.getFusedLocationProviderClient(context)
+    }
+    override val isGpsEnabled: Boolean
+        get() {
+            return locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) ||
+                locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
+        }
+
+    @SuppressLint("MissingPermission")
+    override suspend fun getCurrentLocation(): ResultWrapper<UserLocation?> {
+        if (isGpsEnabled.not()) {
+            return ResultWrapper.Error(
+                errorMessage = "Failed to get location. Enable gps services"
+            )
+        }
+        if (hasLocationPermission().not()) {
+            return ResultWrapper.Error(
+                errorMessage = "Failed to get location. Please grant location permission."
+            )
+        }
+        return suspendCancellableCoroutine { continuation ->
+            fusedLocationProviderClient.lastLocation
+                .apply {
+                    if (isComplete) {
+                        if (isSuccessful) {
+                            continuation.resume(
+                                ResultWrapper.Success(
+                                    UserLocation(
+                                        latitude = result.latitude,
+                                        longitude = result.longitude
+                                    )
+                                )
+                            )
+                        } else {
+                            continuation.resume(
+                                ResultWrapper.Error(
+                                    errorMessage = exception?.message
+                                )
+                            )
+                        }
+                        return@suspendCancellableCoroutine
+                    }
+                    addOnSuccessListener {
+                        continuation.resume(
+                            ResultWrapper.Success(
+                                if (it != null) {
+                                    UserLocation(
+                                        latitude = it.latitude,
+                                        longitude = it.longitude
+                                    )
+                                } else {
+                                    null
+                                }
+
+                            )
+                        )
+                    }
+                    addOnFailureListener {
+                        Timber.i(it)
+                        continuation.resume(
+                            ResultWrapper.Error(
+                                errorMessage = it.message
+                            )
+                        )
+                    }
+                    addOnCanceledListener {
+                        continuation.cancel()
+                    }
+                }
+        }
+    }
+
+    private fun hasLocationPermission(): Boolean {
+        return context.checkSelfPermission(
+            Manifest.permission.ACCESS_FINE_LOCATION
+        ) == PackageManager.PERMISSION_GRANTED
+    }
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/di/DataSourceModule.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/di/DataSourceModule.kt
index 86b3fa8..cf8d03d 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/di/DataSourceModule.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/di/DataSourceModule.kt
@@ -1,9 +1,11 @@
 package com.danielwaiguru.weatherapp.data.di
 
+import com.danielwaiguru.weatherapp.data.AndroidLocationService
 import com.danielwaiguru.weatherapp.data.sources.local.LocalDataSource
 import com.danielwaiguru.weatherapp.data.sources.local.RoomDataSource
 import com.danielwaiguru.weatherapp.data.sources.remote.RemoteDataSource
 import com.danielwaiguru.weatherapp.data.sources.remote.RetrofitDataSource
+import com.danielwaiguru.weatherapp.domain.location.LocationService
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -13,13 +15,27 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 internal abstract class DataSourceModule {
-    @[Singleton Binds]
+    @[
+        Singleton
+        Binds
+    ]
     internal abstract fun bindRemoteDataSource(
         retrofitDataSource: RetrofitDataSource
     ): RemoteDataSource
 
-    @[Singleton Binds]
+    @[
+        Singleton
+        Binds
+    ]
     internal abstract fun bindLocalDataSource(
         roomDataSource: RoomDataSource
     ): LocalDataSource
-}
\ No newline at end of file
+
+    @[
+        Singleton
+        Binds
+    ]
+    internal abstract fun bindLocationService(
+        androidLocationService: AndroidLocationService
+    ): LocationService
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/di/DispatchersModule.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/di/DispatchersModule.kt
index a2a5e6f..af675a2 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/di/DispatchersModule.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/di/DispatchersModule.kt
@@ -12,9 +12,15 @@ import kotlinx.coroutines.Dispatchers
 @Module
 @InstallIn(SingletonComponent::class)
 object DispatchersModule {
-    @[Provides Dispatcher(DispatcherProvider.IO)]
+    @[
+        Provides
+        Dispatcher(DispatcherProvider.IO)
+    ]
     fun providesIoDispatcher(): CoroutineDispatcher = Dispatchers.IO
 
-    @[Provides Dispatcher(DispatcherProvider.MAIN)]
+    @[
+        Provides
+        Dispatcher(DispatcherProvider.MAIN)
+    ]
     fun providesMainDispatcher(): CoroutineDispatcher = Dispatchers.Main
-}
\ No newline at end of file
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/di/LocalDatabaseModule.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/di/LocalDatabaseModule.kt
index c6a39bc..64bf209 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/di/LocalDatabaseModule.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/di/LocalDatabaseModule.kt
@@ -15,7 +15,10 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 object LocalDatabaseModule {
-    @[Provides Singleton]
+    @[
+        Provides
+        Singleton
+    ]
     internal fun provideWeatherAppDatabase(@ApplicationContext appContext: Context) =
         Room.databaseBuilder(
             appContext,
@@ -23,6 +26,9 @@ object LocalDatabaseModule {
             DB_NAME
         ).fallbackToDestructiveMigration().build()
 
-    @[Provides Singleton]
+    @[
+        Provides
+        Singleton
+    ]
     fun provideTouristDao(database: WeatherAppDatabase): WeatherDao = database.weatherDao()
-}
\ No newline at end of file
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/di/NetworkingModule.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/di/NetworkingModule.kt
index d787ce5..c57d045 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/di/NetworkingModule.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/di/NetworkingModule.kt
@@ -5,6 +5,7 @@ import com.chuckerteam.chucker.api.ChuckerCollector
 import com.chuckerteam.chucker.api.ChuckerInterceptor
 import com.danielwaiguru.weatherapp.data.BuildConfig
 import com.danielwaiguru.weatherapp.data.sources.remote.api.WeatherAppApiService
+import com.danielwaiguru.weatherapp.data.sources.remote.interceptors.AppIdInterceptor
 import com.danielwaiguru.weatherapp.data.sources.remote.interceptors.HeadersInterceptor
 import com.danielwaiguru.weatherapp.data.sources.remote.utils.ApiEndpoints.BASE_URL
 import dagger.Module
@@ -12,20 +13,23 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import java.util.concurrent.TimeUnit
+import javax.inject.Singleton
 import okhttp3.Dispatcher
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
-import java.util.concurrent.TimeUnit
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 internal object NetworkingModule {
     private const val REQUEST_TIMEOUT_S = 20L
 
-    @[Singleton Provides]
+    @[
+        Singleton
+        Provides
+    ]
     internal fun provideHttpClient(
         @ApplicationContext appContext: Context
     ): OkHttpClient {
@@ -45,6 +49,7 @@ internal object NetworkingModule {
         return OkHttpClient.Builder()
             .readTimeout(REQUEST_TIMEOUT_S, TimeUnit.SECONDS)
             .connectTimeout(REQUEST_TIMEOUT_S, TimeUnit.SECONDS)
+            .addInterceptor(AppIdInterceptor())
             .addInterceptor(HeadersInterceptor())
             .addInterceptor(logging)
             .addInterceptor(chuckerInterceptor)
@@ -56,7 +61,10 @@ internal object NetworkingModule {
             .build()
     }
 
-    @[Singleton Provides]
+    @[
+        Singleton
+        Provides
+    ]
     internal fun provideConverterFactory(): MoshiConverterFactory =
         MoshiConverterFactory.create().apply {
             asLenient()
@@ -64,7 +72,10 @@ internal object NetworkingModule {
             withNullSerialization()
         }
 
-    @[Singleton Provides]
+    @[
+        Singleton
+        Provides
+    ]
     internal fun provideRetrofit(
         okHttpClient: OkHttpClient,
         moshiConverterFactory: MoshiConverterFactory
@@ -76,8 +87,11 @@ internal object NetworkingModule {
             .build()
     }
 
-    @[Singleton Provides]
+    @[
+        Singleton
+        Provides
+    ]
     internal fun apiServiceBuilder(retrofit: Retrofit): WeatherAppApiService {
         return retrofit.create(WeatherAppApiService::class.java)
     }
-}
\ No newline at end of file
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/di/RepositoriesBindings.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/di/RepositoriesBindings.kt
index 4f8248e..1084641 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/di/RepositoriesBindings.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/di/RepositoriesBindings.kt
@@ -11,8 +11,11 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 abstract class RepositoriesBindings {
-    @[Binds Singleton]
+    @[
+        Binds
+        Singleton
+    ]
     internal abstract fun bindWeatherRepository(
         weatherRepositoryImpl: WeatherRepositoryImpl
     ): WeatherRepository
-}
\ No newline at end of file
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/di/UseCasesModule.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/di/UseCasesModule.kt
index 9ab72ac..783fa31 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/di/UseCasesModule.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/di/UseCasesModule.kt
@@ -2,6 +2,7 @@ package com.danielwaiguru.weatherapp.data.di
 
 import com.danielwaiguru.weatherapp.domain.repositories.WeatherRepository
 import com.danielwaiguru.weatherapp.domain.usecases.GetCurrentWeatherUseCase
+import com.danielwaiguru.weatherapp.domain.usecases.GetWeatherForecastUseCase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -11,8 +12,19 @@ import dagger.hilt.android.scopes.ViewModelScoped
 @Module
 @InstallIn(ViewModelComponent::class)
 object UseCasesModule {
-    @[Provides ViewModelScoped]
+    @[
+        Provides
+        ViewModelScoped
+    ]
     fun provideGetCurrentWeatherUseCase(
         weatherRepository: WeatherRepository
     ): GetCurrentWeatherUseCase = GetCurrentWeatherUseCase(weatherRepository)
-}
\ No newline at end of file
+
+    @[
+        Provides
+        ViewModelScoped
+    ]
+    fun provideGetWeatherForecastUseCase(
+        weatherRepository: WeatherRepository
+    ): GetWeatherForecastUseCase = GetWeatherForecastUseCase(weatherRepository)
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/mappers/WeatherMapper.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/mappers/WeatherMapper.kt
index 52aab69..e021a75 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/mappers/WeatherMapper.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/mappers/WeatherMapper.kt
@@ -1,16 +1,20 @@
 package com.danielwaiguru.weatherapp.data.mappers
 
+import android.text.format.DateUtils
 import com.danielwaiguru.weatherapp.data.models.dtos.CoordinatesDto
 import com.danielwaiguru.weatherapp.data.models.entities.CoordinatesEntity
 import com.danielwaiguru.weatherapp.data.models.entities.ForecastEntity
 import com.danielwaiguru.weatherapp.data.models.entities.WeatherEntity
 import com.danielwaiguru.weatherapp.data.models.responses.ForecastResponse
 import com.danielwaiguru.weatherapp.data.models.responses.WeatherDto
-import com.danielwaiguru.weatherapp.domain.models.Coordinates
+import com.danielwaiguru.weatherapp.domain.models.UserLocation
 import com.danielwaiguru.weatherapp.domain.models.Weather
 import com.danielwaiguru.weatherapp.domain.models.WeatherForecast
+import com.danielwaiguru.weatherapp.domain.utils.getDayName
+import java.util.Date
+import java.util.Locale
 
-fun CoordinatesEntity.toCoordinates(): Coordinates = Coordinates(
+fun CoordinatesEntity.toCoordinates(): UserLocation = UserLocation(
     latitude = latitude,
     longitude = longitude
 )
@@ -24,9 +28,10 @@ fun WeatherEntity.toWeather(): Weather = Weather(
     description = description,
     icon = icon,
     id = id,
-    coordinates = coordinates.toCoordinates(),
+    userLocation = coordinates.toCoordinates(),
     city = city,
     country = country,
+    conditionId = conditionId,
     temp = temp,
     tempMin = tempMin,
     tempMax = tempMax,
@@ -35,23 +40,28 @@ fun WeatherEntity.toWeather(): Weather = Weather(
 )
 
 fun ForecastResponse.toForecastEntity(): List<ForecastEntity> {
-    return list.map { weather ->
-        val weatherInfo = weather.weather[0]
-        ForecastEntity(
-            icon = weatherInfo.icon,
-            id = weather.id,
-            date = weather.date,
-            temp = weather.main.temp,
-            lastUpdatedAt = System.currentTimeMillis()
-        )
-    }
+    return list
+        .dropWhile {
+            DateUtils.isToday(Date(it.date * 1000).time)
+        }
+        .map { weather ->
+            val weatherInfo = weather.weather[0]
+            ForecastEntity(
+                id = null,
+                date = weather.date,
+                temp = weather.main.temp,
+                conditionId = weatherInfo.id
+            )
+        }
 }
+
 fun ForecastEntity.toWeatherForecast(): WeatherForecast = WeatherForecast(
-    icon = icon,
-    id = id,
+    id = id!!,
     date = date,
     temp = temp,
-    lastUpdatedAt = lastUpdatedAt
+    day = date.getDayName().lowercase()
+        .replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.ROOT) else it.toString() },
+    conditionId = conditionId
 )
 
 fun WeatherDto.toWeatherEntity(): WeatherEntity {
@@ -63,10 +73,11 @@ fun WeatherDto.toWeatherEntity(): WeatherEntity {
         id = id,
         coordinates = coordinates.toCoordinatesEntity(),
         country = sys.country,
+        conditionId = weatherInfo.id,
         temp = main.temp,
         tempMin = main.tempMin,
         tempMax = main.tempMax,
         date = date,
         lastUpdateAt = System.currentTimeMillis()
     )
-}
\ No newline at end of file
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/CloudsDto.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/CloudsDto.kt
index 78dcf26..64374ba 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/CloudsDto.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/CloudsDto.kt
@@ -2,4 +2,4 @@ package com.danielwaiguru.weatherapp.data.models.dtos
 
 data class CloudsDto(
     val all: Int
-)
\ No newline at end of file
+)
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/CoordinatesDto.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/CoordinatesDto.kt
index 8d2d965..5034925 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/CoordinatesDto.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/CoordinatesDto.kt
@@ -3,4 +3,4 @@ package com.danielwaiguru.weatherapp.data.models.dtos
 data class CoordinatesDto(
     val lat: Double,
     val lon: Double
-)
\ No newline at end of file
+)
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Main.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Main.kt
index a8f7b2a..53bbe28 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Main.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Main.kt
@@ -16,4 +16,4 @@ data class Main(
     val tempMax: Double,
     @field:Json(name = "temp_min")
     val tempMin: Double
-)
\ No newline at end of file
+)
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Rain.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Rain.kt
index b780d62..7a6efbd 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Rain.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Rain.kt
@@ -2,4 +2,4 @@ package com.danielwaiguru.weatherapp.data.models.dtos
 
 data class Rain(
     val `1h`: Double
-)
\ No newline at end of file
+)
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Sys.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Sys.kt
index d9d1aa3..f01f018 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Sys.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Sys.kt
@@ -6,4 +6,4 @@ data class Sys(
     val sunrise: Int,
     val sunset: Int,
     val type: Int
-)
\ No newline at end of file
+)
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/WeatherInfoDto.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/WeatherInfoDto.kt
index b9d40e3..6541d1d 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/WeatherInfoDto.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/WeatherInfoDto.kt
@@ -5,4 +5,4 @@ data class WeatherInfoDto(
     val icon: String,
     val id: Int,
     val main: String
-)
\ No newline at end of file
+)
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Wind.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Wind.kt
index 5c1c21c..7d36788 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Wind.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/dtos/Wind.kt
@@ -4,4 +4,4 @@ data class Wind(
     val deg: Int,
     val gust: Double,
     val speed: Double
-)
\ No newline at end of file
+)
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/entities/ForecastEntity.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/entities/ForecastEntity.kt
index e31ca43..98b4362 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/entities/ForecastEntity.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/entities/ForecastEntity.kt
@@ -4,10 +4,9 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 @Entity(tableName = "weather_forecast")
 data class ForecastEntity(
-    val icon: String,
-    @PrimaryKey(autoGenerate = false)
-    val id: Int,
+    @PrimaryKey(autoGenerate = true)
+    val id: Int? = null,
     val date: Long,
     val temp: Double,
-    val lastUpdatedAt: Long
-)
\ No newline at end of file
+    val conditionId: Int
+)
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/entities/WeatherEntity.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/entities/WeatherEntity.kt
index d7f702c..9c48fb1 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/entities/WeatherEntity.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/entities/WeatherEntity.kt
@@ -14,20 +14,10 @@ data class WeatherEntity(
     val coordinates: CoordinatesEntity,
     val city: String,
     val country: String,
+    val conditionId: Int,
     val temp: Double,
     val tempMin: Double,
     val tempMax: Double,
     val date: Long,
     val lastUpdateAt: Long
-) {
-    data class CityEntity(
-        val id: Int,
-        val name: String,
-        val country: String
-    )
-    data class TemperatureEntity(
-        val temp: Double,
-        val tempMin: Double,
-        val tempMax: Double,
-    )
-}
\ No newline at end of file
+)
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/responses/WeatherDto.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/responses/WeatherDto.kt
index 6c3698f..4e038da 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/responses/WeatherDto.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/responses/WeatherDto.kt
@@ -26,4 +26,4 @@ data class WeatherDto(
     val visibility: Int,
     val weather: List<WeatherInfoDto>,
     val wind: Wind
-)
\ No newline at end of file
+)
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/responses/WeatherResponse.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/responses/WeatherResponse.kt
index 6bae8f1..88dc9cc 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/models/responses/WeatherResponse.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/models/responses/WeatherResponse.kt
@@ -1,3 +1,3 @@
 package com.danielwaiguru.weatherapp.data.models.responses
 
-typealias WeatherResponse = WeatherDto
\ No newline at end of file
+typealias WeatherResponse = WeatherDto
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/repositories/WeatherRepositoryImpl.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/repositories/WeatherRepositoryImpl.kt
index d5665b2..1780520 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/repositories/WeatherRepositoryImpl.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/repositories/WeatherRepositoryImpl.kt
@@ -8,13 +8,14 @@ import com.danielwaiguru.weatherapp.data.models.entities.ForecastEntity
 import com.danielwaiguru.weatherapp.data.sources.local.LocalDataSource
 import com.danielwaiguru.weatherapp.data.sources.remote.RemoteDataSource
 import com.danielwaiguru.weatherapp.data.utils.networkBoundResource
-import com.danielwaiguru.weatherapp.domain.models.Coordinates
+import com.danielwaiguru.weatherapp.domain.models.UserLocation
 import com.danielwaiguru.weatherapp.domain.models.Weather
 import com.danielwaiguru.weatherapp.domain.models.WeatherForecast
 import com.danielwaiguru.weatherapp.domain.repositories.WeatherRepository
 import com.danielwaiguru.weatherapp.domain.utils.Dispatcher
 import com.danielwaiguru.weatherapp.domain.utils.DispatcherProvider
 import com.danielwaiguru.weatherapp.domain.utils.ResultWrapper
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.flow.Flow
@@ -22,22 +23,22 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 
-internal class WeatherRepositoryImpl(
+internal class WeatherRepositoryImpl @Inject constructor(
     private val remoteDataSource: RemoteDataSource,
     private val localDataSource: LocalDataSource,
     @Dispatcher(DispatcherProvider.IO) private val ioDispatcher: CoroutineDispatcher
-): WeatherRepository {
+) : WeatherRepository {
     override suspend fun getCurrentWeather(
-        coordinates: Coordinates
+        userLocation: UserLocation
     ): Flow<ResultWrapper<Weather?>> = networkBoundResource(
         query = {
-                localDataSource.getCurrentWeather()
-                    .map { weatherEntity -> weatherEntity?.toWeather() }
+            localDataSource.getCurrentWeather()
+                .map { weatherEntity -> weatherEntity?.toWeather() }
         },
         fetch = {
             remoteDataSource.getCurrentWeather(
-                longitude = coordinates.longitude,
-                latitude = coordinates.latitude
+                longitude = userLocation.longitude,
+                latitude = userLocation.latitude
             )
         },
         saveFetchResult = { weatherResponse ->
@@ -49,17 +50,16 @@ internal class WeatherRepositoryImpl(
     ).flowOn(ioDispatcher)
 
     override suspend fun getWeatherForecast(
-        coordinates: Coordinates
+        userLocation: UserLocation
     ): Flow<ResultWrapper<List<WeatherForecast>>> = networkBoundResource(
         query = {
             localDataSource.getWeatherForecast()
                 .map { entities -> entities.map(ForecastEntity::toWeatherForecast) }
-
         },
         fetch = {
             remoteDataSource.getWeatherForecast(
-                latitude = coordinates.latitude,
-                longitude = coordinates.longitude
+                latitude = userLocation.latitude,
+                longitude = userLocation.longitude
             )
         },
         saveFetchResult = { forecastResponse ->
@@ -68,5 +68,5 @@ internal class WeatherRepositoryImpl(
                 localDataSource.saveWeatherForecast(forecastEntity)
             }
         }
-    )
-}
\ No newline at end of file
+    ).flowOn(ioDispatcher)
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/local/LocalDataSource.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/local/LocalDataSource.kt
index 5c5daa5..6df7a2d 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/local/LocalDataSource.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/local/LocalDataSource.kt
@@ -3,8 +3,8 @@ package com.danielwaiguru.weatherapp.data.sources.local
 import com.danielwaiguru.weatherapp.data.models.entities.ForecastEntity
 import com.danielwaiguru.weatherapp.data.models.entities.WeatherEntity
 import com.danielwaiguru.weatherapp.data.sources.local.daos.WeatherDao
-import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
+import kotlinx.coroutines.flow.Flow
 
 internal interface LocalDataSource {
     suspend fun saveWeather(weatherEntity: WeatherEntity)
@@ -18,7 +18,7 @@ internal interface LocalDataSource {
 
 internal class RoomDataSource @Inject constructor(
     private val weatherDao: WeatherDao
-): LocalDataSource {
+) : LocalDataSource {
     override suspend fun saveWeather(weatherEntity: WeatherEntity) {
         weatherDao.upsertCurrentWeather(weatherEntity)
     }
@@ -28,11 +28,10 @@ internal class RoomDataSource @Inject constructor(
     }
 
     override suspend fun saveWeatherForecast(forecasts: List<ForecastEntity>) {
-        weatherDao.saveWeatherForecast(forecasts)
+        weatherDao.upsertForecasts(forecasts)
     }
 
     override fun getWeatherForecast(): Flow<List<ForecastEntity>> {
         return weatherDao.getWeatherForecast()
     }
 }
-
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/local/daos/WeatherDao.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/local/daos/WeatherDao.kt
index ce6e187..efd015d 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/local/daos/WeatherDao.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/local/daos/WeatherDao.kt
@@ -42,6 +42,9 @@ interface WeatherDao {
     @Query("SELECT * FROM weather_forecast")
     fun getWeatherForecast(): Flow<List<ForecastEntity>>
 
+    @Query("DELETE FROM weather_forecast")
+    suspend fun deleteAllForecasts()
+
     @Query("DELETE FROM current_weather")
     suspend fun deleteAll()
 
@@ -51,4 +54,9 @@ interface WeatherDao {
         saveWeather(weather)
     }
 
-}
\ No newline at end of file
+    @Transaction
+    suspend fun upsertForecasts(forecasts: List<ForecastEntity>) {
+        deleteAllForecasts()
+        saveWeatherForecast(forecasts)
+    }
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/local/database/WeatherAppDatabase.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/local/database/WeatherAppDatabase.kt
index 7d609d8..b5d5109 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/local/database/WeatherAppDatabase.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/local/database/WeatherAppDatabase.kt
@@ -14,10 +14,10 @@ import com.danielwaiguru.weatherapp.data.sources.local.daos.WeatherDao
     version = 1,
     exportSchema = true
 )
-abstract class WeatherAppDatabase: RoomDatabase() {
+abstract class WeatherAppDatabase : RoomDatabase() {
     abstract fun weatherDao(): WeatherDao
 
     companion object {
         const val DB_NAME = "weather_app_database"
     }
-}
\ No newline at end of file
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/RemoteDataSource.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/RemoteDataSource.kt
index b3eb7f2..89176d7 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/RemoteDataSource.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/RemoteDataSource.kt
@@ -25,4 +25,4 @@ internal class RetrofitDataSource @Inject constructor(
 
     override suspend fun getWeatherForecast(latitude: Double, longitude: Double): ForecastResponse =
         apiService.getWeatherForecast(latitude, longitude)
-}
\ No newline at end of file
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/api/WeatherAppApiService.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/api/WeatherAppApiService.kt
index ab55371..175a662 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/api/WeatherAppApiService.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/api/WeatherAppApiService.kt
@@ -11,11 +11,14 @@ interface WeatherAppApiService {
     @GET(CURRENT_WEATHER_ENDPOINT)
     suspend fun getCurrentWeather(
         @Query("lat") latitude: Double,
-        @Query("lon") longitude: Double
+        @Query("lon") longitude: Double,
+        @Query("units") units: String = "metric"
     ): WeatherDto
+
     @GET(WEATHER_FORECAST_ENDPOINT)
     suspend fun getWeatherForecast(
         @Query("lat") latitude: Double,
-        @Query("lon") longitude: Double
+        @Query("lon") longitude: Double,
+        @Query("units") units: String = "metric"
     ): ForecastResponse
-}
\ No newline at end of file
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/interceptors/AppIdInterceptor.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/interceptors/AppIdInterceptor.kt
new file mode 100644
index 0000000..1140350
--- /dev/null
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/interceptors/AppIdInterceptor.kt
@@ -0,0 +1,16 @@
+package com.danielwaiguru.weatherapp.data.sources.remote.interceptors
+
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class AppIdInterceptor : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val request = chain.request()
+        val url = request.url.newBuilder()
+            .addQueryParameter("appid", "bb90efd61c3112b077246f518207d544")
+            .build()
+        return chain.proceed(
+            request.newBuilder().url(url).build()
+        )
+    }
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/interceptors/HeadersInterceptor.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/interceptors/HeadersInterceptor.kt
index 3cd6ac5..f8f4fa7 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/interceptors/HeadersInterceptor.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/interceptors/HeadersInterceptor.kt
@@ -14,4 +14,4 @@ internal class HeadersInterceptor : Interceptor {
             .build()
         return chain.proceed(newRequest)
     }
-}
\ No newline at end of file
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/utils/ApiEndpoints.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/utils/ApiEndpoints.kt
index 6c033f3..0b91f92 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/utils/ApiEndpoints.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/sources/remote/utils/ApiEndpoints.kt
@@ -1,7 +1,7 @@
 package com.danielwaiguru.weatherapp.data.sources.remote.utils
 
 object ApiEndpoints {
-    const val CURRENT_WEATHER_ENDPOINT = "current"
-    const val WEATHER_FORECAST_ENDPOINT ="forecast5"
-    const val BASE_URL = "https://openweathermap.org/"
-}
\ No newline at end of file
+    const val CURRENT_WEATHER_ENDPOINT = "weather"
+    const val WEATHER_FORECAST_ENDPOINT = "forecast"
+    const val BASE_URL = "https://api.openweathermap.org/data/2.5/"
+}
diff --git a/data/src/main/java/com/danielwaiguru/weatherapp/data/utils/NetworkBoundResource.kt b/data/src/main/java/com/danielwaiguru/weatherapp/data/utils/NetworkBoundResource.kt
index 1c2aeb0..1dcd9c6 100644
--- a/data/src/main/java/com/danielwaiguru/weatherapp/data/utils/NetworkBoundResource.kt
+++ b/data/src/main/java/com/danielwaiguru/weatherapp/data/utils/NetworkBoundResource.kt
@@ -17,7 +17,7 @@ inline fun <ResultType, RequestType> networkBoundResource(
 
     if (shouldFetch(data)) {
         val loading = launch {
-            query().collect { send(ResultWrapper.Loading(it)) }
+            query().collect { send(ResultWrapper.Loading(data = data)) }
         }
 
         try {
@@ -27,9 +27,9 @@ inline fun <ResultType, RequestType> networkBoundResource(
             query().collect { send(ResultWrapper.Success(it)) }
         } catch (t: Throwable) {
             loading.cancel()
-            query().collect { send(ResultWrapper.Error(t.message)) }
+            query().collect { send(ResultWrapper.Error(errorMessage = t.message, data = data)) }
         }
     } else {
         query().collect { send(ResultWrapper.Success(it)) }
     }
-}
\ No newline at end of file
+}
diff --git a/data/src/test/java/com/danielwaiguru/weatherapp/data/ExampleUnitTest.kt b/data/src/test/java/com/danielwaiguru/weatherapp/data/ExampleUnitTest.kt
index 77106f8..4740c83 100644
--- a/data/src/test/java/com/danielwaiguru/weatherapp/data/ExampleUnitTest.kt
+++ b/data/src/test/java/com/danielwaiguru/weatherapp/data/ExampleUnitTest.kt
@@ -1,8 +1,7 @@
 package com.danielwaiguru.weatherapp.data
 
-import org.junit.Test
-
 import org.junit.Assert.*
+import org.junit.Test
 
 /**
  * Example local unit test, which will execute on the development machine (host).
@@ -14,4 +13,4 @@ class ExampleUnitTest {
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
-}
\ No newline at end of file
+}
diff --git a/designsystem/build.gradle.kts b/designsystem/build.gradle.kts
index f3e0e46..12e1c09 100644
--- a/designsystem/build.gradle.kts
+++ b/designsystem/build.gradle.kts
@@ -15,4 +15,4 @@ dependencies {
     implementation(libs.coil.kt)
     implementation(libs.coil.kt.compose)
     implementation(libs.shimmer)
-}
\ No newline at end of file
+}
diff --git a/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/components/Button.kt b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/components/Button.kt
new file mode 100644
index 0000000..1c71928
--- /dev/null
+++ b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/components/Button.kt
@@ -0,0 +1,55 @@
+package com.danielwaiguru.weatherapp.designsystem.components
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.unit.dp
+import com.danielwaiguru.weatherapp.designsystem.previews.DevicePreviews
+import com.danielwaiguru.weatherapp.designsystem.theme.WeatherAppTheme
+
+@Composable
+fun PrimaryButton(
+    text: String,
+    modifier: Modifier = Modifier,
+    enabled: Boolean = true,
+    shape: Shape = ButtonDefaults.shape,
+    onClick: () -> Unit,
+    contentPadding: PaddingValues = PaddingValues(
+        top = 15.dp,
+        bottom = 15.dp
+    )
+) {
+    Button(
+        onClick = onClick,
+        enabled = enabled,
+        modifier = modifier
+            .testTag("primary_button"),
+        shape = shape,
+        contentPadding = contentPadding
+    ) {
+        Text(
+            text = text
+        )
+    }
+}
+
+@DevicePreviews
+@Composable
+private fun PrimaryButtonPreview() {
+    WeatherAppTheme {
+        PrimaryButton(
+            text = "Click",
+            onClick = { /*TODO*/ },
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(10.dp)
+        )
+    }
+}
diff --git a/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/components/Loader.kt b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/components/Loader.kt
new file mode 100644
index 0000000..a4f02a0
--- /dev/null
+++ b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/components/Loader.kt
@@ -0,0 +1,24 @@
+package com.danielwaiguru.weatherapp.designsystem.components
+
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun ProgressIndicator(
+    modifier: Modifier = Modifier,
+    stockWidth: Dp = 2.dp,
+    color: Color = MaterialTheme.colorScheme.primary
+) {
+    CircularProgressIndicator(
+        modifier = modifier
+            .testTag("progress_indicator"),
+        color = color,
+        strokeWidth = stockWidth
+    )
+}
diff --git a/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/components/TopBar.kt b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/components/TopBar.kt
new file mode 100644
index 0000000..a70bf0c
--- /dev/null
+++ b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/components/TopBar.kt
@@ -0,0 +1,67 @@
+package com.danielwaiguru.weatherapp.designsystem.components
+
+import androidx.compose.foundation.layout.RowScope
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.ArrowBack
+import androidx.compose.material.icons.rounded.Settings
+import androidx.compose.material3.CenterAlignedTopAppBar
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import com.danielwaiguru.weatherapp.designsystem.R
+import com.danielwaiguru.weatherapp.designsystem.previews.DevicePreviews
+import com.danielwaiguru.weatherapp.designsystem.theme.WeatherAppTheme
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun TopAppBar(
+    modifier: Modifier = Modifier,
+    onNavIconPressed: (() -> Unit)? = null,
+    navigationIcon: ImageVector? = null,
+    title: String,
+    actions: @Composable RowScope.() -> Unit = {}
+) {
+    CenterAlignedTopAppBar(
+        title = {
+            Text(
+                text = title
+            )
+        },
+        modifier = modifier,
+        navigationIcon = {
+            if (navigationIcon != null && onNavIconPressed != null) {
+                IconButton(onClick = onNavIconPressed) {
+                    Icon(
+                        imageVector = navigationIcon,
+                        contentDescription = stringResource(id = R.string.nav_icon_content_desc)
+                    )
+                }
+            }
+        },
+        actions = actions
+    )
+}
+
+@DevicePreviews
+@Composable
+fun TopAppBarPreview() {
+    WeatherAppTheme {
+        TopAppBar(
+            modifier = Modifier.fillMaxWidth(),
+            title = "Sample Title",
+            onNavIconPressed = {},
+            navigationIcon = Icons.Outlined.ArrowBack,
+            actions = {
+                IconButton(onClick = {}) {
+                    Icon(imageVector = Icons.Rounded.Settings, contentDescription = null)
+                }
+            }
+        )
+    }
+}
diff --git a/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/previews/DevicePreviews.kt b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/previews/DevicePreviews.kt
new file mode 100644
index 0000000..3bb63d7
--- /dev/null
+++ b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/previews/DevicePreviews.kt
@@ -0,0 +1,10 @@
+package com.danielwaiguru.weatherapp.designsystem.previews
+
+import androidx.compose.ui.tooling.preview.Preview
+
+@Preview(
+    name = "phone",
+    device = "spec:shape=Normal,width=360,height=640,unit=dp,dpi=480",
+    showBackground = true
+)
+annotation class DevicePreviews
diff --git a/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Color.kt b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Color.kt
index 626a233..ef54d06 100644
--- a/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Color.kt
+++ b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Color.kt
@@ -8,4 +8,8 @@ val Pink80 = Color(0xFFEFB8C8)
 
 val Purple40 = Color(0xFF6650a4)
 val PurpleGrey40 = Color(0xFF625b71)
-val Pink40 = Color(0xFF7D5260)
\ No newline at end of file
+val Pink40 = Color(0xFF7D5260)
+
+val cloudyColor = Color(0xFF618593)
+val rainyColor = Color(0xFF57575C)
+val sunnyColor = Color(0xFF4B8FE2)
diff --git a/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Shape.kt b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Shape.kt
index 18c573e..03ca973 100644
--- a/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Shape.kt
+++ b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Shape.kt
@@ -6,4 +6,4 @@ val Shapes = Shapes(
     small = RoundedCornerShape(4.dp),
     medium = RoundedCornerShape(4.dp),
     large = RoundedCornerShape(0.dp)
-)
\ No newline at end of file
+)
diff --git a/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Theme.kt b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Theme.kt
index d039a0c..fe7674d 100644
--- a/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Theme.kt
+++ b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Theme.kt
@@ -2,7 +2,6 @@ package com.danielwaiguru.weatherapp.designsystem.theme
 
 import android.app.Activity
 import android.os.Build
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.dynamicDarkColorScheme
@@ -39,9 +38,9 @@ private val LightColorScheme = lightColorScheme(
 
 @Composable
 fun WeatherAppTheme(
-    darkTheme: Boolean = isSystemInDarkTheme(),
+    darkTheme: Boolean = false,
     // Dynamic color is available on Android 12+
-    dynamicColor: Boolean = true,
+    dynamicColor: Boolean = false,
     content: @Composable () -> Unit
 ) {
     val colorScheme = when {
@@ -68,4 +67,4 @@ fun WeatherAppTheme(
         shapes = Shapes,
         content = content
     )
-}
\ No newline at end of file
+}
diff --git a/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Type.kt b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Type.kt
index 64cb4ec..c96e55a 100644
--- a/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Type.kt
+++ b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/theme/Type.kt
@@ -7,7 +7,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.googlefonts.Font
 import androidx.compose.ui.text.googlefonts.GoogleFont
 import androidx.compose.ui.unit.sp
-import com.danielwaiguru.shoppy.designsystem.utils.SpDimensions
 import com.danielwaiguru.weatherapp.designsystem.R
 
 private val provider = GoogleFont.Provider(
@@ -21,76 +20,22 @@ val poppinsFontName = GoogleFont("Poppins")
 val fontFamily = FontFamily(
     Font(googleFont = poppinsFontName, fontProvider = provider)
 )
-
 val Typography = Typography(
-    titleLarge = TextStyle(
-        fontFamily = fontFamily,
-        fontWeight = FontWeight.ExtraBold,
-        fontSize = 22.sp,
-        letterSpacing = 0.sp,
-        lineHeight = 28.sp
-    ),
-    titleMedium = TextStyle(
-        fontFamily = fontFamily,
-        fontWeight = FontWeight.SemiBold,
-        fontSize = 16.sp,
-        letterSpacing = .15.sp,
-        lineHeight = 24.sp
-    ),
-    titleSmall = TextStyle(
-        fontFamily = fontFamily,
-        fontWeight = FontWeight.SemiBold,
-        fontSize = 12.sp,
-        letterSpacing = .15.sp,
-        lineHeight = 20.sp
-    ),
-    bodyMedium = TextStyle(
-        fontFamily = fontFamily,
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        letterSpacing = .15.sp,
-        lineHeight = 24.sp
-    ),
-    bodySmall = TextStyle(
-        fontFamily = fontFamily,
-        fontWeight = FontWeight.Normal,
-        fontSize = 12.sp,
-        letterSpacing = .15.sp,
-        lineHeight = 20.sp
-    ),
     bodyLarge = TextStyle(
-        fontFamily = fontFamily,
-        fontWeight = FontWeight.SemiBold,
-        fontSize = 20.sp,
-        letterSpacing = .1.sp,
-        lineHeight = 26.sp
-    ),
-    labelMedium = TextStyle(
-        fontFamily = fontFamily,
-        fontWeight = FontWeight.Normal,
-        fontSize = 20.sp,
-        letterSpacing = .1.sp,
-        lineHeight = 26.sp
-    ),
-    labelSmall = TextStyle(
         fontFamily = fontFamily,
         fontWeight = FontWeight.Normal,
-        fontSize = 14.sp,
-        letterSpacing = .15.sp,
-        lineHeight = 20.sp
-    ),
-    displaySmall = TextStyle(
-        fontFamily = fontFamily,
+        fontSize = 16.sp
+    )
+    /* Other default text styles to override
+    button = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.W500,
+        fontSize = 14.sp
+    ),
+    caption = TextStyle(
+        fontFamily = FontFamily.Default,
         fontWeight = FontWeight.Normal,
-        fontSize = 12.sp,
-        letterSpacing = .15.sp,
-        lineHeight = 20.sp
-    ),
-    headlineMedium = TextStyle(
-        fontFamily = fontFamily,
-        fontWeight = FontWeight.Bold,
-        fontSize = SpDimensions.HeadlineMedium,
-        lineHeight = 24.sp,
-        letterSpacing = 0.5.sp
+        fontSize = 12.sp
     )
-)
\ No newline at end of file
+    */
+)
diff --git a/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/utils/SpDimensions.kt b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/utils/Dimensions.kt
similarity index 57%
rename from designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/utils/SpDimensions.kt
rename to designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/utils/Dimensions.kt
index e0f9347..798d899 100644
--- a/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/utils/SpDimensions.kt
+++ b/designsystem/src/main/java/com/danielwaiguru/weatherapp/designsystem/utils/Dimensions.kt
@@ -1,8 +1,9 @@
-package com.danielwaiguru.shoppy.designsystem.utils
+package com.danielwaiguru.weatherapp.designsystem.utils
 
+import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 
-object SpDimensions {
+object Dimensions {
     val HeadlineLarge = 24.sp
     val HeadlineMedium = 18.sp
     val TitleLarge = 18.sp
@@ -10,4 +11,6 @@ object SpDimensions {
     val BodyMedium = 14.sp
     val BodyLarge = 16.sp
     val BodySmall = 12.sp
-}
\ No newline at end of file
+    val PaddingMedium = 16.dp
+    val PaddingLarge = 30.dp
+}
diff --git a/designsystem/src/main/res/values/strings.xml b/designsystem/src/main/res/values/strings.xml
new file mode 100644
index 0000000..17c87fb
--- /dev/null
+++ b/designsystem/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="nav_icon_content_desc">Navigate back</string>
+</resources>
\ No newline at end of file
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
index 7b29667..79a074a 100644
--- a/domain/build.gradle.kts
+++ b/domain/build.gradle.kts
@@ -7,4 +7,4 @@ dependencies {
     implementation(libs.coroutines.core)
     implementation(libs.javax)
     implementation(libs.retrofit.moshi.converter)
-}
\ No newline at end of file
+}
diff --git a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/location/LocationService.kt b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/location/LocationService.kt
new file mode 100644
index 0000000..6f2e832
--- /dev/null
+++ b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/location/LocationService.kt
@@ -0,0 +1,9 @@
+package com.danielwaiguru.weatherapp.domain.location
+
+import com.danielwaiguru.weatherapp.domain.models.UserLocation
+import com.danielwaiguru.weatherapp.domain.utils.ResultWrapper
+
+interface LocationService {
+    suspend fun getCurrentLocation(): ResultWrapper<UserLocation?>
+    val isGpsEnabled: Boolean
+}
diff --git a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/5DayWeatherForecast.kt b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/5DayWeatherForecast.kt
deleted file mode 100644
index 06e774c..0000000
--- a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/5DayWeatherForecast.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.danielwaiguru.weatherapp.domain.models
-
-typealias FiveDayWeatherForecast = List<Weather>
\ No newline at end of file
diff --git a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/CurrentWeatherWithForecast.kt b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/CurrentWeatherWithForecast.kt
new file mode 100644
index 0000000..15f9be3
--- /dev/null
+++ b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/CurrentWeatherWithForecast.kt
@@ -0,0 +1,6 @@
+package com.danielwaiguru.weatherapp.domain.models
+
+data class CurrentWeatherWithForecast(
+    val weather: Weather? = null,
+    val forecasts: List<WeatherForecast>
+)
diff --git a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/Coordinates.kt b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/UserLocation.kt
similarity index 80%
rename from domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/Coordinates.kt
rename to domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/UserLocation.kt
index a68c373..c8fdf23 100644
--- a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/Coordinates.kt
+++ b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/UserLocation.kt
@@ -1,6 +1,6 @@
 package com.danielwaiguru.weatherapp.domain.models
 
-data class Coordinates(
+data class UserLocation(
     val latitude: Double,
     val longitude: Double
 )
diff --git a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/Weather.kt b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/Weather.kt
index e0d05e6..bdbd5a8 100644
--- a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/Weather.kt
+++ b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/Weather.kt
@@ -4,15 +4,16 @@ data class Weather(
     val description: String,
     val icon: String,
     val id: Int,
-    val coordinates: Coordinates,
+    val userLocation: UserLocation,
     val city: String,
     val country: String,
+    val conditionId: Int,
     val temp: Double,
     val tempMin: Double,
     val tempMax: Double,
     val date: Long,
     val lastUpdateAt: Long
-){
+) {
     data class City(
         val id: Int,
         val name: String,
@@ -21,7 +22,6 @@ data class Weather(
     data class Temperature(
         val temp: Double,
         val tempMin: Double,
-        val tempMax: Double,
+        val tempMax: Double
     )
 }
-
diff --git a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/WeatherForecast.kt b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/WeatherForecast.kt
index 62c656d..c0b2a0a 100644
--- a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/WeatherForecast.kt
+++ b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/models/WeatherForecast.kt
@@ -1,9 +1,9 @@
 package com.danielwaiguru.weatherapp.domain.models
 
 data class WeatherForecast(
-    val icon: String,
     val id: Int,
     val date: Long,
     val temp: Double,
-    val lastUpdatedAt: Long
+    val day: String,
+    val conditionId: Int
 )
diff --git a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/repositories/WeatherRepository.kt b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/repositories/WeatherRepository.kt
index ac49b5e..2dd971c 100644
--- a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/repositories/WeatherRepository.kt
+++ b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/repositories/WeatherRepository.kt
@@ -1,6 +1,6 @@
 package com.danielwaiguru.weatherapp.domain.repositories
 
-import com.danielwaiguru.weatherapp.domain.models.Coordinates
+import com.danielwaiguru.weatherapp.domain.models.UserLocation
 import com.danielwaiguru.weatherapp.domain.models.Weather
 import com.danielwaiguru.weatherapp.domain.models.WeatherForecast
 import com.danielwaiguru.weatherapp.domain.utils.ResultWrapper
@@ -8,10 +8,10 @@ import kotlinx.coroutines.flow.Flow
 
 interface WeatherRepository {
     suspend fun getCurrentWeather(
-        coordinates: Coordinates
+        userLocation: UserLocation
     ): Flow<ResultWrapper<Weather?>>
 
     suspend fun getWeatherForecast(
-        coordinates: Coordinates
+        userLocation: UserLocation
     ): Flow<ResultWrapper<List<WeatherForecast>>>
-}
\ No newline at end of file
+}
diff --git a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/usecases/GetCurrentWeatherUseCase.kt b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/usecases/GetCurrentWeatherUseCase.kt
index 8210446..6928f93 100644
--- a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/usecases/GetCurrentWeatherUseCase.kt
+++ b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/usecases/GetCurrentWeatherUseCase.kt
@@ -1,12 +1,15 @@
 package com.danielwaiguru.weatherapp.domain.usecases
 
-import com.danielwaiguru.weatherapp.domain.models.Coordinates
+import com.danielwaiguru.weatherapp.domain.models.UserLocation
 import com.danielwaiguru.weatherapp.domain.models.Weather
 import com.danielwaiguru.weatherapp.domain.repositories.WeatherRepository
 import com.danielwaiguru.weatherapp.domain.utils.ResultWrapper
 import kotlinx.coroutines.flow.Flow
 
-class GetCurrentWeatherUseCase(private val weatherRepository: WeatherRepository) {
-    suspend operator fun invoke(coordinates: Coordinates): Flow<ResultWrapper<Weather?>> =
-        weatherRepository.getCurrentWeather(coordinates)
-}
\ No newline at end of file
+class GetCurrentWeatherUseCase(
+    private val weatherRepository: WeatherRepository
+) {
+    suspend operator fun invoke(userLocation: UserLocation): Flow<ResultWrapper<Weather?>> {
+        return weatherRepository.getCurrentWeather(userLocation)
+    }
+}
diff --git a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/usecases/GetWeatherForecastUseCase.kt b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/usecases/GetWeatherForecastUseCase.kt
new file mode 100644
index 0000000..d98d76f
--- /dev/null
+++ b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/usecases/GetWeatherForecastUseCase.kt
@@ -0,0 +1,32 @@
+package com.danielwaiguru.weatherapp.domain.usecases
+
+import com.danielwaiguru.weatherapp.domain.models.UserLocation
+import com.danielwaiguru.weatherapp.domain.models.WeatherForecast
+import com.danielwaiguru.weatherapp.domain.repositories.WeatherRepository
+import com.danielwaiguru.weatherapp.domain.utils.ResultWrapper
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+class GetWeatherForecastUseCase(
+    private val weatherRepository: WeatherRepository
+) {
+    suspend operator fun invoke(userLocation: UserLocation): Flow<ResultWrapper<List<WeatherForecast>>> {
+        return weatherRepository.getWeatherForecast(userLocation)
+            .map { result ->
+                when (result) {
+                    is ResultWrapper.Error -> {
+                        ResultWrapper.Error(
+                            data = result.data?.distinctBy { it.day },
+                            errorMessage = result.errorMessage
+                        )
+                    }
+                    is ResultWrapper.Loading -> {
+                        ResultWrapper.Loading(data = result.data?.distinctBy { it.day })
+                    }
+                    is ResultWrapper.Success -> {
+                        ResultWrapper.Success(result.data?.distinctBy { it.day } ?: emptyList())
+                    }
+                }
+            }
+    }
+}
diff --git a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/utils/Dispatcher.kt b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/utils/Dispatcher.kt
index 82c1fc3..9bf098e 100644
--- a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/utils/Dispatcher.kt
+++ b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/utils/Dispatcher.kt
@@ -8,4 +8,4 @@ annotation class Dispatcher(val dispatcherProvider: DispatcherProvider)
 
 enum class DispatcherProvider {
     IO, MAIN
-}
\ No newline at end of file
+}
diff --git a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/utils/Ext.kt b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/utils/Ext.kt
new file mode 100644
index 0000000..2e183c3
--- /dev/null
+++ b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/utils/Ext.kt
@@ -0,0 +1,21 @@
+package com.danielwaiguru.weatherapp.domain.utils
+
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+fun Long.getDayName(): String {
+    val sdf = SimpleDateFormat("EEEE", Locale.getDefault())
+    val date = Date(this * 1000)
+    return sdf.format(date)
+//    val utcDate = Date(this)
+//    val formatter = SimpleDateFormat("EEEE", Locale.getDefault())
+//    formatter.timeZone = TimeZone.getTimeZone("UTC")
+//    val c = Calendar.getInstance().apply {
+//        set(Calendar.MILLISECOND, this@getDayName.toInt())
+//    }
+//    val formattedUtcDate = formatter.format(utcDate)
+//    val timeZone = TimeZone.getDefault()
+//    formatter.timeZone = timeZone
+//    return formatter.format(formatter.parse(formattedUtcDate))
+}
diff --git a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/utils/ResultWrapper.kt b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/utils/ResultWrapper.kt
index 4e35953..fc56100 100644
--- a/domain/src/main/java/com/danielwaiguru/weatherapp/domain/utils/ResultWrapper.kt
+++ b/domain/src/main/java/com/danielwaiguru/weatherapp/domain/utils/ResultWrapper.kt
@@ -2,17 +2,21 @@ package com.danielwaiguru.weatherapp.domain.utils
 
 import com.squareup.moshi.Json
 
-sealed class ResultWrapper<out T> {
-    data class Success<out T>(val value: T) : ResultWrapper<T>()
-    data class Error(
-        val errorMessage: String?
-    ) : ResultWrapper<Nothing>()
+sealed class ResultWrapper<T>(
+    val data: T? = null,
+    val errorMessage: String? = null
+) {
+    class Success<T>(data: T) : ResultWrapper<T>(data)
+    class Error<T>(
+        errorMessage: String?,
+        data: T? = null
+    ) : ResultWrapper<T>(data, errorMessage)
 
-    data class Loading<out T>(val value: T? = null) : ResultWrapper<T>()
+    class Loading<T>(data: T? = null) : ResultWrapper<T>(data)
 }
 
 data class ErrorResponse(
     @field:Json(name = "cod")
     val code: Int,
     val message: String
-)
\ No newline at end of file
+)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 58b5dbd..a22ff70 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,6 +12,7 @@ activity-compose = "1.8.2"
 compose-bom = "2023.10.01"
 androidxComposeCompiler = "1.5.7"
 appcompat = "1.6.1"
+lottieCompose = "5.2.0"
 material = "1.11.0"
 hilt = "2.48.1"
 hiltExt = "1.1.0"
@@ -41,12 +42,15 @@ room = "2.6.1"
 targetSdk = "34"
 compileSdk = "34"
 minSdk = "24"
+playServicesLocation = "21.0.1"
+androidDesugarJdkLibs = "2.0.4"
 
 [libraries]
 core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx" }
 activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity-compose" }
 compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
 leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanaryAndroid" }
+lottie-compose = { module = "com.airbnb.android:lottie-compose", version.ref = "lottieCompose" }
 ui = { group = "androidx.compose.ui", name = "ui" }
 ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
 ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
@@ -61,6 +65,7 @@ androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-ru
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "googleAccompanist" }
+accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "googleAccompanist" }
 
 coil-kt = { group = "io.coil-kt", name = "coil", version.ref = "coil" }
 coil-kt-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
@@ -113,6 +118,10 @@ robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectr
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "agp" }
 kotlin-gradlePlugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 ksp-gradlePlugin = { group = "com.google.devtools.ksp", name = "com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
+play-services-location = { group = "com.google.android.gms", name = "play-services-location", version.ref = "playServicesLocation" }
+
+android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }
+
 
 [plugins]
 com-android-application = { id = "com.android.application", version.ref = "agp" }
diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts
index a0154e8..06c1f4c 100644
--- a/presentation/build.gradle.kts
+++ b/presentation/build.gradle.kts
@@ -9,4 +9,7 @@ android {
 }
 dependencies {
     implementation(libs.accompanist.systemuicontroller)
-}
\ No newline at end of file
+    implementation(libs.accompanist.permissions)
+    implementation(project(":designsystem"))
+    implementation(libs.lottie.compose)
+}
diff --git a/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/models/WeatherCondition.kt b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/models/WeatherCondition.kt
new file mode 100644
index 0000000..067d880
--- /dev/null
+++ b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/models/WeatherCondition.kt
@@ -0,0 +1,35 @@
+package com.danielwaiguru.weatherapp.presentation.models
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.compose.ui.graphics.Color
+import com.danielwaiguru.weatherapp.designsystem.theme.cloudyColor
+import com.danielwaiguru.weatherapp.designsystem.theme.rainyColor
+import com.danielwaiguru.weatherapp.designsystem.theme.sunnyColor
+import com.danielwaiguru.weatherapp.presentation.R
+
+enum class WeatherCondition(
+    @StringRes val nameId: Int,
+    @DrawableRes val backgroundId: Int,
+    @DrawableRes val iconId: Int,
+    val backgroundColor: Color
+) {
+    RAINY(
+        nameId = R.string.rainy,
+        backgroundId = R.drawable.sea_rainy,
+        iconId = R.drawable.rain,
+        backgroundColor = rainyColor
+    ),
+    CLOUDY(
+        nameId = R.string.cloudy,
+        backgroundId = R.drawable.sea_cloudy,
+        iconId = R.drawable.partlysunny,
+        backgroundColor = cloudyColor
+    ),
+    SUNNY(
+        nameId = R.string.sunny,
+        backgroundId = R.drawable.sea_sunnypng,
+        iconId = R.drawable.clear,
+        backgroundColor = sunnyColor
+    )
+}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/navigation/AppNavigationDestination.kt b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/navigation/AppNavigationDestination.kt
new file mode 100644
index 0000000..e952d6b
--- /dev/null
+++ b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/navigation/AppNavigationDestination.kt
@@ -0,0 +1,26 @@
+package com.danielwaiguru.weatherapp.presentation.navigation
+
+import androidx.annotation.StringRes
+
+interface AppNavigationDestination {
+    /**
+     * Defines a specific route this destination belongs to.
+     * Route is a String that defines the path to your composable.
+     * You can think of it as an implicit deep link that leads to a specific destination.
+     * Each destination should have a unique route.
+     */
+    val route: String
+
+    /**
+     * Defines a specific destination ID.
+     * This is needed when using nested graphs via the navigation DLS, to differentiate a specific
+     * destination's route from the route of the entire nested graph it belongs to.
+     */
+    val destination: String
+
+    /**
+     * Defines a resource id for the Screen title
+     */
+    @get:StringRes
+    val title: Int
+}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/permissions/PermissionsScreen.kt b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/permissions/PermissionsScreen.kt
new file mode 100644
index 0000000..7c1716e
--- /dev/null
+++ b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/permissions/PermissionsScreen.kt
@@ -0,0 +1,106 @@
+package com.danielwaiguru.weatherapp.presentation.permissions
+
+import android.Manifest
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import com.airbnb.lottie.compose.LottieAnimation
+import com.airbnb.lottie.compose.LottieCompositionSpec
+import com.airbnb.lottie.compose.animateLottieCompositionAsState
+import com.airbnb.lottie.compose.rememberLottieComposition
+import com.danielwaiguru.weatherapp.designsystem.components.PrimaryButton
+import com.danielwaiguru.weatherapp.designsystem.components.TopAppBar
+import com.danielwaiguru.weatherapp.presentation.R
+import com.danielwaiguru.weatherapp.presentation.permissions.navigation.PermissionsScreenDestination
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import com.google.accompanist.permissions.rememberPermissionState
+
+@Composable
+fun PermissionsRoute(onNavigateToWeather: () -> Unit) {
+    PermissionsScreen(
+        onNavigateToWeather = onNavigateToWeather,
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(horizontal = 12.dp)
+    )
+}
+
+val locationPermissions = arrayOf(
+    Manifest.permission.ACCESS_COARSE_LOCATION,
+    Manifest.permission.ACCESS_FINE_LOCATION
+)
+
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun PermissionsScreen(
+    onNavigateToWeather: () -> Unit,
+    modifier: Modifier = Modifier
+) {
+    val locationPermissionsState = rememberPermissionState(
+        permission = Manifest.permission.ACCESS_FINE_LOCATION
+    )
+
+    LaunchedEffect(key1 = locationPermissionsState.status) {
+        if (locationPermissionsState.status.isGranted) {
+            onNavigateToWeather()
+        }
+    }
+    val composition by rememberLottieComposition(
+        LottieCompositionSpec.RawRes(R.raw.location_animation)
+    )
+    val animationState = animateLottieCompositionAsState(composition = composition)
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                modifier = Modifier
+                    .fillMaxWidth(),
+                title = stringResource(id = PermissionsScreenDestination.title)
+            )
+        },
+        modifier = modifier
+    ) { padding ->
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(padding),
+            verticalArrangement = Arrangement.Center,
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            Text(
+                text = stringResource(R.string.location_permission),
+                textAlign = TextAlign.Center
+            )
+            LottieAnimation(
+                composition = composition,
+                progress = { animationState.progress },
+                modifier = Modifier
+                    .align(Alignment.CenterHorizontally)
+                    .size(300.dp),
+                contentScale = ContentScale.Fit
+            )
+            PrimaryButton(
+                text = stringResource(id = R.string.get_started),
+                onClick = {
+                    locationPermissionsState.launchPermissionRequest()
+                },
+                modifier = Modifier
+                    .fillMaxWidth()
+            )
+        }
+    }
+}
diff --git a/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/permissions/navigation/PermissionsScreenDestination.kt b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/permissions/navigation/PermissionsScreenDestination.kt
new file mode 100644
index 0000000..413b061
--- /dev/null
+++ b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/permissions/navigation/PermissionsScreenDestination.kt
@@ -0,0 +1,29 @@
+package com.danielwaiguru.weatherapp.presentation.permissions.navigation
+
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.composable
+import com.danielwaiguru.weatherapp.presentation.R
+import com.danielwaiguru.weatherapp.presentation.navigation.AppNavigationDestination
+import com.danielwaiguru.weatherapp.presentation.permissions.PermissionsRoute
+import com.danielwaiguru.weatherapp.presentation.weather.navigation.WeatherScreenDestination
+
+object PermissionsScreenDestination : AppNavigationDestination {
+    override val route: String = "com.danielwaiguru.weatherapp.PermissionsScreen"
+    override val destination: String = "com.danielwaiguru.weatherapp.PermissionsScreenDestination"
+    override val title: Int = R.string.grant_permissions
+}
+
+fun NavGraphBuilder.permissionsScreen(navController: NavHostController) {
+    composable(route = PermissionsScreenDestination.route) {
+        PermissionsRoute(
+            onNavigateToWeather = {
+                navController.navigate(WeatherScreenDestination.route) {
+                    popUpTo(navController.graph.id) {
+                        inclusive = true
+                    }
+                }
+            }
+        )
+    }
+}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/utils/DateUtils.kt b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/utils/DateUtils.kt
new file mode 100644
index 0000000..acac44c
--- /dev/null
+++ b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/utils/DateUtils.kt
@@ -0,0 +1,28 @@
+package com.danielwaiguru.weatherapp.presentation.utils
+
+import android.text.format.DateUtils
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+object DateUtils {
+    fun toFormattedDate(timeInMillis: Long): String {
+        return try {
+            val outDateFormat = SimpleDateFormat(
+                "d MMM, yyyy, HH:mm",
+                Locale.getDefault()
+            )
+            val outTimeFormat = SimpleDateFormat(
+                "HH:mm",
+                Locale.getDefault()
+            )
+            if (DateUtils.isToday(timeInMillis)) {
+                outTimeFormat.format(timeInMillis)
+            } else {
+                outDateFormat.format(timeInMillis)
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+            ""
+        }
+    }
+}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/utils/PresentationExt.kt b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/utils/PresentationExt.kt
new file mode 100644
index 0000000..45ce9d3
--- /dev/null
+++ b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/utils/PresentationExt.kt
@@ -0,0 +1,23 @@
+package com.danielwaiguru.weatherapp.presentation.utils
+
+import com.danielwaiguru.weatherapp.presentation.models.WeatherCondition
+
+fun Int.getWeatherCondition(): WeatherCondition {
+    return when (this) {
+        in 200..622 -> {
+            WeatherCondition.RAINY
+        }
+
+        in 701..781 -> {
+            WeatherCondition.CLOUDY
+        }
+
+        in 801..804 -> {
+            WeatherCondition.CLOUDY
+        }
+
+        else -> {
+            WeatherCondition.SUNNY
+        }
+    }
+}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/weather/WeatherScreen.kt b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/weather/WeatherScreen.kt
new file mode 100644
index 0000000..b7accae
--- /dev/null
+++ b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/weather/WeatherScreen.kt
@@ -0,0 +1,329 @@
+package com.danielwaiguru.weatherapp.presentation.weather
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.Divider
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.danielwaiguru.weatherapp.designsystem.components.ProgressIndicator
+import com.danielwaiguru.weatherapp.designsystem.previews.DevicePreviews
+import com.danielwaiguru.weatherapp.designsystem.theme.WeatherAppTheme
+import com.danielwaiguru.weatherapp.designsystem.utils.Dimensions
+import com.danielwaiguru.weatherapp.domain.models.Weather
+import com.danielwaiguru.weatherapp.domain.models.WeatherForecast
+import com.danielwaiguru.weatherapp.presentation.R
+import com.danielwaiguru.weatherapp.presentation.models.WeatherCondition
+import com.danielwaiguru.weatherapp.presentation.utils.DateUtils
+import com.danielwaiguru.weatherapp.presentation.utils.getWeatherCondition
+
+@Composable
+fun WeatherRoute(
+    viewModel: WeatherViewModel = hiltViewModel()
+) {
+    val uiState by viewModel.currentWeatherUIState.collectAsStateWithLifecycle()
+    WeatherScreen(
+        modifier = Modifier
+            .fillMaxSize(),
+        state = uiState
+    )
+}
+
+@Composable
+fun WeatherScreen(
+    modifier: Modifier = Modifier,
+    state: WeatherScreenState
+) {
+    val snackbarHostState = remember {
+        SnackbarHostState()
+    }
+    LaunchedEffect(state.errorMessage) {
+        if (state.errorMessage != null) {
+            snackbarHostState.showSnackbar(state.errorMessage)
+        }
+    }
+    Scaffold(
+        modifier = modifier,
+        snackbarHost = {
+            SnackbarHost(snackbarHostState)
+        }
+    ) { paddingValues ->
+        Column(
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(paddingValues)
+        ) {
+            when {
+                state.isLoadingWithNoData -> {
+                    Box(
+                        contentAlignment = Alignment.Center,
+                        modifier = Modifier
+                            .fillMaxSize()
+                    ) {
+                        ProgressIndicator(
+                            modifier = Modifier
+                                .align(Alignment.Center)
+                        )
+                    }
+                }
+                state.currentWeather != null -> {
+                    val weatherCondition by remember(state.currentWeather.conditionId) {
+                        derivedStateOf { state.currentWeather.conditionId.getWeatherCondition() }
+                    }
+                    CurrentWeatherComponent(
+                        weather = state.currentWeather,
+                        weatherCondition = weatherCondition,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .fillMaxHeight(0.45f)
+                    )
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .background(weatherCondition.backgroundColor)
+                    ) {
+                        TempItem(
+                            temp = state.currentWeather.tempMin,
+                            text = stringResource(id = R.string.min),
+                            modifier = Modifier
+                                .padding(10.dp)
+                        )
+                        TempItem(
+                            temp = state.currentWeather.temp,
+                            text = stringResource(id = R.string.current),
+                            modifier = Modifier
+                                .padding(10.dp)
+                        )
+                        TempItem(
+                            temp = state.currentWeather.tempMax,
+                            text = stringResource(id = R.string.max),
+                            modifier = Modifier
+                                .padding(10.dp)
+                        )
+                    }
+                    Divider(
+                        modifier = Modifier
+                            .fillMaxWidth(),
+                        color = MaterialTheme.colorScheme.onPrimary,
+                        thickness = 2.dp
+
+                    )
+                    WeatherForecastComponent(
+                        forecasts = state.forecasts,
+                        modifier = Modifier
+                            .weight(1f)
+                            .fillMaxWidth()
+                            .background(weatherCondition.backgroundColor)
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun WeatherForecastComponent(
+    modifier: Modifier = Modifier,
+    forecasts: List<WeatherForecast>
+) {
+    LazyColumn(
+        modifier = modifier,
+        verticalArrangement = Arrangement
+            .spacedBy(Dimensions.PaddingMedium)
+    ) {
+        items(forecasts, key = { it.id }) { forecast ->
+            ForecastItem(
+                forecast = forecast,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 10.dp)
+            )
+        }
+    }
+}
+
+@Composable
+private fun ForecastItem(
+    modifier: Modifier = Modifier,
+    forecast: WeatherForecast
+) {
+    val weatherCondition by remember(forecast.conditionId) {
+        derivedStateOf { forecast.conditionId.getWeatherCondition() }
+    }
+    Row(
+        modifier = modifier,
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween
+    ) {
+        Text(
+            text = forecast.day,
+            color = MaterialTheme.colorScheme.onPrimary,
+            style = MaterialTheme.typography.bodyMedium,
+            modifier = Modifier
+                .weight(1f)
+        )
+        Image(
+            painter = painterResource(id = weatherCondition.iconId),
+            contentDescription = stringResource(id = weatherCondition.nameId),
+            contentScale = ContentScale.Fit,
+            modifier = Modifier
+                .size(30.dp)
+                .weight(1f)
+
+        )
+        Text(
+            text = "${forecast.temp}°C",
+            color = MaterialTheme.colorScheme.onPrimary,
+            textAlign = TextAlign.End,
+            modifier = Modifier
+                .weight(1f)
+        )
+    }
+}
+
+@DevicePreviews
+@Composable
+fun ForecastItemPreview() {
+    WeatherAppTheme {
+        ForecastItem(
+            forecast = WeatherForecast(
+                id = 3406,
+                date = 1444,
+                temp = 6.7,
+                day = "fabellas",
+                conditionId = 600
+            ),
+            modifier = Modifier
+                .fillMaxWidth()
+        )
+    }
+}
+
+@Composable
+private fun CurrentWeatherComponent(
+    modifier: Modifier = Modifier,
+    weather: Weather,
+    weatherCondition: WeatherCondition
+) {
+    Box(
+        modifier = modifier,
+        contentAlignment = Alignment.Center
+    ) {
+        Image(
+            painter = painterResource(id = weatherCondition.backgroundId),
+            contentDescription = weather.description,
+            contentScale = ContentScale.FillBounds,
+            modifier = Modifier
+                .matchParentSize()
+        )
+        Column(
+            modifier = Modifier
+                .align(Alignment.Center)
+                .fillMaxSize()
+                .padding(Dimensions.PaddingMedium),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center
+        ) {
+            Text(
+                text = "${weather.temp}°C",
+                color = MaterialTheme.colorScheme.onPrimary,
+                style = MaterialTheme.typography.displayLarge,
+                textAlign = TextAlign.Center
+            )
+            Text(
+                text = weatherCondition.name,
+                color = MaterialTheme.colorScheme.onPrimary,
+                style = MaterialTheme.typography.titleLarge.copy(
+                    fontWeight = FontWeight.SemiBold,
+                    fontSize = 25.sp
+                ),
+                textAlign = TextAlign.Center
+            )
+        }
+        Text(
+            text = "Last Updated: ${DateUtils.toFormattedDate(weather.lastUpdateAt)}",
+            modifier = Modifier
+                .align(Alignment.BottomStart)
+                .padding(bottom = Dimensions.PaddingLarge, start = Dimensions.PaddingMedium),
+            color = MaterialTheme.colorScheme.onPrimary
+        )
+        Text(
+            text = "${weather.city}, ${weather.country}",
+            textAlign = TextAlign.Center,
+            modifier = Modifier
+                .fillMaxWidth()
+                .align(Alignment.TopCenter)
+                .padding(top = Dimensions.PaddingLarge),
+            color = MaterialTheme.colorScheme.onPrimary
+        )
+    }
+}
+
+@Composable
+private fun TempItem(
+    temp: Double,
+    text: String,
+    modifier: Modifier = Modifier
+) {
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Text(
+            text = "$temp°C",
+            textAlign = TextAlign.Center,
+            style = MaterialTheme.typography.titleMedium,
+            color = MaterialTheme.colorScheme.onPrimary
+        )
+        Text(
+            text = text,
+            textAlign = TextAlign.Center,
+            color = MaterialTheme.colorScheme.onPrimary
+        )
+    }
+}
+
+@DevicePreviews
+@Composable
+fun TempItemPreview() {
+    WeatherAppTheme {
+        TempItem(
+            temp = 12.0,
+            text = "min",
+            modifier = Modifier
+                .padding(10.dp)
+        )
+    }
+}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/weather/WeatherScreenState.kt b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/weather/WeatherScreenState.kt
new file mode 100644
index 0000000..258664b
--- /dev/null
+++ b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/weather/WeatherScreenState.kt
@@ -0,0 +1,14 @@
+package com.danielwaiguru.weatherapp.presentation.weather
+
+import com.danielwaiguru.weatherapp.domain.models.Weather
+import com.danielwaiguru.weatherapp.domain.models.WeatherForecast
+
+data class WeatherScreenState(
+    private val isLoading: Boolean = false,
+    val currentWeather: Weather? = null,
+    val errorMessage: String? = null,
+    val forecasts: List<WeatherForecast> = emptyList()
+) {
+    val isLoadingWithNoData: Boolean
+        get() = isLoading && currentWeather == null
+}
diff --git a/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/weather/WeatherViewModel.kt b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/weather/WeatherViewModel.kt
new file mode 100644
index 0000000..3c001b8
--- /dev/null
+++ b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/weather/WeatherViewModel.kt
@@ -0,0 +1,130 @@
+package com.danielwaiguru.weatherapp.presentation.weather
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.danielwaiguru.weatherapp.domain.location.LocationService
+import com.danielwaiguru.weatherapp.domain.models.UserLocation
+import com.danielwaiguru.weatherapp.domain.usecases.GetCurrentWeatherUseCase
+import com.danielwaiguru.weatherapp.domain.usecases.GetWeatherForecastUseCase
+import com.danielwaiguru.weatherapp.domain.utils.ResultWrapper
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class WeatherViewModel @Inject constructor(
+    private val getCurrentWeatherUseCase: GetCurrentWeatherUseCase,
+    private val getWeatherForecastUseCase: GetWeatherForecastUseCase,
+    private val locationService: LocationService
+) : ViewModel() {
+    private val _currentWeatherUIState = MutableStateFlow(WeatherScreenState())
+    val currentWeatherUIState: StateFlow<WeatherScreenState> = _currentWeatherUIState.asStateFlow()
+
+    init {
+        getCurrentLocation()
+    }
+
+    private fun getWeatherForecast(userLocation: UserLocation) {
+        viewModelScope.launch {
+            getWeatherForecastUseCase(userLocation)
+                .onEach { result ->
+                    when (result) {
+                        is ResultWrapper.Error -> _currentWeatherUIState.update { currentState ->
+                            currentState.copy(
+                                isLoading = false,
+                                errorMessage = result.errorMessage,
+                                forecasts = result.data ?: emptyList()
+                            )
+                        }
+                        is ResultWrapper.Loading -> _currentWeatherUIState.update { currentState ->
+                            currentState.copy(
+                                isLoading = true,
+                                errorMessage = null,
+                                forecasts = result.data ?: emptyList()
+                            )
+                        }
+                        is ResultWrapper.Success -> _currentWeatherUIState.update { currentState ->
+                            currentState.copy(
+                                isLoading = false,
+                                errorMessage = null,
+                                forecasts = result.data ?: emptyList()
+                            )
+                        }
+                    }
+                }.launchIn(this)
+        }
+    }
+
+    private fun getCurrentWeather(userLocation: UserLocation) {
+        viewModelScope.launch {
+            getCurrentWeatherUseCase(userLocation)
+                .onEach { result ->
+                    when (result) {
+                        is ResultWrapper.Error -> _currentWeatherUIState.update { currentState ->
+                            currentState.copy(
+                                isLoading = false,
+                                errorMessage = result.errorMessage,
+                                currentWeather = result.data
+                            )
+                        }
+                        is ResultWrapper.Loading -> _currentWeatherUIState.update { currentState ->
+                            currentState.copy(
+                                isLoading = true,
+                                errorMessage = null,
+                                currentWeather = result.data
+                            )
+                        }
+                        is ResultWrapper.Success -> _currentWeatherUIState.update { currentState ->
+                            currentState.copy(
+                                isLoading = false,
+                                errorMessage = null,
+                                currentWeather = result.data
+                            )
+                        }
+                    }
+                }.launchIn(this)
+        }
+    }
+
+    private fun getCurrentLocation() {
+        viewModelScope.launch {
+            _currentWeatherUIState.update { currentState ->
+                currentState.copy(
+                    isLoading = true,
+                    errorMessage = null
+                )
+            }
+            when (val userLocationResult = locationService.getCurrentLocation()) {
+                is ResultWrapper.Error -> {
+                    _currentWeatherUIState.update { currentState ->
+                        currentState.copy(
+                            isLoading = false,
+                            errorMessage = userLocationResult.errorMessage
+                        )
+                    }
+                }
+                is ResultWrapper.Loading -> Unit
+                is ResultWrapper.Success -> {
+                    if (userLocationResult.data == null) {
+                        _currentWeatherUIState.update { currentState ->
+                            currentState.copy(
+                                isLoading = false,
+                                errorMessage = "No location found"
+                            )
+                        }
+                        return@launch
+                    }
+                    val userLocation = userLocationResult.data!!
+                    getCurrentWeather(userLocation)
+                    getWeatherForecast(userLocation)
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/weather/navigation/WeatherScreenDestination.kt b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/weather/navigation/WeatherScreenDestination.kt
new file mode 100644
index 0000000..381cb73
--- /dev/null
+++ b/presentation/src/main/java/com/danielwaiguru/weatherapp/presentation/weather/navigation/WeatherScreenDestination.kt
@@ -0,0 +1,19 @@
+package com.danielwaiguru.weatherapp.presentation.weather.navigation
+
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
+import com.danielwaiguru.weatherapp.presentation.navigation.AppNavigationDestination
+import com.danielwaiguru.weatherapp.presentation.weather.WeatherRoute
+
+object WeatherScreenDestination : AppNavigationDestination {
+    override val route: String = "com.danielwaiguru.weatherapp.WeatherScreen"
+    override val destination: String = "com.danielwaiguru.weatherapp.WeatherScreenDestination"
+    override val title: Int
+        get() = TODO("Not yet implemented")
+}
+
+fun NavGraphBuilder.weatherScreen() {
+    composable(route = WeatherScreenDestination.route) {
+        WeatherRoute()
+    }
+}
\ No newline at end of file
diff --git a/presentation/src/main/res/drawable-mdpi/clear.png b/presentation/src/main/res/drawable-mdpi/clear.png
new file mode 100644
index 0000000..2e15781
Binary files /dev/null and b/presentation/src/main/res/drawable-mdpi/clear.png differ
diff --git a/presentation/src/main/res/drawable-mdpi/partlysunny.png b/presentation/src/main/res/drawable-mdpi/partlysunny.png
new file mode 100644
index 0000000..3973670
Binary files /dev/null and b/presentation/src/main/res/drawable-mdpi/partlysunny.png differ
diff --git a/presentation/src/main/res/drawable-mdpi/rain.png b/presentation/src/main/res/drawable-mdpi/rain.png
new file mode 100644
index 0000000..80e2c80
Binary files /dev/null and b/presentation/src/main/res/drawable-mdpi/rain.png differ
diff --git a/presentation/src/main/res/drawable-xhdpi/clear.png b/presentation/src/main/res/drawable-xhdpi/clear.png
new file mode 100644
index 0000000..74f3127
Binary files /dev/null and b/presentation/src/main/res/drawable-xhdpi/clear.png differ
diff --git a/presentation/src/main/res/drawable-xhdpi/partlysunny.png b/presentation/src/main/res/drawable-xhdpi/partlysunny.png
new file mode 100644
index 0000000..d08afd2
Binary files /dev/null and b/presentation/src/main/res/drawable-xhdpi/partlysunny.png differ
diff --git a/presentation/src/main/res/drawable-xhdpi/rain.png b/presentation/src/main/res/drawable-xhdpi/rain.png
new file mode 100644
index 0000000..051dcf5
Binary files /dev/null and b/presentation/src/main/res/drawable-xhdpi/rain.png differ
diff --git a/presentation/src/main/res/drawable-xxhdpi/clear.png b/presentation/src/main/res/drawable-xxhdpi/clear.png
new file mode 100644
index 0000000..8e5727f
Binary files /dev/null and b/presentation/src/main/res/drawable-xxhdpi/clear.png differ
diff --git a/presentation/src/main/res/drawable-xxhdpi/partlysunny.png b/presentation/src/main/res/drawable-xxhdpi/partlysunny.png
new file mode 100644
index 0000000..e726c13
Binary files /dev/null and b/presentation/src/main/res/drawable-xxhdpi/partlysunny.png differ
diff --git a/presentation/src/main/res/drawable-xxhdpi/rain.png b/presentation/src/main/res/drawable-xxhdpi/rain.png
new file mode 100644
index 0000000..b1af53c
Binary files /dev/null and b/presentation/src/main/res/drawable-xxhdpi/rain.png differ
diff --git a/presentation/src/main/res/drawable/sea_cloudy.png b/presentation/src/main/res/drawable/sea_cloudy.png
new file mode 100644
index 0000000..85c6654
Binary files /dev/null and b/presentation/src/main/res/drawable/sea_cloudy.png differ
diff --git a/presentation/src/main/res/drawable/sea_rainy.png b/presentation/src/main/res/drawable/sea_rainy.png
new file mode 100644
index 0000000..70b4a8a
Binary files /dev/null and b/presentation/src/main/res/drawable/sea_rainy.png differ
diff --git a/presentation/src/main/res/drawable/sea_sunnypng.png b/presentation/src/main/res/drawable/sea_sunnypng.png
new file mode 100644
index 0000000..9598f8b
Binary files /dev/null and b/presentation/src/main/res/drawable/sea_sunnypng.png differ
diff --git a/presentation/src/main/res/raw/location_animation.json b/presentation/src/main/res/raw/location_animation.json
new file mode 100644
index 0000000..d0fdcd8
--- /dev/null
+++ b/presentation/src/main/res/raw/location_animation.json
@@ -0,0 +1 @@
+{"v":"5.1.1","fr":30,"ip":0,"op":90,"w":368,"h":240,"nm":"02-B","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"pin Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.71,143.456,0],"ix":2},"a":{"a":0,"k":[42.579,115.457,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[1.444,1.289,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"n":["0p833_1p444_0p167_0","0p833_1p289_0p167_0","0p833_1_0p167_0"],"t":22,"s":[100,100,100],"e":[92.917,112.992,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.99,0.967,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.073,0.135,0]},"n":["0p833_0p99_0p167_0p073","0p833_0p967_0p167_0p135","0p833_1_0p167_0"],"t":26,"s":[92.917,112.992,100],"e":[125.208,92.205,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.949,0.962,1]},"o":{"x":[0.167,0.167,0.167],"y":[-0.016,-0.081,0]},"n":["0p833_0p949_0p167_-0p016","0p833_0p962_0p167_-0p081","0p833_1_0p167_0"],"t":29,"s":[125.208,92.205,100],"e":[97.643,103.464,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.967,0.925,1]},"o":{"x":[0.167,0.167,0.167],"y":[-0.209,-0.098,0]},"n":["0p833_0p967_0p167_-0p209","0p833_0p925_0p167_-0p098","0p833_1_0p167_0"],"t":33,"s":[97.643,103.464,100],"e":[106.102,98,100]},{"i":{"x":[0.811,0.811,0.811],"y":[1.021,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[-0.018,-0.082,0]},"n":["0p811_1p021_0p167_-0p018","0p811_1_0p167_-0p082","0p811_1_0p167_0"],"t":38,"s":[106.102,98,100],"e":[100,100,100]},{"t":40}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,7.781],[7.78,0],[0,-7.78],[-7.781,0]],"o":[[0,-7.78],[-7.781,0],[0,7.781],[7.78,0]],"v":[[14.089,0],[0,-14.088],[-14.089,0],[0,14.088]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.647000002394,0.184000007779,0.125,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[42.624,42.283],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,37.343],[23.454,0],[0,-23.455],[-1.368,0]],"o":[[0,-23.455],[-23.455,0],[0,37.343],[1.367,0]],"v":[[42.468,-14.644],[0,-57.113],[-42.469,-14.644],[0,57.113]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.917999985639,0.337000020345,0.238999998803,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[42.468,57.113],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":90,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"line Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.6,144.956,0],"ix":2},"a":{"a":0,"k":[17.389,6,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[1.733,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"n":["0p833_1p733_0p167_0","0p833_1_0p167_0","0p833_1_0p167_0"],"t":22,"s":[100,100,100],"e":[60,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.987,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.195,0,0]},"n":["0p833_0p987_0p167_0p195","0p833_1_0p167_0","0p833_1_0p167_0"],"t":26,"s":[60,100,100],"e":[173,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.987,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[-0.022,0,0]},"n":["0p833_0p987_0p167_-0p022","0p833_1_0p167_0","0p833_1_0p167_0"],"t":29,"s":[173,100,100],"e":[81,100,100]},{"i":{"x":[0.635,0.635,0.635],"y":[0.714,1,1]},"o":{"x":[0.158,0.158,0.158],"y":[-0.067,0,0]},"n":["0p635_0p714_0p158_-0p067","0p635_1_0p158_0","0p635_1_0p158_0"],"t":33,"s":[81,100,100],"e":[102.444,100,100]},{"i":{"x":[0.811,0.811,0.811],"y":[1.42,1,1]},"o":{"x":[0.438,0.438,0.438],"y":[-1.206,0,0]},"n":["0p811_1p42_0p438_-1p206","0p811_1_0p438_0","0p811_1_0p438_0"],"t":38,"s":[102.444,100,100],"e":[100,100,100]},{"t":40}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[6,6],[28.779,6]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.969000004787,0.74900004069,0.709999952129,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"lc":2,"lj":2,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":90,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"horizontaal","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.5,120,0],"ix":2},"a":{"a":0,"k":[183.5,120,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[99.736,145.12],[265.745,145.12]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"lc":1,"lj":1,"ml":10,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":21,"s":[0],"e":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":33,"s":[0],"e":[0]},{"i":{"x":[0.518],"y":[1]},"o":{"x":[0.426],"y":[0]},"n":["0p518_1_0p426_0"],"t":73,"s":[0],"e":[100]},{"t":84}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.521],"y":[1]},"o":{"x":[0.496],"y":[0]},"n":["0p521_1_0p496_0"],"t":21,"s":[0],"e":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":33,"s":[100],"e":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":73,"s":[100],"e":[100]},{"t":84}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":10,"op":100,"st":10,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"verticaal","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.5,120,0],"ix":2},"a":{"a":0,"k":[183.5,120,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[209.609,41.667],[209.609,200.667]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"lc":1,"lj":1,"ml":10,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":11,"s":[100],"e":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["0p667_1_0p167_0"],"t":23,"s":[100],"e":[100]},{"i":{"x":[0.412],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p412_1_0p333_0"],"t":63,"s":[100],"e":[0]},{"t":75}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.437],"y":[1]},"o":{"x":[0.427],"y":[0]},"n":["0p437_1_0p427_0"],"t":11,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p833_1_0p333_0"],"t":23,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":63,"s":[0],"e":[0]},{"t":75}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":90,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"bocht","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.5,120,0],"ix":2},"a":{"a":0,"k":[183.5,120,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,-20.781],[0,0],[1.889,-4.513]],"o":[[0,0],[-20.568,0],[0,0],[0,5.208],[0,0]],"v":[[62.182,-47.966],[-22.005,-47.966],[-59.249,-10.339],[-59.249,33.285],[-62.182,47.967]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":8,"ix":5},"lc":1,"lj":1,"ml":10,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[204.09,147.818],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":11,"s":[100],"e":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":23,"s":[100],"e":[100]},{"i":{"x":[0.514],"y":[1]},"o":{"x":[0.435],"y":[0]},"n":["0p514_1_0p435_0"],"t":72,"s":[100],"e":[0]},{"t":84}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.429],"y":[1]},"o":{"x":[0.444],"y":[0]},"n":["0p429_1_0p444_0"],"t":11,"s":[100],"e":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":23,"s":[0],"e":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"n":["0p667_1_0p333_0"],"t":72,"s":[0],"e":[0]},{"t":84}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":90,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"blauw","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":20,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":32,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":63,"s":[100],"e":[0]},{"t":75}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.5,117,0],"ix":2},"a":{"a":0,"k":[183.5,120,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[12.741,-1.208],[-4.334,-45.689],[-1.422,-4.92],[0,0],[0,0],[-20.569,0],[0,0],[0,0]],"o":[[-45.689,4.334],[0.502,5.285],[0,0],[0,0],[0,-20.781],[0,0],[0,0],[-11.268,-4.122]],"v":[[21.165,-52.344],[-53.715,38.232],[-50.785,53.551],[-9.253,53.551],[-9.253,47.764],[27.99,10.136],[58.049,10.136],[57.512,-47.688]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.26699999641,0.344999994016,0.866999966491,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[154.094,89.716],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":20,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":32,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":63,"s":[0],"e":[100]},{"t":75}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":20,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":32,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":63,"s":[100],"e":[100]},{"t":75}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":9,"op":99,"st":9,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"groen","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":21,"s":[1],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":33,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":64,"s":[100],"e":[0]},{"t":76}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.5,117,0],"ix":2},"a":{"a":0,"k":[183.5,120,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[25.349,9.192],[0,0],[0,0]],"o":[[0,0],[0,0],[-6.91,-27.008]],"v":[[-26.104,-28.726],[-26.104,28.726],[26.104,28.726]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.301999978458,0.889999988032,0.728999956916,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[237.488,70.677],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":21,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":33,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":64,"s":[0],"e":[100]},{"t":76}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":21,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":33,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":64,"s":[100],"e":[100]},{"t":76}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":10,"op":100,"st":10,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"circle Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[183.355,117.117,0],"ix":2},"a":{"a":0,"k":[83.1,83.099,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.794,45.889],[45.886,0.794],[0.794,-45.888],[-45.888,-0.794]],"o":[[0.794,-45.888],[-45.889,-0.794],[-0.794,45.889],[45.887,0.794]],"v":[[83.087,1.437],[1.439,-83.087],[-83.087,-1.438],[-1.437,83.086]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.948999980852,0.948999980852,0.948999980852,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[83.1,83.099],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":90,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
new file mode 100644
index 0000000..7de861b
--- /dev/null
+++ b/presentation/src/main/res/values/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="grant_permissions">Grant Location Permissions</string>
+    <string name="location_permission">Weather App requires location permissions to be able to show weather information for your location. Please grant permissions to be able to use this app.</string>
+    <string name="get_started">Get Started</string>
+    <string name="rainy">Rainy</string>
+    <string name="cloudy">Cloudy</string>
+    <string name="sunny">Sunny</string>
+    <string name="min">Min</string>
+    <string name="current">Current</string>
+    <string name="max">Max</string>
+</resources>
\ No newline at end of file