From 144a0cc8b05aaf3531812c7e15124ad435db33b6 Mon Sep 17 00:00:00 2001
From: Jina-n11 <jinanqbh37@gmail.com>
Date: Mon, 8 Aug 2022 20:20:24 +0300
Subject: [PATCH 01/16] add observable search

---
 app/build.gradle                              |  2 ++
 .../com/cheese/weatherapp/ui/MainActivity.kt  | 35 ++++++++-----------
 .../com/cheese/weatherapp/util/Constants.kt   |  1 +
 app/src/main/res/values-night/themes.xml      | 16 ---------
 app/src/main/res/values/themes.xml            |  6 ++--
 5 files changed, 21 insertions(+), 39 deletions(-)
 delete mode 100644 app/src/main/res/values-night/themes.xml

diff --git a/app/build.gradle b/app/build.gradle
index 89e3805..90add49 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,4 +46,6 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'com.airbnb.android:lottie:5.2.0'
+    implementation "io.reactivex.rxjava3:rxjava:3.1.5"
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
index 81da396..db6eb6d 100644
--- a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
+++ b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
@@ -3,6 +3,7 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.view.LayoutInflater
 import android.widget.Toast
+import androidx.core.widget.doOnTextChanged
 import com.cheese.weatherapp.R
 import com.cheese.weatherapp.databinding.ActivityMainBinding
 import com.cheese.weatherapp.models.WeatherState
@@ -11,8 +12,10 @@ import com.example.mikmok.util.Constants
 import com.example.mikmok.util.toCelsius
 import com.example.mikmok.util.toPercent
 import com.google.gson.Gson
+import io.reactivex.rxjava3.core.Observable
 import okhttp3.*
 import java.io.IOException
+import java.util.concurrent.TimeUnit
 
 class MainActivity : BaseActivity<ActivityMainBinding>(){
     private val client = OkHttpClient()
@@ -26,32 +29,24 @@ class MainActivity : BaseActivity<ActivityMainBinding>(){
 
     override fun addCallbacks() {
         onSearchChange()
-        onClickSearchButton()
     }
 
-    private fun onClickSearchButton()= binding.buttonSearch.setOnClickListener {
-            cityName =  binding.searchCity.text.toString()
-            getWeather(cityName=cityName)
-    }
 
-    private fun onSearchChange() = binding.searchCity.addTextChangedListener(object : TextWatcher {
-        override fun afterTextChanged(s: Editable) {}
-        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-            visibleButton()
-        }
-    })
+    private fun onSearchChange(){
+        val observableSearch =Observable.create<String>{ emitter->
+            binding.searchCity.doOnTextChanged{text, start, before, count ->
+                emitter.onNext(text.toString())
+            }
+        }.debounce(1,TimeUnit.SECONDS)
+        observableSearch.subscribe(
+            {t->getWeather(cityName=t)},
+            {e-> showToast(message = "${Constants.CITY_NOT_FOUND} : $e")
+            }
+        )
 
-    private fun visibleButton(){
-        binding.buttonSearch.visibility =android.view.View.VISIBLE
-        if(binding.searchCity.text.isEmpty()){
-            binding.buttonSearch.visibility =android.view.View.INVISIBLE
-        }
-        else{
-            binding.buttonSearch.visibility =android.view.View.VISIBLE
-        }
     }
 
+
     private fun getWeather(cityName:String) {
         val request = Request.Builder()
             .url(Constants.API_URL+"${cityName.trim()}")
diff --git a/app/src/main/java/com/cheese/weatherapp/util/Constants.kt b/app/src/main/java/com/cheese/weatherapp/util/Constants.kt
index 7044380..cd87c28 100644
--- a/app/src/main/java/com/cheese/weatherapp/util/Constants.kt
+++ b/app/src/main/java/com/cheese/weatherapp/util/Constants.kt
@@ -9,4 +9,5 @@ object Constants {
     const val  TYPE ="application/json"
     const val CITY  ="Baghdad"
     const val MAIN_ACTIVITY  ="MAIN_ACTIVITY"
+    const val CITY_NOT_FOUND  ="city not found"
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 2d4a99f..0000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.WeatherApp" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a8a7122..2d4a99f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,12 +2,12 @@
     <!-- Base application theme. -->
     <style name="Theme.WeatherApp" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
+        <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorOnPrimary">@color/black</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorSecondaryVariant">@color/teal_200</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>

From c55ffba660de6a7688d28ce433fe218e5efa4f01 Mon Sep 17 00:00:00 2001
From: Jina-n11 <jinanqbh37@gmail.com>
Date: Mon, 8 Aug 2022 21:23:41 +0300
Subject: [PATCH 02/16] add api client class

---
 .../weatherapp/{ => data}/models/Clouds.kt    |  2 +-
 .../weatherapp/{ => data}/models/Coord.kt     |  2 +-
 .../weatherapp/{ => data}/models/Main.kt      |  2 +-
 .../weatherapp/{ => data}/models/Rain.kt      |  2 +-
 .../weatherapp/{ => data}/models/Sys.kt       |  2 +-
 .../weatherapp/{ => data}/models/Weather.kt   |  2 +-
 .../{ => data}/models/WeatherMain.kt          |  2 +-
 .../{ => data}/models/WeatherState.kt         |  2 +-
 .../weatherapp/{ => data}/models/Wind.kt      |  2 +-
 .../weatherapp/data/request/ApiClient.kt      | 21 +++++++++++
 .../com/cheese/weatherapp/ui/MainActivity.kt  | 37 ++++++++-----------
 .../com/cheese/weatherapp/util/Constants.kt   |  2 +
 12 files changed, 47 insertions(+), 31 deletions(-)
 rename app/src/main/java/com/cheese/weatherapp/{ => data}/models/Clouds.kt (50%)
 rename app/src/main/java/com/cheese/weatherapp/{ => data}/models/Coord.kt (60%)
 rename app/src/main/java/com/cheese/weatherapp/{ => data}/models/Main.kt (88%)
 rename app/src/main/java/com/cheese/weatherapp/{ => data}/models/Rain.kt (74%)
 rename app/src/main/java/com/cheese/weatherapp/{ => data}/models/Sys.kt (74%)
 rename app/src/main/java/com/cheese/weatherapp/{ => data}/models/Weather.kt (73%)
 rename app/src/main/java/com/cheese/weatherapp/{ => data}/models/WeatherMain.kt (96%)
 rename app/src/main/java/com/cheese/weatherapp/{ => data}/models/WeatherState.kt (59%)
 rename app/src/main/java/com/cheese/weatherapp/{ => data}/models/Wind.kt (60%)
 create mode 100644 app/src/main/java/com/cheese/weatherapp/data/request/ApiClient.kt

diff --git a/app/src/main/java/com/cheese/weatherapp/models/Clouds.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Clouds.kt
similarity index 50%
rename from app/src/main/java/com/cheese/weatherapp/models/Clouds.kt
rename to app/src/main/java/com/cheese/weatherapp/data/models/Clouds.kt
index e169d7c..fb7255a 100644
--- a/app/src/main/java/com/cheese/weatherapp/models/Clouds.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Clouds.kt
@@ -1,4 +1,4 @@
-package com.cheese.weatherapp.models
+package com.cheese.weatherapp.data.models
 
 data class Clouds (
     val all: Double
diff --git a/app/src/main/java/com/cheese/weatherapp/models/Coord.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Coord.kt
similarity index 60%
rename from app/src/main/java/com/cheese/weatherapp/models/Coord.kt
rename to app/src/main/java/com/cheese/weatherapp/data/models/Coord.kt
index ba58ac2..c3918a9 100644
--- a/app/src/main/java/com/cheese/weatherapp/models/Coord.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Coord.kt
@@ -1,4 +1,4 @@
-package com.cheese.weatherapp.models
+package com.cheese.weatherapp.data.models
 
 data class Coord (
     val lon: Double,
diff --git a/app/src/main/java/com/cheese/weatherapp/models/Main.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Main.kt
similarity index 88%
rename from app/src/main/java/com/cheese/weatherapp/models/Main.kt
rename to app/src/main/java/com/cheese/weatherapp/data/models/Main.kt
index aabddc3..4ae93a1 100644
--- a/app/src/main/java/com/cheese/weatherapp/models/Main.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Main.kt
@@ -1,4 +1,4 @@
-package com.cheese.weatherapp.models
+package com.cheese.weatherapp.data.models
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/app/src/main/java/com/cheese/weatherapp/models/Rain.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Rain.kt
similarity index 74%
rename from app/src/main/java/com/cheese/weatherapp/models/Rain.kt
rename to app/src/main/java/com/cheese/weatherapp/data/models/Rain.kt
index 505f838..d7b2670 100644
--- a/app/src/main/java/com/cheese/weatherapp/models/Rain.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Rain.kt
@@ -1,4 +1,4 @@
-package com.cheese.weatherapp.models
+package com.cheese.weatherapp.data.models
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/app/src/main/java/com/cheese/weatherapp/models/Sys.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Sys.kt
similarity index 74%
rename from app/src/main/java/com/cheese/weatherapp/models/Sys.kt
rename to app/src/main/java/com/cheese/weatherapp/data/models/Sys.kt
index 6b142c4..25a697c 100644
--- a/app/src/main/java/com/cheese/weatherapp/models/Sys.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Sys.kt
@@ -1,4 +1,4 @@
-package com.cheese.weatherapp.models
+package com.cheese.weatherapp.data.models
 
 data class Sys (
     val type: Int,
diff --git a/app/src/main/java/com/cheese/weatherapp/models/Weather.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Weather.kt
similarity index 73%
rename from app/src/main/java/com/cheese/weatherapp/models/Weather.kt
rename to app/src/main/java/com/cheese/weatherapp/data/models/Weather.kt
index 20fccea..7be6cde 100644
--- a/app/src/main/java/com/cheese/weatherapp/models/Weather.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Weather.kt
@@ -1,4 +1,4 @@
-package com.cheese.weatherapp.models
+package com.cheese.weatherapp.data.models
 
 data class Weather (
 //    val id: Int,
diff --git a/app/src/main/java/com/cheese/weatherapp/models/WeatherMain.kt b/app/src/main/java/com/cheese/weatherapp/data/models/WeatherMain.kt
similarity index 96%
rename from app/src/main/java/com/cheese/weatherapp/models/WeatherMain.kt
rename to app/src/main/java/com/cheese/weatherapp/data/models/WeatherMain.kt
index 94060f4..b8e956f 100644
--- a/app/src/main/java/com/cheese/weatherapp/models/WeatherMain.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/WeatherMain.kt
@@ -1,5 +1,5 @@
 package com.example.mikmok.data.models
-import com.cheese.weatherapp.models.*
+import com.cheese.weatherapp.data.models.*
 
 data class WeatherMain(
     val wind: Wind,
diff --git a/app/src/main/java/com/cheese/weatherapp/models/WeatherState.kt b/app/src/main/java/com/cheese/weatherapp/data/models/WeatherState.kt
similarity index 59%
rename from app/src/main/java/com/cheese/weatherapp/models/WeatherState.kt
rename to app/src/main/java/com/cheese/weatherapp/data/models/WeatherState.kt
index b5c6b0d..10ee66e 100644
--- a/app/src/main/java/com/cheese/weatherapp/models/WeatherState.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/WeatherState.kt
@@ -1,4 +1,4 @@
-package com.cheese.weatherapp.models
+package com.cheese.weatherapp.data.models
 
 enum class WeatherState {
     CLOUDS,
diff --git a/app/src/main/java/com/cheese/weatherapp/models/Wind.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Wind.kt
similarity index 60%
rename from app/src/main/java/com/cheese/weatherapp/models/Wind.kt
rename to app/src/main/java/com/cheese/weatherapp/data/models/Wind.kt
index bd5936a..a0d5cab 100644
--- a/app/src/main/java/com/cheese/weatherapp/models/Wind.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Wind.kt
@@ -1,4 +1,4 @@
-package com.cheese.weatherapp.models
+package com.cheese.weatherapp.data.models
 
 data class Wind (
     val speed: Double,
diff --git a/app/src/main/java/com/cheese/weatherapp/data/request/ApiClient.kt b/app/src/main/java/com/cheese/weatherapp/data/request/ApiClient.kt
new file mode 100644
index 0000000..c6f9f71
--- /dev/null
+++ b/app/src/main/java/com/cheese/weatherapp/data/request/ApiClient.kt
@@ -0,0 +1,21 @@
+package com.cheese.weatherapp.data.request
+
+import com.example.mikmok.util.Constants
+import okhttp3.Call
+import okhttp3.OkHttpClient
+import okhttp3.Request
+
+class ApiClient {
+
+    private val client = OkHttpClient()
+    fun makeApiRequest(cityName :String): Call {
+        val request = Request.Builder()
+            .url(Constants.API_URL+"${cityName.trim()}")
+            .get()
+            .addHeader(Constants.ACCEPT, Constants.TYPE)
+            .build()
+
+        return client.newCall(request)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
index db6eb6d..1c87ca7 100644
--- a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
+++ b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
@@ -1,12 +1,10 @@
 package com.cheese.weatherapp.ui
-import android.text.Editable
-import android.text.TextWatcher
 import android.view.LayoutInflater
-import android.widget.Toast
 import androidx.core.widget.doOnTextChanged
 import com.cheese.weatherapp.R
 import com.cheese.weatherapp.databinding.ActivityMainBinding
-import com.cheese.weatherapp.models.WeatherState
+import com.cheese.weatherapp.data.models.WeatherState
+import com.cheese.weatherapp.data.request.ApiClient
 import com.example.mikmok.data.models.WeatherMain
 import com.example.mikmok.util.Constants
 import com.example.mikmok.util.toCelsius
@@ -18,53 +16,48 @@ import java.io.IOException
 import java.util.concurrent.TimeUnit
 
 class MainActivity : BaseActivity<ActivityMainBinding>(){
-    private val client = OkHttpClient()
     var cityName:String =Constants.CITY
+    val gson =Gson()
+    private val apiClient by lazy { ApiClient() }
     override val LOG_TAG: String =Constants.MAIN_ACTIVITY
     override val bindingInflater: (LayoutInflater) -> ActivityMainBinding = ActivityMainBinding::inflate
 
     override fun setUp() {
       getWeather(cityName=cityName)
     }
-
     override fun addCallbacks() {
-        onSearchChange()
+         onSearchChange()
     }
 
 
     private fun onSearchChange(){
         val observableSearch =Observable.create<String>{ emitter->
-            binding.searchCity.doOnTextChanged{text, start, before, count ->
-                emitter.onNext(text.toString())
+            binding.searchCity.doOnTextChanged { text, start, before, count ->
+                if (count !=Constants.INDEXT_COUNT_EMPTY) {
+                    emitter.onNext(text.toString())
+                }
             }
-        }.debounce(1,TimeUnit.SECONDS)
+        }.debounce(Constants.TIME.toLong(),TimeUnit.SECONDS)
         observableSearch.subscribe(
-            {t->getWeather(cityName=t)},
-            {e-> showToast(message = "${Constants.CITY_NOT_FOUND} : $e")
+            {cityName->getWeather(cityName=cityName)},
+            {notFound-> showToast(message = Constants.CITY_NOT_FOUND)
             }
         )
-
     }
 
 
     private fun getWeather(cityName:String) {
-        val request = Request.Builder()
-            .url(Constants.API_URL+"${cityName.trim()}")
-            .get()
-            .addHeader(Constants.ACCEPT, Constants.TYPE)
-            .build()
-
-        client.newCall(request).enqueue(object : Callback {
+        apiClient.makeApiRequest(cityName=cityName.trim()).enqueue(object : Callback {
             override fun onFailure(call: Call, e: IOException) {
                showToast("${Constants.ON_FAILURE} ${e.message}")
             }
             override fun onResponse(call: Call, response: Response) {
                 response.body?.string()?.let { jsonString ->
-                    val result = Gson().fromJson(jsonString, WeatherMain::class.java)
+                    val result = gson.fromJson(jsonString, WeatherMain::class.java)
 
                     runOnUiThread {
                         if (result.cod.toString() == Constants.NOT_FOUND) {
-                         showToast(result.message)
+                            showToast(result.message)
                         }
                         else {
                             attributBinding(result)
diff --git a/app/src/main/java/com/cheese/weatherapp/util/Constants.kt b/app/src/main/java/com/cheese/weatherapp/util/Constants.kt
index cd87c28..22661ee 100644
--- a/app/src/main/java/com/cheese/weatherapp/util/Constants.kt
+++ b/app/src/main/java/com/cheese/weatherapp/util/Constants.kt
@@ -3,6 +3,7 @@ package com.example.mikmok.util
 object Constants {
     const val API_URL = "https://api.openweathermap.org/data/2.5/weather?appid=8e17fb89454f5e7a82cf6d96a082c0ad&q="
     const val INDEXT_WEATHER =0
+    const val INDEXT_COUNT_EMPTY =0
     const val NOT_FOUND = "404"
     const val ON_FAILURE = "Failed to grab the data due to:"
     const val ACCEPT ="Accept"
@@ -10,4 +11,5 @@ object Constants {
     const val CITY  ="Baghdad"
     const val MAIN_ACTIVITY  ="MAIN_ACTIVITY"
     const val CITY_NOT_FOUND  ="city not found"
+    const val TIME = 1
 }
\ No newline at end of file

From dd678323920ef017e122cf2c77e64cf2755be99d Mon Sep 17 00:00:00 2001
From: Falah Hassan <devfalahhassan@gmail.com>
Date: Tue, 9 Aug 2022 21:21:06 -0700
Subject: [PATCH 03/16] add weather service

---
 .../java/com/cheese/weatherapp/data/State.kt  |  7 ++++++
 .../weatherapp/data/services/RequestHelper.kt | 14 +++++++++++
 .../data/services/WeatherService.kt           | 25 +++++++++++++++++++
 .../com/cheese/weatherapp/ui/MainActivity.kt  |  1 -
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/cheese/weatherapp/data/State.kt
 create mode 100644 app/src/main/java/com/cheese/weatherapp/data/services/RequestHelper.kt
 create mode 100644 app/src/main/java/com/cheese/weatherapp/data/services/WeatherService.kt

diff --git a/app/src/main/java/com/cheese/weatherapp/data/State.kt b/app/src/main/java/com/cheese/weatherapp/data/State.kt
new file mode 100644
index 0000000..6759530
--- /dev/null
+++ b/app/src/main/java/com/cheese/weatherapp/data/State.kt
@@ -0,0 +1,7 @@
+package com.cheese.weatherapp.data
+
+sealed class State<out T> {
+    object Loading : State<Nothing>()
+    data class Fail(val message: String) : State<Nothing>()
+    data class Success<T>(val data: T) : State<T>()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cheese/weatherapp/data/services/RequestHelper.kt b/app/src/main/java/com/cheese/weatherapp/data/services/RequestHelper.kt
new file mode 100644
index 0000000..a317ca7
--- /dev/null
+++ b/app/src/main/java/com/cheese/weatherapp/data/services/RequestHelper.kt
@@ -0,0 +1,14 @@
+package com.cheese.weatherapp.data.services
+
+import com.example.mikmok.util.Constants
+import okhttp3.Request
+
+object RequestHelper {
+    fun makeWeatherRequest(cityName: String): Request {
+        return Request.Builder()
+            .url(Constants.API_URL + "${cityName.trim()}")
+            .get()
+            .addHeader(Constants.ACCEPT, Constants.TYPE)
+            .build()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cheese/weatherapp/data/services/WeatherService.kt b/app/src/main/java/com/cheese/weatherapp/data/services/WeatherService.kt
new file mode 100644
index 0000000..d3d6b7f
--- /dev/null
+++ b/app/src/main/java/com/cheese/weatherapp/data/services/WeatherService.kt
@@ -0,0 +1,25 @@
+package com.cheese.weatherapp.data.services
+
+import com.cheese.weatherapp.data.State
+import com.cheese.weatherapp.data.models.Weather
+import com.google.gson.Gson
+import okhttp3.OkHttpClient
+
+interface BaseWeatherService {
+    fun getWeatherByCityName(cityName: String): State<Weather>
+
+}
+
+class WeatherService : BaseWeatherService {
+    private val client = OkHttpClient()
+    override fun getWeatherByCityName(cityName: String): State<Weather> {
+        val response = client.newCall(RequestHelper.makeWeatherRequest(cityName)).execute()
+        return if (response.isSuccessful) {
+            Gson().fromJson(response.body?.string(), Weather::class.java).run {
+                State.Success(this)
+            }
+        } else {
+            State.Fail(response.message)
+        }
+    }
+}
diff --git a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
index 1c87ca7..ff32a8b 100644
--- a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
+++ b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
@@ -10,7 +10,6 @@ import com.example.mikmok.util.Constants
 import com.example.mikmok.util.toCelsius
 import com.example.mikmok.util.toPercent
 import com.google.gson.Gson
-import io.reactivex.rxjava3.core.Observable
 import okhttp3.*
 import java.io.IOException
 import java.util.concurrent.TimeUnit

From 8da385348d84a47af5b0e77c358e0bbba36ca58c Mon Sep 17 00:00:00 2001
From: Falah Hassan <devfalahhassan@gmail.com>
Date: Tue, 9 Aug 2022 22:20:49 -0700
Subject: [PATCH 04/16] add weather repository

---
 .../data/repository/WeatherRepository.kt      | 20 +++++++++++++++++++
 .../com/cheese/weatherapp/ui/MainActivity.kt  |  5 +++--
 2 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/cheese/weatherapp/data/repository/WeatherRepository.kt

diff --git a/app/src/main/java/com/cheese/weatherapp/data/repository/WeatherRepository.kt b/app/src/main/java/com/cheese/weatherapp/data/repository/WeatherRepository.kt
new file mode 100644
index 0000000..aef252c
--- /dev/null
+++ b/app/src/main/java/com/cheese/weatherapp/data/repository/WeatherRepository.kt
@@ -0,0 +1,20 @@
+package com.cheese.weatherapp.data.repository
+
+import com.cheese.weatherapp.data.State
+import com.cheese.weatherapp.data.models.Weather
+import com.cheese.weatherapp.data.services.BaseWeatherService
+import io.reactivex.rxjava3.core.Observable
+
+interface WeatherRepository {
+    fun getWeatherByCityName(cityName: String): Observable<State<Weather>>
+}
+
+class WeatherRepositoryImp(private val weatherService: BaseWeatherService) : WeatherRepository {
+    override fun getWeatherByCityName(cityName: String): Observable<State<Weather>> {
+        return Observable.create { emit ->
+            emit.onNext(State.Loading)
+            emit.onNext(weatherService.getWeatherByCityName(cityName))
+            emit.onComplete()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
index ff32a8b..2129d1c 100644
--- a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
+++ b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
@@ -10,6 +10,7 @@ import com.example.mikmok.util.Constants
 import com.example.mikmok.util.toCelsius
 import com.example.mikmok.util.toPercent
 import com.google.gson.Gson
+import io.reactivex.rxjava3.core.Observable
 import okhttp3.*
 import java.io.IOException
 import java.util.concurrent.TimeUnit
@@ -27,10 +28,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>(){
     override fun addCallbacks() {
          onSearchChange()
     }
-
+//TODO: Remove all code from here that is not related user interaction
 
     private fun onSearchChange(){
-        val observableSearch =Observable.create<String>{ emitter->
+        val observableSearch = Observable.create<String>{ emitter->
             binding.searchCity.doOnTextChanged { text, start, before, count ->
                 if (count !=Constants.INDEXT_COUNT_EMPTY) {
                     emitter.onNext(text.toString())

From 8eecdc37492ab1918886898fddde58efbdb4399e Mon Sep 17 00:00:00 2001
From: moh05hus <92690501+moh05hus@users.noreply.github.com>
Date: Wed, 10 Aug 2022 15:46:33 +0300
Subject: [PATCH 05/16] activity_main.xml -> i did edit text color to gray and
 edit background gradient colors

---
 .idea/.name                               |   1 +
 .idea/misc.xml                            |   2 +
 app/src/main/res/drawable/background.xml  |   5 +-
 app/src/main/res/layout/activity_main.xml | 401 +++++++++++-----------
 app/src/main/res/values/colors.xml        |   2 +
 app/src/main/res/values/strings.xml       |   2 +-
 6 files changed, 215 insertions(+), 198 deletions(-)
 create mode 100644 .idea/.name

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..96341b4
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+weatherApp
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1f88a3f..6961f70 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,8 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/Users/alrya/AndroidStudioProjects/WeatherApp2/app/src/main/res/drawable/background.xml" value="0.1975" />
+        <entry key="..\:/Users/alrya/AndroidStudioProjects/WeatherApp2/app/src/main/res/layout/activity_main.xml" value="0.264" />
         <entry key="..\:/the chance/weatherApp/app/src/main/res/drawable/background.xml" value="0.113" />
         <entry key="..\:/the chance/weatherApp/app/src/main/res/drawable/ic_baseline_search_24.xml" value="0.1285" />
         <entry key="..\:/the chance/weatherApp/app/src/main/res/drawable/ic_clouds_icon.xml" value="0.1285" />
diff --git a/app/src/main/res/drawable/background.xml b/app/src/main/res/drawable/background.xml
index 54d33bb..d5699f7 100644
--- a/app/src/main/res/drawable/background.xml
+++ b/app/src/main/res/drawable/background.xml
@@ -2,8 +2,9 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient
-        android:endColor="@color/color_up"
-        android:startColor="@color/color_down"
+
+        android:endColor="@color/color_up2"
+        android:startColor="@color/color_down2"
         android:angle="90"
         android:type="linear" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 47a005e..ecfd896 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -12,11 +12,13 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="@dimen/margin_horizontal"
-        android:layout_marginTop="@dimen/margin_normal"
+        android:layout_marginTop="24dp"
         android:background="@drawable/edit_text_search_bg"
         android:drawableStart="@drawable/ic_baseline_search_24"
         android:drawablePadding="@dimen/small_size"
         android:drawableTint="@color/gray"
+        android:textColorHint="@color/gray"
+        android:textColor="@color/gray"
         android:hint="@string/city_name"
         android:gravity="start"
         android:inputType="text"
@@ -25,204 +27,213 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.airbnb.lottie.LottieAnimationView
-        android:id="@+id/weather"
-        android:layout_width="@dimen/animation_size"
-        android:layout_height="@dimen/animation_size"
-        android:layout_marginStart="@dimen/margin_horizontal"
-        android:layout_marginTop="@dimen/margin_larg"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/search_city"
-        app:lottie_autoPlay="true"
-        app:lottie_loop="true"
-        app:lottie_rawRes="@raw/sunny"
-        tools:ignore="MissingConstraints" />
-
-    <TextView
-        android:id="@+id/city_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/name_city"
-        android:layout_marginStart="@dimen/margin_small"
-        android:textColor="@color/white"
-        android:textSize="@dimen/text_larg"
-        android:textStyle="bold"
-        app:layout_constraintStart_toEndOf="@+id/weather"
-        app:layout_constraintTop_toTopOf="@+id/weather" />
-    <TextView
-        android:id="@+id/temp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/temp_value"
-        android:textColor="@color/white"
-        android:textSize="20sp"
-        app:layout_constraintHorizontal_bias="0.147"
-        app:layout_constraintStart_toStartOf="@id/city_name"
-        app:layout_constraintTop_toBottomOf="@id/city_name" />
-    <TextView
-        android:id="@+id/description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Clear sky"
-        android:textSize="14sp"
-        app:layout_constraintStart_toStartOf="@id/city_name"
-        app:layout_constraintTop_toBottomOf="@id/temp" />
-    <TextView
-        android:id="@+id/max_min"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="30.55 C Max - 30.55 C Min"
-        android:textSize="14sp"
-        app:layout_constraintStart_toStartOf="@id/city_name"
-        app:layout_constraintTop_toBottomOf="@id/description" />
-
-
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/search_city"
+        android:layout_marginTop="32dp">
+
+        <com.airbnb.lottie.LottieAnimationView
+            android:id="@+id/weather"
+            android:layout_width="@dimen/animation_size"
+            android:layout_height="@dimen/animation_size"
+
+            android:layout_marginTop="@dimen/margin_larg"
+            app:layout_constraintStart_toStartOf="parent"
+
+            app:lottie_autoPlay="true"
+            app:lottie_loop="true"
+            app:lottie_rawRes="@raw/sunny"
+            tools:ignore="MissingConstraints" />
+
+        <TextView
+            android:id="@+id/city_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_small"
+            android:text="@string/name_city"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_larg"
+            android:textStyle="bold"
+            app:layout_constraintStart_toEndOf="@+id/weather"
+            app:layout_constraintTop_toTopOf="@+id/weather" />
+
+        <TextView
+            android:id="@+id/temp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/temp_value"
+            android:textColor="@color/white"
+            android:textSize="20sp"
+            app:layout_constraintHorizontal_bias="0.147"
+            app:layout_constraintStart_toStartOf="@id/city_name"
+            app:layout_constraintTop_toBottomOf="@id/city_name" />
+
+        <TextView
+            android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Clear sky"
+            android:textColor="@color/gray"
+            android:textSize="14sp"
+            app:layout_constraintStart_toStartOf="@id/city_name"
+            app:layout_constraintTop_toBottomOf="@id/temp" />
+
+
+        <ImageView
+            android:id="@+id/icon_pressure"
+            android:layout_width="@dimen/size_icon"
+            android:layout_height="@dimen/size_icon"
+            android:layout_marginTop="42dp"
+            android:src="@drawable/ic_pressure_icon"
+            app:layout_constraintStart_toStartOf="@id/weather"
+            app:layout_constraintTop_toBottomOf="@id/weather"
+            app:tint="@color/primary_icon"
+            tools:ignore="MissingConstraints" />
+
+        <TextView
+            android:id="@+id/title_pressure"
+            android:layout_width="150dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:text="Pressure"
+            android:textColor="@color/gray"
+
+            android:textSize="14sp"
+            app:layout_constraintStart_toEndOf="@+id/icon_pressure"
+            app:layout_constraintTop_toTopOf="@+id/icon_pressure" />
+
+        <TextView
+            android:id="@+id/max_min"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="30.55 C Max - 30.55 C Min"
+            android:textColor="@color/gray"
+            android:textSize="14sp"
+            app:layout_constraintStart_toStartOf="@id/city_name"
+            app:layout_constraintTop_toBottomOf="@id/description" />
+
+        <TextView
+            android:id="@+id/value_pressure"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="23%"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            app:layout_constraintStart_toStartOf="@id/title_pressure"
+            app:layout_constraintTop_toBottomOf="@id/title_pressure" />
+
+
+        <ImageView
+            android:id="@+id/icon_clouds"
+            android:layout_width="@dimen/size_icon"
+            android:layout_height="@dimen/size_icon"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="8dp"
+            android:src="@drawable/ic_clouds_icons"
+            app:layout_constraintStart_toEndOf="@id/title_pressure"
+            app:layout_constraintTop_toTopOf="@id/icon_pressure"
+            app:tint="@color/primary_icon"
+            tools:ignore="MissingConstraints" />
+
+        <TextView
+            android:id="@+id/title_clouds"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:text="Clouds"
+            android:textSize="14sp"
+            android:textColor="@color/gray"
+
+
+            app:layout_constraintStart_toEndOf="@id/icon_clouds"
+            app:layout_constraintTop_toTopOf="@+id/icon_clouds" />
+
+        <TextView
+            android:id="@+id/value_clouds"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="3%"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            app:layout_constraintStart_toStartOf="@id/title_clouds"
+            app:layout_constraintTop_toBottomOf="@id/title_clouds" />
+
+
+        <ImageView
+            android:id="@+id/icon_wind"
+            android:layout_width="@dimen/size_icon"
+            android:layout_height="@dimen/size_icon"
+            android:layout_marginTop="42dp"
+            android:src="@drawable/ic_wind_icon"
+            app:layout_constraintBottom_toBottomOf="@+id/value_wind"
+            app:layout_constraintStart_toStartOf="@id/weather"
+            app:layout_constraintTop_toBottomOf="@id/icon_clouds"
+            app:tint="@color/primary_icon"
+            tools:ignore="MissingConstraints" />
+
+        <TextView
+            android:id="@+id/title_wind"
+            android:layout_width="150dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:text="Wind"
+            android:textSize="14sp"
+            android:textColor="@color/gray"
+
+            app:layout_constraintStart_toEndOf="@+id/icon_wind"
+            app:layout_constraintTop_toTopOf="@+id/icon_wind" />
+
+        <TextView
+            android:id="@+id/value_wind"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="22.11 km/h"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            app:layout_constraintStart_toStartOf="@id/title_wind"
+            app:layout_constraintTop_toBottomOf="@id/title_wind" />
+
+
+        <ImageView
+            android:id="@+id/icon_humidity"
+            android:layout_width="@dimen/size_icon"
+            android:layout_height="@dimen/size_icon"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="8dp"
+            android:src="@drawable/ic_humidity_icon"
+            app:layout_constraintStart_toEndOf="@id/title_wind"
+            app:layout_constraintTop_toTopOf="@id/icon_wind"
+            app:tint="@color/primary_icon"
+            tools:ignore="MissingConstraints" />
+
+        <TextView
+            android:id="@+id/title_humidity"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:text="Humidity"
+            android:textSize="14sp"
+            android:textColor="@color/gray"
+
+            app:layout_constraintStart_toEndOf="@id/icon_humidity"
+            app:layout_constraintTop_toTopOf="@+id/icon_wind" />
+
+        <TextView
+            android:id="@+id/value_humidity"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="23%"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            app:layout_constraintStart_toStartOf="@id/title_humidity"
+            app:layout_constraintTop_toBottomOf="@id/title_humidity" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-    <ImageView
-        android:id="@+id/icon_pressure"
-        android:layout_width="@dimen/size_icon"
-        android:layout_height="@dimen/size_icon"
-        android:layout_marginTop="42dp"
-        app:layout_constraintStart_toStartOf="@id/weather"
-        app:layout_constraintTop_toBottomOf="@id/weather"
-        android:src="@drawable/ic_pressure_icon"
-        app:tint="@color/primary_icon"
-        tools:ignore="MissingConstraints" />
 
-    <TextView
-        android:id="@+id/title_pressure"
-        android:layout_width="150dp"
-        android:layout_height="wrap_content"
-        android:text="Pressure"
-        android:layout_marginStart="8dp"
-        android:textSize="14sp"
-        app:layout_constraintStart_toEndOf="@+id/icon_pressure"
-        app:layout_constraintTop_toTopOf="@+id/icon_pressure" />
-
-    <TextView
-        android:id="@+id/value_pressure"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="23%"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="@id/title_pressure"
-        app:layout_constraintTop_toBottomOf="@id/title_pressure" />
-
-
-
-    <ImageView
-        android:id="@+id/icon_clouds"
-        android:layout_width="@dimen/size_icon"
-        android:layout_height="@dimen/size_icon"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="16dp"
-        app:layout_constraintTop_toTopOf="@id/icon_pressure"
-        app:layout_constraintStart_toEndOf="@id/title_pressure"
-        android:src="@drawable/ic_clouds_icons"
-        app:tint="@color/primary_icon"
-        tools:ignore="MissingConstraints" />
-
-    <TextView
-        android:id="@+id/title_clouds"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Clouds"
-        android:layout_marginStart="8dp"
-        android:textSize="14sp"
-        app:layout_constraintStart_toEndOf="@id/icon_clouds"
-        app:layout_constraintTop_toTopOf="@+id/icon_clouds" />
-    <TextView
-        android:id="@+id/value_clouds"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="3%"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="@id/title_clouds"
-        app:layout_constraintTop_toBottomOf="@id/title_clouds" />
-
-
-
-    <ImageView
-        android:id="@+id/icon_wind"
-        android:layout_width="@dimen/size_icon"
-        android:layout_height="@dimen/size_icon"
-        android:layout_marginTop="42dp"
-        app:layout_constraintStart_toStartOf="@id/weather"
-        app:layout_constraintTop_toBottomOf="@id/icon_clouds"
-        app:layout_constraintBottom_toBottomOf="@+id/value_wind"
-        android:src="@drawable/ic_wind_icon"
-        app:tint="@color/primary_icon"
-        tools:ignore="MissingConstraints" />
-
-    <TextView
-        android:id="@+id/title_wind"
-        android:layout_width="150dp"
-        android:layout_height="wrap_content"
-        android:text="Wind"
-        android:layout_marginStart="8dp"
-        android:textSize="14sp"
-        app:layout_constraintStart_toEndOf="@+id/icon_wind"
-        app:layout_constraintTop_toTopOf="@+id/icon_wind" />
-    <TextView
-        android:id="@+id/value_wind"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="22.11 km/h"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="@id/title_wind"
-        app:layout_constraintTop_toBottomOf="@id/title_wind" />
-
-
-
-    <ImageView
-        android:id="@+id/icon_humidity"
-        android:layout_width="@dimen/size_icon"
-        android:layout_height="@dimen/size_icon"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="16dp"
-        app:layout_constraintTop_toTopOf="@id/icon_wind"
-        app:layout_constraintStart_toEndOf="@id/title_wind"
-        android:src="@drawable/ic_humidity_icon"
-        app:tint="@color/primary_icon"
-        tools:ignore="MissingConstraints" />
-
-    <TextView
-        android:id="@+id/title_humidity"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Humidity"
-        android:layout_marginStart="8dp"
-        android:textSize="14sp"
-        app:layout_constraintStart_toEndOf="@id/icon_humidity"
-        app:layout_constraintTop_toTopOf="@+id/icon_wind" />
-    <TextView
-        android:id="@+id/value_humidity"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="23%"
-        android:textColor="@color/white"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="@id/title_humidity"
-        app:layout_constraintTop_toBottomOf="@id/title_humidity" />
-
-    <Button
-        android:id="@+id/button_search"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="16dp"
-        android:layout_marginHorizontal="24dp"
-        android:visibility="invisible"
-        android:background="@drawable/button_background"
-        android:text="Search"
-        android:textColor="@color/white"
-        android:textSize="14sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintVertical_bias="1" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6c2d2c8..71ab6cc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,7 +8,9 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="color_up">#351C60</color>
+    <color name="color_up2">#532F93</color>
     <color name="color_down">#03092C</color>
+    <color name="color_down2">#00158D</color>
     <color name="gray">#C4C4C4</color>
     <color name="primary">#825CC3</color>
     <color name="primary_icon">#AF93DF</color> //#A282D8
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7f67156..273f6d0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">weather</string>
-    <string name="city_name">city name</string>
+    <string name="city_name">City name</string>
     <string name="name_city">Baghdad ,IQ</string>
     <string name="temp_value">00.00 C</string>
 </resources>
\ No newline at end of file

From 0c17b3c0f2b36e173c44cd3da9db2203ce9a9069 Mon Sep 17 00:00:00 2001
From: karrarjasim <k.jasim@s-gate.iq>
Date: Wed, 10 Aug 2022 16:27:24 +0300
Subject: [PATCH 06/16] change observable type

---
 .../cheese/weatherapp/data/repository/WeatherRepository.kt | 5 +++--
 .../com/cheese/weatherapp/data/services/WeatherService.kt  | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/cheese/weatherapp/data/repository/WeatherRepository.kt b/app/src/main/java/com/cheese/weatherapp/data/repository/WeatherRepository.kt
index aef252c..ee8bdbb 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/repository/WeatherRepository.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/repository/WeatherRepository.kt
@@ -3,14 +3,15 @@ package com.cheese.weatherapp.data.repository
 import com.cheese.weatherapp.data.State
 import com.cheese.weatherapp.data.models.Weather
 import com.cheese.weatherapp.data.services.BaseWeatherService
+import com.example.mikmok.data.models.WeatherMain
 import io.reactivex.rxjava3.core.Observable
 
 interface WeatherRepository {
-    fun getWeatherByCityName(cityName: String): Observable<State<Weather>>
+    fun getWeatherByCityName(cityName: String): Observable<State<WeatherMain>>
 }
 
 class WeatherRepositoryImp(private val weatherService: BaseWeatherService) : WeatherRepository {
-    override fun getWeatherByCityName(cityName: String): Observable<State<Weather>> {
+    override fun getWeatherByCityName(cityName: String): Observable<State<WeatherMain>> {
         return Observable.create { emit ->
             emit.onNext(State.Loading)
             emit.onNext(weatherService.getWeatherByCityName(cityName))
diff --git a/app/src/main/java/com/cheese/weatherapp/data/services/WeatherService.kt b/app/src/main/java/com/cheese/weatherapp/data/services/WeatherService.kt
index d3d6b7f..6d84bfc 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/services/WeatherService.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/services/WeatherService.kt
@@ -2,20 +2,21 @@ package com.cheese.weatherapp.data.services
 
 import com.cheese.weatherapp.data.State
 import com.cheese.weatherapp.data.models.Weather
+import com.example.mikmok.data.models.WeatherMain
 import com.google.gson.Gson
 import okhttp3.OkHttpClient
 
 interface BaseWeatherService {
-    fun getWeatherByCityName(cityName: String): State<Weather>
+    fun getWeatherByCityName(cityName: String): State<WeatherMain>
 
 }
 
 class WeatherService : BaseWeatherService {
     private val client = OkHttpClient()
-    override fun getWeatherByCityName(cityName: String): State<Weather> {
+    override fun getWeatherByCityName(cityName: String): State<WeatherMain> {
         val response = client.newCall(RequestHelper.makeWeatherRequest(cityName)).execute()
         return if (response.isSuccessful) {
-            Gson().fromJson(response.body?.string(), Weather::class.java).run {
+            Gson().fromJson(response.body?.string(), WeatherMain::class.java).run {
                 State.Success(this)
             }
         } else {

From c5eb0ad7bdd7bc884dec7a96e329cd60358c61da Mon Sep 17 00:00:00 2001
From: karrarjasim <k.jasim@s-gate.iq>
Date: Wed, 10 Aug 2022 16:28:51 +0300
Subject: [PATCH 07/16] subscribe on observable

---
 .../com/cheese/weatherapp/ui/MainActivity.kt  | 52 ++++++++++---------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
index 2129d1c..1b38b56 100644
--- a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
+++ b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
@@ -1,24 +1,26 @@
 package com.cheese.weatherapp.ui
+import android.util.Log
 import android.view.LayoutInflater
 import androidx.core.widget.doOnTextChanged
 import com.cheese.weatherapp.R
+import com.cheese.weatherapp.data.State
 import com.cheese.weatherapp.databinding.ActivityMainBinding
 import com.cheese.weatherapp.data.models.WeatherState
+import com.cheese.weatherapp.data.repository.WeatherRepositoryImp
 import com.cheese.weatherapp.data.request.ApiClient
+import com.cheese.weatherapp.data.services.WeatherService
 import com.example.mikmok.data.models.WeatherMain
 import com.example.mikmok.util.Constants
 import com.example.mikmok.util.toCelsius
 import com.example.mikmok.util.toPercent
 import com.google.gson.Gson
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Observable
-import okhttp3.*
-import java.io.IOException
+import io.reactivex.rxjava3.schedulers.Schedulers
 import java.util.concurrent.TimeUnit
 
 class MainActivity : BaseActivity<ActivityMainBinding>(){
     var cityName:String =Constants.CITY
-    val gson =Gson()
-    private val apiClient by lazy { ApiClient() }
     override val LOG_TAG: String =Constants.MAIN_ACTIVITY
     override val bindingInflater: (LayoutInflater) -> ActivityMainBinding = ActivityMainBinding::inflate
 
@@ -28,7 +30,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>(){
     override fun addCallbacks() {
          onSearchChange()
     }
-//TODO: Remove all code from here that is not related user interaction
 
     private fun onSearchChange(){
         val observableSearch = Observable.create<String>{ emitter->
@@ -47,30 +48,33 @@ class MainActivity : BaseActivity<ActivityMainBinding>(){
 
 
     private fun getWeather(cityName:String) {
-        apiClient.makeApiRequest(cityName=cityName.trim()).enqueue(object : Callback {
-            override fun onFailure(call: Call, e: IOException) {
-               showToast("${Constants.ON_FAILURE} ${e.message}")
-            }
-            override fun onResponse(call: Call, response: Response) {
-                response.body?.string()?.let { jsonString ->
-                    val result = gson.fromJson(jsonString, WeatherMain::class.java)
+        val weatherService = WeatherService()
+        val weatherRepositoryImp = WeatherRepositoryImp(weatherService)
+        weatherRepositoryImp.getWeatherByCityName(cityName)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(
+                ::onWeather,
+                ::onError
+            )
+    }
 
-                    runOnUiThread {
-                        if (result.cod.toString() == Constants.NOT_FOUND) {
-                            showToast(result.message)
-                        }
-                        else {
-                            attributBinding(result)
-                            weatherState(result.weather[Constants.INDEXT_WEATHER].main.uppercase())
-                        }
+    private fun onError (throwable: Throwable) {
+        Log.v(LOG_TAG, throwable.message.toString())
+    }
 
-                    }
-                }
+    private fun onWeather(state: State<WeatherMain>) {
+        when(state) {
+            is State.Fail -> showToast("Fail")
+            State.Loading -> showToast("Loading")
+            is State.Success -> {
+                attributeBinding(state.data)
+                weatherState(state.data.weather[Constants.INDEXT_WEATHER].main.uppercase())
             }
-        })
+        }
     }
 
-    private fun attributBinding(result:WeatherMain){
+    private fun attributeBinding(result:WeatherMain){
         binding.apply {
             cityName.text = "${result.name},${result.sys.country}"
             temp.text = "${result.main.temp.toCelsius()}°"

From c0a41d750fe479b00c7a757ff3ad1aeea6a9b510 Mon Sep 17 00:00:00 2001
From: karrarjasim <k.jasim@s-gate.iq>
Date: Wed, 10 Aug 2022 16:31:58 +0300
Subject: [PATCH 08/16] delete unused code

---
 .idea/.name                                   |  1 +
 .idea/gradle.xml                              |  1 +
 .idea/misc.xml                                |  2 +-
 app/build.gradle                              |  1 +
 .../com/cheese/weatherapp/data/models/Main.kt |  3 -
 .../cheese/weatherapp/data/models/Weather.kt  |  2 -
 .../weatherapp/data/models/WeatherMain.kt     | 56 +------------------
 .../com/cheese/weatherapp/data/models/Wind.kt |  1 -
 .../data/repository/WeatherRepository.kt      |  2 +-
 .../data/services/WeatherService.kt           |  3 +-
 .../com/cheese/weatherapp/ui/MainActivity.kt  |  4 +-
 11 files changed, 9 insertions(+), 67 deletions(-)
 create mode 100644 .idea/.name

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..96341b4
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+weatherApp
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a2d7c21..a0de2a1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1f88a3f..db71ad2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -17,7 +17,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 90add49..02a0bbd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,5 +47,6 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.10.0'
     implementation 'com.airbnb.android:lottie:5.2.0'
     implementation "io.reactivex.rxjava3:rxjava:3.1.5"
+    implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cheese/weatherapp/data/models/Main.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Main.kt
index 4ae93a1..c53bfe5 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/models/Main.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Main.kt
@@ -5,9 +5,6 @@ import com.google.gson.annotations.SerializedName
 data class Main (
     val temp: Double,
 
-//    @SerializedName("feels_like")
-//    val feelsLike: Double,
-
     @SerializedName("temp_min")
     val tempMin: Double,
 
diff --git a/app/src/main/java/com/cheese/weatherapp/data/models/Weather.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Weather.kt
index 7be6cde..ad041eb 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/models/Weather.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Weather.kt
@@ -1,9 +1,7 @@
 package com.cheese.weatherapp.data.models
 
 data class Weather (
-//    val id: Int,
     val main: String,
     val description: String,
-//    val icon: String
 )
 
diff --git a/app/src/main/java/com/cheese/weatherapp/data/models/WeatherMain.kt b/app/src/main/java/com/cheese/weatherapp/data/models/WeatherMain.kt
index b8e956f..699399f 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/models/WeatherMain.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/WeatherMain.kt
@@ -1,5 +1,4 @@
-package com.example.mikmok.data.models
-import com.cheese.weatherapp.data.models.*
+package com.cheese.weatherapp.data.models
 
 data class WeatherMain(
     val wind: Wind,
@@ -12,58 +11,5 @@ data class WeatherMain(
     val sys: Sys,
     val cod: Int,
     val message: String,
-//    val coord: Coord,
-//    val visibility: Long,
-//    val dt: Long,
-//    val timezone: Long,
-//    val id: Long,
 
 )
-
-/*
-*
-* {
-    "coord": {
-        "lon": 28.9833,
-        "lat": 41.0351
-    },
-    "weather": [
-        {
-            "id": 800,
-            "main": "Clear",
-            "description": "clear sky",
-            "icon": "01n"
-        }
-    ],
-    "base": "stations",
-    "main": {
-        "temp": 296.83,
-        "feels_like": 297.16,
-        "temp_min": 294.24,
-        "temp_max": 296.83,
-        "pressure": 1013,
-        "humidity": 73
-    },
-    "visibility": 10000,
-    "wind": {
-        "speed": 3.09,
-        "deg": 60
-    },
-    "clouds": {
-        "all": 0
-    },
-    "dt": 1659472435,
-    "sys": {
-        "type": 1,
-        "id": 6970,
-        "country": "TR",
-        "sunrise": 1659409234,
-        "sunset": 1659460801
-    },
-    "timezone": 10800,
-    "id": 745042,
-    "name": "Istanbul",
-    "cod": 200
-}
-* */
-
diff --git a/app/src/main/java/com/cheese/weatherapp/data/models/Wind.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Wind.kt
index a0d5cab..f4a744d 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/models/Wind.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Wind.kt
@@ -2,5 +2,4 @@ package com.cheese.weatherapp.data.models
 
 data class Wind (
     val speed: Double,
-//    val deg: Int
 )
diff --git a/app/src/main/java/com/cheese/weatherapp/data/repository/WeatherRepository.kt b/app/src/main/java/com/cheese/weatherapp/data/repository/WeatherRepository.kt
index ee8bdbb..1561473 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/repository/WeatherRepository.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/repository/WeatherRepository.kt
@@ -3,7 +3,7 @@ package com.cheese.weatherapp.data.repository
 import com.cheese.weatherapp.data.State
 import com.cheese.weatherapp.data.models.Weather
 import com.cheese.weatherapp.data.services.BaseWeatherService
-import com.example.mikmok.data.models.WeatherMain
+import com.cheese.weatherapp.data.models.WeatherMain
 import io.reactivex.rxjava3.core.Observable
 
 interface WeatherRepository {
diff --git a/app/src/main/java/com/cheese/weatherapp/data/services/WeatherService.kt b/app/src/main/java/com/cheese/weatherapp/data/services/WeatherService.kt
index 6d84bfc..d741cfe 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/services/WeatherService.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/services/WeatherService.kt
@@ -1,8 +1,7 @@
 package com.cheese.weatherapp.data.services
 
 import com.cheese.weatherapp.data.State
-import com.cheese.weatherapp.data.models.Weather
-import com.example.mikmok.data.models.WeatherMain
+import com.cheese.weatherapp.data.models.WeatherMain
 import com.google.gson.Gson
 import okhttp3.OkHttpClient
 
diff --git a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
index 1b38b56..4e6fdab 100644
--- a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
+++ b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
@@ -9,7 +9,7 @@ import com.cheese.weatherapp.data.models.WeatherState
 import com.cheese.weatherapp.data.repository.WeatherRepositoryImp
 import com.cheese.weatherapp.data.request.ApiClient
 import com.cheese.weatherapp.data.services.WeatherService
-import com.example.mikmok.data.models.WeatherMain
+import com.cheese.weatherapp.data.models.WeatherMain
 import com.example.mikmok.util.Constants
 import com.example.mikmok.util.toCelsius
 import com.example.mikmok.util.toPercent
@@ -74,7 +74,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(){
         }
     }
 
-    private fun attributeBinding(result:WeatherMain){
+    private fun attributeBinding(result: WeatherMain){
         binding.apply {
             cityName.text = "${result.name},${result.sys.country}"
             temp.text = "${result.main.temp.toCelsius()}°"

From 1eb44b841002f096b13c99213f60c2298f321a1c Mon Sep 17 00:00:00 2001
From: karrarjasim <k.jasim@s-gate.iq>
Date: Wed, 10 Aug 2022 16:32:37 +0300
Subject: [PATCH 09/16] delete JsonParser

---
 app/src/main/java/com/cheese/weatherapp/util/JsonParser.kt | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 app/src/main/java/com/cheese/weatherapp/util/JsonParser.kt

diff --git a/app/src/main/java/com/cheese/weatherapp/util/JsonParser.kt b/app/src/main/java/com/cheese/weatherapp/util/JsonParser.kt
deleted file mode 100644
index e59ae52..0000000
--- a/app/src/main/java/com/cheese/weatherapp/util/JsonParser.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.example.mikmok.util
-
-class JsonParser {
-}
\ No newline at end of file

From cd9fa8b3258d0c533b2d7391978e9bdd457b3671 Mon Sep 17 00:00:00 2001
From: Falah Hassan <devfalahhassan@gmail.com>
Date: Thu, 11 Aug 2022 15:58:26 -0700
Subject: [PATCH 10/16] add loading logic

---
 .../com/cheese/weatherapp/ui/BaseActivity.kt  |   3 +
 .../com/cheese/weatherapp/ui/MainActivity.kt  | 112 ++++++++++--------
 .../com/cheese/weatherapp/util/extensions.kt  |  21 +++-
 app/src/main/res/layout/activity_main.xml     |  15 ++-
 4 files changed, 95 insertions(+), 56 deletions(-)

diff --git a/app/src/main/java/com/cheese/weatherapp/ui/BaseActivity.kt b/app/src/main/java/com/cheese/weatherapp/ui/BaseActivity.kt
index dc218f0..888559b 100644
--- a/app/src/main/java/com/cheese/weatherapp/ui/BaseActivity.kt
+++ b/app/src/main/java/com/cheese/weatherapp/ui/BaseActivity.kt
@@ -2,6 +2,7 @@ package com.cheese.weatherapp.ui
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
+import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.viewbinding.ViewBinding
@@ -37,4 +38,6 @@ abstract class BaseActivity<VB :ViewBinding> :AppCompatActivity() {
         ).show()
     }
 
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
index 4e6fdab..ac1f6a7 100644
--- a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
+++ b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
@@ -1,107 +1,119 @@
 package com.cheese.weatherapp.ui
+
 import android.util.Log
 import android.view.LayoutInflater
+import android.view.View
 import androidx.core.widget.doOnTextChanged
-import com.cheese.weatherapp.R
 import com.cheese.weatherapp.data.State
-import com.cheese.weatherapp.databinding.ActivityMainBinding
-import com.cheese.weatherapp.data.models.WeatherState
+import com.cheese.weatherapp.data.models.WeatherMain
 import com.cheese.weatherapp.data.repository.WeatherRepositoryImp
-import com.cheese.weatherapp.data.request.ApiClient
 import com.cheese.weatherapp.data.services.WeatherService
-import com.cheese.weatherapp.data.models.WeatherMain
+import com.cheese.weatherapp.databinding.ActivityMainBinding
 import com.example.mikmok.util.Constants
+import com.example.mikmok.util.getWeatherStateAnimation
 import com.example.mikmok.util.toCelsius
 import com.example.mikmok.util.toPercent
-import com.google.gson.Gson
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.schedulers.Schedulers
 import java.util.concurrent.TimeUnit
 
-class MainActivity : BaseActivity<ActivityMainBinding>(){
-    var cityName:String =Constants.CITY
-    override val LOG_TAG: String =Constants.MAIN_ACTIVITY
-    override val bindingInflater: (LayoutInflater) -> ActivityMainBinding = ActivityMainBinding::inflate
+class MainActivity : BaseActivity<ActivityMainBinding>() {
+    private var cityName: String = Constants.CITY
+    override val LOG_TAG: String = Constants.MAIN_ACTIVITY
+    override val bindingInflater: (LayoutInflater) -> ActivityMainBinding =
+        ActivityMainBinding::inflate
 
     override fun setUp() {
-      getWeather(cityName=cityName)
+        getWeather(cityName = cityName)
     }
+
     override fun addCallbacks() {
-         onSearchChange()
+        onSearchChange()
     }
 
-    private fun onSearchChange(){
-        val observableSearch = Observable.create<String>{ emitter->
-            binding.searchCity.doOnTextChanged { text, start, before, count ->
-                if (count !=Constants.INDEXT_COUNT_EMPTY) {
+    private fun onSearchChange() {
+        val observableSearch = Observable.create<String> { emitter ->
+            binding.searchCity.doOnTextChanged { text, _, _, count ->
+                if (count != Constants.INDEXT_COUNT_EMPTY) {
                     emitter.onNext(text.toString())
                 }
             }
-        }.debounce(Constants.TIME.toLong(),TimeUnit.SECONDS)
+        }.debounce(Constants.TIME.toLong(), TimeUnit.SECONDS)
         observableSearch.subscribe(
-            {cityName->getWeather(cityName=cityName)},
-            {notFound-> showToast(message = Constants.CITY_NOT_FOUND)
+            { cityName -> getWeather(cityName = cityName) },
+            {
+                showToast(message = Constants.CITY_NOT_FOUND)
             }
         )
     }
 
 
-    private fun getWeather(cityName:String) {
+    private fun getWeather(cityName: String) {
         val weatherService = WeatherService()
         val weatherRepositoryImp = WeatherRepositoryImp(weatherService)
-        weatherRepositoryImp.getWeatherByCityName(cityName)
+        val observer = weatherRepositoryImp.getWeatherByCityName(cityName)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
-            .subscribe(
-                ::onWeather,
-                ::onError
-            )
+        observer.subscribe(::onWeather, ::onError)
     }
 
-    private fun onError (throwable: Throwable) {
+    private fun onError(throwable: Throwable) {
         Log.v(LOG_TAG, throwable.message.toString())
     }
 
     private fun onWeather(state: State<WeatherMain>) {
-        when(state) {
-            is State.Fail -> showToast("Fail")
-            State.Loading -> showToast("Loading")
-            is State.Success -> {
-                attributeBinding(state.data)
-                weatherState(state.data.weather[Constants.INDEXT_WEATHER].main.uppercase())
+        when (state) {
+            is State.Fail -> {
             }
+            State.Loading -> onLoading()
+            is State.Success -> onSuccess(state.data)
         }
     }
 
-    private fun attributeBinding(result: WeatherMain){
+    private fun onSuccess(weatherMain: WeatherMain) {
+        bindView(weatherMain)
+        hideProgressBarAndShowData()
+
+
+    }
+
+    private fun onLoading() {
+        showProgressBarAndHideData()
+    }
+
+    private fun showProgressBarAndHideData() {
+        binding.apply {
+            progressLoading.visibility = View.VISIBLE
+            dataContainer.visibility = View.INVISIBLE
+        }
+    }
+
+    private fun hideProgressBarAndShowData() {
+        binding.apply {
+            progressLoading.visibility = View.INVISIBLE
+            dataContainer.visibility = View.VISIBLE
+        }
+
+    }
+
+    private fun bindView(result: WeatherMain) {
         binding.apply {
             cityName.text = "${result.name},${result.sys.country}"
             temp.text = "${result.main.temp.toCelsius()}°"
             description.text = result.weather[Constants.INDEXT_WEATHER].description
-            maxMin.text = "${result.main.tempMax.toCelsius()}° Max - ${result.main.tempMin.toCelsius()}° Min"
+            maxMin.text =
+                "${result.main.tempMax.toCelsius()}° Max - ${result.main.tempMin.toCelsius()}° Min"
             valueWind.text = "${result.wind.speed} km/h"
             valueClouds.text = "${result.clouds.all.toPercent()}%"
             valueHumidity.text = "${result.main.humidity.toPercent()}%"
             valuePressure.text = "${result.main.pressure.toPercent()}%"
-        }
-    }
+            val lottieAnimation =
+                result.weather[Constants.INDEXT_WEATHER].main.uppercase().getWeatherStateAnimation()
+            weather.setAnimation(lottieAnimation)
 
-    private fun weatherState(weatherState:String){
-        when (weatherState) {
-            WeatherState.CLOUDS.toString() -> {
-                binding.weather.setAnimation(R.raw.cloudy)
-                binding.weather.playAnimation()
-            }
-            WeatherState.CLEAR.toString() -> {
-                binding.weather.setAnimation(R.raw.sunny)
-                binding.weather.playAnimation()
-            }
-            WeatherState.RAIN.toString() -> {
-                binding.weather.setAnimation(R.raw.rain)
-                binding.weather.playAnimation()
-            }
         }
     }
 
+
 }
diff --git a/app/src/main/java/com/cheese/weatherapp/util/extensions.kt b/app/src/main/java/com/cheese/weatherapp/util/extensions.kt
index 367ec0e..a4b09b2 100644
--- a/app/src/main/java/com/cheese/weatherapp/util/extensions.kt
+++ b/app/src/main/java/com/cheese/weatherapp/util/extensions.kt
@@ -1,9 +1,22 @@
 package com.example.mikmok.util
 
-fun Double.toCelsius () : Double {
+import com.cheese.weatherapp.R
+import com.cheese.weatherapp.data.models.WeatherState
+
+fun Double.toCelsius(): Double {
     return String.format("%.2f", (this - 273.15)).toDouble()
 }
 
-fun Double.toPercent () : Double {
-    return String.format("%.2f", (this/100)).toDouble()
-}
\ No newline at end of file
+fun Double.toPercent(): Double {
+    return String.format("%.2f", (this / 100)).toDouble()
+}
+
+fun String.getWeatherStateAnimation(): Int {
+    return when (this) {
+        WeatherState.CLOUDS.toString() -> R.raw.cloudy
+        WeatherState.CLEAR.toString() -> R.raw.sunny
+        WeatherState.RAIN.toString() -> R.raw.rain
+        else -> R.raw.sunny
+    }
+}
+
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ecfd896..4f33134 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,8 +26,21 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+    <ProgressBar
+        android:id="@+id/progress_loading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="invisible"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+
+
+        />
 
     <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/data_container"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
@@ -39,10 +52,8 @@
             android:id="@+id/weather"
             android:layout_width="@dimen/animation_size"
             android:layout_height="@dimen/animation_size"
-
             android:layout_marginTop="@dimen/margin_larg"
             app:layout_constraintStart_toStartOf="parent"
-
             app:lottie_autoPlay="true"
             app:lottie_loop="true"
             app:lottie_rawRes="@raw/sunny"

From 332a4b88022bf83aa1fbd4c5e3cd54fcbde2f241 Mon Sep 17 00:00:00 2001
From: Falah Hassan <devfalahhassan@gmail.com>
Date: Thu, 11 Aug 2022 16:13:27 -0700
Subject: [PATCH 11/16] remove unused lottie files

---
 app/src/main/res/raw/air_pressure.json  | 1 -
 app/src/main/res/raw/cloud2.json        | 1 -
 app/src/main/res/raw/humidly.json       | 1 -
 app/src/main/res/raw/lf20_iodx65pt.json | 1 -
 app/src/main/res/raw/water.json         | 1 -
 app/src/main/res/raw/weather_windy.json | 1 -
 app/src/main/res/raw/wind.json          | 1 -
 app/src/main/res/raw/wind_blowing.json  | 1 -
 app/src/main/res/raw/wind_gust.json     | 1 -
 9 files changed, 9 deletions(-)
 delete mode 100644 app/src/main/res/raw/air_pressure.json
 delete mode 100644 app/src/main/res/raw/cloud2.json
 delete mode 100644 app/src/main/res/raw/humidly.json
 delete mode 100644 app/src/main/res/raw/lf20_iodx65pt.json
 delete mode 100644 app/src/main/res/raw/water.json
 delete mode 100644 app/src/main/res/raw/weather_windy.json
 delete mode 100644 app/src/main/res/raw/wind.json
 delete mode 100644 app/src/main/res/raw/wind_blowing.json
 delete mode 100644 app/src/main/res/raw/wind_gust.json

diff --git a/app/src/main/res/raw/air_pressure.json b/app/src/main/res/raw/air_pressure.json
deleted file mode 100644
index 8c824b7..0000000
--- a/app/src/main/res/raw/air_pressure.json
+++ /dev/null
@@ -1 +0,0 @@
-{"v":"5.7.4","fr":25,"ip":0,"op":76,"w":1080,"h":1080,"nm":"Air Preasure","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Arrow","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":0,"k":540,"ix":3},"y":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.485],"y":[0]},"t":0,"s":[390.022]},{"i":{"x":[0],"y":[1]},"o":{"x":[0],"y":[0]},"t":25,"s":[586.022]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.315],"y":[0]},"t":51,"s":[586.022]},{"t":75,"s":[390.022]}],"ix":4}},"a":{"a":0,"k":[540,390.022,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"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":[[49.993,-49.993],[-49.993,49.993]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":49.993,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[589.993,465.011],"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,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-49.993,24.996],[49.993,124.981],[49.993,-124.981]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":49.993,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[490.007,390.022],"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,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":76,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"wind 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[515.004,614.989,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,55.22],[0,0],[-55.22,0],[0,0]],"o":[[0,0],[-55.22,0],[0,0],[0,-55.22],[0,0],[0,0]],"v":[[324.952,99.985],[-224.967,99.985],[-324.952,0],[-324.952,0],[-224.967,-99.985],[-224.967,-99.985]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.164705882353,0.117647058824,0.901960784314,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":49.993,"ix":5},"lc":2,"lj":2,"bm":0,"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,"bm":0,"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]},"t":0,"s":[62.6]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":25,"s":[62.6]},{"i":{"x":[0.602],"y":[0.42]},"o":{"x":[0.264],"y":[0]},"t":52,"s":[63.3]},{"i":{"x":[0.839],"y":[1]},"o":{"x":[0.242],"y":[0.158]},"t":53,"s":[64.297]},{"t":69,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.256],"y":[1]},"o":{"x":[0.143],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.324],"y":[1]},"o":{"x":[0.839],"y":[0]},"t":25,"s":[10.3]},{"i":{"x":[0.602],"y":[1.452]},"o":{"x":[0.264],"y":[0]},"t":52,"s":[63.3]},{"i":{"x":[0.839],"y":[1]},"o":{"x":[0.242],"y":[0.148]},"t":53,"s":[64.182]},{"t":69,"s":[38]}],"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.05],"y":[1]},"o":{"x":[0.143],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":25,"s":[122]},{"i":{"x":[0.602],"y":[0.774]},"o":{"x":[0.264],"y":[0]},"t":52,"s":[122]},{"i":{"x":[0.839],"y":[1]},"o":{"x":[0.242],"y":[0.165]},"t":53,"s":[129.235]},{"t":69,"s":[225.7]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":76,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"wind 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[639.985,515.004,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,55.22],[0,0],[55.22,0],[0,0]],"o":[[0,0],[55.22,0],[0,0],[0,-55.22],[0,0],[0,0]],"v":[[-249.963,99.985],[149.978,99.985],[249.963,0],[249.963,0],[149.978,-99.985],[149.978,-99.985]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.164705882353,0.117647058824,0.901960784314,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":49.993,"ix":5},"lc":2,"lj":2,"bm":0,"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,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.487],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.256],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":10,"s":[29.6]},{"i":{"x":[0.324],"y":[1]},"o":{"x":[0.839],"y":[0]},"t":25,"s":[20]},{"i":{"x":[0.84],"y":[1]},"o":{"x":[0.244],"y":[0]},"t":52,"s":[72]},{"t":69,"s":[54.8]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.42],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[46]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":25,"s":[72]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":52,"s":[72]},{"t":69,"s":[100]}],"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.42],"y":[1]},"o":{"x":[0.976],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":25,"s":[86]},{"i":{"x":[0.614],"y":[0.956]},"o":{"x":[0.278],"y":[0]},"t":52,"s":[86]},{"i":{"x":[0.838],"y":[1]},"o":{"x":[0.225],"y":[0.107]},"t":53,"s":[102.085]},{"t":69,"s":[163.3]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":76,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Ground","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[540,814.959,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"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":[[-374.944,0],[374.944,0]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":49.993,"ix":5},"lc":2,"lj":2,"bm":0,"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,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":76,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/app/src/main/res/raw/cloud2.json b/app/src/main/res/raw/cloud2.json
deleted file mode 100644
index a170f8a..0000000
--- a/app/src/main/res/raw/cloud2.json
+++ /dev/null
@@ -1 +0,0 @@
-{"v":"5.5.7","fr":30,"ip":0,"op":300,"w":800,"h":600,"nm":"Cloud","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"“Cloud_D”轮廓","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[582,462,0],"ix":2},"a":{"a":0,"k":[90.25,180.25,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":10,"s":[100,100,100]},{"t":40,"s":[120,120,100]}],"ix":6,"x":"var $bm_rt;\n$bm_rt = loopOut('pingpong');"}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-49.706],[-49.706,0],[0,49.706],[49.706,0]],"o":[[0,49.706],[49.706,0],[0,-49.706],[-49.706,0]],"v":[[-90,0],[0,90],[90,0],[0,-90]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.929000016755,0.933000033509,0.948999980852,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[90.25,90.25],"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":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"“Cloud_C”轮廓","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[426,462,0],"ix":2},"a":{"a":0,"k":[160.25,320.25,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"t":30,"s":[92,92,100]}],"ix":6,"x":"var $bm_rt;\n$bm_rt = loopOut('pingpong');"}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-88.366],[-88.366,0],[0,88.365],[88.365,0]],"o":[[0,88.365],[88.365,0],[0,-88.366],[-88.366,0]],"v":[[-160,0],[0,160],[160,0],[0,-160]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.929000016755,0.933000033509,0.948999980852,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[160.25,160.25],"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":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"“Cloud_B”轮廓","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[258,328,0],"ix":2},"a":{"a":0,"k":[70.25,70.25,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":5,"s":[100,100,100]},{"t":35,"s":[124,124,100]}],"ix":6,"x":"var $bm_rt;\n$bm_rt = loopOut('pingpong');"}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-38.66],[-38.66,0],[0,38.66],[38.66,0]],"o":[[0,38.66],[38.66,0],[0,-38.66],[-38.66,0]],"v":[[-70,0],[0,70],[70,0],[0,-70]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.929000016755,0.933000033509,0.948999980852,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[70.25,70.25],"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":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"“Cloud_A”轮廓","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[188,462,0],"ix":2},"a":{"a":0,"k":[60.25,120.25,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"t":30,"s":[120,120,100]}],"ix":6,"x":"var $bm_rt;\n$bm_rt = loopOut('pingpong');"}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-33.137],[-33.137,0],[0,33.137],[33.137,0]],"o":[[0,33.137],[33.137,0],[0,-33.137],[-33.137,0]],"v":[[-60,0],[0,60],[60,0],[0,-60]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.929000016755,0.933000033509,0.948999980852,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[60.25,60.25],"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":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"“Cloud_Buttom”轮廓","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[387,417,0],"ix":2},"a":{"a":0,"k":[199.25,45.25,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,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[199,45],[-199,45],[-199,-45],[199,-45]],"c":true},"ix":2},"nm":"路径 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.929000016755,0.933000033509,0.948999980852,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[199.25,45.25],"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":"变换"}],"nm":"组 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":300,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/app/src/main/res/raw/humidly.json b/app/src/main/res/raw/humidly.json
deleted file mode 100644
index 6300faf..0000000
--- a/app/src/main/res/raw/humidly.json
+++ /dev/null
@@ -1 +0,0 @@
-{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":30,"ip":0,"op":90,"w":38,"h":38,"nm":"logo","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"left upper Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":6,"s":[30]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":76,"s":[30]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[30]},{"t":244,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":20.493,"s":[6.18,15.667,0],"to":[0,0.833,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":31.316,"s":[6.18,20.667,0],"to":[0,0,0],"ti":[0,0.833,0]},{"t":37.3837890625,"s":[6.18,15.667,0]}],"ix":2,"x":"var $bm_rt;\nvar amp, freq, decay, n, n, t, t, v;\namp = 0.03;\nfreq = 5;\ndecay = 7;\n$bm_rt = n = 0;\nif (numKeys > 0) {\n    $bm_rt = n = nearestKey(time).index;\n    if (key(n).time > time) {\n        n--;\n    }\n}\nif (n == 0) {\n    $bm_rt = t = 0;\n} else {\n    $bm_rt = t = $bm_sub(time, key(n).time);\n}\nif (n > 0) {\n    v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n    $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n} else {\n    $bm_rt = value;\n}"},"a":{"a":0,"k":[352.18,246.667,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":[[2.124,0],[0,2.071],[-2.564,2.786],[0,-1.381]],"o":[[-2.125,0],[0,-1.381],[2.564,2.786],[0,2.071]],"v":[[0.001,5],[-3.846,1.25],[0.001,-5],[3.847,1.25]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.2901960784313726,0.5647058823529412,0.8862745098039215,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[352.18,246.667],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":90,"st":-69,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"l lower Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":4,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":10,"s":[30]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":76,"s":[30]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[30]},{"t":244,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":20.493,"s":[12.846,27.333,0],"to":[0,0.833,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":31.316,"s":[12.846,32.333,0],"to":[0,0,0],"ti":[0,0.833,0]},{"t":37.3837890625,"s":[12.846,27.333,0]}],"ix":2,"x":"var $bm_rt;\nvar amp, freq, decay, n, n, t, t, v;\namp = 0.03;\nfreq = 5;\ndecay = 7;\n$bm_rt = n = 0;\nif (numKeys > 0) {\n    $bm_rt = n = nearestKey(time).index;\n    if (key(n).time > time) {\n        n--;\n    }\n}\nif (n == 0) {\n    $bm_rt = t = 0;\n} else {\n    $bm_rt = t = $bm_sub(time, key(n).time);\n}\nif (n > 0) {\n    v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n    $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n} else {\n    $bm_rt = value;\n}"},"a":{"a":0,"k":[358.846,258.333,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":[[2.124,0],[0,2.071],[-2.564,2.786],[0,-1.38]],"o":[[-2.124,0],[0,-1.38],[2.564,2.786],[0,2.071]],"v":[[0,5],[-3.846,1.25],[0,-5],[3.846,1.25]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.2901960784313726,0.5647058823529412,0.8862745098039215,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[358.846,258.333],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":90,"st":-69,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"r lower Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":8,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":14,"s":[30]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":76,"s":[30]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[30]},{"t":244,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":20.493,"s":[25.667,27.333,0],"to":[0,0.833,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":31.316,"s":[25.667,32.333,0],"to":[0,0,0],"ti":[0,0.833,0]},{"t":37.3837890625,"s":[25.667,27.333,0]}],"ix":2,"x":"var $bm_rt;\nvar amp, freq, decay, n, n, t, t, v;\namp = 0.03;\nfreq = 5;\ndecay = 7;\n$bm_rt = n = 0;\nif (numKeys > 0) {\n    $bm_rt = n = nearestKey(time).index;\n    if (key(n).time > time) {\n        n--;\n    }\n}\nif (n == 0) {\n    $bm_rt = t = 0;\n} else {\n    $bm_rt = t = $bm_sub(time, key(n).time);\n}\nif (n > 0) {\n    v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n    $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n} else {\n    $bm_rt = value;\n}"},"a":{"a":0,"k":[371.667,258.333,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":[[2.124,0],[0,2.071],[-2.564,2.786],[0,-1.38]],"o":[[-2.124,0],[0,-1.38],[2.564,2.786],[0,2.071]],"v":[[0,5],[-3.846,1.25],[0,-5],[3.846,1.25]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.2901960784313726,0.5647058823529412,0.8862745098039215,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[371.667,258.333],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":90,"st":-69,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"r upper Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":11,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":17,"s":[30]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":76,"s":[30]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[30]},{"t":244,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":20.493,"s":[31.821,15.667,0],"to":[0,0.833,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":31.316,"s":[31.821,20.667,0],"to":[0,0,0],"ti":[0,0.833,0]},{"t":37.3837890625,"s":[31.821,15.667,0]}],"ix":2,"x":"var $bm_rt;\nvar amp, freq, decay, n, n, t, t, v;\namp = 0.03;\nfreq = 5;\ndecay = 7;\n$bm_rt = n = 0;\nif (numKeys > 0) {\n    $bm_rt = n = nearestKey(time).index;\n    if (key(n).time > time) {\n        n--;\n    }\n}\nif (n == 0) {\n    $bm_rt = t = 0;\n} else {\n    $bm_rt = t = $bm_sub(time, key(n).time);\n}\nif (n > 0) {\n    v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n    $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n} else {\n    $bm_rt = value;\n}"},"a":{"a":0,"k":[377.821,246.667,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":[[2.124,0],[0,2.071],[-2.564,2.786],[0,-1.381]],"o":[[-2.124,0],[0,-1.381],[2.563,2.786],[0,2.071]],"v":[[0,5],[-3.847,1.25],[0,-5],[3.846,1.25]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.2901960784313726,0.5647058823529412,0.8862745098039215,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[377.821,246.667],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":90,"st":-69,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"main drop Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":76,"s":[100]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":220,"s":[100]},{"t":244,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.808,"y":0.04},"t":13,"s":[18.999,-24.333,0],"to":[0,7.5,0],"ti":[0,-6.667,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":33.934,"s":[18.999,20.667,0],"to":[0,6.667,0],"ti":[0,0.833,0]},{"t":40,"s":[18.999,15.667,0]}],"ix":2,"x":"var $bm_rt;\nvar amp, freq, decay, n, n, t, t, v;\namp = 0.03;\nfreq = 5;\ndecay = 7;\n$bm_rt = n = 0;\nif (numKeys > 0) {\n    $bm_rt = n = nearestKey(time).index;\n    if (key(n).time > time) {\n        n--;\n    }\n}\nif (n == 0) {\n    $bm_rt = t = 0;\n} else {\n    $bm_rt = t = $bm_sub(time, key(n).time);\n}\nif (n > 0) {\n    v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n    $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n} else {\n    $bm_rt = value;\n}"},"a":{"a":0,"k":[364.999,246.667,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.138,0.138,0.667],"y":[1.066,1.066,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.667]},"t":12,"s":[0,0,100]},{"t":31,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-2.124,0],[0,2.071],[2.565,2.786],[0,-1.381]],"o":[[2.125,0],[0,-1.381],[-2.564,2.786],[0,2.071]],"v":[[0,5],[3.846,1.25],[0,-5],[-3.846,1.25]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.2901960784313726,0.5647058823529412,0.8862745098039215,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[364.999,246.667],"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":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":90,"st":-69,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/app/src/main/res/raw/lf20_iodx65pt.json b/app/src/main/res/raw/lf20_iodx65pt.json
deleted file mode 100644
index 704b3b8..0000000
--- a/app/src/main/res/raw/lf20_iodx65pt.json
+++ /dev/null
@@ -1 +0,0 @@
-{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":29.9700012207031,"ip":0,"op":90.0000036657751,"w":1125,"h":988,"nm":"droplet","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Layer 2 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[12254]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":30,"s":[12218.281]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":60,"s":[12259.325]},{"t":89.0000036250443,"s":[12240]}],"ix":10},"p":{"a":0,"k":[651,654,0],"ix":2},"a":{"a":0,"k":[651,654,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],[-14,97]],"o":[[0,0],[0,0]],"v":[[-45.5,53.5],[45.5,-53.5]],"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":29,"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[696.5,707.5],"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,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.56],"y":[0]},"t":0,"s":[100]},{"i":{"x":[0.378],"y":[1]},"o":{"x":[0.416],"y":[0]},"t":30,"s":[5]},{"i":{"x":[0.481],"y":[1]},"o":{"x":[0.428],"y":[0]},"t":60,"s":[100]},{"t":89.0000036250443,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"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":91.000003706506,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 1 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[562.5,494,0],"ix":2},"a":{"a":0,"k":[562.5,494,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":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[88.16,171.09],[1.22,1.82],[-16.85,-130.65],[-108.989,-9.66],[0,119.11]],"o":[[-1.25,-1.8],[-64.21,183.76],[14.59,113.13],[114.17,-17.63],[0,-129.94]],"v":[[-18.179,-339.185],[-21.889,-344.605],[-199.909,137.475],[15.18,344.605],[216.76,109.185]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":30,"s":[{"i":[[88.16,171.09],[1.22,1.82],[-16.85,-130.65],[-108.989,-9.66],[0,119.11]],"o":[[-1.25,-1.8],[-64.21,183.76],[14.59,113.13],[114.17,-17.63],[0,-129.94]],"v":[[-118.179,-319.185],[-121.889,-324.605],[-199.909,137.475],[15.18,344.605],[216.76,109.185]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":57,"s":[{"i":[[88.16,171.09],[1.22,1.82],[-16.85,-130.65],[-108.989,-9.66],[0,119.11]],"o":[[-1.25,-1.8],[-64.21,183.76],[14.59,113.13],[114.17,-17.63],[0,-129.94]],"v":[[62.431,-346.982],[58.721,-352.402],[-199.909,137.475],[15.18,344.605],[216.76,109.185]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":73,"s":[{"i":[[88.16,171.09],[1.22,1.82],[-16.85,-130.65],[-108.989,-9.66],[0,119.11]],"o":[[-1.25,-1.8],[-64.21,183.76],[14.59,113.13],[114.17,-17.63],[0,-129.94]],"v":[[-91.506,-332.217],[-95.216,-337.637],[-199.909,137.475],[15.18,344.605],[216.76,109.185]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":76,"s":[{"i":[[88.16,171.09],[1.22,1.82],[-16.85,-130.65],[-108.989,-9.66],[0,119.11]],"o":[[-1.25,-1.8],[-64.21,183.76],[14.59,113.13],[114.17,-17.63],[0,-129.94]],"v":[[21.74,-344.137],[18.03,-349.557],[-199.909,137.475],[15.18,344.605],[216.76,109.185]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.167,"y":0.167},"t":79,"s":[{"i":[[88.16,171.09],[1.22,1.82],[-16.85,-130.65],[-108.989,-9.66],[0,119.11]],"o":[[-1.25,-1.8],[-64.21,183.76],[14.59,113.13],[114.17,-17.63],[0,-129.94]],"v":[[-91.506,-332.217],[-95.216,-337.637],[-199.909,137.475],[15.18,344.605],[216.76,109.185]],"c":true}]},{"t":89.0000036250443,"s":[{"i":[[88.16,171.09],[1.22,1.82],[-16.85,-130.65],[-108.989,-9.66],[0,119.11]],"o":[[-1.25,-1.8],[-64.21,183.76],[14.59,113.13],[114.17,-17.63],[0,-129.94]],"v":[[-18.179,-339.185],[-21.889,-344.605],[-199.909,137.475],[15.18,344.605],[216.76,109.185]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.6077,0.2386,0.8214,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[583.96,493.595],"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,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[14.59,113.13],[-64.21,183.76],[-1.25,-1.8],[0.06,0.11],[1.02,2.03],[0,-131.56],[-131.56,0],[-11.89,1.82],[-0.06,0.01]],"o":[[-16.85,-130.65],[1.22,1.82],[-0.06,-0.11],[-1.04,-2.02],[-87.19,173.82],[0,131.57],[12.401,0],[0.06,-0.01],[-108.99,-9.66]],"v":[[-77.66,136.57],[100.36,-345.51],[104.07,-340.09],[103.89,-340.43],[100.79,-346.5],[-137.43,108.28],[100.79,346.5],[137.26,343.73],[137.43,343.7]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":30,"s":[{"i":[[14.59,113.13],[-64.21,183.76],[-1.25,-1.8],[0.06,0.11],[1.02,2.03],[0,-131.56],[-131.56,0],[-11.89,1.82],[-0.06,0.01]],"o":[[-16.85,-130.65],[1.22,1.82],[-0.06,-0.11],[-1.04,-2.02],[-87.19,173.82],[0,131.57],[12.401,0],[0.06,-0.01],[-108.99,-9.66]],"v":[[-77.66,136.57],[-0.14,-323.01],[3.57,-317.59],[3.39,-317.93],[0.29,-324],[-137.43,108.28],[100.79,346.5],[137.26,343.73],[137.43,343.7]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":57,"s":[{"i":[[14.59,113.13],[-64.21,183.76],[-1.25,-1.8],[0.06,0.11],[1.02,2.03],[0,-131.56],[-131.56,0],[-11.89,1.82],[-0.06,0.01]],"o":[[-16.85,-130.65],[1.22,1.82],[-0.06,-0.11],[-1.04,-2.02],[-87.19,173.82],[0,131.57],[12.401,0],[0.06,-0.01],[-108.99,-9.66]],"v":[[-77.66,136.57],[181.699,-352.951],[185.409,-347.531],[185.229,-347.871],[182.129,-353.941],[-137.43,108.28],[100.79,346.5],[137.26,343.73],[137.43,343.7]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":73,"s":[{"i":[[14.59,113.13],[-64.21,183.76],[-1.25,-1.8],[0.06,0.11],[1.02,2.03],[0,-131.56],[-131.56,0],[-11.89,1.82],[-0.06,0.01]],"o":[[-16.85,-130.65],[1.22,1.82],[-0.06,-0.11],[-1.04,-2.02],[-87.19,173.82],[0,131.57],[12.401,0],[0.06,-0.01],[-108.99,-9.66]],"v":[[-77.66,136.57],[27.13,-338.495],[30.84,-333.075],[30.66,-333.415],[27.56,-339.485],[-137.43,108.28],[100.79,346.5],[137.26,343.73],[137.43,343.7]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":76,"s":[{"i":[[14.59,113.13],[-64.21,183.76],[-1.25,-1.8],[0.06,0.11],[1.02,2.03],[0,-131.56],[-131.56,0],[-11.89,1.82],[-0.06,0.01]],"o":[[-16.85,-130.65],[1.22,1.82],[-0.06,-0.11],[-1.04,-2.02],[-87.19,173.82],[0,131.57],[12.401,0],[0.06,-0.01],[-108.99,-9.66]],"v":[[-77.66,136.57],[140.322,-350.441],[144.032,-345.021],[143.852,-345.361],[140.752,-351.431],[-137.43,108.28],[100.79,346.5],[137.26,343.73],[137.43,343.7]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.167,"y":0.167},"t":79,"s":[{"i":[[14.59,113.13],[-64.21,183.76],[-1.25,-1.8],[0.06,0.11],[1.02,2.03],[0,-131.56],[-131.56,0],[-11.89,1.82],[-0.06,0.01]],"o":[[-16.85,-130.65],[1.22,1.82],[-0.06,-0.11],[-1.04,-2.02],[-87.19,173.82],[0,131.57],[12.401,0],[0.06,-0.01],[-108.99,-9.66]],"v":[[-77.66,136.57],[27.13,-338.495],[30.84,-333.075],[30.66,-333.415],[27.56,-339.485],[-137.43,108.28],[100.79,346.5],[137.26,343.73],[137.43,343.7]],"c":true}]},{"t":89.0000036250443,"s":[{"i":[[14.59,113.13],[-64.21,183.76],[-1.25,-1.8],[0.06,0.11],[1.02,2.03],[0,-131.56],[-131.56,0],[-11.89,1.82],[-0.06,0.01]],"o":[[-16.85,-130.65],[1.22,1.82],[-0.06,-0.11],[-1.04,-2.02],[-87.19,173.82],[0,131.57],[12.401,0],[0.06,-0.01],[-108.99,-9.66]],"v":[[-77.66,136.57],[100.36,-345.51],[104.07,-340.09],[103.89,-340.43],[100.79,-346.5],[-137.43,108.28],[100.79,346.5],[137.26,343.73],[137.43,343.7]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.7529,0.5294,0.8824,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[461.71,494.5],"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,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":90.0000036657751,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/app/src/main/res/raw/water.json b/app/src/main/res/raw/water.json
deleted file mode 100644
index 3b3815e..0000000
--- a/app/src/main/res/raw/water.json
+++ /dev/null
@@ -1 +0,0 @@
-{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":29.9700012207031,"ip":0,"op":90.0000036657751,"w":1125,"h":988,"nm":"droplet","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Layer 2 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[12254]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":30,"s":[12218.281]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":60,"s":[12259.325]},{"t":89.0000036250443,"s":[12240]}],"ix":10},"p":{"a":0,"k":[651,654,0],"ix":2},"a":{"a":0,"k":[651,654,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],[-14,97]],"o":[[0,0],[0,0]],"v":[[-45.5,53.5],[45.5,-53.5]],"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":29,"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[696.5,707.5],"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,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.56],"y":[0]},"t":0,"s":[100]},{"i":{"x":[0.378],"y":[1]},"o":{"x":[0.416],"y":[0]},"t":30,"s":[5]},{"i":{"x":[0.481],"y":[1]},"o":{"x":[0.428],"y":[0]},"t":60,"s":[100]},{"t":89.0000036250443,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"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":91.000003706506,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 1 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[562.5,494,0],"ix":2},"a":{"a":0,"k":[562.5,494,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":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[88.16,171.09],[1.22,1.82],[-16.85,-130.65],[-108.989,-9.66],[0,119.11]],"o":[[-1.25,-1.8],[-64.21,183.76],[14.59,113.13],[114.17,-17.63],[0,-129.94]],"v":[[-18.179,-339.185],[-21.889,-344.605],[-199.909,137.475],[15.18,344.605],[216.76,109.185]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":30,"s":[{"i":[[88.16,171.09],[1.22,1.82],[-16.85,-130.65],[-108.989,-9.66],[0,119.11]],"o":[[-1.25,-1.8],[-64.21,183.76],[14.59,113.13],[114.17,-17.63],[0,-129.94]],"v":[[-118.179,-319.185],[-121.889,-324.605],[-199.909,137.475],[15.18,344.605],[216.76,109.185]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":57,"s":[{"i":[[88.16,171.09],[1.22,1.82],[-16.85,-130.65],[-108.989,-9.66],[0,119.11]],"o":[[-1.25,-1.8],[-64.21,183.76],[14.59,113.13],[114.17,-17.63],[0,-129.94]],"v":[[62.431,-346.982],[58.721,-352.402],[-199.909,137.475],[15.18,344.605],[216.76,109.185]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":73,"s":[{"i":[[88.16,171.09],[1.22,1.82],[-16.85,-130.65],[-108.989,-9.66],[0,119.11]],"o":[[-1.25,-1.8],[-64.21,183.76],[14.59,113.13],[114.17,-17.63],[0,-129.94]],"v":[[-91.506,-332.217],[-95.216,-337.637],[-199.909,137.475],[15.18,344.605],[216.76,109.185]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":76,"s":[{"i":[[88.16,171.09],[1.22,1.82],[-16.85,-130.65],[-108.989,-9.66],[0,119.11]],"o":[[-1.25,-1.8],[-64.21,183.76],[14.59,113.13],[114.17,-17.63],[0,-129.94]],"v":[[21.74,-344.137],[18.03,-349.557],[-199.909,137.475],[15.18,344.605],[216.76,109.185]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.167,"y":0.167},"t":79,"s":[{"i":[[88.16,171.09],[1.22,1.82],[-16.85,-130.65],[-108.989,-9.66],[0,119.11]],"o":[[-1.25,-1.8],[-64.21,183.76],[14.59,113.13],[114.17,-17.63],[0,-129.94]],"v":[[-91.506,-332.217],[-95.216,-337.637],[-199.909,137.475],[15.18,344.605],[216.76,109.185]],"c":true}]},{"t":89.0000036250443,"s":[{"i":[[88.16,171.09],[1.22,1.82],[-16.85,-130.65],[-108.989,-9.66],[0,119.11]],"o":[[-1.25,-1.8],[-64.21,183.76],[14.59,113.13],[114.17,-17.63],[0,-129.94]],"v":[[-18.179,-339.185],[-21.889,-344.605],[-199.909,137.475],[15.18,344.605],[216.76,109.185]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.1686,0.8353,0.8353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[583.96,493.595],"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,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[14.59,113.13],[-64.21,183.76],[-1.25,-1.8],[0.06,0.11],[1.02,2.03],[0,-131.56],[-131.56,0],[-11.89,1.82],[-0.06,0.01]],"o":[[-16.85,-130.65],[1.22,1.82],[-0.06,-0.11],[-1.04,-2.02],[-87.19,173.82],[0,131.57],[12.401,0],[0.06,-0.01],[-108.99,-9.66]],"v":[[-77.66,136.57],[100.36,-345.51],[104.07,-340.09],[103.89,-340.43],[100.79,-346.5],[-137.43,108.28],[100.79,346.5],[137.26,343.73],[137.43,343.7]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":30,"s":[{"i":[[14.59,113.13],[-64.21,183.76],[-1.25,-1.8],[0.06,0.11],[1.02,2.03],[0,-131.56],[-131.56,0],[-11.89,1.82],[-0.06,0.01]],"o":[[-16.85,-130.65],[1.22,1.82],[-0.06,-0.11],[-1.04,-2.02],[-87.19,173.82],[0,131.57],[12.401,0],[0.06,-0.01],[-108.99,-9.66]],"v":[[-77.66,136.57],[-0.14,-323.01],[3.57,-317.59],[3.39,-317.93],[0.29,-324],[-137.43,108.28],[100.79,346.5],[137.26,343.73],[137.43,343.7]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":57,"s":[{"i":[[14.59,113.13],[-64.21,183.76],[-1.25,-1.8],[0.06,0.11],[1.02,2.03],[0,-131.56],[-131.56,0],[-11.89,1.82],[-0.06,0.01]],"o":[[-16.85,-130.65],[1.22,1.82],[-0.06,-0.11],[-1.04,-2.02],[-87.19,173.82],[0,131.57],[12.401,0],[0.06,-0.01],[-108.99,-9.66]],"v":[[-77.66,136.57],[181.699,-352.951],[185.409,-347.531],[185.229,-347.871],[182.129,-353.941],[-137.43,108.28],[100.79,346.5],[137.26,343.73],[137.43,343.7]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":73,"s":[{"i":[[14.59,113.13],[-64.21,183.76],[-1.25,-1.8],[0.06,0.11],[1.02,2.03],[0,-131.56],[-131.56,0],[-11.89,1.82],[-0.06,0.01]],"o":[[-16.85,-130.65],[1.22,1.82],[-0.06,-0.11],[-1.04,-2.02],[-87.19,173.82],[0,131.57],[12.401,0],[0.06,-0.01],[-108.99,-9.66]],"v":[[-77.66,136.57],[27.13,-338.495],[30.84,-333.075],[30.66,-333.415],[27.56,-339.485],[-137.43,108.28],[100.79,346.5],[137.26,343.73],[137.43,343.7]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":76,"s":[{"i":[[14.59,113.13],[-64.21,183.76],[-1.25,-1.8],[0.06,0.11],[1.02,2.03],[0,-131.56],[-131.56,0],[-11.89,1.82],[-0.06,0.01]],"o":[[-16.85,-130.65],[1.22,1.82],[-0.06,-0.11],[-1.04,-2.02],[-87.19,173.82],[0,131.57],[12.401,0],[0.06,-0.01],[-108.99,-9.66]],"v":[[-77.66,136.57],[140.322,-350.441],[144.032,-345.021],[143.852,-345.361],[140.752,-351.431],[-137.43,108.28],[100.79,346.5],[137.26,343.73],[137.43,343.7]],"c":true}]},{"i":{"x":0,"y":1},"o":{"x":0.167,"y":0.167},"t":79,"s":[{"i":[[14.59,113.13],[-64.21,183.76],[-1.25,-1.8],[0.06,0.11],[1.02,2.03],[0,-131.56],[-131.56,0],[-11.89,1.82],[-0.06,0.01]],"o":[[-16.85,-130.65],[1.22,1.82],[-0.06,-0.11],[-1.04,-2.02],[-87.19,173.82],[0,131.57],[12.401,0],[0.06,-0.01],[-108.99,-9.66]],"v":[[-77.66,136.57],[27.13,-338.495],[30.84,-333.075],[30.66,-333.415],[27.56,-339.485],[-137.43,108.28],[100.79,346.5],[137.26,343.73],[137.43,343.7]],"c":true}]},{"t":89.0000036250443,"s":[{"i":[[14.59,113.13],[-64.21,183.76],[-1.25,-1.8],[0.06,0.11],[1.02,2.03],[0,-131.56],[-131.56,0],[-11.89,1.82],[-0.06,0.01]],"o":[[-16.85,-130.65],[1.22,1.82],[-0.06,-0.11],[-1.04,-2.02],[-87.19,173.82],[0,131.57],[12.401,0],[0.06,-0.01],[-108.99,-9.66]],"v":[[-77.66,136.57],[100.36,-345.51],[104.07,-340.09],[103.89,-340.43],[100.79,-346.5],[-137.43,108.28],[100.79,346.5],[137.26,343.73],[137.43,343.7]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.3206,0.8194,0.8194,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[461.71,494.5],"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,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":90.0000036657751,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/app/src/main/res/raw/weather_windy.json b/app/src/main/res/raw/weather_windy.json
deleted file mode 100644
index c3e7d89..0000000
--- a/app/src/main/res/raw/weather_windy.json
+++ /dev/null
@@ -1 +0,0 @@
-{"v":"5.1.1","fr":60,"ip":0,"op":180,"w":256,"h":256,"nm":"Windy","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"cloud","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":0,"s":[117.135,125.78,0],"e":[123.135,125.78,0],"to":[1,0,0],"ti":[3.56038412974158e-7,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"n":"0p833_0p833_0p333_0","t":45,"s":[123.135,125.78,0],"e":[117.135,125.78,0],"to":[-3.56038412974158e-7,0,0],"ti":[0.33333370089531,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"n":"0p833_0p833_0p333_0","t":90,"s":[117.135,125.78,0],"e":[121.135,125.78,0],"to":[-0.33333370089531,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"n":"0p833_0p833_0p333_0","t":135,"s":[121.135,125.78,0],"e":[117.135,125.78,0],"to":[0,0,0],"ti":[0.66666668653488,0,0]},{"t":180}],"ix":2},"a":{"a":0,"k":[102.135,62.78,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,24.37],[-24.44,0],[-6.12,-3.18],[-27.6,0],[0,-34.67],[0.03,-0.7],[0,-12.29],[17.86,0],[0,0],[0,0],[0,0]],"o":[[0,0],[-24.44,0],[0,-24.36],[7.38,0],[8.51,-24.62],[34.78,0],[0,0.71],[10.16,5.44],[0,17.8],[0,0],[-0.1,0],[0,0],[0,0]],"v":[[123.61,125.56],[44.26,125.56],[0,81.44],[44.26,37.33],[64.71,42.31],[124.27,0],[187.25,62.78],[187.21,64.9],[204.27,93.32],[171.93,125.56],[124.27,125.56],[123.61,125.56],[124.27,125.56]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.909803986549,0.909803986549,0.909803986549,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":[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":180,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"cloud","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"n":"0p833_0p833_0p333_0","t":0,"s":[195.37,81.5,0],"e":[199.37,81.5,0],"to":[0.66666668653488,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"n":"0p833_0p833_0p333_0","t":35,"s":[199.37,81.5,0],"e":[195.37,81.5,0],"to":[0,0,0],"ti":[4.57763661643185e-7,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"n":"0p833_0p833_0p333_0","t":80,"s":[195.37,81.5,0],"e":[199.37,81.5,0],"to":[-4.57763661643185e-7,0,0],"ti":[0.66666668653488,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"n":"0p833_0p833_0p333_0","t":125,"s":[199.37,81.5,0],"e":[195.37,81.5,0],"to":[-0.64289206266403,0,0],"ti":[0.03566187247634,0,0]},{"t":180}],"ix":2},"a":{"a":0,"k":[46.37,28.5,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,11.06],[-11.09,0],[-2.78,-1.45],[-12.52,0],[0,-15.74],[0.01,-0.32],[0,-5.58],[8.11,0],[0,0],[0,0],[0,0]],"o":[[0,0],[-11.09,0],[0,-11.06],[3.35,0],[3.86,-11.18],[15.8,0],[0,0.32],[4.61,2.47],[0,8.09],[0,0],[-0.04,0],[0,0],[0,0]],"v":[[56.11,57],[20.09,57],[0,36.97],[20.09,16.95],[29.38,19.21],[56.41,0],[85.01,28.5],[84.99,29.46],[92.74,42.36],[78.05,57],[56.41,57],[56.11,57],[56.41,57]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.909803986549,0.909803986549,0.909803986549,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":[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":180,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"bond","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[128,128,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[256,256],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","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":"bond","np":1,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/app/src/main/res/raw/wind.json b/app/src/main/res/raw/wind.json
deleted file mode 100644
index 89ccd19..0000000
--- a/app/src/main/res/raw/wind.json
+++ /dev/null
@@ -1 +0,0 @@
-{"v":"5.6.1","fr":60,"ip":0,"op":45,"w":500,"h":500,"nm":"Wind 2","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Top Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[131.578,165.236,0],"ix":2},"a":{"a":0,"k":[117.082,70.298,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],[-22.031,0.022],[-0.022,-22.03],[22.03,-0.023],[0,0],[0,0]],"o":[[-0.021,-22.03],[22.03,-0.021],[0.021,22.03],[0,0],[0,0],[0,0]],"v":[[7.283,-0.348],[47.134,-40.277],[87.061,-0.426],[47.212,39.503],[46.547,39.503],[-87.083,40.298]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.416000007181,0.579999976065,0.957000014361,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":30,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[117.082,70.298],"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,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":100,"ix":1},"e":{"a":0,"k":70,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-58]},{"t":45,"s":[-414]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":45,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Middle Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[240.555,178.605,0],"ix":2},"a":{"a":0,"k":[225.482,99.749,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],[-38.108,0.037],[-0.037,-38.106],[38.108,-0.037],[0,0],[0,0]],"o":[[-0.037,-38.107],[38.106,-0.038],[0.037,38.108],[0,0],[0,0],[0,0]],"v":[[57.447,-0.646],[126.378,-69.712],[195.444,-0.782],[126.512,68.286],[125.363,68.281],[-195.481,69.749]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.416000007181,0.579999976065,0.957000014361,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":30,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[225.482,99.75],"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,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":70,"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-360]},{"t":45,"s":[-720]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":45,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Bottom Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[298.558,340.72,0],"ix":2},"a":{"a":0,"k":[167.296,81.078,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],[-28.03,0.027],[0.027,28.03],[28.029,-0.027],[0,0],[0,0]],"o":[[0.027,28.029],[28.029,-0.028],[-0.027,-28.029],[0,0],[0,0],[0,0]],"v":[[35.766,0.349],[86.567,51.051],[137.269,0.25],[86.468,-50.452],[85.621,-50.452],[-137.296,-51.079]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.416000007181,0.579999976065,0.957000014361,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":30,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[167.296,81.079],"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,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":70,"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[360]},{"t":45,"s":[-2]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":45,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/app/src/main/res/raw/wind_blowing.json b/app/src/main/res/raw/wind_blowing.json
deleted file mode 100644
index 6f94c99..0000000
--- a/app/src/main/res/raw/wind_blowing.json
+++ /dev/null
@@ -1 +0,0 @@
-{"v":"5.6.2","fr":25,"ip":0,"op":25,"w":650,"h":650,"nm":"vent","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Souffle bleu Silhouettes 6","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[327.374,227.348,0],"ix":2},"a":{"a":0,"k":[209.75,127.845,0],"ix":1},"s":{"a":0,"k":[105.991,-105.991,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,0],[-23.222,-18.816],[7.031,-26.123],[24.789,-6.946],[11.471,34.31],[-2.995,12.051],[-10.144,4.622],[-6.615,-1.116],[0.673,-17.857]],"o":[[0,0],[0,0],[27.855,0],[20.606,16.697],[-6.846,25.43],[-34.49,9.664],[-3.94,-11.789],[2.689,-10.817],[6.103,-2.781],[16.782,2.83],[0,0]],"v":[[-159.75,-75.131],[-26.687,-75.131],[48.119,-75.131],[127.378,-59.029],[152.719,13.6],[96.381,68.182],[12.991,26.643],[11.498,-11.439],[31.091,-37.141],[50.79,-39.396],[83.494,-3.188]],"c":false},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.717647058824,0.400000029919,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":20,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Contour 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[209.75,127.845],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"bm":0,"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]},"t":5,"s":[0]},{"t":15,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":10,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Réduire les tracés 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":50,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Souffle bleu Silhouettes 5","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[327.374,227.348,0],"ix":2},"a":{"a":0,"k":[209.75,127.845,0],"ix":1},"s":{"a":0,"k":[105.991,-105.991,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,0],[-23.222,-18.816],[7.031,-26.123],[24.789,-6.946],[11.471,34.31],[-2.995,12.051],[-10.144,4.622],[-6.615,-1.116],[0.673,-17.857]],"o":[[0,0],[0,0],[27.855,0],[20.606,16.697],[-6.846,25.43],[-34.49,9.664],[-3.94,-11.789],[2.689,-10.817],[6.103,-2.781],[16.782,2.83],[0,0]],"v":[[-159.75,-75.131],[-26.687,-75.131],[48.119,-75.131],[127.378,-59.029],[152.719,13.6],[96.381,68.182],[12.991,26.643],[11.498,-11.439],[31.091,-37.141],[50.79,-39.396],[83.494,-3.188]],"c":false},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.717647058824,0.400000029919,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":15,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Contour 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[209.75,127.845],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"bm":0,"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]},"t":6,"s":[0]},{"t":16,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":1,"s":[0]},{"t":11,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Réduire les tracés 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":50,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Souffle bleu Silhouettes 4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[327.374,227.348,0],"ix":2},"a":{"a":0,"k":[209.75,127.845,0],"ix":1},"s":{"a":0,"k":[105.991,-105.991,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,0],[-23.222,-18.816],[7.031,-26.123],[24.789,-6.946],[11.471,34.31],[-2.995,12.051],[-10.144,4.622],[-6.615,-1.116],[0.673,-17.857]],"o":[[0,0],[0,0],[27.855,0],[20.606,16.697],[-6.846,25.43],[-34.49,9.664],[-3.94,-11.789],[2.689,-10.817],[6.103,-2.781],[16.782,2.83],[0,0]],"v":[[-159.75,-75.131],[-26.687,-75.131],[48.119,-75.131],[127.378,-59.029],[152.719,13.6],[96.381,68.182],[12.991,26.643],[11.498,-11.439],[31.091,-37.141],[50.79,-39.396],[83.494,-3.188]],"c":false},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.717647058824,0.400000029919,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Contour 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[209.75,127.845],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"bm":0,"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]},"t":7,"s":[0]},{"t":17,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":2,"s":[0]},{"t":12,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Réduire les tracés 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":50,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Souffle bleu Silhouettes","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[327.374,419.348,0],"ix":2},"a":{"a":0,"k":[209.75,127.845,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,0],[-23.222,-18.816],[7.031,-26.123],[24.789,-6.946],[11.471,34.31],[-2.995,12.051],[-10.144,4.622],[-6.615,-1.116],[0.673,-17.857]],"o":[[0,0],[0,0],[27.855,0],[20.606,16.697],[-6.846,25.43],[-34.49,9.664],[-3.94,-11.789],[2.689,-10.817],[6.103,-2.781],[16.782,2.83],[0,0]],"v":[[-159.75,-75.131],[-26.687,-75.131],[48.119,-75.131],[127.378,-59.029],[152.719,13.6],[96.381,68.182],[12.991,26.643],[11.498,-11.439],[31.091,-37.141],[50.79,-39.396],[83.494,-3.188]],"c":false},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.298000021542,0.972999961703,0.870999983245,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":20,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Contour 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[209.75,127.845],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"bm":0,"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]},"t":9,"s":[0]},{"t":19,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":4,"s":[0]},{"t":14,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Réduire les tracés 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":50,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Souffle bleu Silhouettes 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[327.374,419.348,0],"ix":2},"a":{"a":0,"k":[209.75,127.845,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,0],[-23.222,-18.816],[7.031,-26.123],[24.789,-6.946],[11.471,34.31],[-2.995,12.051],[-10.144,4.622],[-6.615,-1.116],[0.673,-17.857]],"o":[[0,0],[0,0],[27.855,0],[20.606,16.697],[-6.846,25.43],[-34.49,9.664],[-3.94,-11.789],[2.689,-10.817],[6.103,-2.781],[16.782,2.83],[0,0]],"v":[[-159.75,-75.131],[-26.687,-75.131],[48.119,-75.131],[127.378,-59.029],[152.719,13.6],[96.381,68.182],[12.991,26.643],[11.498,-11.439],[31.091,-37.141],[50.79,-39.396],[83.494,-3.188]],"c":false},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.298000021542,0.972999961703,0.870999983245,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":15,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Contour 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[209.75,127.845],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"bm":0,"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]},"t":10,"s":[0]},{"t":20,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":5,"s":[0]},{"t":15,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Réduire les tracés 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":50,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Souffle bleu Silhouettes 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[327.374,419.348,0],"ix":2},"a":{"a":0,"k":[209.75,127.845,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,0],[-23.222,-18.816],[7.031,-26.123],[24.789,-6.946],[11.471,34.31],[-2.995,12.051],[-10.144,4.622],[-6.615,-1.116],[0.673,-17.857]],"o":[[0,0],[0,0],[27.855,0],[20.606,16.697],[-6.846,25.43],[-34.49,9.664],[-3.94,-11.789],[2.689,-10.817],[6.103,-2.781],[16.782,2.83],[0,0]],"v":[[-159.75,-75.131],[-26.687,-75.131],[48.119,-75.131],[127.378,-59.029],[152.719,13.6],[96.381,68.182],[12.991,26.643],[11.498,-11.439],[31.091,-37.141],[50.79,-39.396],[83.494,-3.188]],"c":false},"ix":2},"nm":"Tracé 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.298000021542,0.972999961703,0.870999983245,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":10,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Contour 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[209.75,127.845],"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":"Transformer "}],"nm":"Groupe 1","np":2,"cix":2,"bm":0,"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]},"t":11,"s":[0]},{"t":21,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":6,"s":[0]},{"t":16,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Réduire les tracés 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":50,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/app/src/main/res/raw/wind_gust.json b/app/src/main/res/raw/wind_gust.json
deleted file mode 100644
index 89ccd19..0000000
--- a/app/src/main/res/raw/wind_gust.json
+++ /dev/null
@@ -1 +0,0 @@
-{"v":"5.6.1","fr":60,"ip":0,"op":45,"w":500,"h":500,"nm":"Wind 2","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Top Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[131.578,165.236,0],"ix":2},"a":{"a":0,"k":[117.082,70.298,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],[-22.031,0.022],[-0.022,-22.03],[22.03,-0.023],[0,0],[0,0]],"o":[[-0.021,-22.03],[22.03,-0.021],[0.021,22.03],[0,0],[0,0],[0,0]],"v":[[7.283,-0.348],[47.134,-40.277],[87.061,-0.426],[47.212,39.503],[46.547,39.503],[-87.083,40.298]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.416000007181,0.579999976065,0.957000014361,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":30,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[117.082,70.298],"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,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":100,"ix":1},"e":{"a":0,"k":70,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-58]},{"t":45,"s":[-414]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":45,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Middle Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[240.555,178.605,0],"ix":2},"a":{"a":0,"k":[225.482,99.749,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],[-38.108,0.037],[-0.037,-38.106],[38.108,-0.037],[0,0],[0,0]],"o":[[-0.037,-38.107],[38.106,-0.038],[0.037,38.108],[0,0],[0,0],[0,0]],"v":[[57.447,-0.646],[126.378,-69.712],[195.444,-0.782],[126.512,68.286],[125.363,68.281],[-195.481,69.749]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.416000007181,0.579999976065,0.957000014361,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":30,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[225.482,99.75],"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,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":70,"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-360]},{"t":45,"s":[-720]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":45,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Bottom Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[298.558,340.72,0],"ix":2},"a":{"a":0,"k":[167.296,81.078,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],[-28.03,0.027],[0.027,28.03],[28.029,-0.027],[0,0],[0,0]],"o":[[0.027,28.029],[28.029,-0.028],[-0.027,-28.029],[0,0],[0,0],[0,0]],"v":[[35.766,0.349],[86.567,51.051],[137.269,0.25],[86.468,-50.452],[85.621,-50.452],[-137.296,-51.079]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.416000007181,0.579999976065,0.957000014361,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":30,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[167.296,81.079],"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,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":70,"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[360]},{"t":45,"s":[-2]}],"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":45,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file

From 7bda90e01bb5f53640e4efe1b56750727ddb5f8e Mon Sep 17 00:00:00 2001
From: Falah Hassan <devfalahhassan@gmail.com>
Date: Thu, 11 Aug 2022 16:30:29 -0700
Subject: [PATCH 12/16] remove unused class

---
 .../weatherapp/data/request/ApiClient.kt      | 21 -------------------
 .../weatherapp/data/services/RequestHelper.kt | 12 ++++++++++-
 .../com/cheese/weatherapp/ui/MainActivity.kt  | 14 ++++++++-----
 .../com/cheese/weatherapp/util/Constants.kt   | 16 +++++++++++++-
 app/src/main/res/values/strings.xml           |  3 +++
 5 files changed, 38 insertions(+), 28 deletions(-)
 delete mode 100644 app/src/main/java/com/cheese/weatherapp/data/request/ApiClient.kt

diff --git a/app/src/main/java/com/cheese/weatherapp/data/request/ApiClient.kt b/app/src/main/java/com/cheese/weatherapp/data/request/ApiClient.kt
deleted file mode 100644
index c6f9f71..0000000
--- a/app/src/main/java/com/cheese/weatherapp/data/request/ApiClient.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.cheese.weatherapp.data.request
-
-import com.example.mikmok.util.Constants
-import okhttp3.Call
-import okhttp3.OkHttpClient
-import okhttp3.Request
-
-class ApiClient {
-
-    private val client = OkHttpClient()
-    fun makeApiRequest(cityName :String): Call {
-        val request = Request.Builder()
-            .url(Constants.API_URL+"${cityName.trim()}")
-            .get()
-            .addHeader(Constants.ACCEPT, Constants.TYPE)
-            .build()
-
-        return client.newCall(request)
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/cheese/weatherapp/data/services/RequestHelper.kt b/app/src/main/java/com/cheese/weatherapp/data/services/RequestHelper.kt
index a317ca7..7e61ef3 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/services/RequestHelper.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/services/RequestHelper.kt
@@ -1,12 +1,22 @@
 package com.cheese.weatherapp.data.services
 
 import com.example.mikmok.util.Constants
+import com.example.mikmok.util.Params
+import okhttp3.HttpUrl
 import okhttp3.Request
 
 object RequestHelper {
     fun makeWeatherRequest(cityName: String): Request {
+        val url= HttpUrl.Builder()
+            .scheme(Constants.SCHEMA)
+            .host(Constants.HOST)
+            .addPathSegment(Constants.PATH)
+            .addQueryParameter(Params.UNITS, Params.Values.units)
+            .addQueryParameter(Params.APP_ID, Params.Values.APP_ID)
+            .addQueryParameter(Params.CITY,cityName)
+            .build()
         return Request.Builder()
-            .url(Constants.API_URL + "${cityName.trim()}")
+            .url(url)
             .get()
             .addHeader(Constants.ACCEPT, Constants.TYPE)
             .build()
diff --git a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
index ac1f6a7..d5612f0 100644
--- a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
+++ b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
@@ -4,6 +4,7 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import androidx.core.widget.doOnTextChanged
+import com.cheese.weatherapp.R
 import com.cheese.weatherapp.data.State
 import com.cheese.weatherapp.data.models.WeatherMain
 import com.cheese.weatherapp.data.repository.WeatherRepositoryImp
@@ -100,14 +101,17 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
     private fun bindView(result: WeatherMain) {
         binding.apply {
             cityName.text = "${result.name},${result.sys.country}"
-            temp.text = "${result.main.temp.toCelsius()}°"
+            temp.text = "${result.main.temp}°"
             description.text = result.weather[Constants.INDEXT_WEATHER].description
+            val maxText=getString(R.string.max_text)
+            val minText=getString(R.string.min_text)
+            val percentage=getString(R.string.percentage)
             maxMin.text =
-                "${result.main.tempMax.toCelsius()}° Max - ${result.main.tempMin.toCelsius()}° Min"
+                "${result.main.tempMax} $maxText - ${result.main.tempMin} $minText"
             valueWind.text = "${result.wind.speed} km/h"
-            valueClouds.text = "${result.clouds.all.toPercent()}%"
-            valueHumidity.text = "${result.main.humidity.toPercent()}%"
-            valuePressure.text = "${result.main.pressure.toPercent()}%"
+            valueClouds.text = "${result.clouds.all.toPercent()}$percentage"
+            valueHumidity.text = "${result.main.humidity.toPercent()}$percentage"
+            valuePressure.text = "${result.main.pressure.toPercent()}$percentage"
             val lottieAnimation =
                 result.weather[Constants.INDEXT_WEATHER].main.uppercase().getWeatherStateAnimation()
             weather.setAnimation(lottieAnimation)
diff --git a/app/src/main/java/com/cheese/weatherapp/util/Constants.kt b/app/src/main/java/com/cheese/weatherapp/util/Constants.kt
index 22661ee..18001b8 100644
--- a/app/src/main/java/com/cheese/weatherapp/util/Constants.kt
+++ b/app/src/main/java/com/cheese/weatherapp/util/Constants.kt
@@ -1,7 +1,10 @@
 package com.example.mikmok.util
 
 object Constants {
-    const val API_URL = "https://api.openweathermap.org/data/2.5/weather?appid=8e17fb89454f5e7a82cf6d96a082c0ad&q="
+    const val SCHEMA = "https"
+    const val HOST = "api.openweathermap.org"
+    const val PATH = "data/2.5/weather"
+
     const val INDEXT_WEATHER =0
     const val INDEXT_COUNT_EMPTY =0
     const val NOT_FOUND = "404"
@@ -12,4 +15,15 @@ object Constants {
     const val MAIN_ACTIVITY  ="MAIN_ACTIVITY"
     const val CITY_NOT_FOUND  ="city not found"
     const val TIME = 1
+
+}
+object Params{
+    const val UNITS = "units"
+    const val APP_ID="appid"
+    const val CITY="q"
+
+    object Values{
+        const val units = "metric"
+        const val APP_ID="8e17fb89454f5e7a82cf6d96a082c0ad"
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 273f6d0..a7a57d1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,4 +3,7 @@
     <string name="city_name">City name</string>
     <string name="name_city">Baghdad ,IQ</string>
     <string name="temp_value">00.00 C</string>
+    <string name="max_text">° Max</string>
+    <string name="min_text">° Min</string>
+    <string name="percentage">%</string>
 </resources>
\ No newline at end of file

From 0d9f6e514b2f0002f9dfc509ab165efa0ee25c4c Mon Sep 17 00:00:00 2001
From: Falah Hassan <devfalahhassan@gmail.com>
Date: Thu, 11 Aug 2022 16:34:31 -0700
Subject: [PATCH 13/16] add serialized name to all models

---
 .../com/cheese/weatherapp/data/models/Clouds.kt     |  3 +++
 .../java/com/cheese/weatherapp/data/models/Coord.kt |  4 ++++
 .../java/com/cheese/weatherapp/data/models/Main.kt  |  6 +++---
 .../java/com/cheese/weatherapp/data/models/Sys.kt   |  7 +++++++
 .../com/cheese/weatherapp/data/models/Weather.kt    |  4 ++++
 .../cheese/weatherapp/data/models/WeatherMain.kt    | 13 +++++++++++++
 .../java/com/cheese/weatherapp/data/models/Wind.kt  |  3 +++
 7 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/cheese/weatherapp/data/models/Clouds.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Clouds.kt
index fb7255a..3eb5143 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/models/Clouds.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Clouds.kt
@@ -1,5 +1,8 @@
 package com.cheese.weatherapp.data.models
 
+import com.google.gson.annotations.SerializedName
+
 data class Clouds (
+    @SerializedName("all")
     val all: Double
 )
diff --git a/app/src/main/java/com/cheese/weatherapp/data/models/Coord.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Coord.kt
index c3918a9..9e748ea 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/models/Coord.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Coord.kt
@@ -1,6 +1,10 @@
 package com.cheese.weatherapp.data.models
 
+import com.google.gson.annotations.SerializedName
+
 data class Coord (
+    @SerializedName("lon")
     val lon: Double,
+    @SerializedName("lat")
     val lat: Double
 )
diff --git a/app/src/main/java/com/cheese/weatherapp/data/models/Main.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Main.kt
index c53bfe5..71e90ad 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/models/Main.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Main.kt
@@ -3,14 +3,14 @@ package com.cheese.weatherapp.data.models
 import com.google.gson.annotations.SerializedName
 
 data class Main (
+    @SerializedName("temp")
     val temp: Double,
-
     @SerializedName("temp_min")
     val tempMin: Double,
-
     @SerializedName("temp_max")
     val tempMax: Double,
-
+    @SerializedName("pressure")
     val pressure: Double,
+    @SerializedName("humidity")
     val humidity: Double
 )
diff --git a/app/src/main/java/com/cheese/weatherapp/data/models/Sys.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Sys.kt
index 25a697c..ddcb0c6 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/models/Sys.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Sys.kt
@@ -1,9 +1,16 @@
 package com.cheese.weatherapp.data.models
 
+import com.google.gson.annotations.SerializedName
+
 data class Sys (
+    @SerializedName("type")
     val type: Int,
+    @SerializedName("id")
     val id: Int,
+    @SerializedName("country")
     val country: String,
+    @SerializedName("sunrise")
     val sunrise: Long,
+    @SerializedName("sunset")
     val sunset: Long
 )
diff --git a/app/src/main/java/com/cheese/weatherapp/data/models/Weather.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Weather.kt
index ad041eb..a68bc1f 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/models/Weather.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Weather.kt
@@ -1,7 +1,11 @@
 package com.cheese.weatherapp.data.models
 
+import com.google.gson.annotations.SerializedName
+
 data class Weather (
+    @SerializedName("main")
     val main: String,
+    @SerializedName("description")
     val description: String,
 )
 
diff --git a/app/src/main/java/com/cheese/weatherapp/data/models/WeatherMain.kt b/app/src/main/java/com/cheese/weatherapp/data/models/WeatherMain.kt
index 699399f..31ff370 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/models/WeatherMain.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/WeatherMain.kt
@@ -1,15 +1,28 @@
 package com.cheese.weatherapp.data.models
 
+import com.google.gson.annotations.SerializedName
+
 data class WeatherMain(
+    @SerializedName("wind")
     val wind: Wind,
+    @SerializedName("rain")
     val rain :Rain,
+    @SerializedName("clouds")
     val clouds: Clouds,
+    @SerializedName("name")
     val name: String,
+    @SerializedName("weather")
     val weather: List<Weather>,
+    @SerializedName("base")
     val base: String,
+    @SerializedName("main")
     val main: Main,
+    @SerializedName("sys")
     val sys: Sys,
+    @SerializedName("cod")
     val cod: Int,
+    @SerializedName("message")
     val message: String,
 
+
 )
diff --git a/app/src/main/java/com/cheese/weatherapp/data/models/Wind.kt b/app/src/main/java/com/cheese/weatherapp/data/models/Wind.kt
index f4a744d..c50438e 100644
--- a/app/src/main/java/com/cheese/weatherapp/data/models/Wind.kt
+++ b/app/src/main/java/com/cheese/weatherapp/data/models/Wind.kt
@@ -1,5 +1,8 @@
 package com.cheese.weatherapp.data.models
 
+import com.google.gson.annotations.SerializedName
+
 data class Wind (
+    @SerializedName("speed")
     val speed: Double,
 )

From 4490eb855200481b36311f37d3926b60472a5d9e Mon Sep 17 00:00:00 2001
From: Falah Hassan <devfalahhassan@gmail.com>
Date: Thu, 11 Aug 2022 16:36:34 -0700
Subject: [PATCH 14/16] remove never used extensions

---
 app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt | 5 ++---
 app/src/main/java/com/cheese/weatherapp/util/extensions.kt | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
index d5612f0..a1fa726 100644
--- a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
+++ b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
@@ -11,9 +11,8 @@ import com.cheese.weatherapp.data.repository.WeatherRepositoryImp
 import com.cheese.weatherapp.data.services.WeatherService
 import com.cheese.weatherapp.databinding.ActivityMainBinding
 import com.example.mikmok.util.Constants
-import com.example.mikmok.util.getWeatherStateAnimation
-import com.example.mikmok.util.toCelsius
-import com.example.mikmok.util.toPercent
+import com.cheese.weatherapp.util.getWeatherStateAnimation
+import com.cheese.weatherapp.util.toPercent
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.schedulers.Schedulers
diff --git a/app/src/main/java/com/cheese/weatherapp/util/extensions.kt b/app/src/main/java/com/cheese/weatherapp/util/extensions.kt
index a4b09b2..4867d7d 100644
--- a/app/src/main/java/com/cheese/weatherapp/util/extensions.kt
+++ b/app/src/main/java/com/cheese/weatherapp/util/extensions.kt
@@ -1,11 +1,9 @@
-package com.example.mikmok.util
+package com.cheese.weatherapp.util
 
 import com.cheese.weatherapp.R
 import com.cheese.weatherapp.data.models.WeatherState
 
-fun Double.toCelsius(): Double {
-    return String.format("%.2f", (this - 273.15)).toDouble()
-}
+
 
 fun Double.toPercent(): Double {
     return String.format("%.2f", (this / 100)).toDouble()

From cca1c8f1d42833ce795248dd086d3df91784b0f8 Mon Sep 17 00:00:00 2001
From: Falah Hassan <devfalahhassan@gmail.com>
Date: Thu, 11 Aug 2022 16:38:17 -0700
Subject: [PATCH 15/16] edit constants name

---
 .../main/java/com/cheese/weatherapp/ui/MainActivity.kt | 10 +++++-----
 .../main/java/com/cheese/weatherapp/util/Constants.kt  |  6 ++----
 .../main/java/com/cheese/weatherapp/util/extensions.kt |  1 -
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
index a1fa726..5419f1a 100644
--- a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
+++ b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
@@ -10,9 +10,9 @@ import com.cheese.weatherapp.data.models.WeatherMain
 import com.cheese.weatherapp.data.repository.WeatherRepositoryImp
 import com.cheese.weatherapp.data.services.WeatherService
 import com.cheese.weatherapp.databinding.ActivityMainBinding
-import com.example.mikmok.util.Constants
 import com.cheese.weatherapp.util.getWeatherStateAnimation
 import com.cheese.weatherapp.util.toPercent
+import com.example.mikmok.util.Constants
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.schedulers.Schedulers
@@ -35,7 +35,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
     private fun onSearchChange() {
         val observableSearch = Observable.create<String> { emitter ->
             binding.searchCity.doOnTextChanged { text, _, _, count ->
-                if (count != Constants.INDEXT_COUNT_EMPTY) {
+                if (count != Constants.INDEX_COUNT_EMPTY) {
                     emitter.onNext(text.toString())
                 }
             }
@@ -101,9 +101,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         binding.apply {
             cityName.text = "${result.name},${result.sys.country}"
             temp.text = "${result.main.temp}°"
-            description.text = result.weather[Constants.INDEXT_WEATHER].description
+            description.text = result.weather[Constants.INDEX_WEATHER].description
             val maxText=getString(R.string.max_text)
-            val minText=getString(R.string.min_text)
+            val minText= getString(R.string.min_text)
             val percentage=getString(R.string.percentage)
             maxMin.text =
                 "${result.main.tempMax} $maxText - ${result.main.tempMin} $minText"
@@ -112,7 +112,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
             valueHumidity.text = "${result.main.humidity.toPercent()}$percentage"
             valuePressure.text = "${result.main.pressure.toPercent()}$percentage"
             val lottieAnimation =
-                result.weather[Constants.INDEXT_WEATHER].main.uppercase().getWeatherStateAnimation()
+                result.weather[Constants.INDEX_WEATHER].main.uppercase().getWeatherStateAnimation()
             weather.setAnimation(lottieAnimation)
 
         }
diff --git a/app/src/main/java/com/cheese/weatherapp/util/Constants.kt b/app/src/main/java/com/cheese/weatherapp/util/Constants.kt
index 18001b8..3a3d822 100644
--- a/app/src/main/java/com/cheese/weatherapp/util/Constants.kt
+++ b/app/src/main/java/com/cheese/weatherapp/util/Constants.kt
@@ -5,10 +5,8 @@ object Constants {
     const val HOST = "api.openweathermap.org"
     const val PATH = "data/2.5/weather"
 
-    const val INDEXT_WEATHER =0
-    const val INDEXT_COUNT_EMPTY =0
-    const val NOT_FOUND = "404"
-    const val ON_FAILURE = "Failed to grab the data due to:"
+    const val INDEX_WEATHER =0
+    const val INDEX_COUNT_EMPTY =0
     const val ACCEPT ="Accept"
     const val  TYPE ="application/json"
     const val CITY  ="Baghdad"
diff --git a/app/src/main/java/com/cheese/weatherapp/util/extensions.kt b/app/src/main/java/com/cheese/weatherapp/util/extensions.kt
index 4867d7d..e47b97a 100644
--- a/app/src/main/java/com/cheese/weatherapp/util/extensions.kt
+++ b/app/src/main/java/com/cheese/weatherapp/util/extensions.kt
@@ -4,7 +4,6 @@ import com.cheese.weatherapp.R
 import com.cheese.weatherapp.data.models.WeatherState
 
 
-
 fun Double.toPercent(): Double {
     return String.format("%.2f", (this / 100)).toDouble()
 }

From 3ba85a03df6792d6d5fbe945abea76b7b70743c6 Mon Sep 17 00:00:00 2001
From: moh05hus <92690501+moh05hus@users.noreply.github.com>
Date: Fri, 12 Aug 2022 00:10:31 +0300
Subject: [PATCH 16/16] activity_main.xml -> i did edit ui space , and show
 search error

---
 .../com/cheese/weatherapp/ui/MainActivity.kt  | 18 ++++-
 app/src/main/res/layout/activity_main.xml     | 67 ++++++++++++++-----
 app/src/main/res/raw/error.json               |  1 +
 app/src/main/res/values/dimens.xml            |  1 +
 4 files changed, 69 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/res/raw/error.json

diff --git a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
index 5419f1a..c1c9d7c 100644
--- a/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
+++ b/app/src/main/java/com/cheese/weatherapp/ui/MainActivity.kt
@@ -65,9 +65,24 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
     private fun onWeather(state: State<WeatherMain>) {
         when (state) {
             is State.Fail -> {
+                hideProgressBarAndShowData()
+            //    hide all mainActivity items and show error items->
+                binding.apply {
+                dataContainer.visibility = View.INVISIBLE
+                errorLottie.visibility = View.VISIBLE
+                citeNotFoundText.visibility = View.VISIBLE
+                }
+
+
             }
             State.Loading -> onLoading()
-            is State.Success -> onSuccess(state.data)
+            is State.Success -> {onSuccess(state.data)
+              // hide error items ->
+                binding.apply {
+                    errorLottie.visibility = View.INVISIBLE
+                    citeNotFoundText.visibility = View.INVISIBLE
+                }
+            }
         }
     }
 
@@ -78,6 +93,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
 
     }
 
+
     private fun onLoading() {
         showProgressBarAndHideData()
     }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4f33134..9abdc96 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,6 +7,33 @@
     android:background="@drawable/background"
     tools:context=".ui.MainActivity">
 
+
+    <com.airbnb.lottie.LottieAnimationView
+        android:id="@+id/error_lottie"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_marginTop="100dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/search_city"
+        android:visibility="invisible"
+        app:lottie_autoPlay="true"
+        app:lottie_loop="true"
+        app:lottie_rawRes="@raw/error" />
+
+    <TextView
+        android:id="@+id/cite_not_found_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="City not found"
+        android:textSize="24dp"
+        android:textColor="@color/gray"
+        android:visibility="invisible"
+        android:layout_marginTop="16dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/error_lottie" />
+
     <EditText
         android:id="@+id/search_city"
         android:layout_width="match_parent"
@@ -46,14 +73,17 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/search_city"
-        android:layout_marginTop="32dp">
+        android:layout_marginTop="50dp">
 
         <com.airbnb.lottie.LottieAnimationView
             android:id="@+id/weather"
-            android:layout_width="@dimen/animation_size"
-            android:layout_height="@dimen/animation_size"
-            android:layout_marginTop="@dimen/margin_larg"
+            android:layout_width="@dimen/animation_size2"
+            android:layout_height="@dimen/animation_size2"
+            android:layout_marginTop="32dp"
+
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/max_min"
             app:lottie_autoPlay="true"
             app:lottie_loop="true"
             app:lottie_rawRes="@raw/sunny"
@@ -63,13 +93,14 @@
             android:id="@+id/city_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_small"
             android:text="@string/name_city"
             android:textColor="@color/white"
-            android:textSize="@dimen/text_larg"
+            android:textSize="32dp"
             android:textStyle="bold"
-            app:layout_constraintStart_toEndOf="@+id/weather"
-            app:layout_constraintTop_toTopOf="@+id/weather" />
+
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/temp"
@@ -78,8 +109,8 @@
             android:text="@string/temp_value"
             android:textColor="@color/white"
             android:textSize="20sp"
-            app:layout_constraintHorizontal_bias="0.147"
-            app:layout_constraintStart_toStartOf="@id/city_name"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/city_name" />
 
         <TextView
@@ -89,7 +120,8 @@
             android:text="Clear sky"
             android:textColor="@color/gray"
             android:textSize="14sp"
-            app:layout_constraintStart_toStartOf="@id/city_name"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/temp" />
 
 
@@ -97,10 +129,9 @@
             android:id="@+id/icon_pressure"
             android:layout_width="@dimen/size_icon"
             android:layout_height="@dimen/size_icon"
-            android:layout_marginTop="42dp"
             android:src="@drawable/ic_pressure_icon"
-            app:layout_constraintStart_toStartOf="@id/weather"
-            app:layout_constraintTop_toBottomOf="@id/weather"
+            android:layout_marginTop="32dp"
+            app:layout_constraintTop_toBottomOf="@+id/weather"
             app:tint="@color/primary_icon"
             tools:ignore="MissingConstraints" />
 
@@ -123,7 +154,8 @@
             android:text="30.55 C Max - 30.55 C Min"
             android:textColor="@color/gray"
             android:textSize="14sp"
-            app:layout_constraintStart_toStartOf="@id/city_name"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/description" />
 
         <TextView
@@ -143,6 +175,7 @@
             android:layout_height="@dimen/size_icon"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="8dp"
+
             android:src="@drawable/ic_clouds_icons"
             app:layout_constraintStart_toEndOf="@id/title_pressure"
             app:layout_constraintTop_toTopOf="@id/icon_pressure"
@@ -177,10 +210,10 @@
             android:id="@+id/icon_wind"
             android:layout_width="@dimen/size_icon"
             android:layout_height="@dimen/size_icon"
-            android:layout_marginTop="42dp"
+            android:layout_marginTop="32dp"
             android:src="@drawable/ic_wind_icon"
             app:layout_constraintBottom_toBottomOf="@+id/value_wind"
-            app:layout_constraintStart_toStartOf="@id/weather"
+            app:layout_constraintStart_toStartOf="@+id/icon_pressure"
             app:layout_constraintTop_toBottomOf="@id/icon_clouds"
             app:tint="@color/primary_icon"
             tools:ignore="MissingConstraints" />
diff --git a/app/src/main/res/raw/error.json b/app/src/main/res/raw/error.json
new file mode 100644
index 0000000..193604c
--- /dev/null
+++ b/app/src/main/res/raw/error.json
@@ -0,0 +1 @@
+{"v":"5.7.11","fr":30,"ip":0,"op":60,"w":512,"h":512,"nm":"Bouncy Fail","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"X line 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":90,"ix":10},"p":{"a":0,"k":[256,256,0],"ix":2,"l":2},"a":{"a":0,"k":[41,-3,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"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":[[112,-74],[-30,68]],"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":40,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.38823529411764707,0.2784313725490196,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","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":"Shape 1","np":3,"cix":2,"bm":0,"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]},"t":26,"s":[100]},{"t":40,"s":[0]}],"ix":1},"e":{"a":0,"k":100,"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":26,"op":60,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"X line 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[256,256,0],"ix":2,"l":2},"a":{"a":0,"k":[41,-3,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"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":[[112,-74],[-30,68]],"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":40,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.38823529411764707,0.2784313725490196,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","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":"Shape 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":26,"s":[0]},{"t":40,"s":[100]}],"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":26,"op":60,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Circle 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11,"x":"var $bm_rt;\nvar opacityInertialBounce, opacityBounceBack, n, n, t, t, v, amp, freq, decay, v, amp, freq, decay, e, g, nMax, e, g, nMax, n, n, t, v, vl, vu, vu, tCur, segDur, tNext, nb, delta;\nopacityInertialBounce = effect('Bounce & Drop - ukramedia.com')(44);\nopacityBounceBack = effect('Bounce & Drop - ukramedia.com')(45);\ntry {\n    if (opacityInertialBounce == 1) {\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time) {\n                n--;\n            }\n        }\n        if (n == 0) {\n            $bm_rt = t = 0;\n        } else {\n            $bm_rt = t = $bm_sub(time, key(n).time);\n        }\n        if (effect('Bounce & Drop - ukramedia.com')(58) == 1) {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(59);\n                freq = effect('Bounce & Drop - ukramedia.com')(60);\n                decay = effect('Bounce & Drop - ukramedia.com')(61);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        } else {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(47);\n                freq = effect('Bounce & Drop - ukramedia.com')(48);\n                decay = effect('Bounce & Drop - ukramedia.com')(49);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        }\n    } else if (opacityBounceBack == 1) {\n        if (effect('Bounce & Drop - ukramedia.com')(64) == 1) {\n            e = effect('Bounce & Drop - ukramedia.com')(65);\n            g = effect('Bounce & Drop - ukramedia.com')(66);\n            nMax = effect('Bounce & Drop - ukramedia.com')(67);\n        } else {\n            e = effect('Bounce & Drop - ukramedia.com')(52);\n            g = effect('Bounce & Drop - ukramedia.com')(53);\n            nMax = effect('Bounce & Drop - ukramedia.com')(54);\n        }\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time)\n                n--;\n        }\n        if (n > 0) {\n            t = $bm_sub(time, key(n).time);\n            v = $bm_mul($bm_neg(velocityAtTime($bm_sub(key(n).time, 0.001))), e);\n            vl = length(v);\n            if ($bm_isInstanceOfArray(value)) {\n                vu = vl > 0 ? normalize(v) : [\n                    0,\n                    0,\n                    0\n                ];\n            } else {\n                vu = v < 0 ? -1 : 1;\n            }\n            tCur = 0;\n            segDur = $bm_div($bm_mul(2, vl), g);\n            tNext = segDur;\n            nb = 1;\n            while (tNext < t && nb <= nMax) {\n                vl *= e;\n                segDur *= e;\n                tCur = tNext;\n                tNext = $bm_sum(tNext, segDur);\n                nb++;\n            }\n            if (nb <= nMax) {\n                delta = $bm_sub(t, tCur);\n                $bm_rt = $bm_sum(value, $bm_mul($bm_mul(vu, delta), $bm_sub(vl, $bm_div($bm_mul(g, delta), 2))));\n            } else {\n                $bm_rt = value;\n            }\n        } else\n            $bm_rt = value;\n    } else {\n        $bm_rt = value;\n    }\n} catch (err) {\n    $bm_rt = value;\n}"},"r":{"a":0,"k":0,"ix":10,"x":"var $bm_rt;\nvar rotationInertialBounce, rotationBounceBack, n, n, t, t, v, amp, freq, decay, v, amp, freq, decay, e, g, nMax, e, g, nMax, n, n, t, v, vl, vu, vu, tCur, segDur, tNext, nb, delta;\nrotationInertialBounce = effect('Bounce & Drop - ukramedia.com')(30);\nrotationBounceBack = effect('Bounce & Drop - ukramedia.com')(31);\ntry {\n    if (rotationInertialBounce == 1) {\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time) {\n                n--;\n            }\n        }\n        if (n == 0) {\n            $bm_rt = t = 0;\n        } else {\n            $bm_rt = t = $bm_sub(time, key(n).time);\n        }\n        if (effect('Bounce & Drop - ukramedia.com')(58) == 1) {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(59);\n                freq = effect('Bounce & Drop - ukramedia.com')(60);\n                decay = effect('Bounce & Drop - ukramedia.com')(61);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        } else {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(33);\n                freq = effect('Bounce & Drop - ukramedia.com')(34);\n                decay = effect('Bounce & Drop - ukramedia.com')(35);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        }\n    } else if (rotationBounceBack == 1) {\n        if (effect('Bounce & Drop - ukramedia.com')(64) == 1) {\n            e = effect('Bounce & Drop - ukramedia.com')(65);\n            g = effect('Bounce & Drop - ukramedia.com')(66);\n            nMax = effect('Bounce & Drop - ukramedia.com')(67);\n        } else {\n            e = effect('Bounce & Drop - ukramedia.com')(38);\n            g = effect('Bounce & Drop - ukramedia.com')(39);\n            nMax = effect('Bounce & Drop - ukramedia.com')(40);\n        }\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time)\n                n--;\n        }\n        if (n > 0) {\n            t = $bm_sub(time, key(n).time);\n            v = $bm_mul($bm_neg(velocityAtTime($bm_sub(key(n).time, 0.001))), e);\n            vl = length(v);\n            if ($bm_isInstanceOfArray(value)) {\n                vu = vl > 0 ? normalize(v) : [\n                    0,\n                    0,\n                    0\n                ];\n            } else {\n                vu = v < 0 ? -1 : 1;\n            }\n            tCur = 0;\n            segDur = $bm_div($bm_mul(2, vl), g);\n            tNext = segDur;\n            nb = 1;\n            while (tNext < t && nb <= nMax) {\n                vl *= e;\n                segDur *= e;\n                tCur = tNext;\n                tNext = $bm_sum(tNext, segDur);\n                nb++;\n            }\n            if (nb <= nMax) {\n                delta = $bm_sub(t, tCur);\n                $bm_rt = $bm_sum(value, $bm_mul($bm_mul(vu, delta), $bm_sub(vl, $bm_div($bm_mul(g, delta), 2))));\n            } else {\n                $bm_rt = value;\n            }\n        } else\n            $bm_rt = value;\n    } else {\n        $bm_rt = value;\n    }\n} catch (err) {\n    $bm_rt = value;\n}"},"p":{"a":0,"k":[256,256,0],"ix":2,"l":2,"x":"var $bm_rt;\nvar positionInertialBounce, positionBounceBack, n, n, t, t, v, amp, freq, decay, v, amp, freq, decay, e, g, nMax, e, g, nMax, n, n, t, v, vl, vu, vu, tCur, segDur, tNext, nb, delta;\npositionInertialBounce = effect('Bounce & Drop - ukramedia.com')(2);\npositionBounceBack = effect('Bounce & Drop - ukramedia.com')(3);\ntry {\n    if (positionInertialBounce == 1) {\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time) {\n                n--;\n            }\n        }\n        if (n == 0) {\n            $bm_rt = t = 0;\n        } else {\n            $bm_rt = t = $bm_sub(time, key(n).time);\n        }\n        if (effect('Bounce & Drop - ukramedia.com')(58) == 1) {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(59);\n                freq = effect('Bounce & Drop - ukramedia.com')(60);\n                decay = effect('Bounce & Drop - ukramedia.com')(61);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        } else {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(5);\n                freq = effect('Bounce & Drop - ukramedia.com')(6);\n                decay = effect('Bounce & Drop - ukramedia.com')(7);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        }\n    } else if (positionBounceBack == 1) {\n        if (effect('Bounce & Drop - ukramedia.com')(64) == 1) {\n            e = effect('Bounce & Drop - ukramedia.com')(65);\n            g = effect('Bounce & Drop - ukramedia.com')(66);\n            nMax = effect('Bounce & Drop - ukramedia.com')(67);\n        } else {\n            e = effect('Bounce & Drop - ukramedia.com')(10);\n            g = effect('Bounce & Drop - ukramedia.com')(11);\n            nMax = effect('Bounce & Drop - ukramedia.com')(12);\n        }\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time)\n                n--;\n        }\n        if (n > 0) {\n            t = $bm_sub(time, key(n).time);\n            v = $bm_mul($bm_neg(velocityAtTime($bm_sub(key(n).time, 0.001))), e);\n            vl = length(v);\n            if ($bm_isInstanceOfArray(value)) {\n                vu = vl > 0 ? normalize(v) : [\n                    0,\n                    0,\n                    0\n                ];\n            } else {\n                vu = v < 0 ? -1 : 1;\n            }\n            tCur = 0;\n            segDur = $bm_div($bm_mul(2, vl), g);\n            tNext = segDur;\n            nb = 1;\n            while (tNext < t && nb <= nMax) {\n                vl *= e;\n                segDur *= e;\n                tCur = tNext;\n                tNext = $bm_sum(tNext, segDur);\n                nb++;\n            }\n            if (nb <= nMax) {\n                delta = $bm_sub(t, tCur);\n                $bm_rt = $bm_sum(value, $bm_mul($bm_mul(vu, delta), $bm_sub(vl, $bm_div($bm_mul(g, delta), 2))));\n            } else {\n                $bm_rt = value;\n            }\n        } else\n            $bm_rt = value;\n    } else {\n        $bm_rt = value;\n    }\n} catch (err) {\n    $bm_rt = value;\n}"},"a":{"a":0,"k":[140.061,140.061,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,1.01]},"t":10,"s":[0,0,100]},{"t":20,"s":[140,140,100]}],"ix":6,"l":2,"x":"var $bm_rt;\nvar scaleInertialBounce, scaleBounceBack, n, n, t, t, v, amp, freq, decay, v, amp, freq, decay, e, g, nMax, e, g, nMax, n, n, t, v, vl, vu, vu, tCur, segDur, tNext, nb, delta;\nscaleInertialBounce = effect('Bounce & Drop - ukramedia.com')(16);\nscaleBounceBack = effect('Bounce & Drop - ukramedia.com')(17);\ntry {\n    if (scaleInertialBounce == 1) {\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time) {\n                n--;\n            }\n        }\n        if (n == 0) {\n            $bm_rt = t = 0;\n        } else {\n            $bm_rt = t = $bm_sub(time, key(n).time);\n        }\n        if (effect('Bounce & Drop - ukramedia.com')(58) == 1) {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(59);\n                freq = effect('Bounce & Drop - ukramedia.com')(60);\n                decay = effect('Bounce & Drop - ukramedia.com')(61);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        } else {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(19);\n                freq = effect('Bounce & Drop - ukramedia.com')(20);\n                decay = effect('Bounce & Drop - ukramedia.com')(21);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        }\n    } else if (scaleBounceBack == 1) {\n        if (effect('Bounce & Drop - ukramedia.com')(64) == 1) {\n            e = effect('Bounce & Drop - ukramedia.com')(65);\n            g = effect('Bounce & Drop - ukramedia.com')(66);\n            nMax = effect('Bounce & Drop - ukramedia.com')(67);\n        } else {\n            e = effect('Bounce & Drop - ukramedia.com')(24);\n            g = effect('Bounce & Drop - ukramedia.com')(25);\n            nMax = effect('Bounce & Drop - ukramedia.com')(26);\n        }\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time)\n                n--;\n        }\n        if (n > 0) {\n            t = $bm_sub(time, key(n).time);\n            v = $bm_mul($bm_neg(velocityAtTime($bm_sub(key(n).time, 0.001))), e);\n            vl = length(v);\n            if ($bm_isInstanceOfArray(value)) {\n                vu = vl > 0 ? normalize(v) : [\n                    0,\n                    0,\n                    0\n                ];\n            } else {\n                vu = v < 0 ? -1 : 1;\n            }\n            tCur = 0;\n            segDur = $bm_div($bm_mul(2, vl), g);\n            tNext = segDur;\n            nb = 1;\n            while (tNext < t && nb <= nMax) {\n                vl *= e;\n                segDur *= e;\n                tCur = tNext;\n                tNext = $bm_sum(tNext, segDur);\n                nb++;\n            }\n            if (nb <= nMax) {\n                delta = $bm_sub(t, tCur);\n                $bm_rt = $bm_sum(value, $bm_mul($bm_mul(vu, delta), $bm_sub(vl, $bm_div($bm_mul(g, delta), 2))));\n            } else {\n                $bm_rt = value;\n            }\n        } else\n            $bm_rt = value;\n    } else {\n        $bm_rt = value;\n    }\n} catch (err) {\n    $bm_rt = value;\n}"}},"ao":0,"ef":[{"ty":5,"nm":"Bounce & Drop - ukramedia.com","np":70,"mn":"Pseudo/animationControl","ix":1,"en":1,"ef":[{"ty":6,"nm":"Position","mn":"Pseudo/animationControl-0001","ix":1,"v":0},{"ty":7,"nm":"Enable Inertial Bounce","mn":"Pseudo/animationControl-0002","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":7,"nm":"Enable Bounce Back","mn":"Pseudo/animationControl-0003","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":6,"nm":"Inertial Bounce Options","mn":"Pseudo/animationControl-0004","ix":4,"v":0},{"ty":0,"nm":"Amplitude","mn":"Pseudo/animationControl-0005","ix":5,"v":{"a":0,"k":0.05,"ix":5}},{"ty":0,"nm":"Frequency","mn":"Pseudo/animationControl-0006","ix":6,"v":{"a":0,"k":4,"ix":6}},{"ty":0,"nm":"Decay","mn":"Pseudo/animationControl-0007","ix":7,"v":{"a":0,"k":8,"ix":7}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0008","ix":8,"v":0},{"ty":6,"nm":"Bounce Back Options","mn":"Pseudo/animationControl-0009","ix":9,"v":0},{"ty":0,"nm":"Elasticity","mn":"Pseudo/animationControl-0010","ix":10,"v":{"a":0,"k":0.7,"ix":10}},{"ty":0,"nm":"Gravity","mn":"Pseudo/animationControl-0011","ix":11,"v":{"a":0,"k":5000,"ix":11}},{"ty":0,"nm":"nMax","mn":"Pseudo/animationControl-0012","ix":12,"v":{"a":0,"k":9,"ix":12}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0013","ix":13,"v":0},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0014","ix":14,"v":0},{"ty":6,"nm":"Scale","mn":"Pseudo/animationControl-0015","ix":15,"v":0},{"ty":7,"nm":"Enable Inertial Bounce","mn":"Pseudo/animationControl-0016","ix":16,"v":{"a":0,"k":1,"ix":16}},{"ty":7,"nm":"Enable Bounce Back","mn":"Pseudo/animationControl-0017","ix":17,"v":{"a":0,"k":0,"ix":17}},{"ty":6,"nm":"Inertial Bounce Options","mn":"Pseudo/animationControl-0018","ix":18,"v":0},{"ty":0,"nm":"Amplitude","mn":"Pseudo/animationControl-0019","ix":19,"v":{"a":0,"k":0.8,"ix":19}},{"ty":0,"nm":"Frequency","mn":"Pseudo/animationControl-0020","ix":20,"v":{"a":0,"k":4,"ix":20}},{"ty":0,"nm":"Decay","mn":"Pseudo/animationControl-0021","ix":21,"v":{"a":0,"k":8,"ix":21}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0022","ix":22,"v":0},{"ty":6,"nm":"Bounce Back Options","mn":"Pseudo/animationControl-0023","ix":23,"v":0},{"ty":0,"nm":"Elasticity","mn":"Pseudo/animationControl-0024","ix":24,"v":{"a":0,"k":0.7,"ix":24}},{"ty":0,"nm":"Gravity","mn":"Pseudo/animationControl-0025","ix":25,"v":{"a":0,"k":5000,"ix":25}},{"ty":0,"nm":"nMax","mn":"Pseudo/animationControl-0026","ix":26,"v":{"a":0,"k":9,"ix":26}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0027","ix":27,"v":0},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0028","ix":28,"v":0},{"ty":6,"nm":"Rotation","mn":"Pseudo/animationControl-0029","ix":29,"v":0},{"ty":7,"nm":"Enable Inertial Bounce","mn":"Pseudo/animationControl-0030","ix":30,"v":{"a":0,"k":0,"ix":30}},{"ty":7,"nm":"Enable Bounce Back","mn":"Pseudo/animationControl-0031","ix":31,"v":{"a":0,"k":0,"ix":31}},{"ty":6,"nm":"Inertial Bounce Options","mn":"Pseudo/animationControl-0032","ix":32,"v":0},{"ty":0,"nm":"Amplitude","mn":"Pseudo/animationControl-0033","ix":33,"v":{"a":0,"k":0.05,"ix":33}},{"ty":0,"nm":"Frequency","mn":"Pseudo/animationControl-0034","ix":34,"v":{"a":0,"k":4,"ix":34}},{"ty":0,"nm":"Decay","mn":"Pseudo/animationControl-0035","ix":35,"v":{"a":0,"k":8,"ix":35}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0036","ix":36,"v":0},{"ty":6,"nm":"Bounce Back Options","mn":"Pseudo/animationControl-0037","ix":37,"v":0},{"ty":0,"nm":"Elasticity","mn":"Pseudo/animationControl-0038","ix":38,"v":{"a":0,"k":0.7,"ix":38}},{"ty":0,"nm":"Gravity","mn":"Pseudo/animationControl-0039","ix":39,"v":{"a":0,"k":5000,"ix":39}},{"ty":0,"nm":"nMax","mn":"Pseudo/animationControl-0040","ix":40,"v":{"a":0,"k":9,"ix":40}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0041","ix":41,"v":0},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0042","ix":42,"v":0},{"ty":6,"nm":"Opacity","mn":"Pseudo/animationControl-0043","ix":43,"v":0},{"ty":7,"nm":"Enable Inertial Bounce","mn":"Pseudo/animationControl-0044","ix":44,"v":{"a":0,"k":0,"ix":44}},{"ty":7,"nm":"Enable Bounce Back","mn":"Pseudo/animationControl-0045","ix":45,"v":{"a":0,"k":0,"ix":45}},{"ty":6,"nm":"Inertial Bounce Options","mn":"Pseudo/animationControl-0046","ix":46,"v":0},{"ty":0,"nm":"Amplitude","mn":"Pseudo/animationControl-0047","ix":47,"v":{"a":0,"k":0.05,"ix":47}},{"ty":0,"nm":"Frequency","mn":"Pseudo/animationControl-0048","ix":48,"v":{"a":0,"k":4,"ix":48}},{"ty":0,"nm":"Decay","mn":"Pseudo/animationControl-0049","ix":49,"v":{"a":0,"k":8,"ix":49}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0050","ix":50,"v":0},{"ty":6,"nm":"Bounce Back Options","mn":"Pseudo/animationControl-0051","ix":51,"v":0},{"ty":0,"nm":"Elasticity","mn":"Pseudo/animationControl-0052","ix":52,"v":{"a":0,"k":0.7,"ix":52}},{"ty":0,"nm":"Gravity","mn":"Pseudo/animationControl-0053","ix":53,"v":{"a":0,"k":5000,"ix":53}},{"ty":0,"nm":"nMax","mn":"Pseudo/animationControl-0054","ix":54,"v":{"a":0,"k":9,"ix":54}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0055","ix":55,"v":0},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0056","ix":56,"v":0},{"ty":6,"nm":"Global Inertial Bounce Options","mn":"Pseudo/animationControl-0057","ix":57,"v":0},{"ty":7,"nm":"Enable Global Inertial Bounce","mn":"Pseudo/animationControl-0058","ix":58,"v":{"a":0,"k":0,"ix":58}},{"ty":0,"nm":"Amplitude","mn":"Pseudo/animationControl-0059","ix":59,"v":{"a":0,"k":0.05,"ix":59}},{"ty":0,"nm":"Frequency","mn":"Pseudo/animationControl-0060","ix":60,"v":{"a":0,"k":4,"ix":60}},{"ty":0,"nm":"Decay","mn":"Pseudo/animationControl-0061","ix":61,"v":{"a":0,"k":8,"ix":61}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0062","ix":62,"v":0},{"ty":6,"nm":"Global Bounce Back Options","mn":"Pseudo/animationControl-0063","ix":63,"v":0},{"ty":7,"nm":"Enable Global Bounce Back","mn":"Pseudo/animationControl-0064","ix":64,"v":{"a":0,"k":0,"ix":64}},{"ty":0,"nm":"Elasticity","mn":"Pseudo/animationControl-0065","ix":65,"v":{"a":0,"k":0.7,"ix":65}},{"ty":0,"nm":"Gravity","mn":"Pseudo/animationControl-0066","ix":66,"v":{"a":0,"k":5000,"ix":66}},{"ty":0,"nm":"nMax","mn":"Pseudo/animationControl-0067","ix":67,"v":{"a":0,"k":9,"ix":67}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0068","ix":68,"v":0}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-77.215],[77.216,0],[0,77.215],[-77.215,0]],"o":[[0,77.215],[-77.215,0],[0,-77.215],[77.216,0]],"v":[[139.811,0],[0,139.811],[-139.811,0],[0,-139.811]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.38823529411764707,0.2784313725490196,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[140.061,140.061],"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,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":10,"op":360,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Circle 1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":41.25,"s":[50]},{"t":55,"s":[0]}],"ix":11,"x":"var $bm_rt;\nvar opacityInertialBounce, opacityBounceBack, n, n, t, t, v, amp, freq, decay, v, amp, freq, decay, e, g, nMax, e, g, nMax, n, n, t, v, vl, vu, vu, tCur, segDur, tNext, nb, delta;\nopacityInertialBounce = effect('Bounce & Drop - ukramedia.com')(44);\nopacityBounceBack = effect('Bounce & Drop - ukramedia.com')(45);\ntry {\n    if (opacityInertialBounce == 1) {\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time) {\n                n--;\n            }\n        }\n        if (n == 0) {\n            $bm_rt = t = 0;\n        } else {\n            $bm_rt = t = $bm_sub(time, key(n).time);\n        }\n        if (effect('Bounce & Drop - ukramedia.com')(58) == 1) {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(59);\n                freq = effect('Bounce & Drop - ukramedia.com')(60);\n                decay = effect('Bounce & Drop - ukramedia.com')(61);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        } else {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(47);\n                freq = effect('Bounce & Drop - ukramedia.com')(48);\n                decay = effect('Bounce & Drop - ukramedia.com')(49);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        }\n    } else if (opacityBounceBack == 1) {\n        if (effect('Bounce & Drop - ukramedia.com')(64) == 1) {\n            e = effect('Bounce & Drop - ukramedia.com')(65);\n            g = effect('Bounce & Drop - ukramedia.com')(66);\n            nMax = effect('Bounce & Drop - ukramedia.com')(67);\n        } else {\n            e = effect('Bounce & Drop - ukramedia.com')(52);\n            g = effect('Bounce & Drop - ukramedia.com')(53);\n            nMax = effect('Bounce & Drop - ukramedia.com')(54);\n        }\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time)\n                n--;\n        }\n        if (n > 0) {\n            t = $bm_sub(time, key(n).time);\n            v = $bm_mul($bm_neg(velocityAtTime($bm_sub(key(n).time, 0.001))), e);\n            vl = length(v);\n            if ($bm_isInstanceOfArray(value)) {\n                vu = vl > 0 ? normalize(v) : [\n                    0,\n                    0,\n                    0\n                ];\n            } else {\n                vu = v < 0 ? -1 : 1;\n            }\n            tCur = 0;\n            segDur = $bm_div($bm_mul(2, vl), g);\n            tNext = segDur;\n            nb = 1;\n            while (tNext < t && nb <= nMax) {\n                vl *= e;\n                segDur *= e;\n                tCur = tNext;\n                tNext = $bm_sum(tNext, segDur);\n                nb++;\n            }\n            if (nb <= nMax) {\n                delta = $bm_sub(t, tCur);\n                $bm_rt = $bm_sum(value, $bm_mul($bm_mul(vu, delta), $bm_sub(vl, $bm_div($bm_mul(g, delta), 2))));\n            } else {\n                $bm_rt = value;\n            }\n        } else\n            $bm_rt = value;\n    } else {\n        $bm_rt = value;\n    }\n} catch (err) {\n    $bm_rt = value;\n}"},"r":{"a":0,"k":0,"ix":10,"x":"var $bm_rt;\nvar rotationInertialBounce, rotationBounceBack, n, n, t, t, v, amp, freq, decay, v, amp, freq, decay, e, g, nMax, e, g, nMax, n, n, t, v, vl, vu, vu, tCur, segDur, tNext, nb, delta;\nrotationInertialBounce = effect('Bounce & Drop - ukramedia.com')(30);\nrotationBounceBack = effect('Bounce & Drop - ukramedia.com')(31);\ntry {\n    if (rotationInertialBounce == 1) {\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time) {\n                n--;\n            }\n        }\n        if (n == 0) {\n            $bm_rt = t = 0;\n        } else {\n            $bm_rt = t = $bm_sub(time, key(n).time);\n        }\n        if (effect('Bounce & Drop - ukramedia.com')(58) == 1) {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(59);\n                freq = effect('Bounce & Drop - ukramedia.com')(60);\n                decay = effect('Bounce & Drop - ukramedia.com')(61);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        } else {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(33);\n                freq = effect('Bounce & Drop - ukramedia.com')(34);\n                decay = effect('Bounce & Drop - ukramedia.com')(35);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        }\n    } else if (rotationBounceBack == 1) {\n        if (effect('Bounce & Drop - ukramedia.com')(64) == 1) {\n            e = effect('Bounce & Drop - ukramedia.com')(65);\n            g = effect('Bounce & Drop - ukramedia.com')(66);\n            nMax = effect('Bounce & Drop - ukramedia.com')(67);\n        } else {\n            e = effect('Bounce & Drop - ukramedia.com')(38);\n            g = effect('Bounce & Drop - ukramedia.com')(39);\n            nMax = effect('Bounce & Drop - ukramedia.com')(40);\n        }\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time)\n                n--;\n        }\n        if (n > 0) {\n            t = $bm_sub(time, key(n).time);\n            v = $bm_mul($bm_neg(velocityAtTime($bm_sub(key(n).time, 0.001))), e);\n            vl = length(v);\n            if ($bm_isInstanceOfArray(value)) {\n                vu = vl > 0 ? normalize(v) : [\n                    0,\n                    0,\n                    0\n                ];\n            } else {\n                vu = v < 0 ? -1 : 1;\n            }\n            tCur = 0;\n            segDur = $bm_div($bm_mul(2, vl), g);\n            tNext = segDur;\n            nb = 1;\n            while (tNext < t && nb <= nMax) {\n                vl *= e;\n                segDur *= e;\n                tCur = tNext;\n                tNext = $bm_sum(tNext, segDur);\n                nb++;\n            }\n            if (nb <= nMax) {\n                delta = $bm_sub(t, tCur);\n                $bm_rt = $bm_sum(value, $bm_mul($bm_mul(vu, delta), $bm_sub(vl, $bm_div($bm_mul(g, delta), 2))));\n            } else {\n                $bm_rt = value;\n            }\n        } else\n            $bm_rt = value;\n    } else {\n        $bm_rt = value;\n    }\n} catch (err) {\n    $bm_rt = value;\n}"},"p":{"a":0,"k":[256,256,0],"ix":2,"l":2,"x":"var $bm_rt;\nvar positionInertialBounce, positionBounceBack, n, n, t, t, v, amp, freq, decay, v, amp, freq, decay, e, g, nMax, e, g, nMax, n, n, t, v, vl, vu, vu, tCur, segDur, tNext, nb, delta;\npositionInertialBounce = effect('Bounce & Drop - ukramedia.com')(2);\npositionBounceBack = effect('Bounce & Drop - ukramedia.com')(3);\ntry {\n    if (positionInertialBounce == 1) {\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time) {\n                n--;\n            }\n        }\n        if (n == 0) {\n            $bm_rt = t = 0;\n        } else {\n            $bm_rt = t = $bm_sub(time, key(n).time);\n        }\n        if (effect('Bounce & Drop - ukramedia.com')(58) == 1) {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(59);\n                freq = effect('Bounce & Drop - ukramedia.com')(60);\n                decay = effect('Bounce & Drop - ukramedia.com')(61);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        } else {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(5);\n                freq = effect('Bounce & Drop - ukramedia.com')(6);\n                decay = effect('Bounce & Drop - ukramedia.com')(7);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        }\n    } else if (positionBounceBack == 1) {\n        if (effect('Bounce & Drop - ukramedia.com')(64) == 1) {\n            e = effect('Bounce & Drop - ukramedia.com')(65);\n            g = effect('Bounce & Drop - ukramedia.com')(66);\n            nMax = effect('Bounce & Drop - ukramedia.com')(67);\n        } else {\n            e = effect('Bounce & Drop - ukramedia.com')(10);\n            g = effect('Bounce & Drop - ukramedia.com')(11);\n            nMax = effect('Bounce & Drop - ukramedia.com')(12);\n        }\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time)\n                n--;\n        }\n        if (n > 0) {\n            t = $bm_sub(time, key(n).time);\n            v = $bm_mul($bm_neg(velocityAtTime($bm_sub(key(n).time, 0.001))), e);\n            vl = length(v);\n            if ($bm_isInstanceOfArray(value)) {\n                vu = vl > 0 ? normalize(v) : [\n                    0,\n                    0,\n                    0\n                ];\n            } else {\n                vu = v < 0 ? -1 : 1;\n            }\n            tCur = 0;\n            segDur = $bm_div($bm_mul(2, vl), g);\n            tNext = segDur;\n            nb = 1;\n            while (tNext < t && nb <= nMax) {\n                vl *= e;\n                segDur *= e;\n                tCur = tNext;\n                tNext = $bm_sum(tNext, segDur);\n                nb++;\n            }\n            if (nb <= nMax) {\n                delta = $bm_sub(t, tCur);\n                $bm_rt = $bm_sum(value, $bm_mul($bm_mul(vu, delta), $bm_sub(vl, $bm_div($bm_mul(g, delta), 2))));\n            } else {\n                $bm_rt = value;\n            }\n        } else\n            $bm_rt = value;\n    } else {\n        $bm_rt = value;\n    }\n} catch (err) {\n    $bm_rt = value;\n}"},"a":{"a":0,"k":[140.061,140.061,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,16.794]},"t":0,"s":[0,0,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,-0.38]},"t":10,"s":[132,132,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,-0.21]},"t":35,"s":[130,130,100]},{"t":55,"s":[175,175,100]}],"ix":6,"l":2,"x":"var $bm_rt;\nvar scaleInertialBounce, scaleBounceBack, n, n, t, t, v, amp, freq, decay, v, amp, freq, decay, e, g, nMax, e, g, nMax, n, n, t, v, vl, vu, vu, tCur, segDur, tNext, nb, delta;\nscaleInertialBounce = effect('Bounce & Drop - ukramedia.com')(16);\nscaleBounceBack = effect('Bounce & Drop - ukramedia.com')(17);\ntry {\n    if (scaleInertialBounce == 1) {\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time) {\n                n--;\n            }\n        }\n        if (n == 0) {\n            $bm_rt = t = 0;\n        } else {\n            $bm_rt = t = $bm_sub(time, key(n).time);\n        }\n        if (effect('Bounce & Drop - ukramedia.com')(58) == 1) {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(59);\n                freq = effect('Bounce & Drop - ukramedia.com')(60);\n                decay = effect('Bounce & Drop - ukramedia.com')(61);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        } else {\n            if (n > 0 && t < 1) {\n                v = velocityAtTime($bm_sub(key(n).time, $bm_div(thisComp.frameDuration, 10)));\n                amp = effect('Bounce & Drop - ukramedia.com')(19);\n                freq = effect('Bounce & Drop - ukramedia.com')(20);\n                decay = effect('Bounce & Drop - ukramedia.com')(21);\n                $bm_rt = $bm_sum(value, $bm_div($bm_mul($bm_mul(v, amp), Math.sin($bm_mul($bm_mul($bm_mul(freq, t), 2), Math.PI))), Math.exp($bm_mul(decay, t))));\n            } else {\n                $bm_rt = value;\n            }\n        }\n    } else if (scaleBounceBack == 1) {\n        if (effect('Bounce & Drop - ukramedia.com')(64) == 1) {\n            e = effect('Bounce & Drop - ukramedia.com')(65);\n            g = effect('Bounce & Drop - ukramedia.com')(66);\n            nMax = effect('Bounce & Drop - ukramedia.com')(67);\n        } else {\n            e = effect('Bounce & Drop - ukramedia.com')(24);\n            g = effect('Bounce & Drop - ukramedia.com')(25);\n            nMax = effect('Bounce & Drop - ukramedia.com')(26);\n        }\n        $bm_rt = n = 0;\n        if (numKeys > 0) {\n            $bm_rt = n = nearestKey(time).index;\n            if (key(n).time > time)\n                n--;\n        }\n        if (n > 0) {\n            t = $bm_sub(time, key(n).time);\n            v = $bm_mul($bm_neg(velocityAtTime($bm_sub(key(n).time, 0.001))), e);\n            vl = length(v);\n            if ($bm_isInstanceOfArray(value)) {\n                vu = vl > 0 ? normalize(v) : [\n                    0,\n                    0,\n                    0\n                ];\n            } else {\n                vu = v < 0 ? -1 : 1;\n            }\n            tCur = 0;\n            segDur = $bm_div($bm_mul(2, vl), g);\n            tNext = segDur;\n            nb = 1;\n            while (tNext < t && nb <= nMax) {\n                vl *= e;\n                segDur *= e;\n                tCur = tNext;\n                tNext = $bm_sum(tNext, segDur);\n                nb++;\n            }\n            if (nb <= nMax) {\n                delta = $bm_sub(t, tCur);\n                $bm_rt = $bm_sum(value, $bm_mul($bm_mul(vu, delta), $bm_sub(vl, $bm_div($bm_mul(g, delta), 2))));\n            } else {\n                $bm_rt = value;\n            }\n        } else\n            $bm_rt = value;\n    } else {\n        $bm_rt = value;\n    }\n} catch (err) {\n    $bm_rt = value;\n}"}},"ao":0,"ef":[{"ty":5,"nm":"Bounce & Drop - ukramedia.com","np":70,"mn":"Pseudo/animationControl","ix":1,"en":1,"ef":[{"ty":6,"nm":"Position","mn":"Pseudo/animationControl-0001","ix":1,"v":0},{"ty":7,"nm":"Enable Inertial Bounce","mn":"Pseudo/animationControl-0002","ix":2,"v":{"a":0,"k":0,"ix":2}},{"ty":7,"nm":"Enable Bounce Back","mn":"Pseudo/animationControl-0003","ix":3,"v":{"a":0,"k":0,"ix":3}},{"ty":6,"nm":"Inertial Bounce Options","mn":"Pseudo/animationControl-0004","ix":4,"v":0},{"ty":0,"nm":"Amplitude","mn":"Pseudo/animationControl-0005","ix":5,"v":{"a":0,"k":0.05,"ix":5}},{"ty":0,"nm":"Frequency","mn":"Pseudo/animationControl-0006","ix":6,"v":{"a":0,"k":4,"ix":6}},{"ty":0,"nm":"Decay","mn":"Pseudo/animationControl-0007","ix":7,"v":{"a":0,"k":8,"ix":7}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0008","ix":8,"v":0},{"ty":6,"nm":"Bounce Back Options","mn":"Pseudo/animationControl-0009","ix":9,"v":0},{"ty":0,"nm":"Elasticity","mn":"Pseudo/animationControl-0010","ix":10,"v":{"a":0,"k":0.7,"ix":10}},{"ty":0,"nm":"Gravity","mn":"Pseudo/animationControl-0011","ix":11,"v":{"a":0,"k":5000,"ix":11}},{"ty":0,"nm":"nMax","mn":"Pseudo/animationControl-0012","ix":12,"v":{"a":0,"k":9,"ix":12}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0013","ix":13,"v":0},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0014","ix":14,"v":0},{"ty":6,"nm":"Scale","mn":"Pseudo/animationControl-0015","ix":15,"v":0},{"ty":7,"nm":"Enable Inertial Bounce","mn":"Pseudo/animationControl-0016","ix":16,"v":{"a":0,"k":1,"ix":16}},{"ty":7,"nm":"Enable Bounce Back","mn":"Pseudo/animationControl-0017","ix":17,"v":{"a":0,"k":0,"ix":17}},{"ty":6,"nm":"Inertial Bounce Options","mn":"Pseudo/animationControl-0018","ix":18,"v":0},{"ty":0,"nm":"Amplitude","mn":"Pseudo/animationControl-0019","ix":19,"v":{"a":0,"k":0.8,"ix":19}},{"ty":0,"nm":"Frequency","mn":"Pseudo/animationControl-0020","ix":20,"v":{"a":0,"k":4,"ix":20}},{"ty":0,"nm":"Decay","mn":"Pseudo/animationControl-0021","ix":21,"v":{"a":0,"k":8,"ix":21}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0022","ix":22,"v":0},{"ty":6,"nm":"Bounce Back Options","mn":"Pseudo/animationControl-0023","ix":23,"v":0},{"ty":0,"nm":"Elasticity","mn":"Pseudo/animationControl-0024","ix":24,"v":{"a":0,"k":0.7,"ix":24}},{"ty":0,"nm":"Gravity","mn":"Pseudo/animationControl-0025","ix":25,"v":{"a":0,"k":5000,"ix":25}},{"ty":0,"nm":"nMax","mn":"Pseudo/animationControl-0026","ix":26,"v":{"a":0,"k":9,"ix":26}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0027","ix":27,"v":0},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0028","ix":28,"v":0},{"ty":6,"nm":"Rotation","mn":"Pseudo/animationControl-0029","ix":29,"v":0},{"ty":7,"nm":"Enable Inertial Bounce","mn":"Pseudo/animationControl-0030","ix":30,"v":{"a":0,"k":0,"ix":30}},{"ty":7,"nm":"Enable Bounce Back","mn":"Pseudo/animationControl-0031","ix":31,"v":{"a":0,"k":0,"ix":31}},{"ty":6,"nm":"Inertial Bounce Options","mn":"Pseudo/animationControl-0032","ix":32,"v":0},{"ty":0,"nm":"Amplitude","mn":"Pseudo/animationControl-0033","ix":33,"v":{"a":0,"k":0.05,"ix":33}},{"ty":0,"nm":"Frequency","mn":"Pseudo/animationControl-0034","ix":34,"v":{"a":0,"k":4,"ix":34}},{"ty":0,"nm":"Decay","mn":"Pseudo/animationControl-0035","ix":35,"v":{"a":0,"k":8,"ix":35}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0036","ix":36,"v":0},{"ty":6,"nm":"Bounce Back Options","mn":"Pseudo/animationControl-0037","ix":37,"v":0},{"ty":0,"nm":"Elasticity","mn":"Pseudo/animationControl-0038","ix":38,"v":{"a":0,"k":0.7,"ix":38}},{"ty":0,"nm":"Gravity","mn":"Pseudo/animationControl-0039","ix":39,"v":{"a":0,"k":5000,"ix":39}},{"ty":0,"nm":"nMax","mn":"Pseudo/animationControl-0040","ix":40,"v":{"a":0,"k":9,"ix":40}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0041","ix":41,"v":0},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0042","ix":42,"v":0},{"ty":6,"nm":"Opacity","mn":"Pseudo/animationControl-0043","ix":43,"v":0},{"ty":7,"nm":"Enable Inertial Bounce","mn":"Pseudo/animationControl-0044","ix":44,"v":{"a":0,"k":0,"ix":44}},{"ty":7,"nm":"Enable Bounce Back","mn":"Pseudo/animationControl-0045","ix":45,"v":{"a":0,"k":0,"ix":45}},{"ty":6,"nm":"Inertial Bounce Options","mn":"Pseudo/animationControl-0046","ix":46,"v":0},{"ty":0,"nm":"Amplitude","mn":"Pseudo/animationControl-0047","ix":47,"v":{"a":0,"k":0.05,"ix":47}},{"ty":0,"nm":"Frequency","mn":"Pseudo/animationControl-0048","ix":48,"v":{"a":0,"k":4,"ix":48}},{"ty":0,"nm":"Decay","mn":"Pseudo/animationControl-0049","ix":49,"v":{"a":0,"k":8,"ix":49}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0050","ix":50,"v":0},{"ty":6,"nm":"Bounce Back Options","mn":"Pseudo/animationControl-0051","ix":51,"v":0},{"ty":0,"nm":"Elasticity","mn":"Pseudo/animationControl-0052","ix":52,"v":{"a":0,"k":0.7,"ix":52}},{"ty":0,"nm":"Gravity","mn":"Pseudo/animationControl-0053","ix":53,"v":{"a":0,"k":5000,"ix":53}},{"ty":0,"nm":"nMax","mn":"Pseudo/animationControl-0054","ix":54,"v":{"a":0,"k":9,"ix":54}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0055","ix":55,"v":0},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0056","ix":56,"v":0},{"ty":6,"nm":"Global Inertial Bounce Options","mn":"Pseudo/animationControl-0057","ix":57,"v":0},{"ty":7,"nm":"Enable Global Inertial Bounce","mn":"Pseudo/animationControl-0058","ix":58,"v":{"a":0,"k":0,"ix":58}},{"ty":0,"nm":"Amplitude","mn":"Pseudo/animationControl-0059","ix":59,"v":{"a":0,"k":0.05,"ix":59}},{"ty":0,"nm":"Frequency","mn":"Pseudo/animationControl-0060","ix":60,"v":{"a":0,"k":4,"ix":60}},{"ty":0,"nm":"Decay","mn":"Pseudo/animationControl-0061","ix":61,"v":{"a":0,"k":8,"ix":61}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0062","ix":62,"v":0},{"ty":6,"nm":"Global Bounce Back Options","mn":"Pseudo/animationControl-0063","ix":63,"v":0},{"ty":7,"nm":"Enable Global Bounce Back","mn":"Pseudo/animationControl-0064","ix":64,"v":{"a":0,"k":0,"ix":64}},{"ty":0,"nm":"Elasticity","mn":"Pseudo/animationControl-0065","ix":65,"v":{"a":0,"k":0.7,"ix":65}},{"ty":0,"nm":"Gravity","mn":"Pseudo/animationControl-0066","ix":66,"v":{"a":0,"k":5000,"ix":66}},{"ty":0,"nm":"nMax","mn":"Pseudo/animationControl-0067","ix":67,"v":{"a":0,"k":9,"ix":67}},{"ty":6,"nm":"","mn":"Pseudo/animationControl-0068","ix":68,"v":0}]}],"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-77.215],[77.216,0],[0,77.215],[-77.215,0]],"o":[[0,77.215],[-77.215,0],[0,-77.215],[77.216,0]],"v":[[139.811,0],[0,139.811],[-139.811,0],[0,-139.811]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.38823529411764707,0.2784313725490196,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[140.061,140.061],"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,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":360,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f227a6c..13e106d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,6 +5,7 @@
     <dimen name="margin_horizontal">24dp</dimen>
     <dimen name="small_size">4dp</dimen>
     <dimen name="animation_size">120dp</dimen>
+    <dimen name="animation_size2">150dp</dimen>
     <dimen name="margin_larg">32dp</dimen>
     <dimen name="margin_small">8dp</dimen>
     <dimen name="text_larg">28sp</dimen>