diff --git a/.gitignore b/.gitignore
index f76f15e..4314849 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@ migrate_working_dir/
 *.ipr
 *.iws
 .idea/
-.cxx/
 
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
@@ -42,4 +41,4 @@ app.*.map.json
 # Android Studio will place build artifacts here
 /android/app/debug
 /android/app/profile
-/android/app/release
+/android/app/release
\ No newline at end of file
diff --git a/.metadata b/.metadata
index 2d1be89..262ceed 100644
--- a/.metadata
+++ b/.metadata
@@ -1,11 +1,11 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: "2663184aa79047d0a33a14a3b607954f8fdd8730"
-  channel: "stable"
+  revision: 135454af32477f815a7525073027a3ff9eff1bfd
+  channel: stable
 
 project_type: app
 
@@ -13,26 +13,26 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
-      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
+      base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
     - platform: android
-      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
-      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
+      base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
     - platform: ios
-      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
-      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
+      base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
     - platform: linux
-      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
-      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
+      base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
     - platform: macos
-      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
-      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
+      base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
     - platform: web
-      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
-      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
+      base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
     - platform: windows
-      create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
-      base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730
+      create_revision: 135454af32477f815a7525073027a3ff9eff1bfd
+      base_revision: 135454af32477f815a7525073027a3ff9eff1bfd
 
   # User provided section
 
diff --git a/README.md b/README.md
index 14e161c..faf32d4 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,15 @@
 <div align='center'>
-    <img src='/readme/icon.png' width='150'/>
-    <h2>🌦️ Rain</h2>
+<img src='/assets/icons/icon.png' width='150'/>
+<h2>🌦️ Rain</h2>
 </div>
 
 <p align='center'>
-    <p align='center'>
-        <a href='https://github.com/darkmoonight/Rain/stargazers'><img alt='Stars' src='https://img.shields.io/github/stars/darkmoonight/Rain?color=abc0d3'/></a>
-        <a href='https://github.com/darkmoonight/Rain/forks'><img alt='Forks' src='https://img.shields.io/github/forks/darkmoonight/Rain?color=abc0d3'/></a>
-        <a href='https://github.com/darkmoonight/Rain/releases'><img alt='GitHub release' src='https://img.shields.io/github/v/release/darkmoonight/Rain?color=abc0d3'/></a>
-        <a href='https://github.com/darkmoonight/Rain/blob/main/LICENSE'><img alt='License' src='https://img.shields.io/github/license/darkmoonight/Rain?color=abc0d3'/></a>
-    </p>
+ <p align='center'>
+    <a href='https://github.com/darkmoonight/Rain/stargazers'><img alt='Stars' src='https://img.shields.io/github/stars/darkmoonight/Rain?color=abc0d3'/></a>
+    <a href='https://github.com/darkmoonight/Rain/forks'><img alt='Forks' src='https://img.shields.io/github/forks/darkmoonight/Rain?color=abc0d3'/></a>
+    <a href='https://github.com/darkmoonight/Rain/releases'><img alt='GitHub release' src='https://img.shields.io/github/v/release/darkmoonight/Rain?color=abc0d3'/></a>
+    <a href='https://github.com/darkmoonight/Rain/blob/main/LICENSE'><img alt='License' src='https://img.shields.io/github/license/darkmoonight/Rain?color=abc0d3'/></a>
+ </p>
 </p>
 
 <p align='center'> Tired of unpredictable weather? Rain's got you covered! Get ready for any forecast. 🌦️ </p>
@@ -40,7 +40,7 @@ We fetch weather data from [Open-Meteo](https://open-meteo.com/en/docs) and use
 
 ### 📸 Screenshots
 
-<img src='/readme/1.png' width='200'/> <img src='/readme/2.png' width='200'/> <img src='/readme/3.png' width='200'/> <img src='/readme/4.png' width='200'/> <img src='/readme/5.png' width='200'/> <img src='/readme/6.png' width='200'/> <img src='/readme/7.png' width='200'/> <img src='/readme/8.png' width='200'/>
+<img src='/readme/1.png' width='200'/> <img src='/readme/2.png' width='200'/> <img src='/readme/3.png' width='200'/> <img src='/readme/4.png' width='200'/>
 
 ### 💰 Support Us
 
@@ -52,6 +52,7 @@ If you find Rain valuable and worthy for future innovation, consider supporting
 ### 📥 Get Rain Now
 
 [![Play Store](https://img.shields.io/badge/Google_Play-414141?style=for-the-badge&logo=google-play&logoColor=white)](https://play.google.com/store/apps/details?id=com.yoshi.rain)
+[![RuStore](https://img.shields.io/badge/RuStore-blue?style=for-the-badge&logo=vk&logoColor=white)](https://apps.rustore.ru/app/com.yoshi.rain)
 
 Or get the latest APK from the [Releases Section](https://github.com/DarkMooNight/Rain/releases/latest). You can also find the app on IzzyOnDroid via a F-Droid client [here](https://apt.izzysoft.de/fdroid/index/apk/com.yoshi.rain).
 
@@ -62,5 +63,5 @@ This project is licensed under the [MIT License](./LICENSE).
 ### 👨‍💻 Our Contributors
 
 <a href='https://github.com/darkmoonight/Rain/graphs/contributors'>
-    <img src='https://contrib.rocks/image?repo=darkmoonight/Rain'/>
+  <img src='https://contrib.rocks/image?repo=darkmoonight/Rain' />
 </a>
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6a479c4..bc8448f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -4,6 +4,24 @@ plugins {
     id "dev.flutter.flutter-gradle-plugin"
 }
 
+def localProperties = new Properties()
+def localPropertiesFile = rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    localPropertiesFile.withReader('UTF-8') { reader ->
+        localProperties.load(reader)
+    }
+}
+
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
 if (keystorePropertiesFile.exists()) {
@@ -11,73 +29,62 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    namespace = 'com.yoshi.rain'
-    compileSdk = 35
-    ndkVersion = '29.0.13113456'
+    namespace 'com.yoshi.rain'
+    compileSdkVersion 34
+    ndkVersion flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-        coreLibraryDesugaringEnabled = true
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17
+        jvmTarget = '1.8'
     }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
-    dependenciesInfo {
-        // Disables dependency metadata when building APKs.
-        includeInApk = false
-        // Disables dependency metadata when building Android App Bundles.
-        includeInBundle = false
-    }
-
     defaultConfig {
-        applicationId = 'com.yoshi.rain'
-        minSdk = 23
-        targetSdk = flutter.targetSdkVersion
-        versionCode = flutter.versionCode
-        versionName = flutter.versionName
+        applicationId "com.yoshi.rain"
+        minSdkVersion 23
+        targetSdkVersion flutter.targetSdkVersion
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
     }
 
     signingConfigs {
-        release {
-            keyAlias = keystoreProperties['keyAlias']
-            keyPassword = keystoreProperties['keyPassword']
-            storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-            storePassword = keystoreProperties['storePassword']
+       release {
+           keyAlias keystoreProperties['keyAlias']
+           keyPassword keystoreProperties['keyPassword']
+           storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+           storePassword keystoreProperties['storePassword']
         }
     }
 
     buildTypes {
         release {
-           signingConfig = signingConfigs.release
+           signingConfig signingConfigs.release
         }
 
         debug {
-            signingConfig = signingConfigs.debug
-            minifyEnabled = true
+            signingConfig signingConfigs.debug
+            minifyEnabled true
         }
     }
 
     buildFeatures {
-        viewBinding = true
+        viewBinding true
     }
 }
 
 flutter {
-    source = "../.."
+    source '../..'
 }
 
 dependencies {
-    implementation("androidx.core:core-remoteviews:1.1.0")
-    implementation("com.google.android.material:material:1.12.0")
-    implementation('androidx.work:work-runtime-ktx:2.10.0')
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
+    implementation "androidx.core:core-remoteviews:1.0.0"
 }
 
 // Remove this for FLOSS version
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index d02b0cf..1cd4187 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -11,6 +11,16 @@
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:extractNativeLibs="true">
+        <receiver
+            android:name=".OreoWidget"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/oreo_widget_info" />
+        </receiver>
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -18,7 +28,6 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:enableOnBackInvokedCallback="true"
             android:windowSoftInputMode="adjustResize">
             <meta-data
                 android:name="io.flutter.embedding.android.NormalTheme"
@@ -27,32 +36,7 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="es.antonborri.home_widget.action.LAUNCH" />
-            </intent-filter>
         </activity>
-
-        <receiver
-            android:name=".OreoWidget"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/oreo_widget_info" />
-        </receiver>
-
-        <receiver android:name="es.antonborri.home_widget.HomeWidgetBackgroundReceiver"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="es.antonborri.home_widget.action.BACKGROUND" />
-            </intent-filter>
-        </receiver>
-        <service android:name="es.antonborri.home_widget.HomeWidgetBackgroundService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
-            android:exported="true" />
-
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
@@ -68,4 +52,4 @@
             </intent-filter>
         </receiver>
     </application>
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png
index 07af2f0..417e420 100644
Binary files a/android/app/src/main/res/drawable-hdpi/splash.png and b/android/app/src/main/res/drawable-hdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png
index a8261e2..e59ff2b 100644
Binary files a/android/app/src/main/res/drawable-mdpi/splash.png and b/android/app/src/main/res/drawable-mdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png
index fd4fbdf..87f38b3 100644
Binary files a/android/app/src/main/res/drawable-xhdpi/splash.png and b/android/app/src/main/res/drawable-xhdpi/splash.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png
index 1b38ebd..3d3e41f 100644
Binary files a/android/app/src/main/res/drawable-xxhdpi/splash.png and b/android/app/src/main/res/drawable-xxhdpi/splash.png differ
diff --git a/android/app/src/main/res/layout/oreo_widget_big.xml b/android/app/src/main/res/layout/oreo_widget_big.xml
index 1463e19..42ddbae 100644
--- a/android/app/src/main/res/layout/oreo_widget_big.xml
+++ b/android/app/src/main/res/layout/oreo_widget_big.xml
@@ -3,7 +3,6 @@
     style="@style/Widget.Android.AppWidget.Container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSecondaryContainer"
     android:theme="@style/Theme.Android.AppWidgetContainer"
     android:id="@+id/widget_day_oreo">
 
@@ -28,7 +27,7 @@
             android:shadowRadius="1"
             android:textSize="@dimen/widget_large_title_text_size"
             tools:ignore="ObsoleteLayoutParam"
-            tools:text="Saturday, September 30 " />
+            tools:text="Saturday, September 30 │ " />
 
         <ImageView
             android:id="@+id/widget_day_icon"
diff --git a/android/app/src/main/res/layout/oreo_widget_medium.xml b/android/app/src/main/res/layout/oreo_widget_medium.xml
index aedbcbd..41fc8ac 100644
--- a/android/app/src/main/res/layout/oreo_widget_medium.xml
+++ b/android/app/src/main/res/layout/oreo_widget_medium.xml
@@ -3,7 +3,6 @@
     style="@style/Widget.Android.AppWidget.Container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSecondaryContainer"
     android:theme="@style/Theme.Android.AppWidgetContainer"
     android:id="@+id/widget_day_oreo">
 
@@ -28,7 +27,7 @@
             android:shadowRadius="1"
             android:textSize="@dimen/widget_large_title_text_size"
             tools:ignore="ObsoleteLayoutParam"
-            tools:text="Saturday, September 30 " />
+            tools:text="Saturday, September 30 │ " />
 
         <ImageView
             android:id="@+id/widget_day_icon"
diff --git a/android/app/src/main/res/layout/oreo_widget_mini.xml b/android/app/src/main/res/layout/oreo_widget_mini.xml
index 52b2443..220787a 100644
--- a/android/app/src/main/res/layout/oreo_widget_mini.xml
+++ b/android/app/src/main/res/layout/oreo_widget_mini.xml
@@ -3,7 +3,6 @@
     style="@style/Widget.Android.AppWidget.Container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSecondaryContainer"
     android:theme="@style/Theme.Android.AppWidgetContainer"
     android:id="@+id/widget_day_oreo">
 
@@ -33,8 +32,8 @@
             android:shadowRadius="1"
             android:textAppearance="@android:style/TextAppearance.Material.Large"
             android:textSize="@dimen/widget_title_text_size"
-            tools:ignore="ObsoleteLayoutParam"
-            tools:text="21°" />
+            tools:text="21°"
+            tools:ignore="ObsoleteLayoutParam" />
 
     </LinearLayout>
 
diff --git a/android/app/src/main/res/layout/oreo_widget_small.xml b/android/app/src/main/res/layout/oreo_widget_small.xml
index a0b163c..b24c57c 100644
--- a/android/app/src/main/res/layout/oreo_widget_small.xml
+++ b/android/app/src/main/res/layout/oreo_widget_small.xml
@@ -3,7 +3,6 @@
     style="@style/Widget.Android.AppWidget.Container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSecondaryContainer"
     android:theme="@style/Theme.Android.AppWidgetContainer"
     android:id="@+id/widget_day_oreo">
 
diff --git a/android/app/src/main/res/values-night-v31/styles.xml b/android/app/src/main/res/values-night-v31/styles.xml
index 7cadc77..b062802 100644
--- a/android/app/src/main/res/values-night-v31/styles.xml
+++ b/android/app/src/main/res/values-night-v31/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
-    <style name="LaunchTheme" parent="@style/Theme.Material3.DynamicColors.Dark.NoActionBar">
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
@@ -14,7 +14,7 @@
          running.
          
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@style/Theme.Material3.DynamicColors.Dark.NoActionBar">
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
 </resources>
diff --git a/android/app/src/main/res/values-night-v31/themes.xml b/android/app/src/main/res/values-night-v31/themes.xml
index acc3f89..f253c9d 100644
--- a/android/app/src/main/res/values-night-v31/themes.xml
+++ b/android/app/src/main/res/values-night-v31/themes.xml
@@ -3,7 +3,7 @@
     <!--
     Having themes.xml for night-v31 because of the priority order of the resource qualifiers.
     -->
-    <style name="Theme.Android.AppWidgetContainerParent" parent="@style/Theme.Material3.DynamicColors.DayNight">
+    <style name="Theme.Android.AppWidgetContainerParent" parent="@android:style/Theme.DeviceDefault.DayNight">
         <item name="appWidgetRadius">@android:dimen/system_app_widget_background_radius</item>
         <item name="appWidgetInnerRadius">@android:dimen/system_app_widget_inner_radius</item>
     </style>
diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml
index 805a597..dbc9ea9 100644
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
-    <style name="LaunchTheme" parent="@style/Theme.Material3.DynamicColors.Dark.NoActionBar">
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
-        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
+        <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
-        <item name="android:windowDrawsSystemBarBackgrounds" >false</item>
-        <item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="o_mr1">shortEdges</item>
+        <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
@@ -16,7 +16,7 @@
          running.
 
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@style/Theme.Material3.DynamicColors.Dark.NoActionBar">
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
 </resources>
diff --git a/android/app/src/main/res/values-v31/styles.xml b/android/app/src/main/res/values-v31/styles.xml
index c491979..e206829 100644
--- a/android/app/src/main/res/values-v31/styles.xml
+++ b/android/app/src/main/res/values-v31/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
-    <style name="LaunchTheme" parent="@style/Theme.Material3.DynamicColors.DayNight.NoActionBar">
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:forceDarkAllowed">false</item>
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
@@ -14,15 +14,17 @@
          running.
          
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@style/Theme.Material3.DynamicColors.DayNight.NoActionBar">
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
+
     <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
         <item name="android:id">@android:id/background</item>
         <item name="android:padding">?attr/appWidgetPadding</item>
         <item name="android:background">@drawable/app_widget_background</item>
         <item name="android:clipToOutline">true</item>
     </style>
+
     <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
         <item name="android:padding">?attr/appWidgetPadding</item>
         <item name="android:background">@drawable/app_widget_inner_view_background</item>
diff --git a/android/app/src/main/res/values-v31/themes.xml b/android/app/src/main/res/values-v31/themes.xml
index 35ada39..06025ec 100644
--- a/android/app/src/main/res/values-v31/themes.xml
+++ b/android/app/src/main/res/values-v31/themes.xml
@@ -5,7 +5,7 @@
      and @android:dimen/system_app_widget_internal_padding requires API level 31
     -->
     <style name="Theme.Android.AppWidgetContainerParent"
-        parent="@style/Theme.Material3.DynamicColors.DayNight">
+        parent="@android:style/Theme.DeviceDefault.DayNight">
         <item name="appWidgetRadius">@android:dimen/system_app_widget_background_radius</item>
         <item name="appWidgetInnerRadius">@android:dimen/system_app_widget_inner_radius</item>
     </style>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 2c37611..93bed36 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_widget_description">Rain Widget</string>
+    <string name="app_widget_description">Oreo Widget</string>
     <string name="date_format_widget_oreo_style">EEE, d MMM │</string>
     <string name="date_format_widget_oreo_big_style">EEEE, d MMM │</string>
 </resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index e50dbb0..b8334a9 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -2,14 +2,14 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode
     setting is off -->
-    <style name="LaunchTheme" parent="@style/Theme.Material3.DynamicColors.DayNight.NoActionBar">
+    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
              the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
-        <item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
+        <item name="android:forceDarkAllowed" tools:ignore="NewApi">false</item>
         <item name="android:windowFullscreen">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">false</item>
-        <item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="o_mr1">shortEdges</item>
+        <item name="android:windowLayoutInDisplayCutoutMode" tools:ignore="NewApi">shortEdges</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
@@ -17,15 +17,18 @@
          running.
 
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@style/Theme.Material3.DynamicColors.DayNight.NoActionBar">
+    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
     </style>
+
     <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
         <item name="android:id">@android:id/background</item>
-        <item name="android:background">?attr/colorSurface</item>
+        <item name="android:background">?android:attr/colorBackground</item>
     </style>
+
     <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
-        <item name="android:background">?attr/colorSurface</item>
-        <item name="android:textColor">?attr/itemTextColor</item>
+        <item name="android:background">?android:attr/colorBackground</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
-</resources>
+
+</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 1fb58d5..4704876 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -1,5 +1,5 @@
 <resources>
-    <style name="Theme.Android.AppWidgetContainerParent" parent="@style/Theme.Material3.DynamicColors.DayNight">
+    <style name="Theme.Android.AppWidgetContainerParent" parent="@android:style/Theme.DeviceDefault">
         <!-- Radius of the outer bound of widgets to make the rounded corners -->
         <item name="appWidgetRadius">16dp</item>
         <!--
diff --git a/android/build.gradle b/android/build.gradle
index bc157bd..26ab04a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,3 +1,15 @@
+buildscript {
+    ext.kotlin_version = '1.9.22'
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+     dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
 allprojects {
     repositories {
         google()
@@ -8,8 +20,6 @@ allprojects {
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
     project.evaluationDependsOn(':app')
 }
 
diff --git a/android/gradle.properties b/android/gradle.properties
index a792b07..598d13f 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableR8.fullMode = false
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index c6a2952..3c472b9 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index 18a751a..af1ec35 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -5,21 +5,25 @@ pluginManagement {
         def flutterSdkPath = properties.getProperty("flutter.sdk")
         assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
         return flutterSdkPath
-    }()
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
 
-    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
     repositories {
         google()
         mavenCentral()
         gradlePluginPortal()
     }
+
+    plugins {
+        id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
+    }
 }
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.9.0" apply false
-    id "org.jetbrains.kotlin.android" version "2.1.10" apply false
+    id "com.android.application" version '7.4.2' apply false
 }
 
 include ":app"
diff --git a/assets/images/github.png b/assets/images/github.png
new file mode 100644
index 0000000..bfc5e71
Binary files /dev/null and b/assets/images/github.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png
index a8261e2..e59ff2b 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png
index fd4fbdf..87f38b3 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ
diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png
index 1b38ebd..3d3e41f 100644
Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index bd79ef7..717f826 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -25,11 +25,11 @@
 		<key>LSRequiresIPhoneOS</key>
 		<true/>
 		<key>NSLocationWhenInUseUsageDescription</key>
-		<string>The Rain App requires access to the device's location.</string>
+			<string>The Rain App requires access to the device&apos;s location.</string>
 		<key>NSLocationTemporaryUsageDescriptionDictionary</key>
 		<dict>
 			<key>TemporaryPreciseAccuracy</key>
-			<string>The Rain App requires temporary access to the device's precise location.</string>
+			<string>The Rain App requires temporary access to the device&apos;s precise location.</string>
 		</dict>
 		<key>UILaunchStoryboardName</key>
 		<string>LaunchScreen</string>
diff --git a/ios/RunnerTests/RunnerTests.swift b/ios/RunnerTests/RunnerTests.swift
deleted file mode 100644
index 86a7c3b..0000000
--- a/ios/RunnerTests/RunnerTests.swift
+++ /dev/null
@@ -1,12 +0,0 @@
-import Flutter
-import UIKit
-import XCTest
-
-class RunnerTests: XCTestCase {
-
-  func testExample() {
-    // If you add code to the Runner application, consider adding tests here.
-    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
-  }
-
-}
diff --git a/lib/app/api/api.dart b/lib/app/api/api.dart
old mode 100755
new mode 100644
index f2f6715..0872812
--- a/lib/app/api/api.dart
+++ b/lib/app/api/api.dart
@@ -1,38 +1,69 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:rain/app/api/city_api.dart';
-import 'package:rain/app/api/weather_api.dart';
-import 'package:rain/app/data/db.dart';
+import 'package:rain/app/api/city.dart';
+import 'package:rain/app/api/weather.dart';
+import 'package:rain/app/data/weather.dart';
 import 'package:rain/main.dart';
 
 class WeatherAPI {
-  final Dio dio =
-      Dio()..options.baseUrl = 'https://api.open-meteo.com/v1/forecast?';
+  final Dio dio = Dio()
+    ..options.baseUrl = 'https://api.open-meteo.com/v1/forecast?';
   final Dio dioLocation = Dio();
 
-  static const String _weatherParams =
-      'hourly=temperature_2m,relativehumidity_2m,apparent_temperature,precipitation,rain,weathercode,surface_pressure,visibility,evapotranspiration,windspeed_10m,winddirection_10m,windgusts_10m,cloudcover,uv_index,dewpoint_2m,precipitation_probability,shortwave_radiation'
-      '&daily=weathercode,temperature_2m_max,temperature_2m_min,apparent_temperature_max,apparent_temperature_min,sunrise,sunset,precipitation_sum,precipitation_probability_max,windspeed_10m_max,windgusts_10m_max,uv_index_max,rain_sum,winddirection_10m_dominant'
-      '&forecast_days=12&timezone=auto';
-
-  String _buildWeatherUrl(double lat, double lon) {
-    String url = 'latitude=$lat&longitude=$lon&$_weatherParams';
-    if (settings.measurements == 'imperial') {
-      url += '&windspeed_unit=mph&precipitation_unit=inch';
-    }
-    if (settings.degrees == 'fahrenheit') {
-      url += '&temperature_unit=fahrenheit';
-    }
-    return url;
-  }
-
-  Future<MainWeatherCache> getWeatherData(double lat, double lon) async {
-    final String urlWeather = _buildWeatherUrl(lat, lon);
+  Future<MainWeatherCache> getWeatherData(double? lat, double? lon) async {
+    String url =
+        'latitude=$lat&longitude=$lon&hourly=temperature_2m,relativehumidity_2m,apparent_temperature,precipitation,rain,weathercode,surface_pressure,visibility,evapotranspiration,windspeed_10m,winddirection_10m,windgusts_10m,cloudcover,uv_index,dewpoint_2m,precipitation_probability,shortwave_radiation&daily=weathercode,temperature_2m_max,temperature_2m_min,apparent_temperature_max,apparent_temperature_min,sunrise,sunset,precipitation_sum,precipitation_probability_max,windspeed_10m_max,windgusts_10m_max,uv_index_max,rain_sum,winddirection_10m_dominant&forecast_days=12&timezone=auto';
+    String urlWeather;
+    settings.measurements == 'imperial' && settings.degrees == 'fahrenheit'
+        ? urlWeather =
+            '$url&temperature_unit=fahrenheit&windspeed_unit=mph&precipitation_unit=inch'
+        : settings.measurements == 'imperial'
+            ? urlWeather = '$url&windspeed_unit=mph&precipitation_unit=inch'
+            : settings.degrees == 'fahrenheit'
+                ? urlWeather = '$url&temperature_unit=fahrenheit'
+                : urlWeather = url;
     try {
       Response response = await dio.get(urlWeather);
       WeatherDataApi weatherData = WeatherDataApi.fromJson(response.data);
-      return _mapWeatherDataToCache(weatherData);
+      return MainWeatherCache(
+        time: weatherData.hourly.time,
+        temperature2M: weatherData.hourly.temperature2M,
+        relativehumidity2M: weatherData.hourly.relativeHumidity2M,
+        apparentTemperature: weatherData.hourly.apparentTemperature,
+        precipitation: weatherData.hourly.precipitation,
+        rain: weatherData.hourly.rain,
+        weathercode: weatherData.hourly.weatherCode,
+        surfacePressure: weatherData.hourly.surfacePressure,
+        visibility: weatherData.hourly.visibility,
+        evapotranspiration: weatherData.hourly.evapotranspiration,
+        windspeed10M: weatherData.hourly.windSpeed10M,
+        winddirection10M: weatherData.hourly.windDirection10M,
+        windgusts10M: weatherData.hourly.windGusts10M,
+        cloudcover: weatherData.hourly.cloudCover,
+        uvIndex: weatherData.hourly.uvIndex,
+        dewpoint2M: weatherData.hourly.dewpoint2M,
+        precipitationProbability: weatherData.hourly.precipitationProbability,
+        shortwaveRadiation: weatherData.hourly.shortwaveRadiation,
+        timeDaily: weatherData.daily.time,
+        weathercodeDaily: weatherData.daily.weatherCode,
+        temperature2MMax: weatherData.daily.temperature2MMax,
+        temperature2MMin: weatherData.daily.temperature2MMin,
+        apparentTemperatureMax: weatherData.daily.apparentTemperatureMax,
+        apparentTemperatureMin: weatherData.daily.apparentTemperatureMin,
+        sunrise: weatherData.daily.sunrise,
+        sunset: weatherData.daily.sunset,
+        precipitationSum: weatherData.daily.precipitationSum,
+        precipitationProbabilityMax:
+            weatherData.daily.precipitationProbabilityMax,
+        windspeed10MMax: weatherData.daily.windSpeed10MMax,
+        windgusts10MMax: weatherData.daily.windGusts10MMax,
+        uvIndexMax: weatherData.daily.uvIndexMax,
+        rainSum: weatherData.daily.rainSum,
+        winddirection10MDominant: weatherData.daily.windDirection10MDominant,
+        timezone: weatherData.timezone,
+        timestamp: DateTime.now(),
+      );
     } on DioException catch (e) {
       if (kDebugMode) {
         print(e);
@@ -41,24 +72,63 @@ class WeatherAPI {
     }
   }
 
-  Future<WeatherCard> getWeatherCard(
-    double lat,
-    double lon,
-    String city,
-    String district,
-    String timezone,
-  ) async {
-    final String urlWeather = _buildWeatherUrl(lat, lon);
+  Future<WeatherCard> getWeatherCard(double? lat, double? lon, String city,
+      String district, String timezone) async {
+    String url =
+        'latitude=$lat&longitude=$lon&hourly=temperature_2m,relativehumidity_2m,apparent_temperature,precipitation,rain,weathercode,surface_pressure,visibility,evapotranspiration,windspeed_10m,winddirection_10m,windgusts_10m,cloudcover,uv_index,dewpoint_2m,precipitation_probability,shortwave_radiation&daily=weathercode,temperature_2m_max,temperature_2m_min,apparent_temperature_max,apparent_temperature_min,sunrise,sunset,precipitation_sum,precipitation_probability_max,windspeed_10m_max,windgusts_10m_max,uv_index_max,rain_sum,winddirection_10m_dominant&forecast_days=12&timezone=auto';
+    String urlWeather;
+    settings.measurements == 'imperial' && settings.degrees == 'fahrenheit'
+        ? urlWeather =
+            '$url&temperature_unit=fahrenheit&windspeed_unit=mph&precipitation_unit=inch'
+        : settings.measurements == 'imperial'
+            ? urlWeather = '$url&windspeed_unit=mph&precipitation_unit=inch'
+            : settings.degrees == 'fahrenheit'
+                ? urlWeather = '$url&temperature_unit=fahrenheit'
+                : urlWeather = url;
     try {
       Response response = await dio.get(urlWeather);
       WeatherDataApi weatherData = WeatherDataApi.fromJson(response.data);
-      return _mapWeatherDataToCard(
-        weatherData,
-        lat,
-        lon,
-        city,
-        district,
-        timezone,
+      return WeatherCard(
+        time: weatherData.hourly.time,
+        temperature2M: weatherData.hourly.temperature2M,
+        relativehumidity2M: weatherData.hourly.relativeHumidity2M,
+        apparentTemperature: weatherData.hourly.apparentTemperature,
+        precipitation: weatherData.hourly.precipitation,
+        rain: weatherData.hourly.rain,
+        weathercode: weatherData.hourly.weatherCode,
+        surfacePressure: weatherData.hourly.surfacePressure,
+        visibility: weatherData.hourly.visibility,
+        evapotranspiration: weatherData.hourly.evapotranspiration,
+        windspeed10M: weatherData.hourly.windSpeed10M,
+        winddirection10M: weatherData.hourly.windDirection10M,
+        windgusts10M: weatherData.hourly.windGusts10M,
+        cloudcover: weatherData.hourly.cloudCover,
+        uvIndex: weatherData.hourly.uvIndex,
+        dewpoint2M: weatherData.hourly.dewpoint2M,
+        precipitationProbability: weatherData.hourly.precipitationProbability,
+        shortwaveRadiation: weatherData.hourly.shortwaveRadiation,
+        timeDaily: weatherData.daily.time,
+        weathercodeDaily: weatherData.daily.weatherCode,
+        temperature2MMax: weatherData.daily.temperature2MMax,
+        temperature2MMin: weatherData.daily.temperature2MMin,
+        apparentTemperatureMax: weatherData.daily.apparentTemperatureMax,
+        apparentTemperatureMin: weatherData.daily.apparentTemperatureMin,
+        sunrise: weatherData.daily.sunrise,
+        sunset: weatherData.daily.sunset,
+        precipitationSum: weatherData.daily.precipitationSum,
+        precipitationProbabilityMax:
+            weatherData.daily.precipitationProbabilityMax,
+        windspeed10MMax: weatherData.daily.windSpeed10MMax,
+        windgusts10MMax: weatherData.daily.windGusts10MMax,
+        uvIndexMax: weatherData.daily.uvIndexMax,
+        rainSum: weatherData.daily.rainSum,
+        winddirection10MDominant: weatherData.daily.windDirection10MDominant,
+        lat: lat,
+        lon: lon,
+        city: city,
+        district: district,
+        timezone: timezone,
+        timestamp: DateTime.now(),
       );
     } on DioException catch (e) {
       if (kDebugMode) {
@@ -69,7 +139,7 @@ class WeatherAPI {
   }
 
   Future<Iterable<Result>> getCity(String query, Locale? locale) async {
-    final String url =
+    final url =
         'https://geocoding-api.open-meteo.com/v1/search?name=$query&count=5&language=${locale?.languageCode}&format=json';
     try {
       Response response = await dioLocation.get(url);
@@ -93,97 +163,4 @@ class WeatherAPI {
       rethrow;
     }
   }
-
-  MainWeatherCache _mapWeatherDataToCache(WeatherDataApi weatherData) {
-    return MainWeatherCache(
-      time: weatherData.hourly.time,
-      temperature2M: weatherData.hourly.temperature2M,
-      relativehumidity2M: weatherData.hourly.relativeHumidity2M,
-      apparentTemperature: weatherData.hourly.apparentTemperature,
-      precipitation: weatherData.hourly.precipitation,
-      rain: weatherData.hourly.rain,
-      weathercode: weatherData.hourly.weatherCode,
-      surfacePressure: weatherData.hourly.surfacePressure,
-      visibility: weatherData.hourly.visibility,
-      evapotranspiration: weatherData.hourly.evapotranspiration,
-      windspeed10M: weatherData.hourly.windSpeed10M,
-      winddirection10M: weatherData.hourly.windDirection10M,
-      windgusts10M: weatherData.hourly.windGusts10M,
-      cloudcover: weatherData.hourly.cloudCover,
-      uvIndex: weatherData.hourly.uvIndex,
-      dewpoint2M: weatherData.hourly.dewpoint2M,
-      precipitationProbability: weatherData.hourly.precipitationProbability,
-      shortwaveRadiation: weatherData.hourly.shortwaveRadiation,
-      timeDaily: weatherData.daily.time,
-      weathercodeDaily: weatherData.daily.weatherCode,
-      temperature2MMax: weatherData.daily.temperature2MMax,
-      temperature2MMin: weatherData.daily.temperature2MMin,
-      apparentTemperatureMax: weatherData.daily.apparentTemperatureMax,
-      apparentTemperatureMin: weatherData.daily.apparentTemperatureMin,
-      sunrise: weatherData.daily.sunrise,
-      sunset: weatherData.daily.sunset,
-      precipitationSum: weatherData.daily.precipitationSum,
-      precipitationProbabilityMax:
-          weatherData.daily.precipitationProbabilityMax,
-      windspeed10MMax: weatherData.daily.windSpeed10MMax,
-      windgusts10MMax: weatherData.daily.windGusts10MMax,
-      uvIndexMax: weatherData.daily.uvIndexMax,
-      rainSum: weatherData.daily.rainSum,
-      winddirection10MDominant: weatherData.daily.windDirection10MDominant,
-      timezone: weatherData.timezone,
-      timestamp: DateTime.now(),
-    );
-  }
-
-  WeatherCard _mapWeatherDataToCard(
-    WeatherDataApi weatherData,
-    double lat,
-    double lon,
-    String city,
-    String district,
-    String timezone,
-  ) {
-    return WeatherCard(
-      time: weatherData.hourly.time,
-      temperature2M: weatherData.hourly.temperature2M,
-      relativehumidity2M: weatherData.hourly.relativeHumidity2M,
-      apparentTemperature: weatherData.hourly.apparentTemperature,
-      precipitation: weatherData.hourly.precipitation,
-      rain: weatherData.hourly.rain,
-      weathercode: weatherData.hourly.weatherCode,
-      surfacePressure: weatherData.hourly.surfacePressure,
-      visibility: weatherData.hourly.visibility,
-      evapotranspiration: weatherData.hourly.evapotranspiration,
-      windspeed10M: weatherData.hourly.windSpeed10M,
-      winddirection10M: weatherData.hourly.windDirection10M,
-      windgusts10M: weatherData.hourly.windGusts10M,
-      cloudcover: weatherData.hourly.cloudCover,
-      uvIndex: weatherData.hourly.uvIndex,
-      dewpoint2M: weatherData.hourly.dewpoint2M,
-      precipitationProbability: weatherData.hourly.precipitationProbability,
-      shortwaveRadiation: weatherData.hourly.shortwaveRadiation,
-      timeDaily: weatherData.daily.time,
-      weathercodeDaily: weatherData.daily.weatherCode,
-      temperature2MMax: weatherData.daily.temperature2MMax,
-      temperature2MMin: weatherData.daily.temperature2MMin,
-      apparentTemperatureMax: weatherData.daily.apparentTemperatureMax,
-      apparentTemperatureMin: weatherData.daily.apparentTemperatureMin,
-      sunrise: weatherData.daily.sunrise,
-      sunset: weatherData.daily.sunset,
-      precipitationSum: weatherData.daily.precipitationSum,
-      precipitationProbabilityMax:
-          weatherData.daily.precipitationProbabilityMax,
-      windspeed10MMax: weatherData.daily.windSpeed10MMax,
-      windgusts10MMax: weatherData.daily.windGusts10MMax,
-      uvIndexMax: weatherData.daily.uvIndexMax,
-      rainSum: weatherData.daily.rainSum,
-      winddirection10MDominant: weatherData.daily.windDirection10MDominant,
-      lat: lat,
-      lon: lon,
-      city: city,
-      district: district,
-      timezone: timezone,
-      timestamp: DateTime.now(),
-    );
-  }
 }
diff --git a/lib/app/api/city_api.dart b/lib/app/api/city.dart
old mode 100755
new mode 100644
similarity index 67%
rename from lib/app/api/city_api.dart
rename to lib/app/api/city.dart
index 9712e75..55a3b6a
--- a/lib/app/api/city_api.dart
+++ b/lib/app/api/city.dart
@@ -1,14 +1,15 @@
 class CityApi {
-  CityApi({required this.results});
+  CityApi({
+    required this.results,
+  });
 
   List<Result> results;
 
   factory CityApi.fromJson(Map<String, dynamic> json) => CityApi(
-    results:
-        json['results'] == null
+        results: json['results'] == null
             ? List<Result>.empty()
             : List<Result>.from(json['results'].map((x) => Result.fromJson(x))),
-  );
+      );
 }
 
 class Result {
@@ -25,9 +26,9 @@ class Result {
   double longitude;
 
   factory Result.fromJson(Map<String, dynamic> json) => Result(
-    admin1: json['admin1'] ?? '',
-    name: json['name'],
-    latitude: json['latitude'],
-    longitude: json['longitude'],
-  );
+        admin1: json['admin1'] ?? '',
+        name: json['name'],
+        latitude: json['latitude'],
+        longitude: json['longitude'],
+      );
 }
diff --git a/lib/app/api/weather_api.dart b/lib/app/api/weather.dart
old mode 100755
new mode 100644
similarity index 97%
rename from lib/app/api/weather_api.dart
rename to lib/app/api/weather.dart
index 1d7e93b..44e4513
--- a/lib/app/api/weather_api.dart
+++ b/lib/app/api/weather.dart
@@ -2,8 +2,8 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 
 //ignore_for_file: invalid_annotation_target
 
-part 'weather_api.freezed.dart';
-part 'weather_api.g.dart';
+part 'weather.freezed.dart';
+part 'weather.g.dart';
 
 @freezed
 class WeatherDataApi with _$WeatherDataApi {
diff --git a/lib/app/api/weather_api.freezed.dart b/lib/app/api/weather.freezed.dart
old mode 100755
new mode 100644
similarity index 95%
rename from lib/app/api/weather_api.freezed.dart
rename to lib/app/api/weather.freezed.dart
index 543cb8e..e2134f7
--- a/lib/app/api/weather_api.freezed.dart
+++ b/lib/app/api/weather.freezed.dart
@@ -3,7 +3,7 @@
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
-part of 'weather_api.dart';
+part of 'weather.dart';
 
 // **************************************************************************
 // FreezedGenerator
@@ -12,7 +12,7 @@ part of 'weather_api.dart';
 T _$identity<T>(T value) => value;
 
 final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
 
 WeatherDataApi _$WeatherDataApiFromJson(Map<String, dynamic> json) {
   return _WeatherDataApi.fromJson(json);
@@ -24,12 +24,8 @@ mixin _$WeatherDataApi {
   Daily get daily => throw _privateConstructorUsedError;
   String get timezone => throw _privateConstructorUsedError;
 
-  /// Serializes this WeatherDataApi to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of WeatherDataApi
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $WeatherDataApiCopyWith<WeatherDataApi> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -56,8 +52,6 @@ class _$WeatherDataApiCopyWithImpl<$Res, $Val extends WeatherDataApi>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of WeatherDataApi
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -81,8 +75,6 @@ class _$WeatherDataApiCopyWithImpl<$Res, $Val extends WeatherDataApi>
     ) as $Val);
   }
 
-  /// Create a copy of WeatherDataApi
-  /// with the given fields replaced by the non-null parameter values.
   @override
   @pragma('vm:prefer-inline')
   $HourlyCopyWith<$Res> get hourly {
@@ -91,8 +83,6 @@ class _$WeatherDataApiCopyWithImpl<$Res, $Val extends WeatherDataApi>
     });
   }
 
-  /// Create a copy of WeatherDataApi
-  /// with the given fields replaced by the non-null parameter values.
   @override
   @pragma('vm:prefer-inline')
   $DailyCopyWith<$Res> get daily {
@@ -126,8 +116,6 @@ class __$$WeatherDataApiImplCopyWithImpl<$Res>
       _$WeatherDataApiImpl _value, $Res Function(_$WeatherDataApiImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of WeatherDataApi
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -184,13 +172,11 @@ class _$WeatherDataApiImpl implements _WeatherDataApi {
                 other.timezone == timezone));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(runtimeType, hourly, daily, timezone);
 
-  /// Create a copy of WeatherDataApi
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$WeatherDataApiImplCopyWith<_$WeatherDataApiImpl> get copyWith =>
@@ -220,11 +206,8 @@ abstract class _WeatherDataApi implements WeatherDataApi {
   Daily get daily;
   @override
   String get timezone;
-
-  /// Create a copy of WeatherDataApi
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$WeatherDataApiImplCopyWith<_$WeatherDataApiImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -268,12 +251,8 @@ mixin _$Hourly {
   @JsonKey(name: 'shortwave_radiation')
   List<double?>? get shortwaveRadiation => throw _privateConstructorUsedError;
 
-  /// Serializes this Hourly to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of Hourly
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $HourlyCopyWith<Hourly> get copyWith => throw _privateConstructorUsedError;
 }
 
@@ -314,8 +293,6 @@ class _$HourlyCopyWithImpl<$Res, $Val extends Hourly>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of Hourly
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -452,8 +429,6 @@ class __$$HourlyImplCopyWithImpl<$Res>
       _$HourlyImpl _value, $Res Function(_$HourlyImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of Hourly
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -845,7 +820,7 @@ class _$HourlyImpl implements _Hourly {
                 .equals(other._shortwaveRadiation, _shortwaveRadiation));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(
       runtimeType,
@@ -868,9 +843,7 @@ class _$HourlyImpl implements _Hourly {
       const DeepCollectionEquality().hash(_precipitationProbability),
       const DeepCollectionEquality().hash(_shortwaveRadiation));
 
-  /// Create a copy of Hourly
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$HourlyImplCopyWith<_$HourlyImpl> get copyWith =>
@@ -960,11 +933,8 @@ abstract class _Hourly implements Hourly {
   @override
   @JsonKey(name: 'shortwave_radiation')
   List<double?>? get shortwaveRadiation;
-
-  /// Create a copy of Hourly
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$HourlyImplCopyWith<_$HourlyImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
@@ -1008,12 +978,8 @@ mixin _$Daily {
   List<int?>? get windDirection10MDominant =>
       throw _privateConstructorUsedError;
 
-  /// Serializes this Daily to a JSON map.
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-
-  /// Create a copy of Daily
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   $DailyCopyWith<Daily> get copyWith => throw _privateConstructorUsedError;
 }
 
@@ -1054,8 +1020,6 @@ class _$DailyCopyWithImpl<$Res, $Val extends Daily>
   // ignore: unused_field
   final $Res Function($Val) _then;
 
-  /// Create a copy of Daily
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -1177,8 +1141,6 @@ class __$$DailyImplCopyWithImpl<$Res>
       _$DailyImpl _value, $Res Function(_$DailyImpl) _then)
       : super(_value, _then);
 
-  /// Create a copy of Daily
-  /// with the given fields replaced by the non-null parameter values.
   @pragma('vm:prefer-inline')
   @override
   $Res call({
@@ -1516,7 +1478,7 @@ class _$DailyImpl implements _Daily {
                 other._windDirection10MDominant, _windDirection10MDominant));
   }
 
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   int get hashCode => Object.hash(
       runtimeType,
@@ -1536,9 +1498,7 @@ class _$DailyImpl implements _Daily {
       const DeepCollectionEquality().hash(_rainSum),
       const DeepCollectionEquality().hash(_windDirection10MDominant));
 
-  /// Create a copy of Daily
-  /// with the given fields replaced by the non-null parameter values.
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
   _$$DailyImplCopyWith<_$DailyImpl> get copyWith =>
@@ -1621,11 +1581,8 @@ abstract class _Daily implements Daily {
   @override
   @JsonKey(name: 'winddirection_10m_dominant')
   List<int?>? get windDirection10MDominant;
-
-  /// Create a copy of Daily
-  /// with the given fields replaced by the non-null parameter values.
   @override
-  @JsonKey(includeFromJson: false, includeToJson: false)
+  @JsonKey(ignore: true)
   _$$DailyImplCopyWith<_$DailyImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/lib/app/api/weather_api.g.dart b/lib/app/api/weather.g.dart
old mode 100755
new mode 100644
similarity index 94%
rename from lib/app/api/weather_api.g.dart
rename to lib/app/api/weather.g.dart
index 645b156..4fa386e
--- a/lib/app/api/weather_api.g.dart
+++ b/lib/app/api/weather.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'weather_api.dart';
+part of 'weather.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator
@@ -24,7 +24,7 @@ Map<String, dynamic> _$$WeatherDataApiImplToJson(
 _$HourlyImpl _$$HourlyImplFromJson(Map<String, dynamic> json) => _$HourlyImpl(
       time: (json['time'] as List<dynamic>?)?.map((e) => e as String).toList(),
       weatherCode: (json['weathercode'] as List<dynamic>?)
-          ?.map((e) => (e as num).toInt())
+          ?.map((e) => e as int)
           .toList(),
       temperature2M: (json['temperature_2m'] as List<dynamic>?)
           ?.map((e) => (e as num).toDouble())
@@ -39,7 +39,7 @@ _$HourlyImpl _$$HourlyImplFromJson(Map<String, dynamic> json) => _$HourlyImpl(
           ?.map((e) => (e as num?)?.toDouble())
           .toList(),
       relativeHumidity2M: (json['relativehumidity_2m'] as List<dynamic>?)
-          ?.map((e) => (e as num?)?.toInt())
+          ?.map((e) => e as int?)
           .toList(),
       surfacePressure: (json['surface_pressure'] as List<dynamic>?)
           ?.map((e) => (e as num?)?.toDouble())
@@ -54,13 +54,13 @@ _$HourlyImpl _$$HourlyImplFromJson(Map<String, dynamic> json) => _$HourlyImpl(
           ?.map((e) => (e as num?)?.toDouble())
           .toList(),
       windDirection10M: (json['winddirection_10m'] as List<dynamic>?)
-          ?.map((e) => (e as num?)?.toInt())
+          ?.map((e) => e as int?)
           .toList(),
       windGusts10M: (json['windgusts_10m'] as List<dynamic>?)
           ?.map((e) => (e as num?)?.toDouble())
           .toList(),
       cloudCover: (json['cloudcover'] as List<dynamic>?)
-          ?.map((e) => (e as num?)?.toInt())
+          ?.map((e) => e as int?)
           .toList(),
       uvIndex: (json['uv_index'] as List<dynamic>?)
           ?.map((e) => (e as num?)?.toDouble())
@@ -70,7 +70,7 @@ _$HourlyImpl _$$HourlyImplFromJson(Map<String, dynamic> json) => _$HourlyImpl(
           .toList(),
       precipitationProbability:
           (json['precipitation_probability'] as List<dynamic>?)
-              ?.map((e) => (e as num?)?.toInt())
+              ?.map((e) => e as int?)
               .toList(),
       shortwaveRadiation: (json['shortwave_radiation'] as List<dynamic>?)
           ?.map((e) => (e as num?)?.toDouble())
@@ -102,7 +102,7 @@ Map<String, dynamic> _$$HourlyImplToJson(_$HourlyImpl instance) =>
 _$DailyImpl _$$DailyImplFromJson(Map<String, dynamic> json) => _$DailyImpl(
       time: _dateTimeFromJson(json['time'] as List?),
       weatherCode: (json['weathercode'] as List<dynamic>?)
-          ?.map((e) => (e as num?)?.toInt())
+          ?.map((e) => e as int?)
           .toList(),
       temperature2MMax: (json['temperature_2m_max'] as List<dynamic>?)
           ?.map((e) => (e as num?)?.toDouble())
@@ -127,7 +127,7 @@ _$DailyImpl _$$DailyImplFromJson(Map<String, dynamic> json) => _$DailyImpl(
           (json['sunset'] as List<dynamic>?)?.map((e) => e as String).toList(),
       precipitationProbabilityMax:
           (json['precipitation_probability_max'] as List<dynamic>?)
-              ?.map((e) => (e as num?)?.toInt())
+              ?.map((e) => e as int?)
               .toList(),
       windSpeed10MMax: (json['windspeed_10m_max'] as List<dynamic>?)
           ?.map((e) => (e as num?)?.toDouble())
@@ -143,7 +143,7 @@ _$DailyImpl _$$DailyImplFromJson(Map<String, dynamic> json) => _$DailyImpl(
           .toList(),
       windDirection10MDominant:
           (json['winddirection_10m_dominant'] as List<dynamic>?)
-              ?.map((e) => (e as num?)?.toInt())
+              ?.map((e) => e as int?)
               .toList(),
     );
 
diff --git a/lib/app/controller/controller.dart b/lib/app/controller/controller.dart
old mode 100755
new mode 100644
index 32d3ceb..ad50b50
--- a/lib/app/controller/controller.dart
+++ b/lib/app/controller/controller.dart
@@ -1,6 +1,7 @@
 import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:flutter_timezone/flutter_timezone.dart';
 import 'package:geocoding/geocoding.dart';
 import 'package:geolocator/geolocator.dart';
@@ -10,17 +11,16 @@ import 'package:isar/isar.dart';
 import 'package:lat_lng_to_timezone/lat_lng_to_timezone.dart' as tzmap;
 import 'package:path_provider/path_provider.dart';
 import 'package:rain/app/api/api.dart';
-import 'package:rain/app/data/db.dart';
-import 'package:rain/app/utils/notification.dart';
-import 'package:rain/app/utils/show_snack_bar.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_data.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_weather.dart';
+import 'package:rain/app/data/weather.dart';
+import 'package:rain/app/services/notification.dart';
+import 'package:rain/app/services/utils.dart';
+import 'package:rain/app/widgets/status/status_data.dart';
+import 'package:rain/app/widgets/status/status_weather.dart';
 import 'package:rain/main.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
 import 'package:timezone/data/latest_all.dart' as tz;
 import 'package:timezone/standalone.dart' as tz;
 import 'package:timezone/timezone.dart' as tz;
-import 'package:url_launcher/url_launcher.dart';
 import 'package:workmanager/workmanager.dart';
 
 class WeatherController extends GetxController {
@@ -52,14 +52,15 @@ class WeatherController extends GetxController {
 
   @override
   void onInit() {
-    weatherCards.assignAll(
-      isar.weatherCards.where().sortByIndex().findAllSync(),
-    );
+    weatherCards
+        .assignAll(isar.weatherCards.where().sortByIndex().findAllSync());
     super.onInit();
   }
 
-  Future<Position> _determinePosition() async {
-    LocationPermission permission = await Geolocator.checkPermission();
+  Future<Position> determinePosition() async {
+    LocationPermission permission;
+
+    permission = await Geolocator.checkPermission();
     if (permission == LocationPermission.denied) {
       permission = await Geolocator.requestPermission();
       if (permission == LocationPermission.denied) {
@@ -69,36 +70,35 @@ class WeatherController extends GetxController {
 
     if (permission == LocationPermission.deniedForever) {
       return Future.error(
-        'Location permissions are permanently denied, we cannot request permissions.',
-      );
+          'Location permissions are permanently denied, we cannot request permissions.');
     }
-    return await Geolocator.getCurrentPosition();
+    return await Geolocator.getCurrentPosition(
+        desiredAccuracy: LocationAccuracy.high);
   }
 
   Future<void> setLocation() async {
     if (settings.location) {
       await getCurrentLocation();
     } else {
-      final locationCity = isar.locationCaches.where().findFirstSync();
-      if (locationCity != null) {
-        await getLocation(
-          locationCity.lat!,
-          locationCity.lon!,
-          locationCity.district!,
-          locationCity.city!,
-        );
+      if ((isar.locationCaches.where().findAllSync()).isNotEmpty) {
+        LocationCache locationCity =
+            (isar.locationCaches.where().findFirstSync())!;
+        await getLocation(locationCity.lat!, locationCity.lon!,
+            locationCity.district!, locationCity.city!);
       }
     }
   }
 
   Future<void> getCurrentLocation() async {
-    if (!(await isOnline.value)) {
+    bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
+
+    if (!isOnline) {
       showSnackBar(content: 'no_inter'.tr);
       await readCache();
       return;
     }
 
-    if (!await Geolocator.isLocationServiceEnabled()) {
+    if (!serviceEnabled) {
       showSnackBar(
         content: 'no_location'.tr,
         onPressed: () => Geolocator.openLocationSettings(),
@@ -107,73 +107,39 @@ class WeatherController extends GetxController {
       return;
     }
 
-    if (isar.mainWeatherCaches.where().findAllSync().isNotEmpty) {
+    if ((isar.mainWeatherCaches.where().findAllSync()).isNotEmpty) {
       await readCache();
       return;
     }
 
-    final position = await _determinePosition();
-    final placemarks = await placemarkFromCoordinates(
-      position.latitude,
-      position.longitude,
-    );
-    final place = placemarks[0];
+    Position position = await determinePosition();
+    List<Placemark> placemarks =
+        await placemarkFromCoordinates(position.latitude, position.longitude);
+    Placemark place = placemarks[0];
 
     _latitude.value = position.latitude;
     _longitude.value = position.longitude;
-    _district.value = place.administrativeArea ?? '';
-    _city.value = place.locality ?? '';
+    _district.value = '${place.administrativeArea}';
+    _city.value = '${place.locality}';
 
-    _mainWeather.value = await WeatherAPI().getWeatherData(
-      _latitude.value,
-      _longitude.value,
-    );
+    _mainWeather.value =
+        await WeatherAPI().getWeatherData(_latitude.value, _longitude.value);
 
     notificationCheck();
+
     await writeCache();
     await readCache();
   }
 
-  Future<Map<String, dynamic>> getCurrentLocationSearch() async {
-    if (!(await isOnline.value)) {
-      showSnackBar(content: 'no_inter'.tr);
-    }
-
-    if (!await Geolocator.isLocationServiceEnabled()) {
-      showSnackBar(
-        content: 'no_location'.tr,
-        onPressed: () => Geolocator.openLocationSettings(),
-      );
-    }
-
-    final position = await _determinePosition();
-    final placemarks = await placemarkFromCoordinates(
-      position.latitude,
-      position.longitude,
-    );
-    final place = placemarks[0];
-
-    return {
-      'lat': position.latitude,
-      'lon': position.longitude,
-      'city': place.administrativeArea ?? '',
-      'district': place.locality ?? '',
-    };
-  }
-
-  Future<void> getLocation(
-    double latitude,
-    double longitude,
-    String district,
-    String locality,
-  ) async {
-    if (!(await isOnline.value)) {
+  Future<void> getLocation(double latitude, double longitude, String district,
+      String locality) async {
+    if (!isOnline) {
       showSnackBar(content: 'no_inter'.tr);
       await readCache();
       return;
     }
 
-    if (isar.mainWeatherCaches.where().findAllSync().isNotEmpty) {
+    if ((isar.mainWeatherCaches.where().findAllSync()).isNotEmpty) {
       await readCache();
       return;
     }
@@ -183,12 +149,11 @@ class WeatherController extends GetxController {
     _district.value = district;
     _city.value = locality;
 
-    _mainWeather.value = await WeatherAPI().getWeatherData(
-      _latitude.value,
-      _longitude.value,
-    );
+    _mainWeather.value =
+        await WeatherAPI().getWeatherData(_latitude.value, _longitude.value);
 
     notificationCheck();
+
     await writeCache();
     await readCache();
   }
@@ -205,14 +170,10 @@ class WeatherController extends GetxController {
     _mainWeather.value = mainWeatherCache;
     _location.value = locationCache;
 
-    hourOfDay.value = getTime(
-      _mainWeather.value.time!,
-      _mainWeather.value.timezone!,
-    );
-    dayOfNow.value = getDay(
-      _mainWeather.value.timeDaily!,
-      _mainWeather.value.timezone!,
-    );
+    hourOfDay.value =
+        getTime(_mainWeather.value.time!, _mainWeather.value.timezone!);
+    dayOfNow.value =
+        getDay(_mainWeather.value.timeDaily!, _mainWeather.value.timezone!);
 
     if (Platform.isAndroid) {
       Workmanager().registerPeriodicTask(
@@ -243,17 +204,23 @@ class WeatherController extends GetxController {
     );
 
     isar.writeTxnSync(() {
-      if (isar.mainWeatherCaches.where().findAllSync().isEmpty) {
+      final mainWeatherCachesIsEmpty =
+          (isar.mainWeatherCaches.where().findAllSync()).isEmpty;
+      final locationCachesIsEmpty =
+          (isar.locationCaches.where().findAllSync()).isEmpty;
+
+      if (mainWeatherCachesIsEmpty) {
         isar.mainWeatherCaches.putSync(_mainWeather.value);
       }
-      if (isar.locationCaches.where().findAllSync().isEmpty) {
+
+      if (locationCachesIsEmpty) {
         isar.locationCaches.putSync(locationCaches);
       }
     });
   }
 
   Future<void> deleteCache() async {
-    if (!(await isOnline.value)) {
+    if (!isOnline) {
       return;
     }
 
@@ -263,49 +230,41 @@ class WeatherController extends GetxController {
           .timestampLessThan(cacheExpiry)
           .deleteAllSync();
     });
-    if (isar.mainWeatherCaches.where().findAllSync().isEmpty) {
+    if ((isar.mainWeatherCaches.where().findAllSync()).isEmpty) {
       await flutterLocalNotificationsPlugin.cancelAll();
     }
   }
 
   Future<void> deleteAll(bool changeCity) async {
-    if (!(await isOnline.value)) {
+    if (!isOnline) {
       return;
     }
 
-    final serviceEnabled = await Geolocator.isLocationServiceEnabled();
+    bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
     await flutterLocalNotificationsPlugin.cancelAll();
 
     isar.writeTxnSync(() {
       if (!settings.location) {
         isar.mainWeatherCaches.where().deleteAllSync();
       }
-      if (settings.location && serviceEnabled || changeCity) {
+      if ((settings.location && serviceEnabled) || changeCity) {
         isar.mainWeatherCaches.where().deleteAllSync();
         isar.locationCaches.where().deleteAllSync();
       }
     });
   }
 
+  // Card Weather
   Future<void> addCardWeather(
-    double latitude,
-    double longitude,
-    String city,
-    String district,
-  ) async {
-    if (!(await isOnline.value)) {
+      double latitude, double longitude, String city, String district) async {
+    if (!isOnline) {
       showSnackBar(content: 'no_inter'.tr);
       return;
     }
 
-    final tz = tzmap.latLngToTimezoneString(latitude, longitude);
-    _weatherCard.value = await WeatherAPI().getWeatherCard(
-      latitude,
-      longitude,
-      city,
-      district,
-      tz,
-    );
+    String tz = tzmap.latLngToTimezoneString(latitude, longitude);
+    _weatherCard.value = await WeatherAPI()
+        .getWeatherCard(latitude, longitude, city, district, tz);
     isar.writeTxnSync(() {
       weatherCards.add(_weatherCard.value);
       isar.weatherCards.putSync(_weatherCard.value);
@@ -313,88 +272,120 @@ class WeatherController extends GetxController {
   }
 
   Future<void> updateCacheCard(bool refresh) async {
-    final weatherCard = refresh
+    List<WeatherCard> weatherCard = refresh
         ? isar.weatherCards.where().sortByIndex().findAllSync()
         : isar.weatherCards
-              .filter()
-              .timestampLessThan(cacheExpiry)
-              .sortByIndex()
-              .findAllSync();
+            .filter()
+            .timestampLessThan(cacheExpiry)
+            .sortByIndex()
+            .findAllSync();
 
-    if (!(await isOnline.value) || weatherCard.isEmpty) {
+    if (!isOnline || weatherCard.isEmpty) {
       return;
     }
 
     for (var oldCard in weatherCard) {
-      final updatedCard = await WeatherAPI().getWeatherCard(
-        oldCard.lat!,
-        oldCard.lon!,
-        oldCard.city!,
-        oldCard.district!,
-        oldCard.timezone!,
-      );
+      var updatedCard = await WeatherAPI().getWeatherCard(oldCard.lat,
+          oldCard.lon, oldCard.city!, oldCard.district!, oldCard.timezone!);
       isar.writeTxnSync(() {
-        _updateWeatherCard(oldCard, updatedCard);
+        oldCard
+          ..time = updatedCard.time
+          ..weathercode = updatedCard.weathercode
+          ..temperature2M = updatedCard.temperature2M
+          ..apparentTemperature = updatedCard.apparentTemperature
+          ..relativehumidity2M = updatedCard.relativehumidity2M
+          ..precipitation = updatedCard.precipitation
+          ..rain = updatedCard.rain
+          ..surfacePressure = updatedCard.surfacePressure
+          ..visibility = updatedCard.visibility
+          ..evapotranspiration = updatedCard.evapotranspiration
+          ..windspeed10M = updatedCard.windspeed10M
+          ..winddirection10M = updatedCard.winddirection10M
+          ..windgusts10M = updatedCard.windgusts10M
+          ..cloudcover = updatedCard.cloudcover
+          ..uvIndex = updatedCard.uvIndex
+          ..dewpoint2M = updatedCard.dewpoint2M
+          ..precipitationProbability = updatedCard.precipitationProbability
+          ..shortwaveRadiation = updatedCard.shortwaveRadiation
+          ..timeDaily = updatedCard.timeDaily
+          ..weathercodeDaily = updatedCard.weathercodeDaily
+          ..temperature2MMax = updatedCard.temperature2MMax
+          ..temperature2MMin = updatedCard.temperature2MMin
+          ..apparentTemperatureMax = updatedCard.apparentTemperatureMax
+          ..apparentTemperatureMin = updatedCard.apparentTemperatureMin
+          ..sunrise = updatedCard.sunrise
+          ..sunset = updatedCard.sunset
+          ..precipitationSum = updatedCard.precipitationSum
+          ..precipitationProbabilityMax =
+              updatedCard.precipitationProbabilityMax
+          ..windspeed10MMax = updatedCard.windspeed10MMax
+          ..windgusts10MMax = updatedCard.windgusts10MMax
+          ..uvIndexMax = updatedCard.uvIndexMax
+          ..rainSum = updatedCard.rainSum
+          ..winddirection10MDominant = updatedCard.winddirection10MDominant
+          ..timestamp = DateTime.now();
+
+        isar.weatherCards.putSync(oldCard);
+
+        var newCard = oldCard;
+        int oldIdx = weatherCard.indexOf(oldCard);
+        weatherCards[oldIdx] = newCard;
         weatherCards.refresh();
       });
     }
   }
 
-  void _updateWeatherCard(WeatherCard oldCard, WeatherCard updatedCard) {
-    oldCard
-      ..time = updatedCard.time
-      ..weathercode = updatedCard.weathercode
-      ..temperature2M = updatedCard.temperature2M
-      ..apparentTemperature = updatedCard.apparentTemperature
-      ..relativehumidity2M = updatedCard.relativehumidity2M
-      ..precipitation = updatedCard.precipitation
-      ..rain = updatedCard.rain
-      ..surfacePressure = updatedCard.surfacePressure
-      ..visibility = updatedCard.visibility
-      ..evapotranspiration = updatedCard.evapotranspiration
-      ..windspeed10M = updatedCard.windspeed10M
-      ..winddirection10M = updatedCard.winddirection10M
-      ..windgusts10M = updatedCard.windgusts10M
-      ..cloudcover = updatedCard.cloudcover
-      ..uvIndex = updatedCard.uvIndex
-      ..dewpoint2M = updatedCard.dewpoint2M
-      ..precipitationProbability = updatedCard.precipitationProbability
-      ..shortwaveRadiation = updatedCard.shortwaveRadiation
-      ..timeDaily = updatedCard.timeDaily
-      ..weathercodeDaily = updatedCard.weathercodeDaily
-      ..temperature2MMax = updatedCard.temperature2MMax
-      ..temperature2MMin = updatedCard.temperature2MMin
-      ..apparentTemperatureMax = updatedCard.apparentTemperatureMax
-      ..apparentTemperatureMin = updatedCard.apparentTemperatureMin
-      ..sunrise = updatedCard.sunrise
-      ..sunset = updatedCard.sunset
-      ..precipitationSum = updatedCard.precipitationSum
-      ..precipitationProbabilityMax = updatedCard.precipitationProbabilityMax
-      ..windspeed10MMax = updatedCard.windspeed10MMax
-      ..windgusts10MMax = updatedCard.windgusts10MMax
-      ..uvIndexMax = updatedCard.uvIndexMax
-      ..rainSum = updatedCard.rainSum
-      ..winddirection10MDominant = updatedCard.winddirection10MDominant
-      ..timestamp = DateTime.now();
-
-    isar.weatherCards.putSync(oldCard);
-  }
-
   Future<void> updateCard(WeatherCard weatherCard) async {
-    if (!(await isOnline.value)) {
+    if (!isOnline) {
       return;
     }
 
     final updatedCard = await WeatherAPI().getWeatherCard(
-      weatherCard.lat!,
-      weatherCard.lon!,
+      weatherCard.lat,
+      weatherCard.lon,
       weatherCard.city!,
       weatherCard.district!,
       weatherCard.timezone!,
     );
 
     isar.writeTxnSync(() {
-      _updateWeatherCard(weatherCard, updatedCard);
+      weatherCard
+        ..time = updatedCard.time
+        ..weathercode = updatedCard.weathercode
+        ..temperature2M = updatedCard.temperature2M
+        ..apparentTemperature = updatedCard.apparentTemperature
+        ..relativehumidity2M = updatedCard.relativehumidity2M
+        ..precipitation = updatedCard.precipitation
+        ..rain = updatedCard.rain
+        ..surfacePressure = updatedCard.surfacePressure
+        ..visibility = updatedCard.visibility
+        ..evapotranspiration = updatedCard.evapotranspiration
+        ..windspeed10M = updatedCard.windspeed10M
+        ..winddirection10M = updatedCard.winddirection10M
+        ..windgusts10M = updatedCard.windgusts10M
+        ..cloudcover = updatedCard.cloudcover
+        ..uvIndex = updatedCard.uvIndex
+        ..dewpoint2M = updatedCard.dewpoint2M
+        ..precipitationProbability = updatedCard.precipitationProbability
+        ..shortwaveRadiation = updatedCard.shortwaveRadiation
+        ..timeDaily = updatedCard.timeDaily
+        ..weathercodeDaily = updatedCard.weathercodeDaily
+        ..temperature2MMax = updatedCard.temperature2MMax
+        ..temperature2MMin = updatedCard.temperature2MMin
+        ..apparentTemperatureMax = updatedCard.apparentTemperatureMax
+        ..apparentTemperatureMin = updatedCard.apparentTemperatureMin
+        ..sunrise = updatedCard.sunrise
+        ..sunset = updatedCard.sunset
+        ..precipitationSum = updatedCard.precipitationSum
+        ..precipitationProbabilityMax = updatedCard.precipitationProbabilityMax
+        ..windspeed10MMax = updatedCard.windspeed10MMax
+        ..windgusts10MMax = updatedCard.windgusts10MMax
+        ..uvIndexMax = updatedCard.uvIndexMax
+        ..rainSum = updatedCard.rainSum
+        ..winddirection10MDominant = updatedCard.winddirection10MDominant
+        ..timestamp = DateTime.now();
+
+      isar.weatherCards.putSync(weatherCard);
     });
   }
 
@@ -406,26 +397,35 @@ class WeatherController extends GetxController {
   }
 
   int getTime(List<String> time, String timezone) {
-    return time.indexWhere((t) {
-      final dateTime = DateTime.parse(t);
-      return tz.TZDateTime.now(tz.getLocation(timezone)).hour ==
-              dateTime.hour &&
-          tz.TZDateTime.now(tz.getLocation(timezone)).day == dateTime.day;
-    });
+    int getTime = 0;
+    for (var i = 0; i < time.length; i++) {
+      if (tz.TZDateTime.now(tz.getLocation(timezone)).hour ==
+              DateTime.parse(time[i]).hour &&
+          tz.TZDateTime.now(tz.getLocation(timezone)).day ==
+              DateTime.parse(time[i]).day) {
+        getTime = i;
+      }
+    }
+    return getTime;
   }
 
   int getDay(List<DateTime> time, String timezone) {
-    return time.indexWhere(
-      (t) => tz.TZDateTime.now(tz.getLocation(timezone)).day == t.day,
-    );
+    int getDay = 0;
+    for (var i = 0; i < time.length; i++) {
+      if (tz.TZDateTime.now(tz.getLocation(timezone)).day == time[i].day) {
+        getDay = i;
+      }
+    }
+    return getDay;
   }
 
   TimeOfDay timeConvert(String normTime) {
-    final hh = normTime.endsWith('PM') ? 12 : 0;
-    final timeParts = normTime.split(' ')[0].split(':');
+    int hh = 0;
+    if (normTime.endsWith('PM')) hh = 12;
+    normTime = normTime.split(' ')[0];
     return TimeOfDay(
-      hour: hh + int.parse(timeParts[0]) % 24,
-      minute: int.parse(timeParts[1]) % 60,
+      hour: hh + int.parse(normTime.split(':')[0]) % 24,
+      minute: int.parse(normTime.split(':')[1]) % 60,
     );
   }
 
@@ -433,21 +433,21 @@ class WeatherController extends GetxController {
     final directory = await getTemporaryDirectory();
     final imagePath = '${directory.path}/$icon';
 
-    final data = await rootBundle.load('assets/images/$icon');
-    final bytes = data.buffer.asUint8List();
+    final ByteData data = await rootBundle.load('assets/images/$icon');
+    final List<int> bytes = data.buffer.asUint8List();
 
     await File(imagePath).writeAsBytes(bytes);
 
     return imagePath;
   }
 
-  void notification(MainWeatherCache mainWeatherCache) async {
-    final now = DateTime.now();
-    final startHour = timeConvert(timeStart).hour;
-    final endHour = timeConvert(timeEnd).hour;
+  void notlification(MainWeatherCache mainWeatherCache) async {
+    DateTime now = DateTime.now();
+    int startHour = timeConvert(timeStart).hour;
+    int endHour = timeConvert(timeEnd).hour;
 
     for (var i = 0; i < mainWeatherCache.time!.length; i += timeRange) {
-      final notificationTime = DateTime.parse(mainWeatherCache.time![i]);
+      DateTime notificationTime = DateTime.parse(mainWeatherCache.time![i]);
 
       if (notificationTime.isAfter(now) &&
           notificationTime.hour >= startHour &&
@@ -474,15 +474,15 @@ class WeatherController extends GetxController {
 
   void notificationCheck() async {
     if (settings.notifications) {
-      final pendingNotificationRequests = await flutterLocalNotificationsPlugin
-          .pendingNotificationRequests();
+      final List<PendingNotificationRequest> pendingNotificationRequests =
+          await flutterLocalNotificationsPlugin.pendingNotificationRequests();
       if (pendingNotificationRequests.isEmpty) {
-        notification(_mainWeather.value);
+        notlification(_mainWeather.value);
       }
     }
   }
 
-  void reorder(int oldIndex, int newIndex) {
+  void reorder(oldIndex, newIndex) {
     if (newIndex > oldIndex) {
       newIndex -= 1;
     }
@@ -502,11 +502,15 @@ class WeatherController extends GetxController {
       isar.settings.putSync(settings);
     });
 
-    final results = await Future.wait<bool?>([
-      HomeWidget.saveWidgetData('background_color', color),
+    return Future.wait<bool?>([
+      HomeWidget.saveWidgetData(
+        'background_color',
+        color,
+      ),
       HomeWidget.updateWidget(androidName: androidWidgetName),
-    ]);
-    return !results.contains(false);
+    ]).then((value) {
+      return !value.contains(false);
+    });
   }
 
   Future<bool> updateWidgetTextColor(String color) async {
@@ -515,11 +519,15 @@ class WeatherController extends GetxController {
       isar.settings.putSync(settings);
     });
 
-    final results = await Future.wait<bool?>([
-      HomeWidget.saveWidgetData('text_color', color),
+    return Future.wait<bool?>([
+      HomeWidget.saveWidgetData(
+        'text_color',
+        color,
+      ),
       HomeWidget.updateWidget(androidName: androidWidgetName),
-    ]);
-    return !results.contains(false);
+    ]).then((value) {
+      return !value.contains(false);
+    });
   }
 
   Future<bool> updateWidget() async {
@@ -534,39 +542,29 @@ class WeatherController extends GetxController {
       WeatherCardSchema,
     ], directory: (await getApplicationSupportDirectory()).path);
 
-    final mainWeatherCache = isarWidget.mainWeatherCaches
-        .where()
-        .findFirstSync();
+    MainWeatherCache? mainWeatherCache;
+    mainWeatherCache = isarWidget.mainWeatherCaches.where().findFirstSync();
     if (mainWeatherCache == null) return false;
 
-    final hour = getTime(mainWeatherCache.time!, mainWeatherCache.timezone!);
-    final day = getDay(mainWeatherCache.timeDaily!, mainWeatherCache.timezone!);
+    int hour = getTime(mainWeatherCache.time!, mainWeatherCache.timezone!);
+    int day = getDay(mainWeatherCache.timeDaily!, mainWeatherCache.timezone!);
 
-    final results = await Future.wait<bool?>([
+    return Future.wait<bool?>([
       HomeWidget.saveWidgetData(
-        'weather_icon',
-        await getLocalImagePath(
-          StatusWeather().getImageNotification(
+          'weather_icon',
+          await getLocalImagePath(StatusWeather().getImageNotification(
             mainWeatherCache.weathercode![hour],
             mainWeatherCache.time![hour],
             mainWeatherCache.sunrise![day],
             mainWeatherCache.sunset![day],
-          ),
-        ),
-      ),
+          ))),
       HomeWidget.saveWidgetData(
         'weather_degree',
         '${mainWeatherCache.temperature2M?[hour].round()}°',
       ),
       HomeWidget.updateWidget(androidName: androidWidgetName),
-    ]);
-    return !results.contains(false);
-  }
-
-  void urlLauncher(String uri) async {
-    final url = Uri.parse(uri);
-    if (!await launchUrl(url, mode: LaunchMode.externalApplication)) {
-      throw Exception('Could not launch $url');
-    }
+    ]).then((value) {
+      return !value.contains(false);
+    });
   }
 }
diff --git a/lib/app/data/db.dart b/lib/app/data/weather.dart
old mode 100755
new mode 100644
similarity index 65%
rename from lib/app/data/db.dart
rename to lib/app/data/weather.dart
index 332dc35..bca9f94
--- a/lib/app/data/db.dart
+++ b/lib/app/data/weather.dart
@@ -1,6 +1,6 @@
 import 'package:isar/isar.dart';
 
-part 'db.g.dart';
+part 'weather.g.dart';
 
 @collection
 class Settings {
@@ -12,14 +12,10 @@ class Settings {
   bool materialColor = false;
   bool amoledTheme = false;
   bool roundDegree = false;
-  bool largeElement = false;
-  bool hideMap = false;
   String? widgetBackgroundColor;
   String? widgetTextColor;
   String measurements = 'metric';
   String degrees = 'celsius';
-  String wind = 'kph';
-  String pressure = 'hPa';
   String timeformat = '24';
   String? language;
   int? timeRange;
@@ -105,43 +101,43 @@ class MainWeatherCache {
   });
 
   Map<String, dynamic> toJson() => {
-    'id': id,
-    'time': time,
-    'weathercode': weathercode,
-    'temperature2M': temperature2M,
-    'apparentTemperature': apparentTemperature,
-    'relativehumidity2M': relativehumidity2M,
-    'precipitation': precipitation,
-    'rain': rain,
-    'surfacePressure': surfacePressure,
-    'visibility': visibility,
-    'evapotranspiration': evapotranspiration,
-    'windspeed10M': windspeed10M,
-    'winddirection10M': winddirection10M,
-    'windgusts10M': windgusts10M,
-    'cloudcover': cloudcover,
-    'uvIndex': uvIndex,
-    'dewpoint2M': dewpoint2M,
-    'precipitationProbability': precipitationProbability,
-    'shortwaveRadiation': shortwaveRadiation,
-    'timeDaily': timeDaily,
-    'weathercodeDaily': weathercodeDaily,
-    'temperature2MMax': temperature2MMax,
-    'temperature2MMin': temperature2MMin,
-    'apparentTemperatureMax': apparentTemperatureMax,
-    'apparentTemperatureMin': apparentTemperatureMin,
-    'sunrise': sunrise,
-    'sunset': sunset,
-    'precipitationSum': precipitationSum,
-    'precipitationProbabilityMax': precipitationProbabilityMax,
-    'windspeed10MMax': windspeed10MMax,
-    'windgusts10MMax': windgusts10MMax,
-    'uvIndexMax': uvIndexMax,
-    'rainSum': rainSum,
-    'winddirection10MDominant': winddirection10MDominant,
-    'timezone': timezone,
-    'timestamp': timestamp,
-  };
+        'id': id,
+        'time': time,
+        'weathercode': weathercode,
+        'temperature2M': temperature2M,
+        'apparentTemperature': apparentTemperature,
+        'relativehumidity2M': relativehumidity2M,
+        'precipitation': precipitation,
+        'rain': rain,
+        'surfacePressure': surfacePressure,
+        'visibility': visibility,
+        'evapotranspiration': evapotranspiration,
+        'windspeed10M': windspeed10M,
+        'winddirection10M': winddirection10M,
+        'windgusts10M': windgusts10M,
+        'cloudcover': cloudcover,
+        'uvIndex': uvIndex,
+        'dewpoint2M': dewpoint2M,
+        'precipitationProbability': precipitationProbability,
+        'shortwaveRadiation': shortwaveRadiation,
+        'timeDaily': timeDaily,
+        'weathercodeDaily': weathercodeDaily,
+        'temperature2MMax': temperature2MMax,
+        'temperature2MMin': temperature2MMin,
+        'apparentTemperatureMax': apparentTemperatureMax,
+        'apparentTemperatureMin': apparentTemperatureMin,
+        'sunrise': sunrise,
+        'sunset': sunset,
+        'precipitationSum': precipitationSum,
+        'precipitationProbabilityMax': precipitationProbabilityMax,
+        'windspeed10MMax': windspeed10MMax,
+        'windgusts10MMax': windgusts10MMax,
+        'uvIndexMax': uvIndexMax,
+        'rainSum': rainSum,
+        'winddirection10MDominant': winddirection10MDominant,
+        'timezone': timezone,
+        'timestamp': timestamp,
+      };
 }
 
 @collection
@@ -152,15 +148,12 @@ class LocationCache {
   String? city;
   String? district;
 
-  LocationCache({this.lat, this.lon, this.city, this.district});
-
-  Map<String, dynamic> toJson() => {
-    'id': id,
-    'lat': lat,
-    'lon': lon,
-    'city': city,
-    'district': district,
-  };
+  LocationCache({
+    this.lat,
+    this.lon,
+    this.city,
+    this.district,
+  });
 }
 
 @collection
@@ -251,57 +244,56 @@ class WeatherCard {
   });
 
   Map<String, dynamic> toJson() => {
-    'id': id,
-    'time': time,
-    'weathercode': weathercode,
-    'temperature2M': temperature2M,
-    'apparentTemperature': apparentTemperature,
-    'relativehumidity2M': relativehumidity2M,
-    'precipitation': precipitation,
-    'rain': rain,
-    'surfacePressure': surfacePressure,
-    'visibility': visibility,
-    'evapotranspiration': evapotranspiration,
-    'windspeed10M': windspeed10M,
-    'winddirection10M': winddirection10M,
-    'windgusts10M': windgusts10M,
-    'cloudcover': cloudcover,
-    'uvIndex': uvIndex,
-    'dewpoint2M': dewpoint2M,
-    'precipitationProbability': precipitationProbability,
-    'shortwaveRadiation': shortwaveRadiation,
-    'timeDaily': timeDaily,
-    'weathercodeDaily': weathercodeDaily,
-    'temperature2MMax': temperature2MMax,
-    'temperature2MMin': temperature2MMin,
-    'apparentTemperatureMax': apparentTemperatureMax,
-    'apparentTemperatureMin': apparentTemperatureMin,
-    'sunrise': sunrise,
-    'sunset': sunset,
-    'precipitationSum': precipitationSum,
-    'precipitationProbabilityMax': precipitationProbabilityMax,
-    'windspeed10MMax': windspeed10MMax,
-    'windgusts10MMax': windgusts10MMax,
-    'uvIndexMax': uvIndexMax,
-    'rainSum': rainSum,
-    'winddirection10MDominant': winddirection10MDominant,
-    'timezone': timezone,
-    'timestamp': timestamp,
-    'lat': lat,
-    'lon': lon,
-    'city': city,
-    'district': district,
-    'index': index,
-  };
+        'id': id,
+        'time': time,
+        'weathercode': weathercode,
+        'temperature2M': temperature2M,
+        'apparentTemperature': apparentTemperature,
+        'relativehumidity2M': relativehumidity2M,
+        'precipitation': precipitation,
+        'rain': rain,
+        'surfacePressure': surfacePressure,
+        'visibility': visibility,
+        'evapotranspiration': evapotranspiration,
+        'windspeed10M': windspeed10M,
+        'winddirection10M': winddirection10M,
+        'windgusts10M': windgusts10M,
+        'cloudcover': cloudcover,
+        'uvIndex': uvIndex,
+        'dewpoint2M': dewpoint2M,
+        'precipitationProbability': precipitationProbability,
+        'shortwaveRadiation': shortwaveRadiation,
+        'timeDaily': timeDaily,
+        'weathercodeDaily': weathercodeDaily,
+        'temperature2MMax': temperature2MMax,
+        'temperature2MMin': temperature2MMin,
+        'apparentTemperatureMax': apparentTemperatureMax,
+        'apparentTemperatureMin': apparentTemperatureMin,
+        'sunrise': sunrise,
+        'sunset': sunset,
+        'precipitationSum': precipitationSum,
+        'precipitationProbabilityMax': precipitationProbabilityMax,
+        'windspeed10MMax': windspeed10MMax,
+        'windgusts10MMax': windgusts10MMax,
+        'uvIndexMax': uvIndexMax,
+        'rainSum': rainSum,
+        'winddirection10MDominant': winddirection10MDominant,
+        'timezone': timezone,
+        'timestamp': timestamp,
+        'lat': lat,
+        'lon': lon,
+        'city': city,
+        'district': district,
+        'index': index,
+      };
 
   factory WeatherCard.fromJson(Map<String, dynamic> json) {
     return WeatherCard(
       time: List<String>.from(json['time'] ?? []),
       weathercode: List<int>.from(json['weathercode'] ?? []),
       temperature2M: List<double>.from(json['temperature2M'] ?? []),
-      apparentTemperature: List<double?>.from(
-        json['apparentTemperature'] ?? [],
-      ),
+      apparentTemperature:
+          List<double?>.from(json['apparentTemperature'] ?? []),
       relativehumidity2M: List<int?>.from(json['relativehumidity2M'] ?? []),
       precipitation: List<double>.from(json['precipitation'] ?? []),
       rain: List<double?>.from(json['rain'] ?? []),
@@ -314,31 +306,26 @@ class WeatherCard {
       cloudcover: List<int?>.from(json['cloudcover'] ?? []),
       uvIndex: List<double?>.from(json['uvIndex'] ?? []),
       dewpoint2M: List<double?>.from(json['dewpoint2M'] ?? []),
-      precipitationProbability: List<int?>.from(
-        json['precipitationProbability'] ?? [],
-      ),
+      precipitationProbability:
+          List<int?>.from(json['precipitationProbability'] ?? []),
       shortwaveRadiation: List<double?>.from(json['shortwaveRadiation'] ?? []),
       timeDaily: List<DateTime>.from(json['timeDaily'] ?? []),
       weathercodeDaily: List<int?>.from(json['weathercodeDaily'] ?? []),
       temperature2MMax: List<double?>.from(json['temperature2MMax'] ?? []),
       temperature2MMin: List<double?>.from(json['temperature2MMin'] ?? []),
-      apparentTemperatureMax: List<double?>.from(
-        json['apparentTemperatureMax'] ?? [],
-      ),
-      apparentTemperatureMin: List<double?>.from(
-        json['apparentTemperatureMin'] ?? [],
-      ),
+      apparentTemperatureMax:
+          List<double?>.from(json['apparentTemperatureMax'] ?? []),
+      apparentTemperatureMin:
+          List<double?>.from(json['apparentTemperatureMin'] ?? []),
       windspeed10MMax: List<double?>.from(json['windspeed10MMax'] ?? []),
       windgusts10MMax: List<double?>.from(json['windgusts10MMax'] ?? []),
       uvIndexMax: List<double?>.from(json['uvIndexMax'] ?? []),
       rainSum: List<double?>.from(json['rainSum'] ?? []),
-      winddirection10MDominant: List<int?>.from(
-        json['winddirection10MDominant'] ?? [],
-      ),
+      winddirection10MDominant:
+          List<int?>.from(json['winddirection10MDominant'] ?? []),
       precipitationSum: List<double?>.from(json['precipitationSum'] ?? []),
-      precipitationProbabilityMax: List<int?>.from(
-        json['precipitationProbabilityMax'] ?? [],
-      ),
+      precipitationProbabilityMax:
+          List<int?>.from(json['precipitationProbabilityMax'] ?? []),
       sunrise: List<String>.from(json['sunrise'] ?? []),
       sunset: List<String>.from(json['sunset'] ?? []),
       lat: json['lat'],
diff --git a/lib/app/data/db.g.dart b/lib/app/data/weather.g.dart
old mode 100755
new mode 100644
similarity index 97%
rename from lib/app/data/db.g.dart
rename to lib/app/data/weather.g.dart
index e2dbe3b..76c2d16
--- a/lib/app/data/db.g.dart
+++ b/lib/app/data/weather.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'db.dart';
+part of 'weather.dart';
 
 // **************************************************************************
 // IsarCollectionGenerator
@@ -27,95 +27,75 @@ const SettingsSchema = CollectionSchema(
       name: r'degrees',
       type: IsarType.string,
     ),
-    r'hideMap': PropertySchema(
-      id: 2,
-      name: r'hideMap',
-      type: IsarType.bool,
-    ),
     r'language': PropertySchema(
-      id: 3,
+      id: 2,
       name: r'language',
       type: IsarType.string,
     ),
-    r'largeElement': PropertySchema(
-      id: 4,
-      name: r'largeElement',
-      type: IsarType.bool,
-    ),
     r'location': PropertySchema(
-      id: 5,
+      id: 3,
       name: r'location',
       type: IsarType.bool,
     ),
     r'materialColor': PropertySchema(
-      id: 6,
+      id: 4,
       name: r'materialColor',
       type: IsarType.bool,
     ),
     r'measurements': PropertySchema(
-      id: 7,
+      id: 5,
       name: r'measurements',
       type: IsarType.string,
     ),
     r'notifications': PropertySchema(
-      id: 8,
+      id: 6,
       name: r'notifications',
       type: IsarType.bool,
     ),
     r'onboard': PropertySchema(
-      id: 9,
+      id: 7,
       name: r'onboard',
       type: IsarType.bool,
     ),
-    r'pressure': PropertySchema(
-      id: 10,
-      name: r'pressure',
-      type: IsarType.string,
-    ),
     r'roundDegree': PropertySchema(
-      id: 11,
+      id: 8,
       name: r'roundDegree',
       type: IsarType.bool,
     ),
     r'theme': PropertySchema(
-      id: 12,
+      id: 9,
       name: r'theme',
       type: IsarType.string,
     ),
     r'timeEnd': PropertySchema(
-      id: 13,
+      id: 10,
       name: r'timeEnd',
       type: IsarType.string,
     ),
     r'timeRange': PropertySchema(
-      id: 14,
+      id: 11,
       name: r'timeRange',
       type: IsarType.long,
     ),
     r'timeStart': PropertySchema(
-      id: 15,
+      id: 12,
       name: r'timeStart',
       type: IsarType.string,
     ),
     r'timeformat': PropertySchema(
-      id: 16,
+      id: 13,
       name: r'timeformat',
       type: IsarType.string,
     ),
     r'widgetBackgroundColor': PropertySchema(
-      id: 17,
+      id: 14,
       name: r'widgetBackgroundColor',
       type: IsarType.string,
     ),
     r'widgetTextColor': PropertySchema(
-      id: 18,
+      id: 15,
       name: r'widgetTextColor',
       type: IsarType.string,
-    ),
-    r'wind': PropertySchema(
-      id: 19,
-      name: r'wind',
-      type: IsarType.string,
     )
   },
   estimateSize: _settingsEstimateSize,
@@ -129,7 +109,7 @@ const SettingsSchema = CollectionSchema(
   getId: _settingsGetId,
   getLinks: _settingsGetLinks,
   attach: _settingsAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _settingsEstimateSize(
@@ -146,7 +126,6 @@ int _settingsEstimateSize(
     }
   }
   bytesCount += 3 + object.measurements.length * 3;
-  bytesCount += 3 + object.pressure.length * 3;
   {
     final value = object.theme;
     if (value != null) {
@@ -178,7 +157,6 @@ int _settingsEstimateSize(
       bytesCount += 3 + value.length * 3;
     }
   }
-  bytesCount += 3 + object.wind.length * 3;
   return bytesCount;
 }
 
@@ -190,24 +168,20 @@ void _settingsSerialize(
 ) {
   writer.writeBool(offsets[0], object.amoledTheme);
   writer.writeString(offsets[1], object.degrees);
-  writer.writeBool(offsets[2], object.hideMap);
-  writer.writeString(offsets[3], object.language);
-  writer.writeBool(offsets[4], object.largeElement);
-  writer.writeBool(offsets[5], object.location);
-  writer.writeBool(offsets[6], object.materialColor);
-  writer.writeString(offsets[7], object.measurements);
-  writer.writeBool(offsets[8], object.notifications);
-  writer.writeBool(offsets[9], object.onboard);
-  writer.writeString(offsets[10], object.pressure);
-  writer.writeBool(offsets[11], object.roundDegree);
-  writer.writeString(offsets[12], object.theme);
-  writer.writeString(offsets[13], object.timeEnd);
-  writer.writeLong(offsets[14], object.timeRange);
-  writer.writeString(offsets[15], object.timeStart);
-  writer.writeString(offsets[16], object.timeformat);
-  writer.writeString(offsets[17], object.widgetBackgroundColor);
-  writer.writeString(offsets[18], object.widgetTextColor);
-  writer.writeString(offsets[19], object.wind);
+  writer.writeString(offsets[2], object.language);
+  writer.writeBool(offsets[3], object.location);
+  writer.writeBool(offsets[4], object.materialColor);
+  writer.writeString(offsets[5], object.measurements);
+  writer.writeBool(offsets[6], object.notifications);
+  writer.writeBool(offsets[7], object.onboard);
+  writer.writeBool(offsets[8], object.roundDegree);
+  writer.writeString(offsets[9], object.theme);
+  writer.writeString(offsets[10], object.timeEnd);
+  writer.writeLong(offsets[11], object.timeRange);
+  writer.writeString(offsets[12], object.timeStart);
+  writer.writeString(offsets[13], object.timeformat);
+  writer.writeString(offsets[14], object.widgetBackgroundColor);
+  writer.writeString(offsets[15], object.widgetTextColor);
 }
 
 Settings _settingsDeserialize(
@@ -219,25 +193,21 @@ Settings _settingsDeserialize(
   final object = Settings();
   object.amoledTheme = reader.readBool(offsets[0]);
   object.degrees = reader.readString(offsets[1]);
-  object.hideMap = reader.readBool(offsets[2]);
   object.id = id;
-  object.language = reader.readStringOrNull(offsets[3]);
-  object.largeElement = reader.readBool(offsets[4]);
-  object.location = reader.readBool(offsets[5]);
-  object.materialColor = reader.readBool(offsets[6]);
-  object.measurements = reader.readString(offsets[7]);
-  object.notifications = reader.readBool(offsets[8]);
-  object.onboard = reader.readBool(offsets[9]);
-  object.pressure = reader.readString(offsets[10]);
-  object.roundDegree = reader.readBool(offsets[11]);
-  object.theme = reader.readStringOrNull(offsets[12]);
-  object.timeEnd = reader.readStringOrNull(offsets[13]);
-  object.timeRange = reader.readLongOrNull(offsets[14]);
-  object.timeStart = reader.readStringOrNull(offsets[15]);
-  object.timeformat = reader.readString(offsets[16]);
-  object.widgetBackgroundColor = reader.readStringOrNull(offsets[17]);
-  object.widgetTextColor = reader.readStringOrNull(offsets[18]);
-  object.wind = reader.readString(offsets[19]);
+  object.language = reader.readStringOrNull(offsets[2]);
+  object.location = reader.readBool(offsets[3]);
+  object.materialColor = reader.readBool(offsets[4]);
+  object.measurements = reader.readString(offsets[5]);
+  object.notifications = reader.readBool(offsets[6]);
+  object.onboard = reader.readBool(offsets[7]);
+  object.roundDegree = reader.readBool(offsets[8]);
+  object.theme = reader.readStringOrNull(offsets[9]);
+  object.timeEnd = reader.readStringOrNull(offsets[10]);
+  object.timeRange = reader.readLongOrNull(offsets[11]);
+  object.timeStart = reader.readStringOrNull(offsets[12]);
+  object.timeformat = reader.readString(offsets[13]);
+  object.widgetBackgroundColor = reader.readStringOrNull(offsets[14]);
+  object.widgetTextColor = reader.readStringOrNull(offsets[15]);
   return object;
 }
 
@@ -253,41 +223,33 @@ P _settingsDeserializeProp<P>(
     case 1:
       return (reader.readString(offset)) as P;
     case 2:
-      return (reader.readBool(offset)) as P;
-    case 3:
       return (reader.readStringOrNull(offset)) as P;
+    case 3:
+      return (reader.readBool(offset)) as P;
     case 4:
       return (reader.readBool(offset)) as P;
     case 5:
-      return (reader.readBool(offset)) as P;
+      return (reader.readString(offset)) as P;
     case 6:
       return (reader.readBool(offset)) as P;
     case 7:
-      return (reader.readString(offset)) as P;
+      return (reader.readBool(offset)) as P;
     case 8:
       return (reader.readBool(offset)) as P;
     case 9:
-      return (reader.readBool(offset)) as P;
+      return (reader.readStringOrNull(offset)) as P;
     case 10:
-      return (reader.readString(offset)) as P;
+      return (reader.readStringOrNull(offset)) as P;
     case 11:
-      return (reader.readBool(offset)) as P;
+      return (reader.readLongOrNull(offset)) as P;
     case 12:
       return (reader.readStringOrNull(offset)) as P;
     case 13:
-      return (reader.readStringOrNull(offset)) as P;
+      return (reader.readString(offset)) as P;
     case 14:
-      return (reader.readLongOrNull(offset)) as P;
+      return (reader.readStringOrNull(offset)) as P;
     case 15:
       return (reader.readStringOrNull(offset)) as P;
-    case 16:
-      return (reader.readString(offset)) as P;
-    case 17:
-      return (reader.readStringOrNull(offset)) as P;
-    case 18:
-      return (reader.readStringOrNull(offset)) as P;
-    case 19:
-      return (reader.readString(offset)) as P;
     default:
       throw IsarError('Unknown property with id $propertyId');
   }
@@ -522,16 +484,6 @@ extension SettingsQueryFilter
     });
   }
 
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> hideMapEqualTo(
-      bool value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'hideMap',
-        value: value,
-      ));
-    });
-  }
-
   QueryBuilder<Settings, Settings, QAfterFilterCondition> idEqualTo(Id value) {
     return QueryBuilder.apply(this, (query) {
       return query.addFilterCondition(FilterCondition.equalTo(
@@ -730,16 +682,6 @@ extension SettingsQueryFilter
     });
   }
 
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> largeElementEqualTo(
-      bool value) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'largeElement',
-        value: value,
-      ));
-    });
-  }
-
   QueryBuilder<Settings, Settings, QAfterFilterCondition> locationEqualTo(
       bool value) {
     return QueryBuilder.apply(this, (query) {
@@ -914,136 +856,6 @@ extension SettingsQueryFilter
     });
   }
 
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> pressureEqualTo(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'pressure',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> pressureGreaterThan(
-    String value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        include: include,
-        property: r'pressure',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> pressureLessThan(
-    String value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.lessThan(
-        include: include,
-        property: r'pressure',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> pressureBetween(
-    String lower,
-    String upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.between(
-        property: r'pressure',
-        lower: lower,
-        includeLower: includeLower,
-        upper: upper,
-        includeUpper: includeUpper,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> pressureStartsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'pressure',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> pressureEndsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'pressure',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> pressureContains(
-      String value,
-      {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.contains(
-        property: r'pressure',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> pressureMatches(
-      String pattern,
-      {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.matches(
-        property: r'pressure',
-        wildcard: pattern,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> pressureIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'pressure',
-        value: '',
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> pressureIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'pressure',
-        value: '',
-      ));
-    });
-  }
-
   QueryBuilder<Settings, Settings, QAfterFilterCondition> roundDegreeEqualTo(
       bool value) {
     return QueryBuilder.apply(this, (query) {
@@ -2001,136 +1813,6 @@ extension SettingsQueryFilter
       ));
     });
   }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> windEqualTo(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'wind',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> windGreaterThan(
-    String value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        include: include,
-        property: r'wind',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> windLessThan(
-    String value, {
-    bool include = false,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.lessThan(
-        include: include,
-        property: r'wind',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> windBetween(
-    String lower,
-    String upper, {
-    bool includeLower = true,
-    bool includeUpper = true,
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.between(
-        property: r'wind',
-        lower: lower,
-        includeLower: includeLower,
-        upper: upper,
-        includeUpper: includeUpper,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> windStartsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.startsWith(
-        property: r'wind',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> windEndsWith(
-    String value, {
-    bool caseSensitive = true,
-  }) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.endsWith(
-        property: r'wind',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> windContains(
-      String value,
-      {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.contains(
-        property: r'wind',
-        value: value,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> windMatches(
-      String pattern,
-      {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.matches(
-        property: r'wind',
-        wildcard: pattern,
-        caseSensitive: caseSensitive,
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> windIsEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.equalTo(
-        property: r'wind',
-        value: '',
-      ));
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterFilterCondition> windIsNotEmpty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addFilterCondition(FilterCondition.greaterThan(
-        property: r'wind',
-        value: '',
-      ));
-    });
-  }
 }
 
 extension SettingsQueryObject
@@ -2164,18 +1846,6 @@ extension SettingsQuerySortBy on QueryBuilder<Settings, Settings, QSortBy> {
     });
   }
 
-  QueryBuilder<Settings, Settings, QAfterSortBy> sortByHideMap() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'hideMap', Sort.asc);
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterSortBy> sortByHideMapDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'hideMap', Sort.desc);
-    });
-  }
-
   QueryBuilder<Settings, Settings, QAfterSortBy> sortByLanguage() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'language', Sort.asc);
@@ -2188,18 +1858,6 @@ extension SettingsQuerySortBy on QueryBuilder<Settings, Settings, QSortBy> {
     });
   }
 
-  QueryBuilder<Settings, Settings, QAfterSortBy> sortByLargeElement() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'largeElement', Sort.asc);
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterSortBy> sortByLargeElementDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'largeElement', Sort.desc);
-    });
-  }
-
   QueryBuilder<Settings, Settings, QAfterSortBy> sortByLocation() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'location', Sort.asc);
@@ -2260,18 +1918,6 @@ extension SettingsQuerySortBy on QueryBuilder<Settings, Settings, QSortBy> {
     });
   }
 
-  QueryBuilder<Settings, Settings, QAfterSortBy> sortByPressure() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'pressure', Sort.asc);
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterSortBy> sortByPressureDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'pressure', Sort.desc);
-    });
-  }
-
   QueryBuilder<Settings, Settings, QAfterSortBy> sortByRoundDegree() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'roundDegree', Sort.asc);
@@ -2368,18 +2014,6 @@ extension SettingsQuerySortBy on QueryBuilder<Settings, Settings, QSortBy> {
       return query.addSortBy(r'widgetTextColor', Sort.desc);
     });
   }
-
-  QueryBuilder<Settings, Settings, QAfterSortBy> sortByWind() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'wind', Sort.asc);
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterSortBy> sortByWindDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'wind', Sort.desc);
-    });
-  }
 }
 
 extension SettingsQuerySortThenBy
@@ -2408,18 +2042,6 @@ extension SettingsQuerySortThenBy
     });
   }
 
-  QueryBuilder<Settings, Settings, QAfterSortBy> thenByHideMap() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'hideMap', Sort.asc);
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterSortBy> thenByHideMapDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'hideMap', Sort.desc);
-    });
-  }
-
   QueryBuilder<Settings, Settings, QAfterSortBy> thenById() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'id', Sort.asc);
@@ -2444,18 +2066,6 @@ extension SettingsQuerySortThenBy
     });
   }
 
-  QueryBuilder<Settings, Settings, QAfterSortBy> thenByLargeElement() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'largeElement', Sort.asc);
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterSortBy> thenByLargeElementDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'largeElement', Sort.desc);
-    });
-  }
-
   QueryBuilder<Settings, Settings, QAfterSortBy> thenByLocation() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'location', Sort.asc);
@@ -2516,18 +2126,6 @@ extension SettingsQuerySortThenBy
     });
   }
 
-  QueryBuilder<Settings, Settings, QAfterSortBy> thenByPressure() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'pressure', Sort.asc);
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterSortBy> thenByPressureDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'pressure', Sort.desc);
-    });
-  }
-
   QueryBuilder<Settings, Settings, QAfterSortBy> thenByRoundDegree() {
     return QueryBuilder.apply(this, (query) {
       return query.addSortBy(r'roundDegree', Sort.asc);
@@ -2624,18 +2222,6 @@ extension SettingsQuerySortThenBy
       return query.addSortBy(r'widgetTextColor', Sort.desc);
     });
   }
-
-  QueryBuilder<Settings, Settings, QAfterSortBy> thenByWind() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'wind', Sort.asc);
-    });
-  }
-
-  QueryBuilder<Settings, Settings, QAfterSortBy> thenByWindDesc() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addSortBy(r'wind', Sort.desc);
-    });
-  }
 }
 
 extension SettingsQueryWhereDistinct
@@ -2653,12 +2239,6 @@ extension SettingsQueryWhereDistinct
     });
   }
 
-  QueryBuilder<Settings, Settings, QDistinct> distinctByHideMap() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'hideMap');
-    });
-  }
-
   QueryBuilder<Settings, Settings, QDistinct> distinctByLanguage(
       {bool caseSensitive = true}) {
     return QueryBuilder.apply(this, (query) {
@@ -2666,12 +2246,6 @@ extension SettingsQueryWhereDistinct
     });
   }
 
-  QueryBuilder<Settings, Settings, QDistinct> distinctByLargeElement() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'largeElement');
-    });
-  }
-
   QueryBuilder<Settings, Settings, QDistinct> distinctByLocation() {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(r'location');
@@ -2703,13 +2277,6 @@ extension SettingsQueryWhereDistinct
     });
   }
 
-  QueryBuilder<Settings, Settings, QDistinct> distinctByPressure(
-      {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'pressure', caseSensitive: caseSensitive);
-    });
-  }
-
   QueryBuilder<Settings, Settings, QDistinct> distinctByRoundDegree() {
     return QueryBuilder.apply(this, (query) {
       return query.addDistinctBy(r'roundDegree');
@@ -2765,13 +2332,6 @@ extension SettingsQueryWhereDistinct
           caseSensitive: caseSensitive);
     });
   }
-
-  QueryBuilder<Settings, Settings, QDistinct> distinctByWind(
-      {bool caseSensitive = true}) {
-    return QueryBuilder.apply(this, (query) {
-      return query.addDistinctBy(r'wind', caseSensitive: caseSensitive);
-    });
-  }
 }
 
 extension SettingsQueryProperty
@@ -2794,24 +2354,12 @@ extension SettingsQueryProperty
     });
   }
 
-  QueryBuilder<Settings, bool, QQueryOperations> hideMapProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'hideMap');
-    });
-  }
-
   QueryBuilder<Settings, String?, QQueryOperations> languageProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'language');
     });
   }
 
-  QueryBuilder<Settings, bool, QQueryOperations> largeElementProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'largeElement');
-    });
-  }
-
   QueryBuilder<Settings, bool, QQueryOperations> locationProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'location');
@@ -2842,12 +2390,6 @@ extension SettingsQueryProperty
     });
   }
 
-  QueryBuilder<Settings, String, QQueryOperations> pressureProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'pressure');
-    });
-  }
-
   QueryBuilder<Settings, bool, QQueryOperations> roundDegreeProperty() {
     return QueryBuilder.apply(this, (query) {
       return query.addPropertyName(r'roundDegree');
@@ -2896,12 +2438,6 @@ extension SettingsQueryProperty
       return query.addPropertyName(r'widgetTextColor');
     });
   }
-
-  QueryBuilder<Settings, String, QQueryOperations> windProperty() {
-    return QueryBuilder.apply(this, (query) {
-      return query.addPropertyName(r'wind');
-    });
-  }
 }
 
 // coverage:ignore-file
@@ -3102,7 +2638,7 @@ const MainWeatherCacheSchema = CollectionSchema(
   getId: _mainWeatherCacheGetId,
   getLinks: _mainWeatherCacheGetLinks,
   attach: _mainWeatherCacheAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _mainWeatherCacheEstimateSize(
@@ -10825,7 +10361,7 @@ const LocationCacheSchema = CollectionSchema(
   getId: _locationCacheGetId,
   getLinks: _locationCacheGetLinks,
   attach: _locationCacheAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _locationCacheEstimateSize(
@@ -11924,7 +11460,7 @@ const WeatherCardSchema = CollectionSchema(
   getId: _weatherCardGetId,
   getLinks: _weatherCardGetLinks,
   attach: _weatherCardAttach,
-  version: '3.1.8',
+  version: '3.1.0+1',
 );
 
 int _weatherCardEstimateSize(
diff --git a/lib/app/modules/cards/view/info_weather_card.dart b/lib/app/modules/cards/view/info_weather_card.dart
new file mode 100644
index 0000000..a5a88dc
--- /dev/null
+++ b/lib/app/modules/cards/view/info_weather_card.dart
@@ -0,0 +1,187 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:iconsax/iconsax.dart';
+import 'package:rain/app/controller/controller.dart';
+import 'package:rain/app/data/weather.dart';
+import 'package:rain/app/widgets/daily/weather_daily.dart';
+import 'package:rain/app/widgets/daily/weather_more.dart';
+import 'package:rain/app/widgets/desc/desc_container.dart';
+import 'package:rain/app/widgets/hourly/weather_hourly.dart';
+import 'package:rain/app/widgets/now/weather_now.dart';
+import 'package:rain/app/widgets/sun_moon/sunset_sunrise.dart';
+import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
+
+class InfoWeatherCard extends StatefulWidget {
+  const InfoWeatherCard({
+    super.key,
+    required this.weatherCard,
+  });
+  final WeatherCard weatherCard;
+
+  @override
+  State<InfoWeatherCard> createState() => _InfoWeatherCardState();
+}
+
+class _InfoWeatherCardState extends State<InfoWeatherCard> {
+  int timeNow = 0;
+  int dayNow = 0;
+  final weatherController = Get.put(WeatherController());
+  final itemScrollController = ItemScrollController();
+
+  @override
+  void initState() {
+    getTime();
+    super.initState();
+  }
+
+  void getTime() {
+    final weatherCard = widget.weatherCard;
+
+    timeNow =
+        weatherController.getTime(weatherCard.time!, weatherCard.timezone!);
+    dayNow =
+        weatherController.getDay(weatherCard.timeDaily!, weatherCard.timezone!);
+    Future.delayed(const Duration(milliseconds: 30), () {
+      itemScrollController.scrollTo(
+        index: timeNow,
+        duration: const Duration(seconds: 2),
+        curve: Curves.easeInOutCubic,
+      );
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final weatherCard = widget.weatherCard;
+
+    return RefreshIndicator(
+      onRefresh: () async {
+        await weatherController.updateCard(weatherCard);
+        getTime();
+        setState(() {});
+      },
+      child: Scaffold(
+        appBar: AppBar(
+          centerTitle: true,
+          automaticallyImplyLeading: false,
+          leading: IconButton(
+            onPressed: () => Get.back(),
+            icon: const Icon(
+              Iconsax.arrow_left_1,
+              size: 20,
+            ),
+          ),
+          title: Text(
+            weatherCard.district!.isNotEmpty
+                ? '${weatherCard.city}'
+                    ', ${weatherCard.district}'
+                : '${weatherCard.city}',
+            style: context.textTheme.titleMedium?.copyWith(
+              fontWeight: FontWeight.w600,
+              fontSize: 18,
+            ),
+          ),
+        ),
+        body: SafeArea(
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 10),
+            child: ListView(
+              children: [
+                WeatherNow(
+                  time: weatherCard.time![timeNow],
+                  weather: weatherCard.weathercode![timeNow],
+                  degree: weatherCard.temperature2M![timeNow],
+                  timeDay: weatherCard.sunrise![dayNow],
+                  timeNight: weatherCard.sunset![dayNow],
+                ),
+                Card(
+                  margin: const EdgeInsets.symmetric(vertical: 15),
+                  child: Padding(
+                    padding:
+                        const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+                    child: SizedBox(
+                      height: 135,
+                      child: ScrollablePositionedList.separated(
+                        key: const PageStorageKey(1),
+                        separatorBuilder: (BuildContext context, int index) {
+                          return const VerticalDivider(
+                            width: 10,
+                            indent: 40,
+                            endIndent: 40,
+                          );
+                        },
+                        scrollDirection: Axis.horizontal,
+                        itemScrollController: itemScrollController,
+                        itemCount: weatherCard.time!.length,
+                        itemBuilder: (ctx, i) => GestureDetector(
+                          onTap: () {
+                            timeNow = i;
+                            dayNow = (i / 24).floor();
+                            setState(() {});
+                          },
+                          child: Container(
+                            margin: const EdgeInsets.symmetric(vertical: 5),
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: 20,
+                              vertical: 5,
+                            ),
+                            decoration: BoxDecoration(
+                              color: i == timeNow
+                                  ? context.theme.colorScheme.primaryContainer
+                                  : Colors.transparent,
+                              borderRadius: const BorderRadius.all(
+                                Radius.circular(20),
+                              ),
+                            ),
+                            child: WeatherHourly(
+                              time: weatherCard.time![i],
+                              weather: weatherCard.weathercode![i],
+                              degree: weatherCard.temperature2M![i],
+                              timeDay: weatherCard.sunrise![(i / 24).floor()],
+                              timeNight: weatherCard.sunset![(i / 24).floor()],
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+                SunsetSunrise(
+                  timeSunrise: weatherCard.sunrise![dayNow],
+                  timeSunset: weatherCard.sunset![dayNow],
+                ),
+                DescContainer(
+                  humidity: weatherCard.relativehumidity2M?[timeNow],
+                  wind: weatherCard.windspeed10M?[timeNow],
+                  visibility: weatherCard.visibility?[timeNow],
+                  feels: weatherCard.apparentTemperature?[timeNow],
+                  evaporation: weatherCard.evapotranspiration?[timeNow],
+                  precipitation: weatherCard.precipitation?[timeNow],
+                  direction: weatherCard.winddirection10M?[timeNow],
+                  pressure: weatherCard.surfacePressure?[timeNow],
+                  rain: weatherCard.rain?[timeNow],
+                  cloudcover: weatherCard.cloudcover?[timeNow],
+                  windgusts: weatherCard.windgusts10M?[timeNow],
+                  uvIndex: weatherCard.uvIndex?[timeNow],
+                  dewpoint2M: weatherCard.dewpoint2M?[timeNow],
+                  precipitationProbability:
+                      weatherCard.precipitationProbability?[timeNow],
+                  shortwaveRadiation: weatherCard.shortwaveRadiation?[timeNow],
+                ),
+                WeatherDaily(
+                  weatherData: weatherCard,
+                  onTap: () => Get.to(
+                    () => WeatherMore(
+                      weatherData: weatherCard,
+                    ),
+                    transition: Transition.downToUp,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/app/modules/cards/view/list_weather_card.dart b/lib/app/modules/cards/view/list_weather_card.dart
new file mode 100644
index 0000000..962f902
--- /dev/null
+++ b/lib/app/modules/cards/view/list_weather_card.dart
@@ -0,0 +1,133 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:iconsax/iconsax.dart';
+import 'package:rain/app/controller/controller.dart';
+import 'package:rain/app/modules/cards/view/info_weather_card.dart';
+import 'package:rain/app/modules/cards/widgets/weather_card_container.dart';
+
+class ListWeatherCard extends StatefulWidget {
+  const ListWeatherCard({super.key});
+
+  @override
+  State<ListWeatherCard> createState() => _ListWeatherCardState();
+}
+
+class _ListWeatherCardState extends State<ListWeatherCard> {
+  final weatherController = Get.put(WeatherController());
+
+  @override
+  Widget build(BuildContext context) {
+    final textTheme = context.textTheme;
+    final titleMedium = textTheme.titleMedium;
+    return RefreshIndicator(
+      onRefresh: () async {
+        await weatherController.updateCacheCard(true);
+        setState(() {});
+      },
+      child: Obx(
+        () => weatherController.weatherCards.isEmpty
+            ? Center(
+                child: SingleChildScrollView(
+                  child: Column(
+                    children: [
+                      Image.asset(
+                        'assets/icons/City.png',
+                        scale: 6,
+                      ),
+                      SizedBox(
+                        width: Get.size.width * 0.8,
+                        child: Text(
+                          'noWeatherCard'.tr,
+                          textAlign: TextAlign.center,
+                          style: titleMedium?.copyWith(
+                            fontWeight: FontWeight.w600,
+                            fontSize: 18,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              )
+            : ReorderableListView(
+                onReorder: (oldIndex, newIndex) =>
+                    weatherController.reorder(oldIndex, newIndex),
+                children: [
+                  ...weatherController.weatherCards.map(
+                    (weatherCardList) => Dismissible(
+                      key: ValueKey(weatherCardList),
+                      direction: DismissDirection.endToStart,
+                      background: Container(
+                        alignment: Alignment.centerRight,
+                        child: const Padding(
+                          padding: EdgeInsets.only(right: 15),
+                          child: Icon(
+                            Iconsax.trush_square,
+                            color: Colors.red,
+                          ),
+                        ),
+                      ),
+                      confirmDismiss: (DismissDirection direction) async {
+                        return await showAdaptiveDialog(
+                          context: context,
+                          builder: (BuildContext context) {
+                            return AlertDialog.adaptive(
+                              title: Text(
+                                'deletedCardWeather'.tr,
+                                style: textTheme.titleLarge,
+                              ),
+                              content: Text('deletedCardWeatherQuery'.tr,
+                                  style: titleMedium),
+                              actions: [
+                                TextButton(
+                                  onPressed: () => Get.back(result: false),
+                                  child: Text(
+                                    'cancel'.tr,
+                                    style: titleMedium?.copyWith(
+                                        color: Colors.blueAccent),
+                                  ),
+                                ),
+                                TextButton(
+                                  onPressed: () => Get.back(result: true),
+                                  child: Text(
+                                    'delete'.tr,
+                                    style: titleMedium?.copyWith(
+                                        color: Colors.red),
+                                  ),
+                                ),
+                              ],
+                            );
+                          },
+                        );
+                      },
+                      onDismissed: (DismissDirection direction) async {
+                        await weatherController
+                            .deleteCardWeather(weatherCardList);
+                      },
+                      child: GestureDetector(
+                        onTap: () => Get.to(
+                          () => InfoWeatherCard(
+                            weatherCard: weatherCardList,
+                          ),
+                          transition: Transition.downToUp,
+                        ),
+                        child: WeatherCardContainer(
+                          time: weatherCardList.time!,
+                          timeDaily: weatherCardList.timeDaily!,
+                          timeDay: weatherCardList.sunrise!,
+                          timeNight: weatherCardList.sunset!,
+                          weather: weatherCardList.weathercode!,
+                          degree: weatherCardList.temperature2M!,
+                          district: weatherCardList.district!,
+                          city: weatherCardList.city!,
+                          timezone: weatherCardList.timezone!,
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+      ),
+    );
+  }
+}
diff --git a/lib/app/modules/cards/widgets/create_card_weather.dart b/lib/app/modules/cards/widgets/create_card_weather.dart
new file mode 100644
index 0000000..6e6ee9e
--- /dev/null
+++ b/lib/app/modules/cards/widgets/create_card_weather.dart
@@ -0,0 +1,245 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:iconsax/iconsax.dart';
+import 'package:rain/app/api/api.dart';
+import 'package:rain/app/api/city.dart';
+import 'package:rain/app/controller/controller.dart';
+import 'package:rain/app/widgets/text_form.dart';
+import 'package:rain/main.dart';
+
+class CreateWeatherCard extends StatefulWidget {
+  const CreateWeatherCard({super.key});
+
+  @override
+  State<CreateWeatherCard> createState() => _CreateWeatherCardState();
+}
+
+class _CreateWeatherCardState extends State<CreateWeatherCard> {
+  bool isLoading = false;
+  final formKey = GlobalKey<FormState>();
+  final _focusNode = FocusNode();
+  final weatherController = Get.put(WeatherController());
+  final _controller = TextEditingController();
+  final _controllerLat = TextEditingController();
+  final _controllerLon = TextEditingController();
+  final _controllerCity = TextEditingController();
+  final _controllerDistrict = TextEditingController();
+
+  textTrim(value) {
+    value.text = value.text.trim();
+    while (value.text.contains('  ')) {
+      value.text = value.text.replaceAll('  ', ' ');
+    }
+  }
+
+  void fillController(selection) {
+    _controllerLat.text = '${selection.latitude}';
+    _controllerLon.text = '${selection.longitude}';
+    _controllerCity.text = selection.name;
+    _controllerDistrict.text = selection.admin1;
+    _controller.clear();
+    _focusNode.unfocus();
+    setState(() {});
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    const kTextFieldElevation = 4.0;
+    return Form(
+      key: formKey,
+      child: SingleChildScrollView(
+        child: Stack(
+          children: [
+            Padding(
+              padding: EdgeInsets.only(
+                bottom: MediaQuery.of(context).viewInsets.bottom,
+              ),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.fromLTRB(10, 10, 10, 0),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        IconButton(
+                          onPressed: () {
+                            Get.back();
+                          },
+                          icon: const Icon(
+                            Iconsax.close_square,
+                            size: 18,
+                          ),
+                        ),
+                        Text(
+                          'create'.tr,
+                          style: context.textTheme.titleLarge?.copyWith(
+                            fontSize: 20,
+                          ),
+                          textAlign: TextAlign.center,
+                        ),
+                        IconButton(
+                          onPressed: () async {
+                            if (formKey.currentState!.validate()) {
+                              textTrim(_controllerLat);
+                              textTrim(_controllerLon);
+                              textTrim(_controllerCity);
+                              textTrim(_controllerDistrict);
+                              setState(() => isLoading = true);
+                              await weatherController.addCardWeather(
+                                double.parse(_controllerLat.text),
+                                double.parse(_controllerLon.text),
+                                _controllerCity.text,
+                                _controllerDistrict.text,
+                              );
+                              setState(() => isLoading = false);
+                              Get.back();
+                            }
+                          },
+                          icon: const Icon(
+                            Iconsax.tick_square,
+                            size: 18,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  RawAutocomplete<Result>(
+                    focusNode: _focusNode,
+                    textEditingController: _controller,
+                    fieldViewBuilder: (BuildContext context,
+                        TextEditingController fieldTextEditingController,
+                        FocusNode fieldFocusNode,
+                        VoidCallback onFieldSubmitted) {
+                      return MyTextForm(
+                        elevation: kTextFieldElevation,
+                        labelText: 'search'.tr,
+                        type: TextInputType.text,
+                        icon: const Icon(Iconsax.global_search),
+                        controller: _controller,
+                        margin:
+                            const EdgeInsets.only(left: 10, right: 10, top: 10),
+                        focusNode: _focusNode,
+                      );
+                    },
+                    optionsBuilder: (TextEditingValue textEditingValue) {
+                      if (textEditingValue.text.isEmpty) {
+                        return const Iterable<Result>.empty();
+                      }
+                      return WeatherAPI()
+                          .getCity(textEditingValue.text, locale);
+                    },
+                    onSelected: (Result selection) => fillController(selection),
+                    displayStringForOption: (Result option) =>
+                        '${option.name}, ${option.admin1}',
+                    optionsViewBuilder: (BuildContext context,
+                        AutocompleteOnSelected<Result> onSelected,
+                        Iterable<Result> options) {
+                      return Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 10),
+                        child: Align(
+                          alignment: Alignment.topCenter,
+                          child: Material(
+                            borderRadius: BorderRadius.circular(20),
+                            elevation: 4.0,
+                            child: ListView.builder(
+                              padding: EdgeInsets.zero,
+                              shrinkWrap: true,
+                              itemCount: options.length,
+                              itemBuilder: (BuildContext context, int index) {
+                                final Result option = options.elementAt(index);
+                                return InkWell(
+                                  onTap: () => onSelected(option),
+                                  child: ListTile(
+                                    title: Text(
+                                      '${option.name}, ${option.admin1}',
+                                      style: context.textTheme.labelLarge,
+                                    ),
+                                  ),
+                                );
+                              },
+                            ),
+                          ),
+                        ),
+                      );
+                    },
+                  ),
+                  MyTextForm(
+                    elevation: kTextFieldElevation,
+                    controller: _controllerLat,
+                    labelText: 'lat'.tr,
+                    type: TextInputType.number,
+                    icon: const Icon(Iconsax.location),
+                    margin: const EdgeInsets.only(left: 10, right: 10, top: 10),
+                    validator: (value) {
+                      if (value == null || value.isEmpty) {
+                        return 'validateValue'.tr;
+                      }
+                      double? numericValue = double.tryParse(value);
+                      if (numericValue == null) {
+                        return 'validateNumber'.tr;
+                      }
+                      if (numericValue < -90 || numericValue > 90) {
+                        return 'validate90'.tr;
+                      }
+                      return null;
+                    },
+                  ),
+                  MyTextForm(
+                    elevation: kTextFieldElevation,
+                    controller: _controllerLon,
+                    labelText: 'lon'.tr,
+                    type: TextInputType.number,
+                    icon: const Icon(Iconsax.location),
+                    margin: const EdgeInsets.only(left: 10, right: 10, top: 10),
+                    validator: (value) {
+                      if (value == null || value.isEmpty) {
+                        return 'validateValue'.tr;
+                      }
+                      double? numericValue = double.tryParse(value);
+                      if (numericValue == null) {
+                        return 'validateNumber'.tr;
+                      }
+                      if (numericValue < -180 || numericValue > 180) {
+                        return 'validate180'.tr;
+                      }
+                      return null;
+                    },
+                  ),
+                  MyTextForm(
+                    elevation: kTextFieldElevation,
+                    controller: _controllerCity,
+                    labelText: 'city'.tr,
+                    type: TextInputType.name,
+                    icon: const Icon(Icons.location_city_rounded),
+                    margin: const EdgeInsets.only(left: 10, right: 10, top: 10),
+                    validator: (value) {
+                      if (value == null || value.isEmpty) {
+                        return 'validateName'.tr;
+                      }
+                      return null;
+                    },
+                  ),
+                  MyTextForm(
+                    elevation: kTextFieldElevation,
+                    controller: _controllerDistrict,
+                    labelText: 'district'.tr,
+                    type: TextInputType.streetAddress,
+                    icon: const Icon(Iconsax.global),
+                    margin: const EdgeInsets.only(left: 10, right: 10, top: 10),
+                  ),
+                  const SizedBox(height: 20),
+                ],
+              ),
+            ),
+            if (isLoading)
+              const Center(
+                child: CircularProgressIndicator(),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/app/modules/cards/widgets/weather_card_container.dart b/lib/app/modules/cards/widgets/weather_card_container.dart
new file mode 100644
index 0000000..921cabd
--- /dev/null
+++ b/lib/app/modules/cards/widgets/weather_card_container.dart
@@ -0,0 +1,124 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:rain/app/controller/controller.dart';
+import 'package:rain/app/widgets/status/status_weather.dart';
+import 'package:rain/app/widgets/status/status_data.dart';
+import 'package:timezone/standalone.dart' as tz;
+
+class WeatherCardContainer extends StatefulWidget {
+  const WeatherCardContainer({
+    super.key,
+    required this.time,
+    required this.weather,
+    required this.degree,
+    required this.district,
+    required this.city,
+    required this.timezone,
+    required this.timeDay,
+    required this.timeNight,
+    required this.timeDaily,
+  });
+  final List<String> time;
+  final List<String> timeDay;
+  final List<String> timeNight;
+  final List<DateTime> timeDaily;
+  final String district;
+  final String city;
+  final List<int> weather;
+  final List<double> degree;
+  final String timezone;
+
+  @override
+  State<WeatherCardContainer> createState() => _WeatherCardContainerState();
+}
+
+class _WeatherCardContainerState extends State<WeatherCardContainer> {
+  final statusWeather = StatusWeather();
+  final statusData = StatusData();
+  final weatherController = Get.put(WeatherController());
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      margin: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 15, horizontal: 20),
+        child: Row(
+          children: [
+            Expanded(
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Row(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    children: [
+                      Text(
+                        statusData.getDegree(widget.degree[weatherController
+                                .getTime(widget.time, widget.timezone)]
+                            .round()
+                            .toInt()),
+                        style: context.textTheme.titleLarge?.copyWith(
+                          fontSize: 22,
+                          fontWeight: FontWeight.w600,
+                        ),
+                      ),
+                      const SizedBox(width: 7),
+                      Text(
+                        statusWeather.getText(widget.weather[weatherController
+                            .getTime(widget.time, widget.timezone)]),
+                        style: context.textTheme.titleMedium?.copyWith(
+                          color: Colors.grey,
+                          fontWeight: FontWeight.w400,
+                        ),
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 10),
+                  Text(
+                    widget.district.isEmpty
+                        ? widget.city
+                        : widget.city.isEmpty
+                            ? widget.district
+                            : widget.city == widget.district
+                                ? widget.city
+                                : '${widget.city}'
+                                    ', ${widget.district}',
+                    style: context.textTheme.titleMedium?.copyWith(
+                      fontWeight: FontWeight.w500,
+                    ),
+                  ),
+                  const SizedBox(height: 5),
+                  StreamBuilder(
+                    stream: Stream.periodic(const Duration(seconds: 1)),
+                    builder: (context, snapshot) {
+                      return Text(
+                        '${'time'.tr}: ${statusData.getTimeFormatTz(tz.TZDateTime.now(tz.getLocation(widget.timezone)))}',
+                        style: context.textTheme.titleMedium?.copyWith(
+                          color: Colors.grey,
+                          fontWeight: FontWeight.w400,
+                        ),
+                      );
+                    },
+                  ),
+                ],
+              ),
+            ),
+            const SizedBox(width: 5),
+            Image.asset(
+              statusWeather.getImageNow(
+                  widget.weather[
+                      weatherController.getTime(widget.time, widget.timezone)],
+                  widget.time[
+                      weatherController.getTime(widget.time, widget.timezone)],
+                  widget.timeDay[weatherController.getDay(
+                      widget.timeDaily, widget.timezone)],
+                  widget.timeNight[weatherController.getDay(
+                      widget.timeDaily, widget.timezone)]),
+              scale: 6.5,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/app/modules/home.dart b/lib/app/modules/home.dart
new file mode 100644
index 0000000..2d49093
--- /dev/null
+++ b/lib/app/modules/home.dart
@@ -0,0 +1,242 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:iconsax/iconsax.dart';
+import 'package:isar/isar.dart';
+import 'package:rain/app/api/api.dart';
+import 'package:rain/app/api/city.dart';
+import 'package:rain/app/controller/controller.dart';
+import 'package:rain/app/data/weather.dart';
+import 'package:rain/app/modules/cards/view/list_weather_card.dart';
+import 'package:rain/app/modules/cards/widgets/create_card_weather.dart';
+import 'package:rain/app/modules/main/view/weather.dart';
+import 'package:rain/app/modules/settings/view/settings.dart';
+import 'package:rain/app/services/utils.dart';
+import 'package:rain/main.dart';
+
+class HomePage extends StatefulWidget {
+  const HomePage({super.key});
+
+  @override
+  State<HomePage> createState() => _HomePageState();
+}
+
+class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
+  int tabIndex = 0;
+  bool visible = false;
+  final _focusNode = FocusNode();
+  late TabController tabController;
+  final weatherController = Get.put(WeatherController());
+  final _controller = TextEditingController();
+
+  final pages = [
+    const WeatherPage(),
+    const ListWeatherCard(),
+    const SettingsPage(),
+  ];
+
+  @override
+  void initState() {
+    getData();
+    tabController = TabController(
+      initialIndex: tabIndex,
+      length: pages.length,
+      vsync: this,
+    );
+    tabController.addListener(() {
+      setState(() {
+        tabIndex = tabController.index;
+      });
+    });
+    super.initState();
+  }
+
+  void getData() async {
+    await weatherController.deleteCache();
+    await weatherController.updateCacheCard(false);
+    await weatherController.setLocation();
+  }
+
+  void changeTabIndex(int index) {
+    setState(() {
+      tabIndex = index;
+    });
+    tabController.animateTo(tabIndex);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final textTheme = context.textTheme;
+    final labelLarge = textTheme.labelLarge;
+
+    return DefaultTabController(
+      length: pages.length,
+      child: ScaffoldMessenger(
+        key: globalKey,
+        child: Scaffold(
+          appBar: AppBar(
+            centerTitle: true,
+            automaticallyImplyLeading: false,
+            leading: const Icon(
+              Iconsax.location,
+              size: 18,
+            ),
+            title: visible
+                ? RawAutocomplete<Result>(
+                    focusNode: _focusNode,
+                    textEditingController: _controller,
+                    fieldViewBuilder: (_, __, ___, ____) {
+                      return TextField(
+                        controller: _controller,
+                        focusNode: _focusNode,
+                        style: labelLarge?.copyWith(fontSize: 16),
+                        decoration: InputDecoration(
+                          hintText: 'search'.tr,
+                        ),
+                      );
+                    },
+                    optionsBuilder: (TextEditingValue textEditingValue) {
+                      if (textEditingValue.text.isEmpty) {
+                        return const Iterable<Result>.empty();
+                      }
+                      return WeatherAPI()
+                          .getCity(textEditingValue.text, locale);
+                    },
+                    onSelected: (Result selection) async {
+                      await weatherController.deleteAll(true);
+                      await weatherController.getLocation(
+                        double.parse('${selection.latitude}'),
+                        double.parse('${selection.longitude}'),
+                        selection.admin1,
+                        selection.name,
+                      );
+                      visible = false;
+                      _controller.clear();
+                      _focusNode.unfocus();
+                      setState(() {});
+                    },
+                    displayStringForOption: (Result option) =>
+                        '${option.name}, ${option.admin1}',
+                    optionsViewBuilder: (BuildContext context,
+                        AutocompleteOnSelected<Result> onSelected,
+                        Iterable<Result> options) {
+                      return Align(
+                        alignment: Alignment.topLeft,
+                        child: Material(
+                          borderRadius: BorderRadius.circular(20),
+                          elevation: 4.0,
+                          child: SizedBox(
+                            width: 250,
+                            child: ListView.builder(
+                              padding: EdgeInsets.zero,
+                              shrinkWrap: true,
+                              itemCount: options.length,
+                              itemBuilder: (BuildContext context, int index) {
+                                final Result option = options.elementAt(index);
+                                return InkWell(
+                                  onTap: () => onSelected(option),
+                                  child: ListTile(
+                                    title: Text(
+                                      '${option.name}, ${option.admin1}',
+                                      style: labelLarge,
+                                    ),
+                                  ),
+                                );
+                              },
+                            ),
+                          ),
+                        ),
+                      );
+                    },
+                  )
+                : Obx(
+                    () {
+                      final location = weatherController.location;
+                      final city = location.city;
+                      final district = location.district;
+                      return Text(
+                        weatherController.isLoading.isFalse
+                            ? district!.isEmpty
+                                ? '$city'
+                                : city!.isEmpty
+                                    ? district
+                                    : city == district
+                                        ? city
+                                        : '$city' ', $district'
+                            : settings.location
+                                ? 'search'.tr
+                                : (isar.locationCaches.where().findAllSync())
+                                        .isNotEmpty
+                                    ? 'loading'.tr
+                                    : 'searchCity'.tr,
+                        style: textTheme.titleMedium?.copyWith(
+                          fontWeight: FontWeight.w600,
+                          fontSize: 18,
+                        ),
+                      );
+                    },
+                  ),
+            actions: [
+              IconButton(
+                onPressed: () {
+                  if (visible) {
+                    _controller.clear();
+                    _focusNode.unfocus();
+                    visible = false;
+                  } else {
+                    visible = true;
+                  }
+                  setState(() {});
+                },
+                icon: Icon(
+                  visible ? Icons.close : Iconsax.search_normal_1,
+                  size: 18,
+                ),
+              ),
+            ],
+          ),
+          body: SafeArea(
+            child: TabBarView(
+              controller: tabController,
+              children: pages,
+            ),
+          ),
+          bottomNavigationBar: NavigationBar(
+            onDestinationSelected: (int index) => changeTabIndex(index),
+            selectedIndex: tabIndex,
+            destinations: [
+              NavigationDestination(
+                icon: const Icon(Iconsax.cloud_sunny),
+                selectedIcon: const Icon(Iconsax.cloud_sunny5),
+                label: 'name'.tr,
+              ),
+              NavigationDestination(
+                icon: const Icon(Iconsax.map_1),
+                selectedIcon: const Icon(Iconsax.map5),
+                label: 'city'.tr,
+              ),
+              NavigationDestination(
+                icon: const Icon(Iconsax.category),
+                selectedIcon: const Icon(Iconsax.category5),
+                label: 'settings'.tr,
+              ),
+            ],
+          ),
+          floatingActionButton: tabIndex == 1
+              ? FloatingActionButton(
+                  onPressed: () => showModalBottomSheet(
+                    context: context,
+                    isScrollControlled: true,
+                    enableDrag: false,
+                    builder: (BuildContext context) =>
+                        const CreateWeatherCard(),
+                  ),
+                  child: const Icon(
+                    Iconsax.add,
+                  ),
+                )
+              : null,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/app/modules/main/view/weather.dart b/lib/app/modules/main/view/weather.dart
new file mode 100644
index 0000000..62189c7
--- /dev/null
+++ b/lib/app/modules/main/view/weather.dart
@@ -0,0 +1,171 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:rain/app/controller/controller.dart';
+import 'package:rain/app/data/weather.dart';
+import 'package:rain/app/widgets/daily/weather_daily.dart';
+import 'package:rain/app/widgets/daily/weather_more.dart';
+import 'package:rain/app/widgets/desc/desc_container.dart';
+import 'package:rain/app/widgets/hourly/weather_hourly.dart';
+import 'package:rain/app/widgets/now/weather_now.dart';
+import 'package:rain/app/widgets/shimmer.dart';
+import 'package:rain/app/widgets/sun_moon/sunset_sunrise.dart';
+import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
+
+class WeatherPage extends StatefulWidget {
+  const WeatherPage({super.key});
+
+  @override
+  State<WeatherPage> createState() => _WeatherPageState();
+}
+
+class _WeatherPageState extends State<WeatherPage> {
+  final weatherController = Get.put(WeatherController());
+
+  @override
+  Widget build(BuildContext context) {
+    return RefreshIndicator(
+      onRefresh: () async {
+        await weatherController.deleteAll(false);
+        await weatherController.setLocation();
+        setState(() {});
+      },
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 10),
+        child: Obx(() {
+          if (weatherController.isLoading.isTrue) {
+            return ListView(
+              children: const [
+                MyShimmer(
+                  hight: 350,
+                ),
+                MyShimmer(
+                  hight: 130,
+                  edgeInsetsMargin: EdgeInsets.symmetric(vertical: 15),
+                ),
+                MyShimmer(
+                  hight: 90,
+                  edgeInsetsMargin: EdgeInsets.only(bottom: 15),
+                ),
+                MyShimmer(
+                  hight: 400,
+                  edgeInsetsMargin: EdgeInsets.only(bottom: 15),
+                ),
+                MyShimmer(
+                  hight: 450,
+                  edgeInsetsMargin: EdgeInsets.only(bottom: 15),
+                )
+              ],
+            );
+          }
+
+          final mainWeather = weatherController.mainWeather;
+          final weatherCard = WeatherCard.fromJson(mainWeather.toJson());
+          final hourOfDay = weatherController.hourOfDay.value;
+          final dayOfNow = weatherController.dayOfNow.value;
+          final sunrise = mainWeather.sunrise![dayOfNow];
+          final sunset = mainWeather.sunset![dayOfNow];
+
+          return ListView(
+            children: [
+              WeatherNow(
+                time: mainWeather.time![hourOfDay],
+                weather: mainWeather.weathercode![hourOfDay],
+                degree: mainWeather.temperature2M![hourOfDay],
+                timeDay: sunrise,
+                timeNight: sunset,
+              ),
+              Card(
+                margin: const EdgeInsets.symmetric(vertical: 15),
+                child: Padding(
+                  padding:
+                      const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+                  child: SizedBox(
+                    height: 135,
+                    child: ScrollablePositionedList.separated(
+                      key: const PageStorageKey(0),
+                      separatorBuilder: (BuildContext context, int index) {
+                        return const VerticalDivider(
+                          width: 10,
+                          indent: 40,
+                          endIndent: 40,
+                        );
+                      },
+                      scrollDirection: Axis.horizontal,
+                      itemScrollController:
+                          weatherController.itemScrollController,
+                      itemCount: mainWeather.time!.length,
+                      itemBuilder: (ctx, i) {
+                        final i24 = (i / 24).floor();
+
+                        return GestureDetector(
+                          onTap: () {
+                            weatherController.hourOfDay.value = i;
+                            weatherController.dayOfNow.value = i24;
+                            setState(() {});
+                          },
+                          child: Container(
+                            margin: const EdgeInsets.symmetric(vertical: 5),
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: 20,
+                              vertical: 5,
+                            ),
+                            decoration: BoxDecoration(
+                              color: i == hourOfDay
+                                  ? context.theme.colorScheme.primaryContainer
+                                  : Colors.transparent,
+                              borderRadius: const BorderRadius.all(
+                                Radius.circular(20),
+                              ),
+                            ),
+                            child: WeatherHourly(
+                              time: mainWeather.time![i],
+                              weather: mainWeather.weathercode![i],
+                              degree: mainWeather.temperature2M![i],
+                              timeDay: mainWeather.sunrise![i24],
+                              timeNight: mainWeather.sunset![i24],
+                            ),
+                          ),
+                        );
+                      },
+                    ),
+                  ),
+                ),
+              ),
+              SunsetSunrise(
+                timeSunrise: sunrise,
+                timeSunset: sunset,
+              ),
+              DescContainer(
+                humidity: mainWeather.relativehumidity2M?[hourOfDay],
+                wind: mainWeather.windspeed10M?[hourOfDay],
+                visibility: mainWeather.visibility?[hourOfDay],
+                feels: mainWeather.apparentTemperature?[hourOfDay],
+                evaporation: mainWeather.evapotranspiration?[hourOfDay],
+                precipitation: mainWeather.precipitation?[hourOfDay],
+                direction: mainWeather.winddirection10M?[hourOfDay],
+                pressure: mainWeather.surfacePressure?[hourOfDay],
+                rain: mainWeather.rain?[hourOfDay],
+                cloudcover: mainWeather.cloudcover?[hourOfDay],
+                windgusts: mainWeather.windgusts10M?[hourOfDay],
+                uvIndex: mainWeather.uvIndex?[hourOfDay],
+                dewpoint2M: mainWeather.dewpoint2M?[hourOfDay],
+                precipitationProbability:
+                    mainWeather.precipitationProbability?[hourOfDay],
+                shortwaveRadiation: mainWeather.shortwaveRadiation?[hourOfDay],
+              ),
+              WeatherDaily(
+                weatherData: weatherCard,
+                onTap: () => Get.to(
+                  () => WeatherMore(
+                    weatherData: weatherCard,
+                  ),
+                  transition: Transition.downToUp,
+                ),
+              )
+            ],
+          );
+        }),
+      ),
+    );
+  }
+}
diff --git a/lib/app/ui/onboarding.dart b/lib/app/modules/onboarding.dart
old mode 100755
new mode 100644
similarity index 50%
rename from lib/app/ui/onboarding.dart
rename to lib/app/modules/onboarding.dart
index 29561c3..dce33c6
--- a/lib/app/ui/onboarding.dart
+++ b/lib/app/modules/onboarding.dart
@@ -1,9 +1,8 @@
-import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
-import 'package:rain/app/data/db.dart';
-import 'package:rain/app/ui/geolocation.dart';
-import 'package:rain/app/ui/widgets/button.dart';
+import 'package:rain/app/data/weather.dart';
+import 'package:rain/app/modules/home.dart';
+import 'package:rain/app/widgets/button.dart';
 import 'package:rain/main.dart';
+import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
 class OnBording extends StatefulWidget {
@@ -19,8 +18,8 @@ class _OnBordingState extends State<OnBording> {
 
   @override
   void initState() {
-    super.initState();
     pageController = PageController(initialPage: 0);
+    super.initState();
   }
 
   @override
@@ -32,82 +31,69 @@ class _OnBordingState extends State<OnBording> {
   void onBoardHome() {
     settings.onboard = true;
     isar.writeTxnSync(() => isar.settings.putSync(settings));
-    Get.off(
-      () => const SelectGeolocation(isStart: true),
-      transition: Transition.downToUp,
-    );
+    Get.off(() => const HomePage(), transition: Transition.downToUp);
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(),
       body: SafeArea(
         child: Column(
           children: [
-            _buildPageView(),
-            _buildDotIndicators(),
-            _buildActionButton(),
+            Expanded(
+              child: PageView.builder(
+                controller: pageController,
+                itemCount: data.length,
+                onPageChanged: (index) {
+                  setState(() {
+                    pageIndex = index;
+                  });
+                },
+                itemBuilder: (context, index) => OnboardContent(
+                  image: data[index].image,
+                  title: data[index].title,
+                  description: data[index].description,
+                ),
+              ),
+            ),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                ...List.generate(
+                    data.length,
+                    (index) => Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 5),
+                          child: DotIndicator(isActive: index == pageIndex),
+                        )),
+              ],
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+              child: MyTextButton(
+                buttonName:
+                    pageIndex == data.length - 1 ? 'start'.tr : 'next'.tr,
+                onPressed: () {
+                  pageIndex == data.length - 1
+                      ? onBoardHome()
+                      : pageController.nextPage(
+                          duration: const Duration(milliseconds: 300),
+                          curve: Curves.ease,
+                        );
+                },
+              ),
+            )
           ],
         ),
       ),
     );
   }
-
-  Widget _buildPageView() {
-    return Expanded(
-      child: PageView.builder(
-        controller: pageController,
-        itemCount: data.length,
-        onPageChanged: (index) {
-          setState(() {
-            pageIndex = index;
-          });
-        },
-        itemBuilder: (context, index) => OnboardContent(
-          image: data[index].image,
-          title: data[index].title,
-          description: data[index].description,
-        ),
-      ),
-    );
-  }
-
-  Widget _buildDotIndicators() {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: List.generate(
-        data.length,
-        (index) => Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 5),
-          child: DotIndicator(isActive: index == pageIndex),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildActionButton() {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
-      child: MyTextButton(
-        buttonName: pageIndex == data.length - 1 ? 'start'.tr : 'next'.tr,
-        onPressed: () {
-          if (pageIndex == data.length - 1) {
-            onBoardHome();
-          } else {
-            pageController.nextPage(
-              duration: const Duration(milliseconds: 300),
-              curve: Curves.ease,
-            );
-          }
-        },
-      ),
-    );
-  }
 }
 
 class DotIndicator extends StatelessWidget {
-  const DotIndicator({super.key, this.isActive = false});
+  const DotIndicator({
+    super.key,
+    this.isActive = false,
+  });
 
   final bool isActive;
 
@@ -139,20 +125,17 @@ class Onboard {
 
 final List<Onboard> data = [
   Onboard(
-    image: 'assets/icons/Rain.png',
-    title: 'name'.tr,
-    description: 'description'.tr,
-  ),
+      image: 'assets/icons/Rain.png',
+      title: 'name'.tr,
+      description: 'description'.tr),
   Onboard(
-    image: 'assets/icons/Design.png',
-    title: 'name2'.tr,
-    description: 'description2'.tr,
-  ),
+      image: 'assets/icons/Design.png',
+      title: 'name2'.tr,
+      description: 'description2'.tr),
   Onboard(
-    image: 'assets/icons/Team.png',
-    title: 'name3'.tr,
-    description: 'description3'.tr,
-  ),
+      image: 'assets/icons/Team.png',
+      title: 'name3'.tr,
+      description: 'description3'.tr),
 ];
 
 class OnboardContent extends StatelessWidget {
@@ -162,7 +145,6 @@ class OnboardContent extends StatelessWidget {
     required this.title,
     required this.description,
   });
-
   final String image, title, description;
 
   @override
@@ -173,14 +155,16 @@ class OnboardContent extends StatelessWidget {
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              Image.asset(image, scale: 5),
+              Image.asset(
+                image,
+                scale: 5,
+              ),
               Text(
                 title,
-                style: context.textTheme.titleLarge?.copyWith(
-                  fontWeight: FontWeight.w600,
-                ),
+                style: context.textTheme.titleLarge
+                    ?.copyWith(fontWeight: FontWeight.w600),
               ),
-              const Gap(10),
+              const SizedBox(height: 10),
               SizedBox(
                 width: 300,
                 child: Text(
diff --git a/lib/app/modules/settings/view/settings.dart b/lib/app/modules/settings/view/settings.dart
new file mode 100644
index 0000000..7c97bd2
--- /dev/null
+++ b/lib/app/modules/settings/view/settings.dart
@@ -0,0 +1,922 @@
+import 'dart:io';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_colorpicker/flutter_colorpicker.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:geolocator/geolocator.dart';
+import 'package:get/get.dart';
+import 'package:iconsax/iconsax.dart';
+import 'package:intl/intl.dart';
+import 'package:package_info_plus/package_info_plus.dart';
+import 'package:rain/app/controller/controller.dart';
+import 'package:rain/app/data/weather.dart';
+import 'package:rain/app/modules/settings/widgets/setting_card.dart';
+import 'package:rain/main.dart';
+import 'package:rain/theme/theme_controller.dart';
+import 'package:rain/utils/color_converter.dart';
+import 'package:url_launcher/url_launcher.dart';
+
+class SettingsPage extends StatefulWidget {
+  const SettingsPage({super.key});
+
+  @override
+  State<SettingsPage> createState() => _SettingsPageState();
+}
+
+class _SettingsPageState extends State<SettingsPage> {
+  final themeController = Get.put(ThemeController());
+  final weatherController = Get.put(WeatherController());
+  String? appVersion;
+  String? colorBackground;
+  String? colorText;
+
+  Future<void> infoVersion() async {
+    final packageInfo = await PackageInfo.fromPlatform();
+    setState(() {
+      appVersion = packageInfo.version;
+    });
+  }
+
+  void urlLauncher(String uri) async {
+    final Uri url = Uri.parse(uri);
+    if (!await launchUrl(url, mode: LaunchMode.externalApplication)) {
+      throw Exception('Could not launch $url');
+    }
+  }
+
+  @override
+  void initState() {
+    infoVersion();
+    super.initState();
+  }
+
+  updateLanguage(Locale locale) {
+    settings.language = '$locale';
+    isar.writeTxnSync(() => isar.settings.putSync(settings));
+    Get.updateLocale(locale);
+    Get.back();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          SettingCard(
+            icon: const Icon(Iconsax.brush_1),
+            text: 'appearance'.tr,
+            onPressed: () {
+              showModalBottomSheet(
+                context: context,
+                builder: (BuildContext context) {
+                  return StatefulBuilder(
+                    builder: (BuildContext context, setState) {
+                      return SingleChildScrollView(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            Padding(
+                              padding: const EdgeInsets.symmetric(vertical: 15),
+                              child: Text(
+                                'appearance'.tr,
+                                style: context.textTheme.titleLarge?.copyWith(
+                                  fontSize: 20,
+                                ),
+                              ),
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.moon),
+                              text: 'theme'.tr,
+                              dropdown: true,
+                              dropdownName: settings.theme?.tr,
+                              dropdownList: <String>[
+                                'system'.tr,
+                                'dark'.tr,
+                                'light'.tr
+                              ],
+                              dropdownCange: (String? newValue) {
+                                final newThemeMode = newValue?.tr;
+                                final darkTheme = 'dark'.tr;
+                                final systemTheme = 'system'.tr;
+                                ThemeMode themeMode =
+                                    newThemeMode == systemTheme
+                                        ? ThemeMode.system
+                                        : newThemeMode == darkTheme
+                                            ? ThemeMode.dark
+                                            : ThemeMode.light;
+                                String theme = newThemeMode == systemTheme
+                                    ? 'system'
+                                    : newThemeMode == darkTheme
+                                        ? 'dark'
+                                        : 'light';
+                                themeController.saveTheme(theme);
+                                themeController.changeThemeMode(themeMode);
+                                setState(() {});
+                              },
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.mobile),
+                              text: 'amoledTheme'.tr,
+                              switcher: true,
+                              value: settings.amoledTheme,
+                              onChange: (value) {
+                                themeController.saveOledTheme(value);
+                                MyApp.updateAppState(context,
+                                    newAmoledTheme: value);
+                              },
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.colorfilter),
+                              text: 'materialColor'.tr,
+                              switcher: true,
+                              value: settings.materialColor,
+                              onChange: (value) {
+                                themeController.saveMaterialTheme(value);
+                                MyApp.updateAppState(context,
+                                    newMaterialColor: value);
+                              },
+                            ),
+                            const SizedBox(height: 10),
+                          ],
+                        ),
+                      );
+                    },
+                  );
+                },
+              );
+            },
+          ),
+          SettingCard(
+            icon: const Icon(Iconsax.code),
+            text: 'functions'.tr,
+            onPressed: () {
+              showModalBottomSheet(
+                context: context,
+                builder: (BuildContext context) {
+                  return StatefulBuilder(
+                    builder: (BuildContext context, setState) {
+                      return SingleChildScrollView(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            Padding(
+                              padding: const EdgeInsets.symmetric(vertical: 15),
+                              child: Text(
+                                'functions'.tr,
+                                style: context.textTheme.titleLarge?.copyWith(
+                                  fontSize: 20,
+                                ),
+                              ),
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.map_1),
+                              text: 'location'.tr,
+                              switcher: true,
+                              value: settings.location,
+                              onChange: (value) async {
+                                if (value) {
+                                  bool serviceEnabled = await Geolocator
+                                      .isLocationServiceEnabled();
+                                  if (!serviceEnabled) {
+                                    if (!mounted) return;
+                                    await showAdaptiveDialog(
+                                      context: context,
+                                      builder: (BuildContext context) {
+                                        return AlertDialog.adaptive(
+                                          title: Text(
+                                            'location'.tr,
+                                            style: context.textTheme.titleLarge,
+                                          ),
+                                          content: Text('no_location'.tr,
+                                              style: context
+                                                  .textTheme.titleMedium),
+                                          actions: [
+                                            TextButton(
+                                              onPressed: () =>
+                                                  Get.back(result: false),
+                                              child: Text(
+                                                'cancel'.tr,
+                                                style: context
+                                                    .textTheme.titleMedium
+                                                    ?.copyWith(
+                                                        color:
+                                                            Colors.blueAccent),
+                                              ),
+                                            ),
+                                            TextButton(
+                                              onPressed: () {
+                                                Geolocator
+                                                    .openLocationSettings();
+                                                Get.back(result: true);
+                                              },
+                                              child: Text(
+                                                'settings'.tr,
+                                                style: context
+                                                    .textTheme.titleMedium
+                                                    ?.copyWith(
+                                                        color: Colors.green),
+                                              ),
+                                            ),
+                                          ],
+                                        );
+                                      },
+                                    );
+
+                                    return;
+                                  }
+                                  weatherController.getCurrentLocation();
+                                }
+                                isar.writeTxnSync(() {
+                                  settings.location = value;
+                                  isar.settings.putSync(settings);
+                                });
+                                setState(() {});
+                              },
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.notification_1),
+                              text: 'notifications'.tr,
+                              switcher: true,
+                              value: settings.notifications,
+                              onChange: (value) async {
+                                final resultExact =
+                                    await flutterLocalNotificationsPlugin
+                                        .resolvePlatformSpecificImplementation<
+                                            AndroidFlutterLocalNotificationsPlugin>()
+                                        ?.requestExactAlarmsPermission();
+                                final result = Platform.isIOS
+                                    ? await flutterLocalNotificationsPlugin
+                                        .resolvePlatformSpecificImplementation<
+                                            IOSFlutterLocalNotificationsPlugin>()
+                                        ?.requestPermissions()
+                                    : await flutterLocalNotificationsPlugin
+                                        .resolvePlatformSpecificImplementation<
+                                            AndroidFlutterLocalNotificationsPlugin>()
+                                        ?.requestNotificationsPermission();
+                                if (result != null && resultExact != null) {
+                                  isar.writeTxnSync(() {
+                                    settings.notifications = value;
+                                    isar.settings.putSync(settings);
+                                  });
+                                  if (value) {
+                                    weatherController.notlification(
+                                        weatherController.mainWeather);
+                                  } else {
+                                    flutterLocalNotificationsPlugin.cancelAll();
+                                  }
+                                  setState(() {});
+                                }
+                              },
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.notification_status),
+                              text: 'timeRange'.tr,
+                              dropdown: true,
+                              dropdownName: '$timeRange',
+                              dropdownList: const <String>[
+                                '1',
+                                '2',
+                                '3',
+                                '4',
+                                '5',
+                              ],
+                              dropdownCange: (String? newValue) {
+                                isar.writeTxnSync(() {
+                                  settings.timeRange = int.parse(newValue!);
+                                  isar.settings.putSync(settings);
+                                });
+                                MyApp.updateAppState(context,
+                                    newTimeRange: int.parse(newValue!));
+                                if (settings.notifications) {
+                                  flutterLocalNotificationsPlugin.cancelAll();
+                                  weatherController.notlification(
+                                      weatherController.mainWeather);
+                                }
+                              },
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.timer_start),
+                              text: 'timeStart'.tr,
+                              info: true,
+                              infoSettings: true,
+                              infoWidget: _TextInfo(
+                                info: settings.timeformat == '12'
+                                    ? DateFormat.jm().format(DateFormat.Hm()
+                                        .parse(weatherController
+                                            .timeConvert(timeStart)
+                                            .format(context)))
+                                    : DateFormat.Hm().format(DateFormat.Hm()
+                                        .parse(weatherController
+                                            .timeConvert(timeStart)
+                                            .format(context))),
+                              ),
+                              onPressed: () async {
+                                final TimeOfDay? timeStartPicker =
+                                    await showTimePicker(
+                                  context: context,
+                                  initialTime:
+                                      weatherController.timeConvert(timeStart),
+                                  builder: (context, child) {
+                                    final Widget mediaQueryWrapper = MediaQuery(
+                                      data: MediaQuery.of(context).copyWith(
+                                        alwaysUse24HourFormat:
+                                            settings.timeformat == '12'
+                                                ? false
+                                                : true,
+                                      ),
+                                      child: child!,
+                                    );
+                                    return mediaQueryWrapper;
+                                  },
+                                );
+                                if (timeStartPicker != null) {
+                                  isar.writeTxnSync(() {
+                                    settings.timeStart =
+                                        timeStartPicker.format(context);
+                                    isar.settings.putSync(settings);
+                                  });
+                                  if (!mounted) return;
+                                  MyApp.updateAppState(context,
+                                      newTimeStart:
+                                          timeStartPicker.format(context));
+                                  if (settings.notifications) {
+                                    flutterLocalNotificationsPlugin.cancelAll();
+                                    weatherController.notlification(
+                                        weatherController.mainWeather);
+                                  }
+                                }
+                              },
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.timer_pause),
+                              text: 'timeEnd'.tr,
+                              info: true,
+                              infoSettings: true,
+                              infoWidget: _TextInfo(
+                                info: settings.timeformat == '12'
+                                    ? DateFormat.jm().format(DateFormat.Hm()
+                                        .parse(weatherController
+                                            .timeConvert(timeEnd)
+                                            .format(context)))
+                                    : DateFormat.Hm().format(DateFormat.Hm()
+                                        .parse(weatherController
+                                            .timeConvert(timeEnd)
+                                            .format(context))),
+                              ),
+                              onPressed: () async {
+                                final TimeOfDay? timeEndPicker =
+                                    await showTimePicker(
+                                  context: context,
+                                  initialTime:
+                                      weatherController.timeConvert(timeEnd),
+                                  builder: (context, child) {
+                                    final Widget mediaQueryWrapper = MediaQuery(
+                                      data: MediaQuery.of(context).copyWith(
+                                        alwaysUse24HourFormat:
+                                            settings.timeformat == '12'
+                                                ? false
+                                                : true,
+                                      ),
+                                      child: child!,
+                                    );
+                                    return mediaQueryWrapper;
+                                  },
+                                );
+                                if (timeEndPicker != null) {
+                                  isar.writeTxnSync(() {
+                                    settings.timeEnd =
+                                        timeEndPicker.format(context);
+                                    isar.settings.putSync(settings);
+                                  });
+                                  if (!mounted) return;
+                                  MyApp.updateAppState(context,
+                                      newTimeEnd:
+                                          timeEndPicker.format(context));
+                                  if (settings.notifications) {
+                                    flutterLocalNotificationsPlugin.cancelAll();
+                                    weatherController.notlification(
+                                        weatherController.mainWeather);
+                                  }
+                                }
+                              },
+                            ),
+                            const SizedBox(height: 10),
+                          ],
+                        ),
+                      );
+                    },
+                  );
+                },
+              );
+            },
+          ),
+          SettingCard(
+            icon: const Icon(Iconsax.d_square),
+            text: 'data'.tr,
+            onPressed: () {
+              showModalBottomSheet(
+                context: context,
+                builder: (BuildContext context) {
+                  return StatefulBuilder(
+                    builder: (BuildContext context, setState) {
+                      return SingleChildScrollView(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            Padding(
+                              padding: const EdgeInsets.symmetric(vertical: 15),
+                              child: Text(
+                                'data'.tr,
+                                style: context.textTheme.titleLarge?.copyWith(
+                                  fontSize: 20,
+                                ),
+                              ),
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.cloud_notif),
+                              text: 'roundDegree'.tr,
+                              switcher: true,
+                              value: settings.roundDegree,
+                              onChange: (value) {
+                                settings.roundDegree = value;
+                                isar.writeTxnSync(
+                                    () => isar.settings.putSync(settings));
+                                MyApp.updateAppState(context,
+                                    newRoundDegree: value);
+                                setState(() {});
+                              },
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.sun_1),
+                              text: 'degrees'.tr,
+                              dropdown: true,
+                              dropdownName: settings.degrees.tr,
+                              dropdownList: <String>[
+                                'celsius'.tr,
+                                'fahrenheit'.tr
+                              ],
+                              dropdownCange: (String? newValue) async {
+                                isar.writeTxnSync(() {
+                                  settings.degrees = newValue == 'celsius'.tr
+                                      ? 'celsius'
+                                      : 'fahrenheit';
+                                  isar.settings.putSync(settings);
+                                });
+                                await weatherController.deleteAll(false);
+                                await weatherController.setLocation();
+                                await weatherController.updateCacheCard(true);
+                                setState(() {});
+                              },
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.rulerpen),
+                              text: 'measurements'.tr,
+                              dropdown: true,
+                              dropdownName: settings.measurements.tr,
+                              dropdownList: <String>[
+                                'metric'.tr,
+                                'imperial'.tr
+                              ],
+                              dropdownCange: (String? newValue) async {
+                                isar.writeTxnSync(() {
+                                  settings.measurements =
+                                      newValue == 'metric'.tr
+                                          ? 'metric'
+                                          : 'imperial';
+                                  isar.settings.putSync(settings);
+                                });
+                                await weatherController.deleteAll(false);
+                                await weatherController.setLocation();
+                                await weatherController.updateCacheCard(true);
+                                setState(() {});
+                              },
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.clock),
+                              text: 'timeformat'.tr,
+                              dropdown: true,
+                              dropdownName: settings.timeformat.tr,
+                              dropdownList: <String>['12'.tr, '24'.tr],
+                              dropdownCange: (String? newValue) {
+                                isar.writeTxnSync(() {
+                                  settings.timeformat =
+                                      newValue == '12'.tr ? '12' : '24';
+                                  isar.settings.putSync(settings);
+                                });
+                                setState(() {});
+                              },
+                            ),
+                            const SizedBox(height: 10),
+                          ],
+                        ),
+                      );
+                    },
+                  );
+                },
+              );
+            },
+          ),
+          SettingCard(
+            icon: const Icon(Iconsax.setting_3),
+            text: 'widget'.tr,
+            onPressed: () {
+              showModalBottomSheet(
+                context: context,
+                builder: (BuildContext context) {
+                  return StatefulBuilder(
+                    builder: (BuildContext context, setState) {
+                      return SingleChildScrollView(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            Padding(
+                              padding: const EdgeInsets.symmetric(vertical: 15),
+                              child: Text(
+                                'widget'.tr,
+                                style: context.textTheme.titleLarge?.copyWith(
+                                  fontSize: 20,
+                                ),
+                              ),
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.bucket_square),
+                              text: 'widgetBackground'.tr,
+                              info: true,
+                              infoWidget: CircleAvatar(
+                                backgroundColor: context.theme.indicatorColor,
+                                radius: 11,
+                                child: CircleAvatar(
+                                  backgroundColor: widgetBackgroundColor.isEmpty
+                                      ? context.theme.primaryColor
+                                      : HexColor.fromHex(widgetBackgroundColor),
+                                  radius: 10,
+                                ),
+                              ),
+                              onPressed: () {
+                                colorBackground = null;
+                                showDialog(
+                                  context: context,
+                                  builder: (context) => Dialog(
+                                    child: SingleChildScrollView(
+                                      child: Column(
+                                        mainAxisSize: MainAxisSize.min,
+                                        crossAxisAlignment:
+                                            CrossAxisAlignment.center,
+                                        children: [
+                                          Padding(
+                                            padding: const EdgeInsets.symmetric(
+                                                vertical: 15),
+                                            child: Text(
+                                              'widgetBackground'.tr,
+                                              style: context
+                                                  .textTheme.titleMedium
+                                                  ?.copyWith(fontSize: 18),
+                                            ),
+                                          ),
+                                          Padding(
+                                            padding: const EdgeInsets.symmetric(
+                                                horizontal: 15),
+                                            child: Theme(
+                                              data: context.theme.copyWith(
+                                                inputDecorationTheme:
+                                                    InputDecorationTheme(
+                                                  border: OutlineInputBorder(
+                                                    borderRadius:
+                                                        BorderRadius.circular(
+                                                            8),
+                                                  ),
+                                                ),
+                                              ),
+                                              child: ColorPicker(
+                                                pickerColor: widgetBackgroundColor
+                                                        .isEmpty
+                                                    ? context.theme.primaryColor
+                                                    : HexColor.fromHex(
+                                                        widgetBackgroundColor),
+                                                onColorChanged: (pickedColor) {
+                                                  colorBackground =
+                                                      pickedColor.toHex();
+                                                },
+                                                hexInputBar: true,
+                                                labelTypes: const [],
+                                                pickerAreaHeightPercent: 0.7,
+                                                pickerAreaBorderRadius:
+                                                    BorderRadius.circular(20),
+                                              ),
+                                            ),
+                                          ),
+                                          IconButton(
+                                            icon: const Icon(
+                                              Iconsax.tick_square,
+                                            ),
+                                            onPressed: () {
+                                              if (colorBackground == null) {
+                                                return;
+                                              }
+                                              weatherController
+                                                  .updateWidgetBackgroundColor(
+                                                      colorBackground!);
+                                              MyApp.updateAppState(context,
+                                                  newWidgetBackgroundColor:
+                                                      colorBackground);
+                                              Get.back();
+                                            },
+                                          ),
+                                        ],
+                                      ),
+                                    ),
+                                  ),
+                                );
+                              },
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.text_block),
+                              text: 'widgetText'.tr,
+                              info: true,
+                              infoWidget: CircleAvatar(
+                                backgroundColor: context.theme.indicatorColor,
+                                radius: 11,
+                                child: CircleAvatar(
+                                  backgroundColor: widgetTextColor.isEmpty
+                                      ? context.theme.primaryColor
+                                      : HexColor.fromHex(widgetTextColor),
+                                  radius: 10,
+                                ),
+                              ),
+                              onPressed: () {
+                                colorText = null;
+                                showDialog(
+                                  context: context,
+                                  builder: (context) => Dialog(
+                                    child: SingleChildScrollView(
+                                      child: Column(
+                                        mainAxisSize: MainAxisSize.min,
+                                        crossAxisAlignment:
+                                            CrossAxisAlignment.center,
+                                        children: [
+                                          Padding(
+                                            padding: const EdgeInsets.symmetric(
+                                                vertical: 15),
+                                            child: Text(
+                                              'widgetText'.tr,
+                                              style: context
+                                                  .textTheme.titleMedium
+                                                  ?.copyWith(fontSize: 18),
+                                            ),
+                                          ),
+                                          Padding(
+                                            padding: const EdgeInsets.symmetric(
+                                                horizontal: 15),
+                                            child: Theme(
+                                              data: context.theme.copyWith(
+                                                inputDecorationTheme:
+                                                    InputDecorationTheme(
+                                                  border: OutlineInputBorder(
+                                                    borderRadius:
+                                                        BorderRadius.circular(
+                                                            8),
+                                                  ),
+                                                ),
+                                              ),
+                                              child: ColorPicker(
+                                                pickerColor: widgetTextColor
+                                                        .isEmpty
+                                                    ? context.theme.primaryColor
+                                                    : HexColor.fromHex(
+                                                        widgetTextColor),
+                                                onColorChanged: (pickedColor) {
+                                                  colorText =
+                                                      pickedColor.toHex();
+                                                },
+                                                hexInputBar: true,
+                                                labelTypes: const [],
+                                                pickerAreaHeightPercent: 0.7,
+                                                pickerAreaBorderRadius:
+                                                    BorderRadius.circular(20),
+                                              ),
+                                            ),
+                                          ),
+                                          IconButton(
+                                            icon: const Icon(
+                                              Iconsax.tick_square,
+                                            ),
+                                            onPressed: () {
+                                              if (colorText == null) return;
+                                              weatherController
+                                                  .updateWidgetTextColor(
+                                                      colorText!);
+                                              MyApp.updateAppState(context,
+                                                  newWidgetTextColor:
+                                                      colorText);
+                                              Get.back();
+                                            },
+                                          ),
+                                        ],
+                                      ),
+                                    ),
+                                  ),
+                                );
+                              },
+                            ),
+                            const SizedBox(height: 10),
+                          ],
+                        ),
+                      );
+                    },
+                  );
+                },
+              );
+            },
+          ),
+          SettingCard(
+            icon: const Icon(Iconsax.language_square),
+            text: 'language'.tr,
+            info: true,
+            infoSettings: true,
+            infoWidget: _TextInfo(
+              info: appLanguages.firstWhere(
+                  (element) => (element['locale'] == locale),
+                  orElse: () => appLanguages.first)['name'],
+            ),
+            onPressed: () {
+              showModalBottomSheet(
+                context: context,
+                builder: (BuildContext context) {
+                  return StatefulBuilder(
+                    builder: (BuildContext context, setState) {
+                      return ListView(
+                        children: [
+                          Padding(
+                            padding: const EdgeInsets.symmetric(vertical: 15),
+                            child: Text(
+                              'language'.tr,
+                              style: context.textTheme.titleLarge?.copyWith(
+                                fontSize: 20,
+                              ),
+                              textAlign: TextAlign.center,
+                            ),
+                          ),
+                          ListView.builder(
+                            shrinkWrap: true,
+                            physics: const BouncingScrollPhysics(),
+                            itemCount: appLanguages.length,
+                            itemBuilder: (context, index) {
+                              return Card(
+                                elevation: 4,
+                                margin: const EdgeInsets.symmetric(
+                                    horizontal: 10, vertical: 5),
+                                child: ListTile(
+                                  title: Text(
+                                    appLanguages[index]['name'],
+                                    style: context.textTheme.labelLarge,
+                                    textAlign: TextAlign.center,
+                                  ),
+                                  onTap: () {
+                                    MyApp.updateAppState(context,
+                                        newLocale: appLanguages[index]
+                                            ['locale']);
+                                    updateLanguage(
+                                        appLanguages[index]['locale']);
+                                  },
+                                ),
+                              );
+                            },
+                          ),
+                          const SizedBox(height: 10),
+                        ],
+                      );
+                    },
+                  );
+                },
+              );
+            },
+          ),
+          SettingCard(
+            icon: const Icon(Iconsax.dollar_square),
+            text: 'support'.tr,
+            onPressed: () {
+              showModalBottomSheet(
+                context: context,
+                builder: (BuildContext context) {
+                  return StatefulBuilder(
+                    builder: (BuildContext context, setState) {
+                      return SingleChildScrollView(
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.center,
+                          mainAxisSize: MainAxisSize.min,
+                          children: [
+                            Padding(
+                              padding: const EdgeInsets.symmetric(vertical: 15),
+                              child: Text(
+                                'support'.tr,
+                                style: context.textTheme.titleLarge?.copyWith(
+                                  fontSize: 20,
+                                ),
+                              ),
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.card),
+                              text: 'DonationAlerts',
+                              onPressed: () => urlLauncher(
+                                  'https://www.donationalerts.com/r/darkmoonight'),
+                            ),
+                            SettingCard(
+                              elevation: 4,
+                              icon: const Icon(Iconsax.wallet),
+                              text: 'ЮMoney',
+                              onPressed: () => urlLauncher(
+                                  'https://yoomoney.ru/to/4100117672775961'),
+                            ),
+                            const SizedBox(height: 10),
+                          ],
+                        ),
+                      );
+                    },
+                  );
+                },
+              );
+            },
+          ),
+          SettingCard(
+            icon: const Icon(Iconsax.document),
+            text: 'license'.tr,
+            onPressed: () => Get.to(
+              LicensePage(
+                applicationIcon: Container(
+                  width: 100,
+                  height: 100,
+                  margin: const EdgeInsets.symmetric(vertical: 5),
+                  decoration: const BoxDecoration(
+                    borderRadius: BorderRadius.all(Radius.circular(20)),
+                    image: DecorationImage(
+                      image: AssetImage('assets/icons/icon.png'),
+                    ),
+                  ),
+                ),
+                applicationName: 'Rain',
+                applicationVersion: appVersion,
+              ),
+              transition: Transition.downToUp,
+            ),
+          ),
+          SettingCard(
+            icon: const Icon(Iconsax.hierarchy_square_2),
+            text: 'version'.tr,
+            info: true,
+            infoWidget: _TextInfo(
+              info: '$appVersion',
+            ),
+          ),
+          SettingCard(
+            icon: Image.asset(
+              'assets/images/github.png',
+              scale: 20,
+            ),
+            text: '${'project'.tr} GitHub',
+            onPressed: () =>
+                urlLauncher('https://github.com/darkmoonight/Rain'),
+          ),
+          const SizedBox(height: 10),
+        ],
+      ),
+    );
+  }
+}
+
+class _TextInfo extends StatelessWidget {
+  const _TextInfo({required this.info});
+
+  final String info;
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.only(right: 5),
+      child: Text(
+        info,
+        style: context.textTheme.bodyMedium,
+        overflow: TextOverflow.visible,
+      ),
+    );
+  }
+}
diff --git a/lib/app/modules/settings/widgets/setting_card.dart b/lib/app/modules/settings/widgets/setting_card.dart
new file mode 100644
index 0000000..4bdccca
--- /dev/null
+++ b/lib/app/modules/settings/widgets/setting_card.dart
@@ -0,0 +1,94 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:iconsax/iconsax.dart';
+
+class SettingCard extends StatelessWidget {
+  const SettingCard({
+    super.key,
+    required this.icon,
+    required this.text,
+    this.switcher = false,
+    this.dropdown = false,
+    this.info = false,
+    this.infoSettings = false,
+    this.elevation,
+    this.dropdownName,
+    this.dropdownList,
+    this.dropdownCange,
+    this.value,
+    this.onPressed,
+    this.onChange,
+    this.infoWidget,
+  });
+  final Widget icon;
+  final String text;
+  final bool switcher;
+  final bool dropdown;
+  final bool info;
+  final bool infoSettings;
+  final Widget? infoWidget;
+  final String? dropdownName;
+  final List<String>? dropdownList;
+  final Function(String?)? dropdownCange;
+  final bool? value;
+  final Function()? onPressed;
+  final Function(bool)? onChange;
+  final double? elevation;
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      elevation: elevation ?? 1,
+      margin: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+      child: ListTile(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(16),
+        ),
+        onTap: onPressed,
+        leading: icon,
+        title: Text(
+          text,
+          style: context.textTheme.titleMedium,
+          overflow: TextOverflow.visible,
+        ),
+        trailing: switcher
+            ? Transform.scale(
+                scale: 0.8,
+                child: Switch(
+                  value: value!,
+                  onChanged: onChange,
+                ),
+              )
+            : dropdown
+                ? DropdownButton<String>(
+                    underline: Container(),
+                    value: dropdownName,
+                    items: dropdownList!
+                        .map<DropdownMenuItem<String>>((String value) {
+                      return DropdownMenuItem<String>(
+                        value: value,
+                        child: Text(value),
+                      );
+                    }).toList(),
+                    onChanged: dropdownCange,
+                  )
+                : info
+                    ? infoSettings
+                        ? Wrap(
+                            children: [
+                              infoWidget!,
+                              const Icon(
+                                Iconsax.arrow_right_3,
+                                size: 18,
+                              ),
+                            ],
+                          )
+                        : infoWidget!
+                    : const Icon(
+                        Iconsax.arrow_right_3,
+                        size: 18,
+                      ),
+      ),
+    );
+  }
+}
diff --git a/lib/app/services/notification.dart b/lib/app/services/notification.dart
new file mode 100644
index 0000000..ba07067
--- /dev/null
+++ b/lib/app/services/notification.dart
@@ -0,0 +1,42 @@
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:rain/app/controller/controller.dart';
+import 'package:rain/main.dart';
+import 'package:timezone/timezone.dart' as tz;
+
+class NotificationShow {
+  Future showNotification(
+    int id,
+    String title,
+    String body,
+    DateTime date,
+    String icon,
+  ) async {
+    final imagePath = await WeatherController().getLocalImagePath(icon);
+
+    AndroidNotificationDetails androidNotificationDetails =
+        AndroidNotificationDetails(
+      'Rain',
+      'DARK NIGHT',
+      priority: Priority.high,
+      importance: Importance.max,
+      playSound: false,
+      enableVibration: false,
+      largeIcon: FilePathAndroidBitmap(imagePath),
+    );
+    NotificationDetails notificationDetails =
+        NotificationDetails(android: androidNotificationDetails);
+
+    var scheduledTime = tz.TZDateTime.from(date, tz.local);
+    flutterLocalNotificationsPlugin.zonedSchedule(
+      id,
+      title,
+      body,
+      scheduledTime,
+      notificationDetails,
+      uiLocalNotificationDateInterpretation:
+          UILocalNotificationDateInterpretation.absoluteTime,
+      androidScheduleMode: AndroidScheduleMode.exactAllowWhileIdle,
+      payload: imagePath,
+    );
+  }
+}
diff --git a/lib/app/services/utils.dart b/lib/app/services/utils.dart
new file mode 100644
index 0000000..a7dd8a1
--- /dev/null
+++ b/lib/app/services/utils.dart
@@ -0,0 +1,20 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+final globalKey = GlobalKey<ScaffoldMessengerState>();
+
+void showSnackBar({required String content, Function? onPressed}) {
+  globalKey.currentState?.showSnackBar(
+    SnackBar(
+      content: Text(content),
+      action: onPressed != null
+          ? SnackBarAction(
+              label: 'settings'.tr,
+              onPressed: () {
+                onPressed();
+              },
+            )
+          : null,
+    ),
+  );
+}
diff --git a/lib/app/ui/geolocation.dart b/lib/app/ui/geolocation.dart
deleted file mode 100755
index 2b6165c..0000000
--- a/lib/app/ui/geolocation.dart
+++ /dev/null
@@ -1,479 +0,0 @@
-import 'dart:ui';
-import 'package:flutter/material.dart';
-import 'package:flutter_map/flutter_map.dart';
-import 'package:gap/gap.dart';
-import 'package:geolocator/geolocator.dart';
-import 'package:get/get.dart';
-import 'package:iconsax_plus/iconsax_plus.dart';
-import 'package:latlong2/latlong.dart';
-import 'package:rain/app/api/api.dart';
-import 'package:rain/app/api/city_api.dart';
-import 'package:rain/app/controller/controller.dart';
-import 'package:rain/app/ui/home.dart';
-import 'package:rain/app/ui/widgets/button.dart';
-import 'package:rain/app/ui/widgets/text_form.dart';
-import 'package:rain/main.dart';
-
-class SelectGeolocation extends StatefulWidget {
-  const SelectGeolocation({super.key, required this.isStart});
-  final bool isStart;
-
-  @override
-  State<SelectGeolocation> createState() => _SelectGeolocationState();
-}
-
-class _SelectGeolocationState extends State<SelectGeolocation> {
-  bool isLoading = false;
-  final formKeySearch = GlobalKey<FormState>();
-  final _focusNode = FocusNode();
-  final weatherController = Get.put(WeatherController());
-  final _controller = TextEditingController();
-  final _controllerLat = TextEditingController();
-  final _controllerLon = TextEditingController();
-  final _controllerCity = TextEditingController();
-  final _controllerDistrict = TextEditingController();
-
-  static const kTextFieldElevation = 4.0;
-
-  static const colorFilter = ColorFilter.matrix(<double>[
-    -0.2, -0.7, -0.08, 0, 255, // Red channel
-    -0.2, -0.7, -0.08, 0, 255, // Green channel
-    -0.2, -0.7, -0.08, 0, 255, // Blue channel
-    0, 0, 0, 1, 0, // Alpha channel
-  ]);
-
-  final bool _isDarkMode = Get.theme.brightness == Brightness.dark;
-  final mapController = MapController();
-
-  void textTrim(TextEditingController value) {
-    value.text = value.text.trim();
-    while (value.text.contains('  ')) {
-      value.text = value.text.replaceAll('  ', ' ');
-    }
-  }
-
-  void fillController(Result selection) {
-    _controllerLat.text = '${selection.latitude}';
-    _controllerLon.text = '${selection.longitude}';
-    _controllerCity.text = selection.name;
-    _controllerDistrict.text = selection.admin1;
-    _controller.clear();
-    _focusNode.unfocus();
-    setState(() {});
-  }
-
-  void fillControllerGeo(Map<String, dynamic> location) {
-    _controllerLat.text = '${location['lat']}';
-    _controllerLon.text = '${location['lon']}';
-    _controllerCity.text = location['district'];
-    _controllerDistrict.text = location['city'];
-    setState(() {});
-  }
-
-  void fillMap(double latitude, double longitude) {
-    _controllerLat.text = '$latitude';
-    _controllerLon.text = '$longitude';
-    setState(() {});
-  }
-
-  Widget _buildMapTileLayer() {
-    return TileLayer(
-      urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
-      userAgentPackageName: 'com.darkmoonight.rain',
-    );
-  }
-
-  Widget _buildMap() {
-    return ClipRRect(
-      borderRadius: const BorderRadius.all(Radius.circular(20)),
-      child: SizedBox(
-        height: Get.size.height * 0.3,
-        child: FlutterMap(
-          mapController: mapController,
-          options: MapOptions(
-            backgroundColor: context.theme.colorScheme.surface,
-            initialCenter: const LatLng(55.7522, 37.6156),
-            initialZoom: 3,
-            interactionOptions: const InteractionOptions(
-              flags: InteractiveFlag.all & ~InteractiveFlag.rotate,
-            ),
-            cameraConstraint: CameraConstraint.contain(
-              bounds: LatLngBounds(
-                const LatLng(-90, -180),
-                const LatLng(90, 180),
-              ),
-            ),
-            onLongPress: (tapPosition, point) =>
-                fillMap(point.latitude, point.longitude),
-          ),
-          children: [
-            if (_isDarkMode)
-              ColorFiltered(
-                colorFilter: colorFilter,
-                child: _buildMapTileLayer(),
-              )
-            else
-              _buildMapTileLayer(),
-            RichAttributionWidget(
-              animationConfig: const ScaleRAWA(),
-              attributions: [
-                TextSourceAttribution(
-                  'OpenStreetMap contributors',
-                  onTap: () => weatherController.urlLauncher(
-                    'https://openstreetmap.org/copyright',
-                  ),
-                ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildSearchField() {
-    return RawAutocomplete<Result>(
-      focusNode: _focusNode,
-      textEditingController: _controller,
-      fieldViewBuilder:
-          (
-            BuildContext context,
-            TextEditingController fieldTextEditingController,
-            FocusNode fieldFocusNode,
-            VoidCallback onFieldSubmitted,
-          ) {
-            return MyTextForm(
-              elevation: kTextFieldElevation,
-              labelText: 'search'.tr,
-              type: TextInputType.text,
-              icon: const Icon(IconsaxPlusLinear.global_search),
-              controller: _controller,
-              margin: const EdgeInsets.only(left: 10, right: 10, top: 10),
-              focusNode: _focusNode,
-            );
-          },
-      optionsBuilder: (TextEditingValue textEditingValue) {
-        if (textEditingValue.text.isEmpty) {
-          return const Iterable<Result>.empty();
-        }
-        return WeatherAPI().getCity(textEditingValue.text, locale);
-      },
-      onSelected: (Result selection) => fillController(selection),
-      displayStringForOption: (Result option) =>
-          '${option.name}, ${option.admin1}',
-      optionsViewBuilder:
-          (
-            BuildContext context,
-            AutocompleteOnSelected<Result> onSelected,
-            Iterable<Result> options,
-          ) {
-            return _buildOptionsView(context, onSelected, options);
-          },
-    );
-  }
-
-  Widget _buildOptionsView(
-    BuildContext context,
-    AutocompleteOnSelected<Result> onSelected,
-    Iterable<Result> options,
-  ) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
-      child: Align(
-        alignment: Alignment.topCenter,
-        child: Material(
-          borderRadius: BorderRadius.circular(20),
-          elevation: 4.0,
-          child: ListView.builder(
-            padding: EdgeInsets.zero,
-            shrinkWrap: true,
-            itemCount: options.length,
-            itemBuilder: (BuildContext context, int index) {
-              final Result option = options.elementAt(index);
-              return InkWell(
-                onTap: () => onSelected(option),
-                child: ListTile(
-                  title: Text(
-                    '${option.name}, ${option.admin1}',
-                    style: context.textTheme.labelLarge,
-                  ),
-                ),
-              );
-            },
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildLocationButton() {
-    return Card(
-      elevation: kTextFieldElevation,
-      margin: const EdgeInsets.only(top: 10, right: 10),
-      child: Container(
-        margin: const EdgeInsets.all(2.5),
-        child: IconButton(
-          onPressed: _handleLocationButtonPress,
-          icon: const Icon(IconsaxPlusLinear.location),
-        ),
-      ),
-    );
-  }
-
-  Future<void> _handleLocationButtonPress() async {
-    bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
-    if (!serviceEnabled) {
-      if (!context.mounted) return;
-      await _showLocationDialog();
-      return;
-    }
-    setState(() => isLoading = true);
-    final location = await weatherController.getCurrentLocationSearch();
-    fillControllerGeo(location);
-    setState(() => isLoading = false);
-  }
-
-  Future<void> _showLocationDialog() async {
-    await showAdaptiveDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog.adaptive(
-          title: Text('location'.tr, style: context.textTheme.titleLarge),
-          content: Text('no_location'.tr, style: context.textTheme.titleMedium),
-          actions: [
-            TextButton(
-              onPressed: () => Get.back(result: false),
-              child: Text(
-                'cancel'.tr,
-                style: context.textTheme.titleMedium?.copyWith(
-                  color: Colors.blueAccent,
-                ),
-              ),
-            ),
-            TextButton(
-              onPressed: () {
-                Geolocator.openLocationSettings();
-                Get.back(result: true);
-              },
-              child: Text(
-                'settings'.tr,
-                style: context.textTheme.titleMedium?.copyWith(
-                  color: Colors.green,
-                ),
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  Widget _buildLatitudeField() {
-    return MyTextForm(
-      elevation: kTextFieldElevation,
-      controller: _controllerLat,
-      labelText: 'lat'.tr,
-      type: TextInputType.number,
-      icon: const Icon(IconsaxPlusLinear.location),
-      margin: const EdgeInsets.only(left: 10, right: 10, top: 10),
-      validator: (value) => _validateLatitude(value),
-    );
-  }
-
-  Widget _buildLongitudeField() {
-    return MyTextForm(
-      elevation: kTextFieldElevation,
-      controller: _controllerLon,
-      labelText: 'lon'.tr,
-      type: TextInputType.number,
-      icon: const Icon(IconsaxPlusLinear.location),
-      margin: const EdgeInsets.only(left: 10, right: 10, top: 10),
-      validator: (value) => _validateLongitude(value),
-    );
-  }
-
-  Widget _buildCityField() {
-    return MyTextForm(
-      elevation: kTextFieldElevation,
-      controller: _controllerCity,
-      labelText: 'city'.tr,
-      type: TextInputType.name,
-      icon: const Icon(IconsaxPlusLinear.building_3),
-      margin: const EdgeInsets.only(left: 10, right: 10, top: 10),
-      validator: (value) => _validateCity(value),
-    );
-  }
-
-  Widget _buildDistrictField() {
-    return MyTextForm(
-      elevation: kTextFieldElevation,
-      controller: _controllerDistrict,
-      labelText: 'district'.tr,
-      type: TextInputType.streetAddress,
-      icon: const Icon(IconsaxPlusLinear.global),
-      margin: const EdgeInsets.only(left: 10, right: 10, top: 10),
-    );
-  }
-
-  Widget _buildSubmitButton() {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
-      child: MyTextButton(buttonName: 'done'.tr, onPressed: _handleSubmit),
-    );
-  }
-
-  String? _validateLatitude(String? value) {
-    if (value == null || value.isEmpty) {
-      return 'validateValue'.tr;
-    }
-    double? numericValue = double.tryParse(value);
-    if (numericValue == null) {
-      return 'validateNumber'.tr;
-    }
-    if (numericValue < -90 || numericValue > 90) {
-      return 'validate90'.tr;
-    }
-    return null;
-  }
-
-  String? _validateLongitude(String? value) {
-    if (value == null || value.isEmpty) {
-      return 'validateValue'.tr;
-    }
-    double? numericValue = double.tryParse(value);
-    if (numericValue == null) {
-      return 'validateNumber'.tr;
-    }
-    if (numericValue < -180 || numericValue > 180) {
-      return 'validate180'.tr;
-    }
-    return null;
-  }
-
-  String? _validateCity(String? value) {
-    if (value == null || value.isEmpty) {
-      return 'validateName'.tr;
-    }
-    return null;
-  }
-
-  Future<void> _handleSubmit() async {
-    if (formKeySearch.currentState!.validate()) {
-      textTrim(_controllerLat);
-      textTrim(_controllerLon);
-      textTrim(_controllerCity);
-      textTrim(_controllerDistrict);
-      try {
-        await weatherController.deleteAll(true);
-        await weatherController.getLocation(
-          double.parse(_controllerLat.text),
-          double.parse(_controllerLon.text),
-          _controllerDistrict.text,
-          _controllerCity.text,
-        );
-        widget.isStart
-            ? Get.off(() => const HomePage(), transition: Transition.downToUp)
-            : Get.back();
-      } catch (error) {
-        Future.error(error);
-      }
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Form(
-      key: formKeySearch,
-      child: Scaffold(
-        resizeToAvoidBottomInset: true,
-        appBar: _buildAppBar(),
-        body: SafeArea(
-          child: Stack(
-            children: [
-              Column(
-                children: [
-                  Flexible(
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.center,
-                      children: [
-                        Flexible(
-                          child: SingleChildScrollView(
-                            child: Column(
-                              children: [
-                                Padding(
-                                  padding: const EdgeInsets.symmetric(
-                                    horizontal: 10,
-                                  ),
-                                  child: _buildMap(),
-                                ),
-                                Padding(
-                                  padding: const EdgeInsets.fromLTRB(
-                                    10,
-                                    15,
-                                    10,
-                                    5,
-                                  ),
-                                  child: Text(
-                                    'searchMethod'.tr,
-                                    style: context.theme.textTheme.bodyLarge
-                                        ?.copyWith(fontWeight: FontWeight.bold),
-                                    textAlign: TextAlign.center,
-                                  ),
-                                ),
-                                Row(
-                                  children: [
-                                    Flexible(child: _buildSearchField()),
-                                    _buildLocationButton(),
-                                  ],
-                                ),
-                                _buildLatitudeField(),
-                                _buildLongitudeField(),
-                                _buildCityField(),
-                                _buildDistrictField(),
-                                const Gap(20),
-                              ],
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                  _buildSubmitButton(),
-                ],
-              ),
-              if (isLoading)
-                BackdropFilter(
-                  filter: ImageFilter.blur(sigmaY: 3, sigmaX: 3),
-                  child: const Center(child: CircularProgressIndicator()),
-                ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  AppBar _buildAppBar() {
-    return AppBar(
-      centerTitle: true,
-      leading: widget.isStart
-          ? null
-          : IconButton(
-              onPressed: () {
-                Get.back();
-              },
-              icon: const Icon(IconsaxPlusLinear.arrow_left_3, size: 20),
-              splashColor: Colors.transparent,
-              highlightColor: Colors.transparent,
-            ),
-      automaticallyImplyLeading: false,
-      title: Text(
-        'searchCity'.tr,
-        style: context.textTheme.titleMedium?.copyWith(
-          fontWeight: FontWeight.w600,
-          fontSize: 18,
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/app/ui/home.dart b/lib/app/ui/home.dart
deleted file mode 100755
index 655d2ba..0000000
--- a/lib/app/ui/home.dart
+++ /dev/null
@@ -1,311 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:iconsax_plus/iconsax_plus.dart';
-import 'package:isar/isar.dart';
-import 'package:rain/app/api/api.dart';
-import 'package:rain/app/api/city_api.dart';
-import 'package:rain/app/controller/controller.dart';
-import 'package:rain/app/data/db.dart';
-import 'package:rain/app/ui/places/view/place_list.dart';
-import 'package:rain/app/ui/places/widgets/create_place.dart';
-import 'package:rain/app/ui/geolocation.dart';
-import 'package:rain/app/ui/main/view/main.dart';
-import 'package:rain/app/ui/map/view/map.dart';
-import 'package:rain/app/ui/settings/view/settings.dart';
-import 'package:rain/app/utils/show_snack_bar.dart';
-import 'package:rain/main.dart';
-
-class HomePage extends StatefulWidget {
-  const HomePage({super.key});
-
-  @override
-  State<HomePage> createState() => _HomePageState();
-}
-
-class _HomePageState extends State<HomePage> with TickerProviderStateMixin {
-  int tabIndex = 0;
-  bool visible = false;
-  final _focusNode = FocusNode();
-  late TabController tabController;
-  final weatherController = Get.put(WeatherController());
-  final _controller = TextEditingController();
-
-  final List<Widget> pages = [
-    const MainPage(),
-    const PlaceList(),
-    if (!settings.hideMap) const MapPage(),
-    const SettingsPage(),
-  ];
-
-  @override
-  void initState() {
-    super.initState();
-    getData();
-    setupTabController();
-  }
-
-  @override
-  void dispose() {
-    tabController.dispose();
-    super.dispose();
-  }
-
-  void setupTabController() {
-    tabController = TabController(
-      initialIndex: tabIndex,
-      length: pages.length,
-      vsync: this,
-    );
-
-    tabController.animation?.addListener(() {
-      int value = (tabController.animation!.value).round();
-      if (value != tabIndex) setState(() => tabIndex = value);
-    });
-
-    tabController.addListener(() {
-      setState(() {
-        tabIndex = tabController.index;
-      });
-    });
-  }
-
-  void getData() async {
-    await weatherController.deleteCache();
-    await weatherController.updateCacheCard(false);
-    await weatherController.setLocation();
-  }
-
-  void changeTabIndex(int index) {
-    setState(() {
-      tabIndex = index;
-    });
-    tabController.animateTo(tabIndex);
-  }
-
-  Widget _buildAppBarTitle(
-    int tabIndex,
-    TextStyle? textStyle,
-    TextStyle? labelLarge,
-  ) {
-    switch (tabIndex) {
-      case 0:
-        return visible
-            ? _buildSearchField(labelLarge)
-            : Obx(() {
-              final location = weatherController.location;
-              final city = location.city;
-              final district = location.district;
-              return Text(
-                weatherController.isLoading.isFalse
-                    ? district!.isEmpty
-                        ? '$city'
-                        : city!.isEmpty
-                        ? district
-                        : city == district
-                        ? city
-                        : '$city, $district'
-                    : settings.location
-                    ? 'search'.tr
-                    : (isar.locationCaches.where().findAllSync()).isNotEmpty
-                    ? 'loading'.tr
-                    : 'searchCity'.tr,
-                style: textStyle,
-              );
-            });
-      case 1:
-        return Text('cities'.tr, style: textStyle);
-      case 2:
-        return settings.hideMap
-            ? Text('settings_full'.tr, style: textStyle)
-            : Text('map'.tr, style: textStyle);
-      case 3:
-        return Text('settings_full'.tr, style: textStyle);
-      default:
-        return const SizedBox.shrink();
-    }
-  }
-
-  Widget _buildSearchField(TextStyle? labelLarge) {
-    return RawAutocomplete<Result>(
-      focusNode: _focusNode,
-      textEditingController: _controller,
-      fieldViewBuilder: (_, __, ___, ____) {
-        return TextField(
-          controller: _controller,
-          focusNode: _focusNode,
-          style: labelLarge?.copyWith(fontSize: 16),
-          decoration: InputDecoration(hintText: 'search'.tr),
-        );
-      },
-      optionsBuilder: (TextEditingValue textEditingValue) {
-        if (textEditingValue.text.isEmpty) {
-          return const Iterable<Result>.empty();
-        }
-        return WeatherAPI().getCity(textEditingValue.text, locale);
-      },
-      onSelected: (Result selection) async {
-        await weatherController.deleteAll(true);
-        await weatherController.getLocation(
-          double.parse('${selection.latitude}'),
-          double.parse('${selection.longitude}'),
-          selection.admin1,
-          selection.name,
-        );
-        visible = false;
-        _controller.clear();
-        _focusNode.unfocus();
-        setState(() {});
-      },
-      displayStringForOption:
-          (Result option) => '${option.name}, ${option.admin1}',
-      optionsViewBuilder: (
-        BuildContext context,
-        AutocompleteOnSelected<Result> onSelected,
-        Iterable<Result> options,
-      ) {
-        return _buildOptionsView(context, onSelected, options, labelLarge);
-      },
-    );
-  }
-
-  Widget _buildOptionsView(
-    BuildContext context,
-    AutocompleteOnSelected<Result> onSelected,
-    Iterable<Result> options,
-    TextStyle? labelLarge,
-  ) {
-    return Align(
-      alignment: Alignment.topLeft,
-      child: Material(
-        borderRadius: BorderRadius.circular(20),
-        elevation: 4.0,
-        child: SizedBox(
-          width: 250,
-          child: ListView.builder(
-            padding: EdgeInsets.zero,
-            shrinkWrap: true,
-            itemCount: options.length,
-            itemBuilder: (BuildContext context, int index) {
-              final Result option = options.elementAt(index);
-              return InkWell(
-                onTap: () => onSelected(option),
-                child: ListTile(
-                  title: Text(
-                    '${option.name}, ${option.admin1}',
-                    style: labelLarge,
-                  ),
-                ),
-              );
-            },
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildSearchIconButton() {
-    return IconButton(
-      onPressed: () {
-        if (visible) {
-          _controller.clear();
-          _focusNode.unfocus();
-          visible = false;
-        } else {
-          visible = true;
-        }
-        setState(() {});
-      },
-      icon: Icon(
-        visible
-            ? IconsaxPlusLinear.close_circle
-            : IconsaxPlusLinear.search_normal_1,
-        size: 18,
-      ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final textTheme = context.textTheme;
-    final labelLarge = textTheme.labelLarge;
-
-    final textStyle = textTheme.titleMedium?.copyWith(
-      fontWeight: FontWeight.w600,
-      fontSize: 18,
-    );
-
-    return DefaultTabController(
-      length: pages.length,
-      child: ScaffoldMessenger(
-        key: globalKey,
-        child: Scaffold(
-          appBar: AppBar(
-            centerTitle: true,
-            automaticallyImplyLeading: false,
-            leading:
-                tabIndex == 0
-                    ? IconButton(
-                      onPressed: () {
-                        Get.to(
-                          () => const SelectGeolocation(isStart: false),
-                          transition: Transition.downToUp,
-                        );
-                      },
-                      icon: const Icon(
-                        IconsaxPlusLinear.global_search,
-                        size: 18,
-                      ),
-                    )
-                    : null,
-            title: _buildAppBarTitle(tabIndex, textStyle, labelLarge),
-            actions: tabIndex == 0 ? [_buildSearchIconButton()] : null,
-          ),
-          body: SafeArea(
-            child: TabBarView(controller: tabController, children: pages),
-          ),
-          bottomNavigationBar: NavigationBar(
-            onDestinationSelected: (int index) => changeTabIndex(index),
-            selectedIndex: tabIndex,
-            destinations: [
-              NavigationDestination(
-                icon: const Icon(IconsaxPlusLinear.cloud_sunny),
-                selectedIcon: const Icon(IconsaxPlusBold.cloud_sunny),
-                label: 'name'.tr,
-              ),
-              NavigationDestination(
-                icon: const Icon(IconsaxPlusLinear.buildings),
-                selectedIcon: const Icon(IconsaxPlusBold.buildings),
-                label: 'cities'.tr,
-              ),
-              if (!settings.hideMap)
-                NavigationDestination(
-                  icon: const Icon(IconsaxPlusLinear.map),
-                  selectedIcon: const Icon(IconsaxPlusBold.map),
-                  label: 'map'.tr,
-                ),
-              NavigationDestination(
-                icon: const Icon(IconsaxPlusLinear.category),
-                selectedIcon: const Icon(IconsaxPlusBold.category),
-                label: 'settings_full'.tr,
-              ),
-            ],
-          ),
-          floatingActionButton:
-              tabIndex == 1
-                  ? FloatingActionButton(
-                    onPressed:
-                        () => showModalBottomSheet(
-                          context: context,
-                          isScrollControlled: true,
-                          enableDrag: false,
-                          builder:
-                              (BuildContext context) => const CreatePlace(),
-                        ),
-                    child: const Icon(IconsaxPlusLinear.add),
-                  )
-                  : null,
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/app/ui/main/view/main.dart b/lib/app/ui/main/view/main.dart
deleted file mode 100755
index fe0987e..0000000
--- a/lib/app/ui/main/view/main.dart
+++ /dev/null
@@ -1,242 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:rain/app/controller/controller.dart';
-import 'package:rain/app/data/db.dart';
-import 'package:rain/app/ui/widgets/weather/daily/daily_card_list.dart';
-import 'package:rain/app/ui/widgets/weather/daily/daily_container.dart';
-import 'package:rain/app/ui/widgets/weather/desc/desc_container.dart';
-import 'package:rain/app/ui/widgets/weather/hourly.dart';
-import 'package:rain/app/ui/widgets/weather/now.dart';
-import 'package:rain/app/ui/widgets/shimmer.dart';
-import 'package:rain/app/ui/widgets/weather/sunset_sunrise.dart';
-import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
-
-class MainPage extends StatefulWidget {
-  const MainPage({super.key});
-
-  @override
-  State<MainPage> createState() => _MainPageState();
-}
-
-class _MainPageState extends State<MainPage> {
-  final weatherController = Get.put(WeatherController());
-
-  @override
-  Widget build(BuildContext context) {
-    return RefreshIndicator(
-      onRefresh: _handleRefresh,
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 10),
-        child: Obx(() {
-          if (weatherController.isLoading.isTrue) {
-            return _buildLoadingView();
-          }
-
-          final mainWeather = weatherController.mainWeather;
-          final weatherCard = WeatherCard.fromJson(mainWeather.toJson());
-          final hourOfDay = weatherController.hourOfDay.value;
-          final dayOfNow = weatherController.dayOfNow.value;
-          final sunrise = mainWeather.sunrise![dayOfNow];
-          final sunset = mainWeather.sunset![dayOfNow];
-          final tempMax = mainWeather.temperature2MMax![dayOfNow];
-          final tempMin = mainWeather.temperature2MMin![dayOfNow];
-
-          return _buildMainView(
-            context,
-            mainWeather,
-            weatherCard,
-            hourOfDay,
-            dayOfNow,
-            sunrise,
-            sunset,
-            tempMax!,
-            tempMin!,
-          );
-        }),
-      ),
-    );
-  }
-
-  Future<void> _handleRefresh() async {
-    await weatherController.deleteAll(false);
-    await weatherController.setLocation();
-    setState(() {});
-  }
-
-  Widget _buildLoadingView() {
-    return ListView(
-      children: const [
-        MyShimmer(height: 200),
-        MyShimmer(height: 130, margin: EdgeInsets.symmetric(vertical: 15)),
-        MyShimmer(height: 90, margin: EdgeInsets.only(bottom: 15)),
-        MyShimmer(height: 400, margin: EdgeInsets.only(bottom: 15)),
-        MyShimmer(height: 450, margin: EdgeInsets.only(bottom: 15)),
-      ],
-    );
-  }
-
-  Widget _buildMainView(
-    BuildContext context,
-    MainWeatherCache mainWeather,
-    WeatherCard weatherCard,
-    int hourOfDay,
-    int dayOfNow,
-    String sunrise,
-    String sunset,
-    double tempMax,
-    double tempMin,
-  ) {
-    return ListView(
-      children: [
-        _buildNowWidget(
-          mainWeather,
-          hourOfDay,
-          dayOfNow,
-          sunrise,
-          sunset,
-          tempMax,
-          tempMin,
-        ),
-        _buildHourlyList(context, mainWeather, hourOfDay, dayOfNow),
-        _buildSunsetSunriseWidget(sunrise, sunset),
-        _buildHourlyDescContainer(mainWeather, hourOfDay),
-        _buildDailyContainer(weatherCard),
-      ],
-    );
-  }
-
-  Widget _buildNowWidget(
-    MainWeatherCache mainWeather,
-    int hourOfDay,
-    int dayOfNow,
-    String sunrise,
-    String sunset,
-    double tempMax,
-    double tempMin,
-  ) {
-    return Now(
-      time: mainWeather.time![hourOfDay],
-      weather: mainWeather.weathercode![hourOfDay],
-      degree: mainWeather.temperature2M![hourOfDay],
-      feels: mainWeather.apparentTemperature![hourOfDay]!,
-      timeDay: sunrise,
-      timeNight: sunset,
-      tempMax: tempMax,
-      tempMin: tempMin,
-    );
-  }
-
-  Widget _buildHourlyList(
-    BuildContext context,
-    MainWeatherCache mainWeather,
-    int hourOfDay,
-    int dayOfNow,
-  ) {
-    return Card(
-      margin: const EdgeInsets.only(bottom: 15),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
-        child: SizedBox(
-          height: 135,
-          child: ScrollablePositionedList.separated(
-            key: const PageStorageKey(0),
-            separatorBuilder: (BuildContext context, int index) {
-              return const VerticalDivider(
-                width: 10,
-                indent: 40,
-                endIndent: 40,
-              );
-            },
-            scrollDirection: Axis.horizontal,
-            itemScrollController: weatherController.itemScrollController,
-            itemCount: mainWeather.time!.length,
-            itemBuilder: (ctx, i) {
-              return _buildHourlyItem(
-                context,
-                mainWeather,
-                i,
-                hourOfDay,
-                dayOfNow,
-              );
-            },
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildHourlyItem(
-    BuildContext context,
-    MainWeatherCache mainWeather,
-    int i,
-    int hourOfDay,
-    int dayOfNow,
-  ) {
-    final i24 = (i / 24).floor();
-
-    return GestureDetector(
-      onTap: () {
-        weatherController.hourOfDay.value = i;
-        weatherController.dayOfNow.value = i24;
-        setState(() {});
-      },
-      child: Container(
-        margin: const EdgeInsets.symmetric(vertical: 5),
-        padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 5),
-        decoration: BoxDecoration(
-          color: i == hourOfDay
-              ? context.theme.colorScheme.secondaryContainer
-              : Colors.transparent,
-          borderRadius: const BorderRadius.all(Radius.circular(20)),
-        ),
-        child: Hourly(
-          time: mainWeather.time![i],
-          weather: mainWeather.weathercode![i],
-          degree: mainWeather.temperature2M![i],
-          timeDay: mainWeather.sunrise![i24],
-          timeNight: mainWeather.sunset![i24],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildSunsetSunriseWidget(String sunrise, String sunset) {
-    return SunsetSunrise(timeSunrise: sunrise, timeSunset: sunset);
-  }
-
-  Widget _buildHourlyDescContainer(
-    MainWeatherCache mainWeather,
-    int hourOfDay,
-  ) {
-    return DescContainer(
-      humidity: mainWeather.relativehumidity2M?[hourOfDay],
-      wind: mainWeather.windspeed10M?[hourOfDay],
-      visibility: mainWeather.visibility?[hourOfDay],
-      feels: mainWeather.apparentTemperature?[hourOfDay],
-      evaporation: mainWeather.evapotranspiration?[hourOfDay],
-      precipitation: mainWeather.precipitation?[hourOfDay],
-      direction: mainWeather.winddirection10M?[hourOfDay],
-      pressure: mainWeather.surfacePressure?[hourOfDay],
-      rain: mainWeather.rain?[hourOfDay],
-      cloudcover: mainWeather.cloudcover?[hourOfDay],
-      windgusts: mainWeather.windgusts10M?[hourOfDay],
-      uvIndex: mainWeather.uvIndex?[hourOfDay],
-      dewpoint2M: mainWeather.dewpoint2M?[hourOfDay],
-      precipitationProbability:
-          mainWeather.precipitationProbability?[hourOfDay],
-      shortwaveRadiation: mainWeather.shortwaveRadiation?[hourOfDay],
-      initiallyExpanded: false,
-      title: 'hourlyVariables'.tr,
-    );
-  }
-
-  Widget _buildDailyContainer(WeatherCard weatherCard) {
-    return DailyContainer(
-      weatherData: weatherCard,
-      onTap: () => Get.to(
-        () => DailyCardList(weatherData: weatherCard),
-        transition: Transition.downToUp,
-      ),
-    );
-  }
-}
diff --git a/lib/app/ui/map/view/map.dart b/lib/app/ui/map/view/map.dart
deleted file mode 100755
index 7f26040..0000000
--- a/lib/app/ui/map/view/map.dart
+++ /dev/null
@@ -1,477 +0,0 @@
-import 'dart:io';
-import 'package:dio_cache_interceptor/dio_cache_interceptor.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_expandable_fab/flutter_expandable_fab.dart';
-import 'package:flutter_map/flutter_map.dart';
-import 'package:flutter_map_animations/flutter_map_animations.dart';
-import 'package:flutter_map_cache/flutter_map_cache.dart';
-import 'package:gap/gap.dart';
-import 'package:get/get.dart';
-import 'package:http_cache_file_store/http_cache_file_store.dart';
-import 'package:iconsax_plus/iconsax_plus.dart';
-import 'package:latlong2/latlong.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:rain/app/api/api.dart';
-import 'package:rain/app/api/city_api.dart';
-import 'package:rain/app/controller/controller.dart';
-import 'package:rain/app/data/db.dart';
-import 'package:rain/app/ui/places/view/place_info.dart';
-import 'package:rain/app/ui/places/widgets/create_place.dart';
-import 'package:rain/app/ui/places/widgets/place_card.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_data.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_weather.dart';
-import 'package:rain/app/ui/widgets/text_form.dart';
-import 'package:rain/main.dart';
-
-class MapPage extends StatefulWidget {
-  const MapPage({super.key});
-
-  @override
-  State<MapPage> createState() => _MapPageState();
-}
-
-class _MapPageState extends State<MapPage> with TickerProviderStateMixin {
-  late final AnimatedMapController _animatedMapController =
-      AnimatedMapController(vsync: this);
-  final weatherController = Get.put(WeatherController());
-  final statusWeather = StatusWeather();
-  final statusData = StatusData();
-  final Future<CacheStore> _cacheStoreFuture = _getCacheStore();
-
-  final GlobalKey<ExpandableFabState> _fabKey = GlobalKey<ExpandableFabState>();
-
-  final bool _isDarkMode = Get.theme.brightness == Brightness.dark;
-  WeatherCard? _selectedWeatherCard;
-  bool _isCardVisible = false;
-  late final AnimationController _animationController;
-  late final Animation<Offset> _offsetAnimation;
-  static const _useTransformerId = 'useTransformerId';
-  final bool _useTransformer = true;
-
-  final _focusNode = FocusNode();
-  late final TextEditingController _controllerSearch = TextEditingController();
-
-  static Future<CacheStore> _getCacheStore() async {
-    final dir = await getTemporaryDirectory();
-    return FileCacheStore('${dir.path}${Platform.pathSeparator}MapTiles');
-  }
-
-  @override
-  void initState() {
-    _animationController = AnimationController(
-      duration: const Duration(milliseconds: 300),
-      vsync: this,
-    );
-
-    _offsetAnimation = Tween<Offset>(
-      begin: const Offset(0.0, 1.0),
-      end: Offset.zero,
-    ).animate(
-      CurvedAnimation(parent: _animationController, curve: Curves.easeInOut),
-    );
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    _animatedMapController.dispose();
-    _controllerSearch.dispose();
-    _animationController.dispose();
-    super.dispose();
-  }
-
-  void _resetMapOrientation({LatLng? center, double? zoom}) {
-    _animatedMapController.animateTo(
-      customId: _useTransformer ? _useTransformerId : null,
-      dest: center,
-      zoom: zoom,
-      rotation: 0,
-      duration: const Duration(milliseconds: 500),
-      curve: Curves.easeInOut,
-    );
-  }
-
-  void _onMarkerTap(WeatherCard weatherCard) {
-    setState(() {
-      _selectedWeatherCard = weatherCard;
-    });
-    _animationController.forward();
-    _isCardVisible = true;
-
-    if (_fabKey.currentState?.isOpen == true) {
-      _fabKey.currentState?.toggle();
-    }
-  }
-
-  void _hideCard() {
-    _animationController.reverse().then((_) {
-      setState(() {
-        _isCardVisible = false;
-        _selectedWeatherCard = null;
-      });
-    });
-    _focusNode.unfocus();
-  }
-
-  Widget _buildStyleMarkers(
-    int weathercode,
-    String time,
-    String sunrise,
-    String sunset,
-    double temperature2M,
-  ) {
-    return Card(
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Image.asset(
-            statusWeather.getImageNow(weathercode, time, sunrise, sunset),
-            scale: 18,
-          ),
-          const MaxGap(5),
-          Text(
-            statusData.getDegree(
-              roundDegree ? temperature2M.round() : temperature2M,
-            ),
-            style: context.textTheme.labelLarge?.copyWith(
-              fontWeight: FontWeight.bold,
-              fontSize: 16,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Marker _buildMainLocationMarker(
-    WeatherCard weatherCard,
-    int hourOfDay,
-    int dayOfNow,
-  ) {
-    return Marker(
-      height: 50,
-      width: 100,
-      point: LatLng(weatherCard.lat!, weatherCard.lon!),
-      child: GestureDetector(
-        onTap: () => _onMarkerTap(weatherCard),
-        child: _buildStyleMarkers(
-          weatherCard.weathercode![hourOfDay],
-          weatherCard.time![hourOfDay],
-          weatherCard.sunrise![dayOfNow],
-          weatherCard.sunset![dayOfNow],
-          weatherCard.temperature2M![hourOfDay],
-        ),
-      ),
-    );
-  }
-
-  Marker _buildCardMarker(WeatherCard weatherCardList) {
-    final hourOfDay = weatherController.getTime(
-      weatherCardList.time!,
-      weatherCardList.timezone!,
-    );
-    final dayOfNow = weatherController.getDay(
-      weatherCardList.timeDaily!,
-      weatherCardList.timezone!,
-    );
-
-    return Marker(
-      height: 50,
-      width: 100,
-      point: LatLng(weatherCardList.lat!, weatherCardList.lon!),
-      child: GestureDetector(
-        onTap: () => _onMarkerTap(weatherCardList),
-        child: _buildStyleMarkers(
-          weatherCardList.weathercode![hourOfDay],
-          weatherCardList.time![hourOfDay],
-          weatherCardList.sunrise![dayOfNow],
-          weatherCardList.sunset![dayOfNow],
-          weatherCardList.temperature2M![hourOfDay],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildMapTileLayer(CacheStore cacheStore) {
-    return TileLayer(
-      urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
-      userAgentPackageName: 'com.darkmoonight.rain',
-      tileProvider: CachedTileProvider(
-        store: cacheStore,
-        maxStale: const Duration(days: 30),
-      ),
-    );
-  }
-
-  Widget _buildWeatherCard() {
-    return _isCardVisible && _selectedWeatherCard != null
-        ? SlideTransition(
-          position: _offsetAnimation,
-          child: GestureDetector(
-            onTap:
-                () => Get.to(
-                  () => PlaceInfo(weatherCard: _selectedWeatherCard!),
-                  transition: Transition.downToUp,
-                ),
-            child: PlaceCard(
-              time: _selectedWeatherCard!.time!,
-              timeDaily: _selectedWeatherCard!.timeDaily!,
-              timeDay: _selectedWeatherCard!.sunrise!,
-              timeNight: _selectedWeatherCard!.sunset!,
-              weather: _selectedWeatherCard!.weathercode!,
-              degree: _selectedWeatherCard!.temperature2M!,
-              district: _selectedWeatherCard!.district!,
-              city: _selectedWeatherCard!.city!,
-              timezone: _selectedWeatherCard!.timezone!,
-            ),
-          ),
-        )
-        : const SizedBox.shrink();
-  }
-
-  Widget _buildSearchField() {
-    return RawAutocomplete<Result>(
-      focusNode: _focusNode,
-      textEditingController: _controllerSearch,
-      fieldViewBuilder: (
-        BuildContext context,
-        TextEditingController fieldTextEditingController,
-        FocusNode fieldFocusNode,
-        VoidCallback onFieldSubmitted,
-      ) {
-        return MyTextForm(
-          labelText: 'search'.tr,
-          type: TextInputType.text,
-          icon: const Icon(IconsaxPlusLinear.global_search),
-          controller: _controllerSearch,
-          margin: const EdgeInsets.only(left: 10, right: 10, top: 10),
-          focusNode: _focusNode,
-          onChanged: (value) => setState(() {}),
-          iconButton:
-              _controllerSearch.text.isNotEmpty
-                  ? IconButton(
-                    onPressed: () {
-                      _controllerSearch.clear();
-                    },
-                    icon: const Icon(
-                      IconsaxPlusLinear.close_circle,
-                      color: Colors.grey,
-                      size: 20,
-                    ),
-                  )
-                  : null,
-        );
-      },
-      optionsBuilder: (TextEditingValue textEditingValue) {
-        if (textEditingValue.text.isEmpty) {
-          return const Iterable<Result>.empty();
-        }
-        return WeatherAPI().getCity(textEditingValue.text, locale);
-      },
-      onSelected: (Result selection) {
-        _animatedMapController.mapController.move(
-          LatLng(selection.latitude, selection.longitude),
-          14,
-        );
-        _controllerSearch.clear();
-        _focusNode.unfocus();
-      },
-      displayStringForOption:
-          (Result option) => '${option.name}, ${option.admin1}',
-      optionsViewBuilder: (
-        BuildContext context,
-        AutocompleteOnSelected<Result> onSelected,
-        Iterable<Result> options,
-      ) {
-        return Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
-          child: Align(
-            alignment: Alignment.topCenter,
-            child: Material(
-              borderRadius: BorderRadius.circular(20),
-              elevation: 4.0,
-              child: ListView.builder(
-                padding: EdgeInsets.zero,
-                shrinkWrap: true,
-                itemCount: options.length,
-                itemBuilder: (BuildContext context, int index) {
-                  final Result option = options.elementAt(index);
-                  return InkWell(
-                    onTap: () => onSelected(option),
-                    child: ListTile(
-                      title: Text(
-                        '${option.name}, ${option.admin1}',
-                        style: context.textTheme.labelLarge,
-                      ),
-                    ),
-                  );
-                },
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final mainLocation = weatherController.location;
-    final mainWeather = weatherController.mainWeather;
-
-    final hourOfDay = weatherController.hourOfDay.value;
-    final dayOfNow = weatherController.dayOfNow.value;
-
-    return Scaffold(
-      body: FutureBuilder<CacheStore>(
-        future: _cacheStoreFuture,
-        builder: (context, snapshot) {
-          if (snapshot.connectionState == ConnectionState.waiting) {
-            return const Center(child: CircularProgressIndicator());
-          }
-
-          if (snapshot.hasError) {
-            return Center(child: Text(snapshot.error.toString()));
-          }
-
-          final cacheStore = snapshot.data!;
-
-          return Stack(
-            children: [
-              FlutterMap(
-                mapController: _animatedMapController.mapController,
-                options: MapOptions(
-                  backgroundColor: context.theme.colorScheme.surface,
-                  initialCenter: LatLng(mainLocation.lat!, mainLocation.lon!),
-                  initialZoom: 8,
-                  interactionOptions: const InteractionOptions(
-                    flags: InteractiveFlag.all & ~InteractiveFlag.rotate,
-                  ),
-                  cameraConstraint: CameraConstraint.contain(
-                    bounds: LatLngBounds(
-                      const LatLng(-90, -180),
-                      const LatLng(90, 180),
-                    ),
-                  ),
-                  onTap: (_, __) => _hideCard(),
-                  onLongPress:
-                      (tapPosition, point) => showModalBottomSheet(
-                        context: context,
-                        isScrollControlled: true,
-                        enableDrag: false,
-                        builder:
-                            (BuildContext context) => CreatePlace(
-                              latitude: '${point.latitude}',
-                              longitude: '${point.longitude}',
-                            ),
-                      ),
-                ),
-                children: [
-                  if (_isDarkMode)
-                    ColorFiltered(
-                      colorFilter: const ColorFilter.matrix(<double>[
-                        -0.2, -0.7, -0.08, 0, 255, // Red channel
-                        -0.2, -0.7, -0.08, 0, 255, // Green channel
-                        -0.2, -0.7, -0.08, 0, 255, // Blue channel
-                        0, 0, 0, 1, 0, // Alpha channel
-                      ]),
-                      child: _buildMapTileLayer(cacheStore),
-                    )
-                  else
-                    _buildMapTileLayer(cacheStore),
-                  RichAttributionWidget(
-                    animationConfig: const ScaleRAWA(),
-                    alignment: AttributionAlignment.bottomLeft,
-                    attributions: [
-                      TextSourceAttribution(
-                        'OpenStreetMap contributors',
-                        onTap:
-                            () => weatherController.urlLauncher(
-                              'https://openstreetmap.org/copyright',
-                            ),
-                      ),
-                    ],
-                  ),
-                  Obx(() {
-                    final mainMarker = _buildMainLocationMarker(
-                      WeatherCard.fromJson({
-                        ...mainWeather.toJson(),
-                        ...mainLocation.toJson(),
-                      }),
-                      hourOfDay,
-                      dayOfNow,
-                    );
-
-                    final cardMarkers =
-                        weatherController.weatherCards
-                            .map(
-                              (weatherCardList) =>
-                                  _buildCardMarker(weatherCardList),
-                            )
-                            .toList();
-
-                    return MarkerLayer(markers: [mainMarker, ...cardMarkers]);
-                  }),
-                  ExpandableFab(
-                    key: _fabKey,
-                    pos: ExpandableFabPos.right,
-                    type: ExpandableFabType.up,
-                    distance: 70,
-                    openButtonBuilder: RotateFloatingActionButtonBuilder(
-                      child: const Icon(IconsaxPlusLinear.menu),
-                      fabSize: ExpandableFabSize.regular,
-                    ),
-                    closeButtonBuilder: DefaultFloatingActionButtonBuilder(
-                      child: const Icon(Icons.close),
-                      fabSize: ExpandableFabSize.regular,
-                    ),
-                    children: [
-                      FloatingActionButton(
-                        heroTag: null,
-                        child: const Icon(IconsaxPlusLinear.home_2),
-                        onPressed:
-                            () => _resetMapOrientation(
-                              center: LatLng(
-                                mainLocation.lat!,
-                                mainLocation.lon!,
-                              ),
-                              zoom: 8,
-                            ),
-                      ),
-                      FloatingActionButton(
-                        heroTag: null,
-                        child: const Icon(IconsaxPlusLinear.search_zoom_out_1),
-                        onPressed:
-                            () => _animatedMapController.animatedZoomOut(
-                              customId:
-                                  _useTransformer ? _useTransformerId : null,
-                            ),
-                      ),
-                      FloatingActionButton(
-                        heroTag: null,
-                        child: const Icon(IconsaxPlusLinear.search_zoom_in),
-                        onPressed:
-                            () => _animatedMapController.animatedZoomIn(
-                              customId:
-                                  _useTransformer ? _useTransformerId : null,
-                            ),
-                      ),
-                    ],
-                  ),
-                  Positioned(
-                    left: 0,
-                    right: 0,
-                    bottom: 0,
-                    child: _buildWeatherCard(),
-                  ),
-                ],
-              ),
-              _buildSearchField(),
-            ],
-          );
-        },
-      ),
-      floatingActionButtonLocation: ExpandableFab.location,
-    );
-  }
-}
diff --git a/lib/app/ui/places/view/place_info.dart b/lib/app/ui/places/view/place_info.dart
deleted file mode 100755
index f56f709..0000000
--- a/lib/app/ui/places/view/place_info.dart
+++ /dev/null
@@ -1,212 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:iconsax_plus/iconsax_plus.dart';
-import 'package:rain/app/controller/controller.dart';
-import 'package:rain/app/data/db.dart';
-import 'package:rain/app/ui/widgets/weather/daily/daily_card_list.dart';
-import 'package:rain/app/ui/widgets/weather/daily/daily_container.dart';
-import 'package:rain/app/ui/widgets/weather/desc/desc_container.dart';
-import 'package:rain/app/ui/widgets/weather/hourly.dart';
-import 'package:rain/app/ui/widgets/weather/now.dart';
-import 'package:rain/app/ui/widgets/weather/sunset_sunrise.dart';
-import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
-
-class PlaceInfo extends StatefulWidget {
-  const PlaceInfo({super.key, required this.weatherCard});
-  final WeatherCard weatherCard;
-
-  @override
-  State<PlaceInfo> createState() => _PlaceInfoState();
-}
-
-class _PlaceInfoState extends State<PlaceInfo> {
-  int timeNow = 0;
-  int dayNow = 0;
-  final weatherController = Get.put(WeatherController());
-  final itemScrollController = ItemScrollController();
-
-  @override
-  void initState() {
-    getTime();
-    super.initState();
-  }
-
-  void getTime() {
-    final weatherCard = widget.weatherCard;
-
-    timeNow = weatherController.getTime(
-      weatherCard.time!,
-      weatherCard.timezone!,
-    );
-    dayNow = weatherController.getDay(
-      weatherCard.timeDaily!,
-      weatherCard.timezone!,
-    );
-    Future.delayed(const Duration(milliseconds: 30), () {
-      itemScrollController.scrollTo(
-        index: timeNow,
-        duration: const Duration(seconds: 2),
-        curve: Curves.easeInOutCubic,
-      );
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final weatherCard = widget.weatherCard;
-
-    return RefreshIndicator(
-      onRefresh: _handleRefresh,
-      child: Scaffold(
-        appBar: _buildAppBar(context, weatherCard),
-        body: SafeArea(
-          child: Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 10),
-            child: ListView(
-              children: [
-                _buildNowWidget(weatherCard),
-                _buildHourlyList(weatherCard),
-                _buildSunsetSunriseWidget(weatherCard),
-                _buildHourlyDescContainer(weatherCard),
-                _buildDailyContainer(weatherCard),
-              ],
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-
-  Future<void> _handleRefresh() async {
-    await weatherController.updateCard(widget.weatherCard);
-    getTime();
-    setState(() {});
-  }
-
-  AppBar _buildAppBar(BuildContext context, WeatherCard weatherCard) {
-    return AppBar(
-      centerTitle: true,
-      automaticallyImplyLeading: false,
-      leading: IconButton(
-        onPressed: () => Get.back(),
-        icon: const Icon(IconsaxPlusLinear.arrow_left_3, size: 20),
-      ),
-      title: Text(
-        weatherCard.district!.isNotEmpty
-            ? '${weatherCard.city}, ${weatherCard.district}'
-            : '${weatherCard.city}',
-        style: context.textTheme.titleMedium?.copyWith(
-          fontWeight: FontWeight.w600,
-          fontSize: 18,
-        ),
-      ),
-    );
-  }
-
-  Widget _buildNowWidget(WeatherCard weatherCard) {
-    return Now(
-      time: weatherCard.time![timeNow],
-      weather: weatherCard.weathercode![timeNow],
-      degree: weatherCard.temperature2M![timeNow],
-      feels: weatherCard.apparentTemperature![timeNow]!,
-      timeDay: weatherCard.sunrise![dayNow],
-      timeNight: weatherCard.sunset![dayNow],
-      tempMax: weatherCard.temperature2MMax![dayNow]!,
-      tempMin: weatherCard.temperature2MMin![dayNow]!,
-    );
-  }
-
-  Widget _buildHourlyList(WeatherCard weatherCard) {
-    return Card(
-      margin: const EdgeInsets.only(bottom: 15),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
-        child: SizedBox(
-          height: 135,
-          child: ScrollablePositionedList.separated(
-            key: const PageStorageKey(1),
-            separatorBuilder: (BuildContext context, int index) {
-              return const VerticalDivider(
-                width: 10,
-                indent: 40,
-                endIndent: 40,
-              );
-            },
-            scrollDirection: Axis.horizontal,
-            itemScrollController: itemScrollController,
-            itemCount: weatherCard.time!.length,
-            itemBuilder: (ctx, i) => _buildHourlyItem(weatherCard, i),
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildHourlyItem(WeatherCard weatherCard, int i) {
-    return GestureDetector(
-      onTap: () {
-        timeNow = i;
-        dayNow = (i / 24).floor();
-        setState(() {});
-      },
-      child: Container(
-        margin: const EdgeInsets.symmetric(vertical: 5),
-        padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 5),
-        decoration: BoxDecoration(
-          color:
-              i == timeNow
-                  ? context.theme.colorScheme.secondaryContainer
-                  : Colors.transparent,
-          borderRadius: const BorderRadius.all(Radius.circular(20)),
-        ),
-        child: Hourly(
-          time: weatherCard.time![i],
-          weather: weatherCard.weathercode![i],
-          degree: weatherCard.temperature2M![i],
-          timeDay: weatherCard.sunrise![(i / 24).floor()],
-          timeNight: weatherCard.sunset![(i / 24).floor()],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildSunsetSunriseWidget(WeatherCard weatherCard) {
-    return SunsetSunrise(
-      timeSunrise: weatherCard.sunrise![dayNow],
-      timeSunset: weatherCard.sunset![dayNow],
-    );
-  }
-
-  Widget _buildHourlyDescContainer(WeatherCard weatherCard) {
-    return DescContainer(
-      humidity: weatherCard.relativehumidity2M?[timeNow],
-      wind: weatherCard.windspeed10M?[timeNow],
-      visibility: weatherCard.visibility?[timeNow],
-      feels: weatherCard.apparentTemperature?[timeNow],
-      evaporation: weatherCard.evapotranspiration?[timeNow],
-      precipitation: weatherCard.precipitation?[timeNow],
-      direction: weatherCard.winddirection10M?[timeNow],
-      pressure: weatherCard.surfacePressure?[timeNow],
-      rain: weatherCard.rain?[timeNow],
-      cloudcover: weatherCard.cloudcover?[timeNow],
-      windgusts: weatherCard.windgusts10M?[timeNow],
-      uvIndex: weatherCard.uvIndex?[timeNow],
-      dewpoint2M: weatherCard.dewpoint2M?[timeNow],
-      precipitationProbability: weatherCard.precipitationProbability?[timeNow],
-      shortwaveRadiation: weatherCard.shortwaveRadiation?[timeNow],
-      initiallyExpanded: false,
-      title: 'hourlyVariables'.tr,
-    );
-  }
-
-  Widget _buildDailyContainer(WeatherCard weatherCard) {
-    return DailyContainer(
-      weatherData: weatherCard,
-      onTap:
-          () => Get.to(
-            () => DailyCardList(weatherData: weatherCard),
-            transition: Transition.downToUp,
-          ),
-    );
-  }
-}
diff --git a/lib/app/ui/places/view/place_list.dart b/lib/app/ui/places/view/place_list.dart
deleted file mode 100755
index 7fafd5a..0000000
--- a/lib/app/ui/places/view/place_list.dart
+++ /dev/null
@@ -1,116 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:iconsax_plus/iconsax_plus.dart';
-import 'package:rain/app/controller/controller.dart';
-import 'package:rain/app/ui/places/widgets/place_card_list.dart';
-import 'package:rain/app/ui/widgets/text_form.dart';
-
-class PlaceList extends StatefulWidget {
-  const PlaceList({super.key});
-
-  @override
-  State<PlaceList> createState() => _PlaceListState();
-}
-
-class _PlaceListState extends State<PlaceList> {
-  final weatherController = Get.put(WeatherController());
-  final TextEditingController searchTasks = TextEditingController();
-  String filter = '';
-
-  @override
-  void initState() {
-    super.initState();
-    applyFilter('');
-  }
-
-  void applyFilter(String value) {
-    filter = value.toLowerCase();
-    setState(() {});
-  }
-
-  void clearSearch() {
-    searchTasks.clear();
-    applyFilter('');
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final textTheme = context.textTheme;
-    final titleMedium = textTheme.titleMedium;
-
-    return Obx(() => _buildContent(context, titleMedium));
-  }
-
-  Widget _buildContent(BuildContext context, TextStyle? titleMedium) {
-    if (weatherController.weatherCards.isEmpty) {
-      return _buildEmptyState(context, titleMedium);
-    } else {
-      return _buildListView(context);
-    }
-  }
-
-  Widget _buildEmptyState(BuildContext context, TextStyle? titleMedium) {
-    return Center(
-      child: SingleChildScrollView(
-        child: Column(
-          children: [
-            Image.asset('assets/icons/City.png', scale: 6),
-            SizedBox(
-              width: Get.size.width * 0.8,
-              child: Text(
-                'noWeatherCard'.tr,
-                textAlign: TextAlign.center,
-                style: titleMedium?.copyWith(
-                  fontWeight: FontWeight.w600,
-                  fontSize: 18,
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildListView(BuildContext context) {
-    return NestedScrollView(
-      physics: const NeverScrollableScrollPhysics(),
-      headerSliverBuilder: (context, innerBoxIsScrolled) {
-        return [_buildSearchField(context)];
-      },
-      body: RefreshIndicator(
-        onRefresh: _handleRefresh,
-        child: PlaceCardList(searchCity: filter),
-      ),
-    );
-  }
-
-  Widget _buildSearchField(BuildContext context) {
-    return SliverToBoxAdapter(
-      child: MyTextForm(
-        labelText: 'search'.tr,
-        type: TextInputType.text,
-        icon: const Icon(IconsaxPlusLinear.search_normal_1, size: 20),
-        controller: searchTasks,
-        margin: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
-        onChanged: applyFilter,
-        iconButton:
-            searchTasks.text.isNotEmpty
-                ? IconButton(
-                  onPressed: clearSearch,
-                  icon: const Icon(
-                    IconsaxPlusLinear.close_circle,
-                    color: Colors.grey,
-                    size: 20,
-                  ),
-                )
-                : null,
-      ),
-    );
-  }
-
-  Future<void> _handleRefresh() async {
-    await weatherController.updateCacheCard(true);
-    setState(() {});
-  }
-}
diff --git a/lib/app/ui/places/widgets/create_place.dart b/lib/app/ui/places/widgets/create_place.dart
deleted file mode 100755
index 0ef872a..0000000
--- a/lib/app/ui/places/widgets/create_place.dart
+++ /dev/null
@@ -1,346 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:iconsax_plus/iconsax_plus.dart';
-import 'package:rain/app/api/api.dart';
-import 'package:rain/app/api/city_api.dart';
-import 'package:rain/app/controller/controller.dart';
-import 'package:rain/app/ui/widgets/button.dart';
-import 'package:rain/app/ui/widgets/text_form.dart';
-import 'package:rain/main.dart';
-
-class CreatePlace extends StatefulWidget {
-  const CreatePlace({super.key, this.latitude, this.longitude});
-  final String? latitude;
-  final String? longitude;
-
-  @override
-  State<CreatePlace> createState() => _CreatePlaceState();
-}
-
-class _CreatePlaceState extends State<CreatePlace>
-    with SingleTickerProviderStateMixin {
-  bool isLoading = false;
-  final formKey = GlobalKey<FormState>();
-  final _focusNode = FocusNode();
-  final weatherController = Get.put(WeatherController());
-
-  static const kTextFieldElevation = 4.0;
-
-  late TextEditingController _controller;
-  late TextEditingController _controllerLat;
-  late TextEditingController _controllerLon;
-  late TextEditingController _controllerCity;
-  late TextEditingController _controllerDistrict;
-
-  late AnimationController _animationController;
-  late Animation<double> _animation;
-
-  @override
-  void initState() {
-    super.initState();
-    _controller = TextEditingController();
-    _controllerLat = TextEditingController(text: widget.latitude);
-    _controllerLon = TextEditingController(text: widget.longitude);
-    _controllerCity = TextEditingController();
-    _controllerDistrict = TextEditingController();
-
-    _animationController = AnimationController(
-      duration: const Duration(milliseconds: 300),
-      vsync: this,
-    );
-    _animation = CurvedAnimation(
-      parent: _animationController,
-      curve: Curves.easeInOut,
-    );
-  }
-
-  @override
-  void dispose() {
-    _animationController.dispose();
-    _controller.dispose();
-    _controllerLat.dispose();
-    _controllerLon.dispose();
-    _controllerCity.dispose();
-    _controllerDistrict.dispose();
-    super.dispose();
-  }
-
-  void textTrim(TextEditingController value) {
-    value.text = value.text.trim();
-    while (value.text.contains('  ')) {
-      value.text = value.text.replaceAll('  ', ' ');
-    }
-  }
-
-  void fillController(Result selection) {
-    _controllerLat.text = '${selection.latitude}';
-    _controllerLon.text = '${selection.longitude}';
-    _controllerCity.text = selection.name;
-    _controllerDistrict.text = selection.admin1;
-    _controller.clear();
-    _focusNode.unfocus();
-    setState(() {});
-  }
-
-  bool get showButton {
-    return _controllerLon.text.isNotEmpty &&
-        _controllerLat.text.isNotEmpty &&
-        _controllerCity.text.isNotEmpty &&
-        _controllerDistrict.text.isNotEmpty;
-  }
-
-  void updateButtonVisibility() {
-    if (showButton) {
-      _animationController.forward();
-    } else {
-      _animationController.reverse();
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    updateButtonVisibility();
-
-    return Padding(
-      padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom),
-      child: Form(
-        key: formKey,
-        child: SingleChildScrollView(
-          child: Stack(
-            children: [
-              Padding(
-                padding: EdgeInsets.only(
-                  bottom: MediaQuery.of(context).viewInsets.bottom,
-                ),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    _buildTitleText(),
-                    _buildSearchField(),
-                    _buildLatitudeField(),
-                    _buildLongitudeField(),
-                    _buildCityField(),
-                    _buildDistrictField(),
-                    _buildSubmitButton(),
-                  ],
-                ),
-              ),
-              if (isLoading) const Center(child: CircularProgressIndicator()),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildTitleText() {
-    return Padding(
-      padding: const EdgeInsets.only(top: 14, bottom: 7),
-      child: Text(
-        'create'.tr,
-        style: context.textTheme.titleLarge?.copyWith(
-          fontWeight: FontWeight.bold,
-        ),
-        textAlign: TextAlign.center,
-      ),
-    );
-  }
-
-  Widget _buildSearchField() {
-    return RawAutocomplete<Result>(
-      focusNode: _focusNode,
-      textEditingController: _controller,
-      fieldViewBuilder: (
-        BuildContext context,
-        TextEditingController fieldTextEditingController,
-        FocusNode fieldFocusNode,
-        VoidCallback onFieldSubmitted,
-      ) {
-        return MyTextForm(
-          elevation: kTextFieldElevation,
-          labelText: 'search'.tr,
-          type: TextInputType.text,
-          icon: const Icon(IconsaxPlusLinear.global_search),
-          controller: _controller,
-          margin: const EdgeInsets.only(left: 10, right: 10, top: 10),
-          focusNode: _focusNode,
-        );
-      },
-      optionsBuilder: (TextEditingValue textEditingValue) {
-        if (textEditingValue.text.isEmpty) {
-          return const Iterable<Result>.empty();
-        }
-        return WeatherAPI().getCity(textEditingValue.text, locale);
-      },
-      onSelected: (Result selection) => fillController(selection),
-      displayStringForOption:
-          (Result option) => '${option.name}, ${option.admin1}',
-      optionsViewBuilder: (
-        BuildContext context,
-        AutocompleteOnSelected<Result> onSelected,
-        Iterable<Result> options,
-      ) {
-        return _buildOptionsView(context, onSelected, options);
-      },
-    );
-  }
-
-  Widget _buildOptionsView(
-    BuildContext context,
-    AutocompleteOnSelected<Result> onSelected,
-    Iterable<Result> options,
-  ) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 10),
-      child: Align(
-        alignment: Alignment.topCenter,
-        child: Material(
-          borderRadius: BorderRadius.circular(20),
-          elevation: 4.0,
-          child: ListView.builder(
-            padding: EdgeInsets.zero,
-            shrinkWrap: true,
-            itemCount: options.length,
-            itemBuilder: (BuildContext context, int index) {
-              final Result option = options.elementAt(index);
-              return InkWell(
-                onTap: () => onSelected(option),
-                child: ListTile(
-                  title: Text(
-                    '${option.name}, ${option.admin1}',
-                    style: context.textTheme.labelLarge,
-                  ),
-                ),
-              );
-            },
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildLatitudeField() {
-    return MyTextForm(
-      elevation: kTextFieldElevation,
-      controller: _controllerLat,
-      labelText: 'lat'.tr,
-      type: TextInputType.number,
-      icon: const Icon(IconsaxPlusLinear.location),
-      onChanged: (value) => setState(() {}),
-      margin: const EdgeInsets.only(left: 10, right: 10, top: 10),
-      validator: (value) => _validateLatitude(value),
-    );
-  }
-
-  Widget _buildLongitudeField() {
-    return MyTextForm(
-      elevation: kTextFieldElevation,
-      controller: _controllerLon,
-      labelText: 'lon'.tr,
-      type: TextInputType.number,
-      icon: const Icon(IconsaxPlusLinear.location),
-      onChanged: (value) => setState(() {}),
-      margin: const EdgeInsets.only(left: 10, right: 10, top: 10),
-      validator: (value) => _validateLongitude(value),
-    );
-  }
-
-  Widget _buildCityField() {
-    return MyTextForm(
-      elevation: kTextFieldElevation,
-      controller: _controllerCity,
-      labelText: 'city'.tr,
-      type: TextInputType.name,
-      icon: const Icon(IconsaxPlusLinear.building_3),
-      onChanged: (value) => setState(() {}),
-      margin: const EdgeInsets.only(left: 10, right: 10, top: 10),
-      validator: (value) => _validateCity(value),
-    );
-  }
-
-  Widget _buildDistrictField() {
-    return MyTextForm(
-      elevation: kTextFieldElevation,
-      controller: _controllerDistrict,
-      labelText: 'district'.tr,
-      type: TextInputType.streetAddress,
-      icon: const Icon(IconsaxPlusLinear.global),
-      onChanged: (value) => setState(() {}),
-      margin: const EdgeInsets.only(left: 10, right: 10, top: 10),
-      validator: (value) => _validateDistrict(value),
-    );
-  }
-
-  Widget _buildSubmitButton() {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10),
-      child: SizeTransition(
-        sizeFactor: _animation,
-        axisAlignment: -1.0,
-        child: MyTextButton(buttonName: 'done'.tr, onPressed: _handleSubmit),
-      ),
-    );
-  }
-
-  String? _validateLatitude(String? value) {
-    if (value == null || value.isEmpty) {
-      return 'validateValue'.tr;
-    }
-    double? numericValue = double.tryParse(value);
-    if (numericValue == null) {
-      return 'validateNumber'.tr;
-    }
-    if (numericValue < -90 || numericValue > 90) {
-      return 'validate90'.tr;
-    }
-    return null;
-  }
-
-  String? _validateLongitude(String? value) {
-    if (value == null || value.isEmpty) {
-      return 'validateValue'.tr;
-    }
-    double? numericValue = double.tryParse(value);
-    if (numericValue == null) {
-      return 'validateNumber'.tr;
-    }
-    if (numericValue < -180 || numericValue > 180) {
-      return 'validate180'.tr;
-    }
-    return null;
-  }
-
-  String? _validateCity(String? value) {
-    if (value == null || value.isEmpty) {
-      return 'validateName'.tr;
-    }
-    return null;
-  }
-
-  String? _validateDistrict(String? value) {
-    if (value == null || value.isEmpty) {
-      return 'validateName'.tr;
-    }
-    return null;
-  }
-
-  Future<void> _handleSubmit() async {
-    if (formKey.currentState!.validate()) {
-      textTrim(_controllerLat);
-      textTrim(_controllerLon);
-      textTrim(_controllerCity);
-      textTrim(_controllerDistrict);
-
-      setState(() => isLoading = true);
-      await weatherController.addCardWeather(
-        double.parse(_controllerLat.text),
-        double.parse(_controllerLon.text),
-        _controllerCity.text,
-        _controllerDistrict.text,
-      );
-      setState(() => isLoading = false);
-      Get.back();
-    }
-  }
-}
diff --git a/lib/app/ui/places/widgets/place_card.dart b/lib/app/ui/places/widgets/place_card.dart
deleted file mode 100755
index 3e35537..0000000
--- a/lib/app/ui/places/widgets/place_card.dart
+++ /dev/null
@@ -1,155 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
-import 'package:get/get.dart';
-import 'package:rain/app/controller/controller.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_weather.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_data.dart';
-import 'package:timezone/standalone.dart' as tz;
-
-class PlaceCard extends StatefulWidget {
-  const PlaceCard({
-    super.key,
-    required this.time,
-    required this.weather,
-    required this.degree,
-    required this.district,
-    required this.city,
-    required this.timezone,
-    required this.timeDay,
-    required this.timeNight,
-    required this.timeDaily,
-  });
-
-  final List<String> time;
-  final List<String> timeDay;
-  final List<String> timeNight;
-  final List<DateTime> timeDaily;
-  final String district;
-  final String city;
-  final List<int> weather;
-  final List<double> degree;
-  final String timezone;
-
-  @override
-  State<PlaceCard> createState() => _PlaceCardState();
-}
-
-class _PlaceCardState extends State<PlaceCard> {
-  final statusWeather = StatusWeather();
-  final statusData = StatusData();
-  final weatherController = Get.put(WeatherController());
-
-  @override
-  Widget build(BuildContext context) {
-    final currentTimeIndex = weatherController.getTime(
-      widget.time,
-      widget.timezone,
-    );
-    final currentDayIndex = weatherController.getDay(
-      widget.timeDaily,
-      widget.timezone,
-    );
-
-    return Card(
-      margin: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(vertical: 15, horizontal: 20),
-        child: Row(
-          children: [
-            _buildWeatherInfo(context, currentTimeIndex, currentDayIndex),
-            const Gap(5),
-            _buildWeatherImage(currentTimeIndex, currentDayIndex),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildWeatherInfo(
-    BuildContext context,
-    int currentTimeIndex,
-    int currentDayIndex,
-  ) {
-    return Expanded(
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            children: [
-              Text(
-                statusData.getDegree(
-                  widget.degree[currentTimeIndex].round().toInt(),
-                ),
-                style: context.textTheme.titleLarge?.copyWith(
-                  fontSize: 22,
-                  fontWeight: FontWeight.w600,
-                ),
-              ),
-              const Gap(7),
-              Text(
-                statusWeather.getText(widget.weather[currentTimeIndex]),
-                style: context.textTheme.titleMedium?.copyWith(
-                  color: Colors.grey,
-                  fontWeight: FontWeight.w400,
-                ),
-              ),
-            ],
-          ),
-          const Gap(10),
-          _buildLocationText(),
-          const Gap(5),
-          _buildCurrentTimeText(context),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildLocationText() {
-    String locationText;
-
-    if (widget.district.isEmpty) {
-      locationText = widget.city;
-    } else if (widget.city.isEmpty) {
-      locationText = widget.district;
-    } else if (widget.city == widget.district) {
-      locationText = widget.city;
-    } else {
-      locationText = '${widget.city}, ${widget.district}';
-    }
-
-    return Text(
-      locationText,
-      style: context.textTheme.titleMedium?.copyWith(
-        fontWeight: FontWeight.w500,
-      ),
-    );
-  }
-
-  Widget _buildCurrentTimeText(BuildContext context) {
-    return StreamBuilder(
-      stream: Stream.periodic(const Duration(seconds: 1)),
-      builder: (context, snapshot) {
-        return Text(
-          '${'time'.tr}: ${statusData.getTimeFormatTz(tz.TZDateTime.now(tz.getLocation(widget.timezone)))}',
-          style: context.textTheme.titleMedium?.copyWith(
-            color: Colors.grey,
-            fontWeight: FontWeight.w400,
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildWeatherImage(int currentTimeIndex, int currentDayIndex) {
-    return Image.asset(
-      statusWeather.getImageNow(
-        widget.weather[currentTimeIndex],
-        widget.time[currentTimeIndex],
-        widget.timeDay[currentDayIndex],
-        widget.timeNight[currentDayIndex],
-      ),
-      scale: 6.5,
-    );
-  }
-}
diff --git a/lib/app/ui/places/widgets/place_card_list.dart b/lib/app/ui/places/widgets/place_card_list.dart
deleted file mode 100755
index 6f1a0b1..0000000
--- a/lib/app/ui/places/widgets/place_card_list.dart
+++ /dev/null
@@ -1,155 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:iconsax_plus/iconsax_plus.dart';
-import 'package:rain/app/controller/controller.dart';
-import 'package:rain/app/data/db.dart';
-import 'package:rain/app/ui/places/view/place_info.dart';
-import 'package:rain/app/ui/places/widgets/place_card.dart';
-
-class PlaceCardList extends StatefulWidget {
-  const PlaceCardList({super.key, required this.searchCity});
-  final String searchCity;
-
-  @override
-  State<PlaceCardList> createState() => _PlaceCardListState();
-}
-
-class _PlaceCardListState extends State<PlaceCardList> {
-  final weatherController = Get.put(WeatherController());
-
-  @override
-  Widget build(BuildContext context) {
-    final textTheme = context.textTheme;
-    final titleMedium = textTheme.titleMedium;
-
-    final weatherCards = _filterWeatherCards(
-      weatherController.weatherCards,
-      widget.searchCity,
-    );
-
-    return ReorderableListView(
-      onReorder:
-          (oldIndex, newIndex) => weatherController.reorder(oldIndex, newIndex),
-      children: _buildWeatherCardList(
-        weatherCards,
-        context,
-        textTheme,
-        titleMedium,
-      ),
-    );
-  }
-
-  List<WeatherCard> _filterWeatherCards(
-    List<WeatherCard> weatherCards,
-    String searchCity,
-  ) {
-    return weatherCards
-        .where(
-          (weatherCard) =>
-              (searchCity.isEmpty ||
-                  weatherCard.city!.toLowerCase().contains(searchCity)),
-        )
-        .toList();
-  }
-
-  List<Widget> _buildWeatherCardList(
-    List<WeatherCard> weatherCards,
-    BuildContext context,
-    TextTheme textTheme,
-    TextStyle? titleMedium,
-  ) {
-    return weatherCards
-        .map(
-          (weatherCardList) => _buildDismissibleCard(
-            context,
-            weatherCardList,
-            textTheme,
-            titleMedium,
-          ),
-        )
-        .toList();
-  }
-
-  Widget _buildDismissibleCard(
-    BuildContext context,
-    WeatherCard weatherCardList,
-    TextTheme textTheme,
-    TextStyle? titleMedium,
-  ) {
-    return Dismissible(
-      key: ValueKey(weatherCardList),
-      direction: DismissDirection.endToStart,
-      background: _buildDismissibleBackground(),
-      confirmDismiss:
-          (DismissDirection direction) =>
-              _showDeleteConfirmationDialog(context, textTheme, titleMedium),
-      onDismissed: (DismissDirection direction) async {
-        await weatherController.deleteCardWeather(weatherCardList);
-      },
-      child: _buildCardGestureDetector(weatherCardList),
-    );
-  }
-
-  Widget _buildDismissibleBackground() {
-    return Container(
-      alignment: Alignment.centerRight,
-      child: const Padding(
-        padding: EdgeInsets.only(right: 15),
-        child: Icon(IconsaxPlusLinear.trash_square, color: Colors.red),
-      ),
-    );
-  }
-
-  Future<bool> _showDeleteConfirmationDialog(
-    BuildContext context,
-    TextTheme textTheme,
-    TextStyle? titleMedium,
-  ) async {
-    return await showAdaptiveDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog.adaptive(
-          title: Text('deletedCardWeather'.tr, style: textTheme.titleLarge),
-          content: Text('deletedCardWeatherQuery'.tr, style: titleMedium),
-          actions: [
-            TextButton(
-              onPressed: () => Get.back(result: false),
-              child: Text(
-                'cancel'.tr,
-                style: titleMedium?.copyWith(color: Colors.blueAccent),
-              ),
-            ),
-            TextButton(
-              onPressed: () => Get.back(result: true),
-              child: Text(
-                'delete'.tr,
-                style: titleMedium?.copyWith(color: Colors.red),
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  Widget _buildCardGestureDetector(WeatherCard weatherCardList) {
-    return GestureDetector(
-      onTap:
-          () => Get.to(
-            () => PlaceInfo(weatherCard: weatherCardList),
-            transition: Transition.downToUp,
-          ),
-      child: PlaceCard(
-        time: weatherCardList.time!,
-        timeDaily: weatherCardList.timeDaily!,
-        timeDay: weatherCardList.sunrise!,
-        timeNight: weatherCardList.sunset!,
-        weather: weatherCardList.weathercode!,
-        degree: weatherCardList.temperature2M!,
-        district: weatherCardList.district!,
-        city: weatherCardList.city!,
-        timezone: weatherCardList.timezone!,
-      ),
-    );
-  }
-}
diff --git a/lib/app/ui/settings/view/settings.dart b/lib/app/ui/settings/view/settings.dart
deleted file mode 100755
index 884e284..0000000
--- a/lib/app/ui/settings/view/settings.dart
+++ /dev/null
@@ -1,1275 +0,0 @@
-import 'dart:io';
-import 'package:flutter/material.dart';
-import 'package:flutter_hsvcolor_picker/flutter_hsvcolor_picker.dart';
-import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:gap/gap.dart';
-import 'package:geolocator/geolocator.dart';
-import 'package:get/get.dart';
-import 'package:home_widget/home_widget.dart';
-import 'package:http_cache_file_store/http_cache_file_store.dart';
-import 'package:iconsax_plus/iconsax_plus.dart';
-import 'package:intl/intl.dart';
-import 'package:line_awesome_flutter/line_awesome_flutter.dart';
-import 'package:package_info_plus/package_info_plus.dart';
-import 'package:path_provider/path_provider.dart';
-import 'package:rain/app/controller/controller.dart';
-import 'package:rain/app/data/db.dart';
-import 'package:rain/app/ui/settings/widgets/setting_card.dart';
-import 'package:rain/main.dart';
-import 'package:rain/theme/theme_controller.dart';
-import 'package:rain/app/utils/color_converter.dart';
-import 'package:restart_app/restart_app.dart';
-
-class SettingsPage extends StatefulWidget {
-  const SettingsPage({super.key});
-
-  @override
-  State<SettingsPage> createState() => _SettingsPageState();
-}
-
-class _SettingsPageState extends State<SettingsPage> {
-  final themeController = Get.put(ThemeController());
-  final weatherController = Get.put(WeatherController());
-  String? appVersion;
-  String? colorBackground;
-  String? colorText;
-
-  @override
-  void initState() {
-    super.initState();
-    _infoVersion();
-  }
-
-  Future<void> _infoVersion() async {
-    final packageInfo = await PackageInfo.fromPlatform();
-    setState(() {
-      appVersion = packageInfo.version;
-    });
-  }
-
-  void _updateLanguage(Locale locale) {
-    settings.language = '$locale';
-    isar.writeTxnSync(() => isar.settings.putSync(settings));
-    Get.updateLocale(locale);
-    Get.back();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SingleChildScrollView(
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: [
-          _buildAppearanceCard(context),
-          _buildFunctionsCard(context),
-          _buildDataCard(context),
-          _buildWidgetCard(context),
-          _buildMapCard(context),
-          _buildLanguageCard(context),
-          _buildGroupsCard(context),
-          _buildLicenseCard(context),
-          _buildVersionCard(context),
-          _buildGitHubCard(context),
-          _buildOpenMeteoText(context),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildAppearanceCard(BuildContext context) {
-    return SettingCard(
-      icon: const Icon(IconsaxPlusLinear.brush_1),
-      text: 'appearance'.tr,
-      onPressed: () {
-        _showAppearanceBottomSheet(context);
-      },
-    );
-  }
-
-  void _showAppearanceBottomSheet(BuildContext context) {
-    showModalBottomSheet(
-      context: context,
-      builder: (BuildContext context) {
-        return Padding(
-          padding: EdgeInsets.only(
-            bottom: MediaQuery.of(context).padding.bottom,
-          ),
-          child: StatefulBuilder(
-            builder: (BuildContext context, setState) {
-              return SingleChildScrollView(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    _buildAppearanceTitle(context),
-                    _buildThemeSettingCard(context, setState),
-                    _buildAmoledThemeSettingCard(context, setState),
-                    _buildMaterialColorSettingCard(context, setState),
-                    _buildLargeElementSettingCard(context, setState),
-                    const Gap(10),
-                  ],
-                ),
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildAppearanceTitle(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 15),
-      child: Text(
-        'appearance'.tr,
-        style: context.textTheme.titleLarge?.copyWith(fontSize: 20),
-      ),
-    );
-  }
-
-  Widget _buildThemeSettingCard(BuildContext context, StateSetter setState) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.moon),
-      text: 'theme'.tr,
-      dropdown: true,
-      dropdownName: settings.theme?.tr,
-      dropdownList: <String>['system'.tr, 'dark'.tr, 'light'.tr],
-      dropdownChange: (String? newValue) {
-        _updateTheme(newValue, context, setState);
-      },
-    );
-  }
-
-  void _updateTheme(
-    String? newValue,
-    BuildContext context,
-    StateSetter setState,
-  ) {
-    ThemeMode themeMode = newValue?.tr == 'system'.tr
-        ? ThemeMode.system
-        : newValue?.tr == 'dark'.tr
-        ? ThemeMode.dark
-        : ThemeMode.light;
-    String theme = newValue?.tr == 'system'.tr
-        ? 'system'
-        : newValue?.tr == 'dark'.tr
-        ? 'dark'
-        : 'light';
-    themeController.saveTheme(theme);
-    themeController.changeThemeMode(themeMode);
-    setState(() {});
-  }
-
-  Widget _buildAmoledThemeSettingCard(
-    BuildContext context,
-    StateSetter setState,
-  ) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.mobile),
-      text: 'amoledTheme'.tr,
-      switcher: true,
-      value: settings.amoledTheme,
-      onChange: (value) {
-        themeController.saveOledTheme(value);
-        MyApp.updateAppState(context, newAmoledTheme: value);
-      },
-    );
-  }
-
-  Widget _buildMaterialColorSettingCard(
-    BuildContext context,
-    StateSetter setState,
-  ) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.colorfilter),
-      text: 'materialColor'.tr,
-      switcher: true,
-      value: settings.materialColor,
-      onChange: (value) {
-        themeController.saveMaterialTheme(value);
-        MyApp.updateAppState(context, newMaterialColor: value);
-      },
-    );
-  }
-
-  Widget _buildLargeElementSettingCard(
-    BuildContext context,
-    StateSetter setState,
-  ) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.additem),
-      text: 'largeElement'.tr,
-      switcher: true,
-      value: settings.largeElement,
-      onChange: (value) {
-        settings.largeElement = value;
-        isar.writeTxnSync(() => isar.settings.putSync(settings));
-        MyApp.updateAppState(context, newLargeElement: value);
-        setState(() {});
-      },
-    );
-  }
-
-  Widget _buildFunctionsCard(BuildContext context) {
-    return SettingCard(
-      icon: const Icon(IconsaxPlusLinear.code_1),
-      text: 'functions'.tr,
-      onPressed: () {
-        _showFunctionsBottomSheet(context);
-      },
-    );
-  }
-
-  void _showFunctionsBottomSheet(BuildContext context) {
-    showModalBottomSheet(
-      context: context,
-      builder: (BuildContext context) {
-        return Padding(
-          padding: EdgeInsets.only(
-            bottom: MediaQuery.of(context).padding.bottom,
-          ),
-          child: StatefulBuilder(
-            builder: (BuildContext context, setState) {
-              return SingleChildScrollView(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    _buildFunctionsTitle(context),
-                    _buildLocationSettingCard(context, setState),
-                    _buildNotificationsSettingCard(context, setState),
-                    _buildTimeRangeSettingCard(context, setState),
-                    _buildTimeStartSettingCard(context, setState),
-                    _buildTimeEndSettingCard(context, setState),
-                    const Gap(10),
-                  ],
-                ),
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildFunctionsTitle(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 15),
-      child: Text(
-        'functions'.tr,
-        style: context.textTheme.titleLarge?.copyWith(fontSize: 20),
-      ),
-    );
-  }
-
-  Widget _buildLocationSettingCard(BuildContext context, StateSetter setState) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.map),
-      text: 'location'.tr,
-      switcher: true,
-      value: settings.location,
-      onChange: (value) async {
-        if (value) {
-          bool serviceEnabled = await Geolocator.isLocationServiceEnabled();
-          if (!serviceEnabled) {
-            if (!context.mounted) return;
-            await _showLocationDialog(context);
-            return;
-          }
-          weatherController.getCurrentLocation();
-        }
-        isar.writeTxnSync(() {
-          settings.location = value;
-          isar.settings.putSync(settings);
-        });
-        setState(() {});
-      },
-    );
-  }
-
-  Future<void> _showLocationDialog(BuildContext context) async {
-    await showAdaptiveDialog(
-      context: context,
-      builder: (BuildContext context) {
-        return AlertDialog.adaptive(
-          title: Text('location'.tr, style: context.textTheme.titleLarge),
-          content: Text('no_location'.tr, style: context.textTheme.titleMedium),
-          actions: [
-            TextButton(
-              onPressed: () => Get.back(result: false),
-              child: Text(
-                'cancel'.tr,
-                style: context.textTheme.titleMedium?.copyWith(
-                  color: Colors.blueAccent,
-                ),
-              ),
-            ),
-            TextButton(
-              onPressed: () {
-                Geolocator.openLocationSettings();
-                Get.back(result: true);
-              },
-              child: Text(
-                'settings'.tr,
-                style: context.textTheme.titleMedium?.copyWith(
-                  color: Colors.green,
-                ),
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
-
-  Widget _buildNotificationsSettingCard(
-    BuildContext context,
-    StateSetter setState,
-  ) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.notification_1),
-      text: 'notifications'.tr,
-      switcher: true,
-      value: settings.notifications,
-      onChange: (value) async {
-        final resultExact = await flutterLocalNotificationsPlugin
-            .resolvePlatformSpecificImplementation<
-              AndroidFlutterLocalNotificationsPlugin
-            >()
-            ?.requestExactAlarmsPermission();
-        final result = Platform.isIOS
-            ? await flutterLocalNotificationsPlugin
-                  .resolvePlatformSpecificImplementation<
-                    IOSFlutterLocalNotificationsPlugin
-                  >()
-                  ?.requestPermissions()
-            : await flutterLocalNotificationsPlugin
-                  .resolvePlatformSpecificImplementation<
-                    AndroidFlutterLocalNotificationsPlugin
-                  >()
-                  ?.requestNotificationsPermission();
-        if (result != null && resultExact != null) {
-          isar.writeTxnSync(() {
-            settings.notifications = value;
-            isar.settings.putSync(settings);
-          });
-          if (value) {
-            weatherController.notification(weatherController.mainWeather);
-          } else {
-            flutterLocalNotificationsPlugin.cancelAll();
-          }
-          setState(() {});
-        }
-      },
-    );
-  }
-
-  Widget _buildTimeRangeSettingCard(
-    BuildContext context,
-    StateSetter setState,
-  ) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.notification_status),
-      text: 'timeRange'.tr,
-      dropdown: true,
-      dropdownName: '$timeRange',
-      dropdownList: const <String>['1', '2', '3', '4', '5'],
-      dropdownChange: (String? newValue) {
-        isar.writeTxnSync(() {
-          settings.timeRange = int.parse(newValue!);
-          isar.settings.putSync(settings);
-        });
-        MyApp.updateAppState(context, newTimeRange: int.parse(newValue!));
-        if (settings.notifications) {
-          flutterLocalNotificationsPlugin.cancelAll();
-          weatherController.notification(weatherController.mainWeather);
-        }
-      },
-    );
-  }
-
-  Widget _buildTimeStartSettingCard(
-    BuildContext context,
-    StateSetter setState,
-  ) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.timer_start),
-      text: 'timeStart'.tr,
-      info: true,
-      infoSettings: true,
-      infoWidget: _TextInfo(
-        info: settings.timeformat == '12'
-            ? DateFormat.jm(locale.languageCode).format(
-                DateFormat.Hm(locale.languageCode).parse(
-                  weatherController.timeConvert(timeStart).format(context),
-                ),
-              )
-            : DateFormat.Hm(locale.languageCode).format(
-                DateFormat.Hm(locale.languageCode).parse(
-                  weatherController.timeConvert(timeStart).format(context),
-                ),
-              ),
-      ),
-      onPressed: () async {
-        final TimeOfDay? timeStartPicker = await showTimePicker(
-          context: context,
-          initialTime: weatherController.timeConvert(timeStart),
-          builder: (context, child) {
-            final Widget mediaQueryWrapper = MediaQuery(
-              data: MediaQuery.of(context).copyWith(
-                alwaysUse24HourFormat: settings.timeformat == '12'
-                    ? false
-                    : true,
-              ),
-              child: child!,
-            );
-            return mediaQueryWrapper;
-          },
-        );
-        if (timeStartPicker != null) {
-          isar.writeTxnSync(() {
-            settings.timeStart = timeStartPicker.format(context);
-            isar.settings.putSync(settings);
-          });
-          if (!context.mounted) return;
-          MyApp.updateAppState(
-            context,
-            newTimeStart: timeStartPicker.format(context),
-          );
-          if (settings.notifications) {
-            flutterLocalNotificationsPlugin.cancelAll();
-            weatherController.notification(weatherController.mainWeather);
-          }
-        }
-      },
-    );
-  }
-
-  Widget _buildTimeEndSettingCard(BuildContext context, StateSetter setState) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.timer_pause),
-      text: 'timeEnd'.tr,
-      info: true,
-      infoSettings: true,
-      infoWidget: _TextInfo(
-        info: settings.timeformat == '12'
-            ? DateFormat.jm(locale.languageCode).format(
-                DateFormat.Hm(
-                  locale.languageCode,
-                ).parse(weatherController.timeConvert(timeEnd).format(context)),
-              )
-            : DateFormat.Hm(locale.languageCode).format(
-                DateFormat.Hm(
-                  locale.languageCode,
-                ).parse(weatherController.timeConvert(timeEnd).format(context)),
-              ),
-      ),
-      onPressed: () async {
-        final TimeOfDay? timeEndPicker = await showTimePicker(
-          context: context,
-          initialTime: weatherController.timeConvert(timeEnd),
-          builder: (context, child) {
-            final Widget mediaQueryWrapper = MediaQuery(
-              data: MediaQuery.of(context).copyWith(
-                alwaysUse24HourFormat: settings.timeformat == '12'
-                    ? false
-                    : true,
-              ),
-              child: child!,
-            );
-            return mediaQueryWrapper;
-          },
-        );
-        if (timeEndPicker != null) {
-          isar.writeTxnSync(() {
-            settings.timeEnd = timeEndPicker.format(context);
-            isar.settings.putSync(settings);
-          });
-          if (!context.mounted) return;
-          MyApp.updateAppState(
-            context,
-            newTimeEnd: timeEndPicker.format(context),
-          );
-          if (settings.notifications) {
-            flutterLocalNotificationsPlugin.cancelAll();
-            weatherController.notification(weatherController.mainWeather);
-          }
-        }
-      },
-    );
-  }
-
-  Widget _buildDataCard(BuildContext context) {
-    return SettingCard(
-      icon: const Icon(IconsaxPlusLinear.d_square),
-      text: 'data'.tr,
-      onPressed: () {
-        _showDataBottomSheet(context);
-      },
-    );
-  }
-
-  void _showDataBottomSheet(BuildContext context) {
-    showModalBottomSheet(
-      context: context,
-      builder: (BuildContext context) {
-        return Padding(
-          padding: EdgeInsets.only(
-            bottom: MediaQuery.of(context).padding.bottom,
-          ),
-          child: StatefulBuilder(
-            builder: (BuildContext context, setState) {
-              return SingleChildScrollView(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    _buildDataTitle(context),
-                    _buildRoundDegreeSettingCard(context, setState),
-                    _buildDegreesSettingCard(context, setState),
-                    _buildMeasurementsSettingCard(context, setState),
-                    _buildWindSettingCard(context, setState),
-                    _buildPressureSettingCard(context, setState),
-                    _buildTimeFormatSettingCard(context, setState),
-                    const Gap(10),
-                  ],
-                ),
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildDataTitle(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 15),
-      child: Text(
-        'data'.tr,
-        style: context.textTheme.titleLarge?.copyWith(fontSize: 20),
-      ),
-    );
-  }
-
-  Widget _buildRoundDegreeSettingCard(
-    BuildContext context,
-    StateSetter setState,
-  ) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.cloud_notif),
-      text: 'roundDegree'.tr,
-      switcher: true,
-      value: settings.roundDegree,
-      onChange: (value) {
-        settings.roundDegree = value;
-        isar.writeTxnSync(() => isar.settings.putSync(settings));
-        MyApp.updateAppState(context, newRoundDegree: value);
-        setState(() {});
-      },
-    );
-  }
-
-  Widget _buildDegreesSettingCard(BuildContext context, StateSetter setState) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.sun_1),
-      text: 'degrees'.tr,
-      dropdown: true,
-      dropdownName: settings.degrees.tr,
-      dropdownList: <String>['celsius'.tr, 'fahrenheit'.tr],
-      dropdownChange: (String? newValue) async {
-        isar.writeTxnSync(() {
-          settings.degrees = newValue == 'celsius'.tr
-              ? 'celsius'
-              : 'fahrenheit';
-          isar.settings.putSync(settings);
-        });
-        await weatherController.deleteAll(false);
-        await weatherController.setLocation();
-        await weatherController.updateCacheCard(true);
-        setState(() {});
-      },
-    );
-  }
-
-  Widget _buildMeasurementsSettingCard(
-    BuildContext context,
-    StateSetter setState,
-  ) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.rulerpen),
-      text: 'measurements'.tr,
-      dropdown: true,
-      dropdownName: settings.measurements.tr,
-      dropdownList: <String>['metric'.tr, 'imperial'.tr],
-      dropdownChange: (String? newValue) async {
-        isar.writeTxnSync(() {
-          settings.measurements = newValue == 'metric'.tr
-              ? 'metric'
-              : 'imperial';
-          isar.settings.putSync(settings);
-        });
-        await weatherController.deleteAll(false);
-        await weatherController.setLocation();
-        await weatherController.updateCacheCard(true);
-        setState(() {});
-      },
-    );
-  }
-
-  Widget _buildWindSettingCard(BuildContext context, StateSetter setState) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.wind),
-      text: 'wind'.tr,
-      dropdown: true,
-      dropdownName: settings.wind.tr,
-      dropdownList: <String>['kph'.tr, 'm/s'.tr],
-      dropdownChange: (String? newValue) async {
-        isar.writeTxnSync(() {
-          settings.wind = newValue == 'kph'.tr ? 'kph' : 'm/s';
-          isar.settings.putSync(settings);
-        });
-        setState(() {});
-      },
-    );
-  }
-
-  Widget _buildPressureSettingCard(BuildContext context, StateSetter setState) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.ruler),
-      text: 'pressure'.tr,
-      dropdown: true,
-      dropdownName: settings.pressure.tr,
-      dropdownList: <String>['hPa'.tr, 'mmHg'.tr],
-      dropdownChange: (String? newValue) async {
-        isar.writeTxnSync(() {
-          settings.pressure = newValue == 'hPa'.tr ? 'hPa' : 'mmHg';
-          isar.settings.putSync(settings);
-        });
-        setState(() {});
-      },
-    );
-  }
-
-  Widget _buildTimeFormatSettingCard(
-    BuildContext context,
-    StateSetter setState,
-  ) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.clock_1),
-      text: 'timeformat'.tr,
-      dropdown: true,
-      dropdownName: settings.timeformat.tr,
-      dropdownList: <String>['12'.tr, '24'.tr],
-      dropdownChange: (String? newValue) {
-        isar.writeTxnSync(() {
-          settings.timeformat = newValue == '12'.tr ? '12' : '24';
-          isar.settings.putSync(settings);
-        });
-        setState(() {});
-      },
-    );
-  }
-
-  Widget _buildWidgetCard(BuildContext context) {
-    return SettingCard(
-      icon: const Icon(IconsaxPlusLinear.setting_3),
-      text: 'widget'.tr,
-      onPressed: () {
-        _showWidgetBottomSheet(context);
-      },
-    );
-  }
-
-  void _showWidgetBottomSheet(BuildContext context) {
-    showModalBottomSheet(
-      context: context,
-      builder: (BuildContext context) {
-        return Padding(
-          padding: EdgeInsets.only(
-            bottom: MediaQuery.of(context).padding.bottom,
-          ),
-          child: StatefulBuilder(
-            builder: (BuildContext context, setState) {
-              return SingleChildScrollView(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    _buildWidgetTitle(context),
-                    _buildAddWidgetSettingCard(context, setState),
-                    _buildWidgetBackgroundSettingCard(context, setState),
-                    _buildWidgetTextSettingCard(context, setState),
-                    const Gap(10),
-                  ],
-                ),
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildWidgetTitle(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 15),
-      child: Text(
-        'widget'.tr,
-        style: context.textTheme.titleLarge?.copyWith(fontSize: 20),
-      ),
-    );
-  }
-
-  Widget _buildAddWidgetSettingCard(
-    BuildContext context,
-    StateSetter setState,
-  ) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.add_square),
-      text: 'addWidget'.tr,
-      onPressed: () {
-        HomeWidget.requestPinWidget(
-          name: androidWidgetName,
-          androidName: androidWidgetName,
-          qualifiedAndroidName: 'com.yoshi.rain.OreoWidget',
-        );
-      },
-    );
-  }
-
-  Widget _buildWidgetBackgroundSettingCard(
-    BuildContext context,
-    StateSetter setState,
-  ) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.bucket_square),
-      text: 'widgetBackground'.tr,
-      info: true,
-      infoWidget: CircleAvatar(
-        backgroundColor: context.theme.indicatorColor,
-        radius: 11,
-        child: CircleAvatar(
-          backgroundColor: widgetBackgroundColor.isEmpty
-              ? context.theme.primaryColor
-              : HexColor.fromHex(widgetBackgroundColor),
-          radius: 10,
-        ),
-      ),
-      onPressed: () {
-        colorBackground = null;
-        showDialog(
-          context: context,
-          builder: (context) => Dialog(
-            child: SingleChildScrollView(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  _buildWidgetBackgroundTitle(context),
-                  _buildColorPicker(context),
-                  _buildColorPickerButton(context),
-                ],
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildWidgetBackgroundTitle(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 15),
-      child: Text(
-        'widgetBackground'.tr,
-        style: context.textTheme.titleMedium?.copyWith(fontSize: 18),
-      ),
-    );
-  }
-
-  Widget _buildColorPicker(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 15),
-      child: Theme(
-        data: context.theme.copyWith(
-          inputDecorationTheme: InputDecorationTheme(
-            border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
-          ),
-        ),
-        child: ColorPicker(
-          color: widgetBackgroundColor.isEmpty
-              ? context.theme.primaryColor
-              : HexColor.fromHex(widgetBackgroundColor),
-          onChanged: (pickedColor) {
-            colorBackground = pickedColor.toHex();
-          },
-        ),
-      ),
-    );
-  }
-
-  Widget _buildColorPickerButton(BuildContext context) {
-    return IconButton(
-      icon: const Icon(IconsaxPlusLinear.tick_square),
-      onPressed: () {
-        if (colorBackground == null) {
-          return;
-        }
-        weatherController.updateWidgetBackgroundColor(colorBackground!);
-        MyApp.updateAppState(
-          context,
-          newWidgetBackgroundColor: colorBackground,
-        );
-        Get.back();
-      },
-    );
-  }
-
-  Widget _buildWidgetTextSettingCard(
-    BuildContext context,
-    StateSetter setState,
-  ) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.text_block),
-      text: 'widgetText'.tr,
-      info: true,
-      infoWidget: CircleAvatar(
-        backgroundColor: context.theme.indicatorColor,
-        radius: 11,
-        child: CircleAvatar(
-          backgroundColor: widgetTextColor.isEmpty
-              ? context.theme.primaryColor
-              : HexColor.fromHex(widgetTextColor),
-          radius: 10,
-        ),
-      ),
-      onPressed: () {
-        colorText = null;
-        showDialog(
-          context: context,
-          builder: (context) => Dialog(
-            child: SingleChildScrollView(
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  _buildWidgetTextTitle(context),
-                  _buildTextColorPicker(context),
-                  _buildTextColorPickerButton(context),
-                ],
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildWidgetTextTitle(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 15),
-      child: Text(
-        'widgetText'.tr,
-        style: context.textTheme.titleMedium?.copyWith(fontSize: 18),
-      ),
-    );
-  }
-
-  Widget _buildTextColorPicker(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 15),
-      child: Theme(
-        data: context.theme.copyWith(
-          inputDecorationTheme: InputDecorationTheme(
-            border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
-          ),
-        ),
-        child: ColorPicker(
-          color: widgetTextColor.isEmpty
-              ? context.theme.primaryColor
-              : HexColor.fromHex(widgetTextColor),
-          onChanged: (pickedColor) {
-            colorText = pickedColor.toHex();
-          },
-        ),
-      ),
-    );
-  }
-
-  Widget _buildTextColorPickerButton(BuildContext context) {
-    return IconButton(
-      icon: const Icon(IconsaxPlusLinear.tick_square),
-      onPressed: () {
-        if (colorText == null) {
-          return;
-        }
-        weatherController.updateWidgetTextColor(colorText!);
-        MyApp.updateAppState(context, newWidgetTextColor: colorText);
-        Get.back();
-      },
-    );
-  }
-
-  Widget _buildMapCard(BuildContext context) {
-    return SettingCard(
-      icon: const Icon(IconsaxPlusLinear.map),
-      text: 'map'.tr,
-      onPressed: () {
-        _showMapBottomSheet(context);
-      },
-    );
-  }
-
-  void _showMapBottomSheet(BuildContext context) {
-    showModalBottomSheet(
-      context: context,
-      builder: (BuildContext context) {
-        return Padding(
-          padding: EdgeInsets.only(
-            bottom: MediaQuery.of(context).padding.bottom,
-          ),
-          child: StatefulBuilder(
-            builder: (BuildContext context, setState) {
-              return SingleChildScrollView(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    _buildMapTitle(context),
-                    _buildHideMapSettingCard(context, setState),
-                    _buildClearCacheStoreSettingCard(context),
-                    const Gap(10),
-                  ],
-                ),
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildMapTitle(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 15),
-      child: Text(
-        'map'.tr,
-        style: context.textTheme.titleLarge?.copyWith(fontSize: 20),
-      ),
-    );
-  }
-
-  Widget _buildHideMapSettingCard(BuildContext context, StateSetter setState) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.location_slash),
-      text: 'hideMap'.tr,
-      switcher: true,
-      value: settings.hideMap,
-      onChange: (value) {
-        settings.hideMap = value;
-        isar.writeTxnSync(() => isar.settings.putSync(settings));
-        setState(() {});
-        Future.delayed(
-          const Duration(milliseconds: 500),
-          () => Restart.restartApp(),
-        );
-      },
-    );
-  }
-
-  Widget _buildClearCacheStoreSettingCard(BuildContext context) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(IconsaxPlusLinear.trash_square),
-      text: 'clearCacheStore'.tr,
-      onPressed: () => _showClearCacheStoreDialog(context),
-    );
-  }
-
-  void _showClearCacheStoreDialog(BuildContext context) {
-    showAdaptiveDialog(
-      context: context,
-      builder: (context) => AlertDialog.adaptive(
-        title: Text(
-          'deletedCacheStore'.tr,
-          style: context.textTheme.titleLarge,
-        ),
-        content: Text(
-          'deletedCacheStoreQuery'.tr,
-          style: context.textTheme.titleMedium,
-        ),
-        actions: [
-          TextButton(
-            onPressed: () => Get.back(),
-            child: Text(
-              'cancel'.tr,
-              style: context.textTheme.titleMedium?.copyWith(
-                color: Colors.blueAccent,
-              ),
-            ),
-          ),
-          TextButton(
-            onPressed: () async {
-              final dir = await getTemporaryDirectory();
-              final cacheStoreFuture = FileCacheStore(
-                '${dir.path}${Platform.pathSeparator}MapTiles',
-              );
-              cacheStoreFuture.clean();
-              Get.back();
-            },
-            child: Text(
-              'delete'.tr,
-              style: context.textTheme.titleMedium?.copyWith(color: Colors.red),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildLanguageCard(BuildContext context) {
-    return SettingCard(
-      icon: const Icon(IconsaxPlusLinear.language_square),
-      text: 'language'.tr,
-      info: true,
-      infoSettings: true,
-      infoWidget: _TextInfo(
-        info: appLanguages.firstWhere(
-          (element) => (element['locale'] == locale),
-          orElse: () => {'name': ''},
-        )['name'],
-      ),
-      onPressed: () {
-        _showLanguageBottomSheet(context);
-      },
-    );
-  }
-
-  void _showLanguageBottomSheet(BuildContext context) {
-    showModalBottomSheet(
-      context: context,
-      builder: (BuildContext context) {
-        return Padding(
-          padding: EdgeInsets.only(
-            bottom: MediaQuery.of(context).padding.bottom,
-          ),
-          child: StatefulBuilder(
-            builder: (BuildContext context, setState) {
-              return ListView(
-                children: [
-                  _buildLanguageTitle(context),
-                  _buildLanguageList(context),
-                  const Gap(10),
-                ],
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildLanguageTitle(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 15),
-      child: Text(
-        'language'.tr,
-        style: context.textTheme.titleLarge?.copyWith(fontSize: 20),
-        textAlign: TextAlign.center,
-      ),
-    );
-  }
-
-  Widget _buildLanguageList(BuildContext context) {
-    return ListView.builder(
-      shrinkWrap: true,
-      physics: const BouncingScrollPhysics(),
-      itemCount: appLanguages.length,
-      itemBuilder: (context, index) {
-        return Card(
-          elevation: 4,
-          margin: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
-          child: ListTile(
-            title: Text(
-              appLanguages[index]['name'],
-              style: context.textTheme.labelLarge,
-              textAlign: TextAlign.center,
-            ),
-            onTap: () {
-              MyApp.updateAppState(
-                context,
-                newLocale: appLanguages[index]['locale'],
-              );
-              _updateLanguage(appLanguages[index]['locale']);
-            },
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildGroupsCard(BuildContext context) {
-    return SettingCard(
-      icon: const Icon(IconsaxPlusLinear.link_square),
-      text: 'groups'.tr,
-      onPressed: () {
-        _showGroupsBottomSheet(context);
-      },
-    );
-  }
-
-  void _showGroupsBottomSheet(BuildContext context) {
-    showModalBottomSheet(
-      context: context,
-      builder: (BuildContext context) {
-        return Padding(
-          padding: EdgeInsets.only(
-            bottom: MediaQuery.of(context).padding.bottom,
-          ),
-          child: StatefulBuilder(
-            builder: (BuildContext context, setState) {
-              return SingleChildScrollView(
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    _buildGroupsTitle(context),
-                    _buildDiscordSettingCard(context),
-                    _buildTelegramSettingCard(context),
-                    const Gap(10),
-                  ],
-                ),
-              );
-            },
-          ),
-        );
-      },
-    );
-  }
-
-  Widget _buildGroupsTitle(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 15),
-      child: Text(
-        'groups'.tr,
-        style: context.textTheme.titleLarge?.copyWith(fontSize: 20),
-      ),
-    );
-  }
-
-  Widget _buildDiscordSettingCard(BuildContext context) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(LineAwesomeIcons.discord),
-      text: 'Discord',
-      onPressed: () =>
-          weatherController.urlLauncher('https://discord.gg/JMMa9aHh8f'),
-    );
-  }
-
-  Widget _buildTelegramSettingCard(BuildContext context) {
-    return SettingCard(
-      elevation: 4,
-      icon: const Icon(LineAwesomeIcons.telegram),
-      text: 'Telegram',
-      onPressed: () =>
-          weatherController.urlLauncher('https://t.me/darkmoonightX'),
-    );
-  }
-
-  Widget _buildLicenseCard(BuildContext context) {
-    return SettingCard(
-      icon: const Icon(IconsaxPlusLinear.document),
-      text: 'license'.tr,
-      onPressed: () => Get.to(
-        () => LicensePage(
-          applicationIcon: Container(
-            width: 100,
-            height: 100,
-            margin: const EdgeInsets.symmetric(vertical: 5),
-            decoration: const BoxDecoration(
-              borderRadius: BorderRadius.all(Radius.circular(20)),
-              image: DecorationImage(
-                image: AssetImage('assets/icons/icon.png'),
-              ),
-            ),
-          ),
-          applicationName: 'Rain',
-          applicationVersion: appVersion,
-        ),
-        transition: Transition.downToUp,
-      ),
-    );
-  }
-
-  Widget _buildVersionCard(BuildContext context) {
-    return SettingCard(
-      icon: const Icon(IconsaxPlusLinear.hierarchy_square_2),
-      text: 'version'.tr,
-      info: true,
-      infoWidget: _TextInfo(info: '$appVersion'),
-    );
-  }
-
-  Widget _buildGitHubCard(BuildContext context) {
-    return SettingCard(
-      icon: const Icon(LineAwesomeIcons.github),
-      text: '${'project'.tr} GitHub',
-      onPressed: () =>
-          weatherController.urlLauncher('https://github.com/darkmoonight/Rain'),
-    );
-  }
-
-  Widget _buildOpenMeteoText(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.all(10),
-      child: GestureDetector(
-        child: Text(
-          'openMeteo'.tr,
-          style: context.textTheme.bodyMedium,
-          overflow: TextOverflow.visible,
-          textAlign: TextAlign.center,
-        ),
-        onTap: () => weatherController.urlLauncher('https://open-meteo.com/'),
-      ),
-    );
-  }
-}
-
-class _TextInfo extends StatelessWidget {
-  const _TextInfo({required this.info});
-
-  final String info;
-
-  @override
-  Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(right: 5),
-      child: Text(
-        info,
-        style: context.textTheme.bodyMedium,
-        overflow: TextOverflow.visible,
-      ),
-    );
-  }
-}
diff --git a/lib/app/ui/settings/widgets/setting_card.dart b/lib/app/ui/settings/widgets/setting_card.dart
deleted file mode 100755
index 2721a7b..0000000
--- a/lib/app/ui/settings/widgets/setting_card.dart
+++ /dev/null
@@ -1,107 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:iconsax_plus/iconsax_plus.dart';
-
-class SettingCard extends StatelessWidget {
-  const SettingCard({
-    super.key,
-    required this.icon,
-    required this.text,
-    this.switcher = false,
-    this.dropdown = false,
-    this.info = false,
-    this.infoSettings = false,
-    this.elevation,
-    this.dropdownName,
-    this.dropdownList,
-    this.dropdownChange,
-    this.value,
-    this.onPressed,
-    this.onChange,
-    this.infoWidget,
-  });
-
-  final Widget icon;
-  final String text;
-  final bool switcher;
-  final bool dropdown;
-  final bool info;
-  final bool infoSettings;
-  final Widget? infoWidget;
-  final String? dropdownName;
-  final List<String>? dropdownList;
-  final ValueChanged<String?>? dropdownChange;
-  final bool? value;
-  final VoidCallback? onPressed;
-  final ValueChanged<bool>? onChange;
-  final double? elevation;
-
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      elevation: elevation ?? 1,
-      margin: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
-      child: ListTile(
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(15)),
-        onTap: onPressed,
-        leading: icon,
-        title: Text(
-          text,
-          style: context.textTheme.titleMedium,
-          overflow: TextOverflow.visible,
-        ),
-        trailing: _buildTrailingWidget(context),
-      ),
-    );
-  }
-
-  Widget _buildTrailingWidget(BuildContext context) {
-    if (switcher) {
-      return _buildSwitchWidget();
-    } else if (dropdown) {
-      return _buildDropdownWidget();
-    } else if (info) {
-      return _buildInfoWidget();
-    } else {
-      return const Icon(IconsaxPlusLinear.arrow_right_3, size: 18);
-    }
-  }
-
-  Widget _buildSwitchWidget() {
-    return Transform.scale(
-      scale: 0.8,
-      child: Switch(value: value!, onChanged: onChange),
-    );
-  }
-
-  Widget _buildDropdownWidget() {
-    return DropdownButton<String>(
-      icon: const Padding(
-        padding: EdgeInsets.only(left: 7),
-        child: Icon(IconsaxPlusLinear.arrow_down),
-      ),
-      iconSize: 15,
-      alignment: AlignmentDirectional.centerEnd,
-      borderRadius: const BorderRadius.all(Radius.circular(15)),
-      underline: Container(),
-      value: dropdownName,
-      items: dropdownList!.map<DropdownMenuItem<String>>((String value) {
-        return DropdownMenuItem<String>(value: value, child: Text(value));
-      }).toList(),
-      onChanged: dropdownChange,
-    );
-  }
-
-  Widget _buildInfoWidget() {
-    if (infoSettings) {
-      return Wrap(
-        children: [
-          infoWidget!,
-          const Icon(IconsaxPlusLinear.arrow_right_3, size: 18),
-        ],
-      );
-    } else {
-      return infoWidget!;
-    }
-  }
-}
diff --git a/lib/app/ui/widgets/button.dart b/lib/app/ui/widgets/button.dart
deleted file mode 100755
index 8aa03cf..0000000
--- a/lib/app/ui/widgets/button.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-
-class MyTextButton extends StatelessWidget {
-  const MyTextButton({
-    super.key,
-    required this.buttonName,
-    required this.onPressed,
-    this.height = 50.0,
-  });
-
-  final String buttonName;
-  final VoidCallback? onPressed;
-  final double height;
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      height: height,
-      width: double.infinity,
-      child: ElevatedButton(
-        style: _buildButtonStyle(context),
-        onPressed: onPressed,
-        child: Text(buttonName, style: context.textTheme.titleMedium),
-      ),
-    );
-  }
-
-  ButtonStyle _buildButtonStyle(BuildContext context) {
-    return ButtonStyle(
-      shadowColor: const WidgetStatePropertyAll(Colors.transparent),
-      backgroundColor: WidgetStatePropertyAll(
-        context.theme.colorScheme.secondaryContainer.withAlpha(80),
-      ),
-    );
-  }
-}
diff --git a/lib/app/ui/widgets/weather/daily/daily_card.dart b/lib/app/ui/widgets/weather/daily/daily_card.dart
deleted file mode 100755
index b23cf68..0000000
--- a/lib/app/ui/widgets/weather/daily/daily_card.dart
+++ /dev/null
@@ -1,99 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
-import 'package:get/get.dart';
-import 'package:intl/intl.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_weather.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_data.dart';
-import 'package:rain/main.dart';
-
-class DailyCard extends StatefulWidget {
-  const DailyCard({
-    super.key,
-    required this.timeDaily,
-    required this.weathercodeDaily,
-    required this.temperature2MMax,
-    required this.temperature2MMin,
-  });
-
-  final DateTime timeDaily;
-  final int? weathercodeDaily;
-  final double? temperature2MMax;
-  final double? temperature2MMin;
-
-  @override
-  State<DailyCard> createState() => _DailyCardState();
-}
-
-class _DailyCardState extends State<DailyCard> {
-  final statusWeather = StatusWeather();
-  final statusData = StatusData();
-
-  @override
-  Widget build(BuildContext context) {
-    if (widget.weathercodeDaily == null) {
-      return Container();
-    }
-
-    return Card(
-      margin: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(vertical: 15, horizontal: 20),
-        child: Row(
-          children: [
-            _buildTemperatureInfo(context),
-            const Gap(5),
-            _buildWeatherImage(),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildTemperatureInfo(BuildContext context) {
-    return Expanded(
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Text(
-            '${statusData.getDegree(widget.temperature2MMin?.round())} / ${statusData.getDegree(widget.temperature2MMax?.round())}',
-            style: context.textTheme.titleLarge?.copyWith(
-              fontSize: 22,
-              fontWeight: FontWeight.w600,
-            ),
-          ),
-          const Gap(5),
-          _buildDateText(context),
-          const Gap(5),
-          _buildWeatherDescription(context),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildDateText(BuildContext context) {
-    return Text(
-      DateFormat.MMMMEEEEd(locale.languageCode).format(widget.timeDaily),
-      style: context.textTheme.titleMedium?.copyWith(
-        color: Colors.grey,
-        fontWeight: FontWeight.w400,
-      ),
-    );
-  }
-
-  Widget _buildWeatherDescription(BuildContext context) {
-    return Text(
-      statusWeather.getText(widget.weathercodeDaily),
-      style: context.textTheme.titleMedium?.copyWith(
-        color: Colors.grey,
-        fontWeight: FontWeight.w400,
-      ),
-    );
-  }
-
-  Widget _buildWeatherImage() {
-    return Image.asset(
-      statusWeather.getImageNowDaily(widget.weathercodeDaily),
-      scale: 6.5,
-    );
-  }
-}
diff --git a/lib/app/ui/widgets/weather/daily/daily_card_info.dart b/lib/app/ui/widgets/weather/daily/daily_card_info.dart
deleted file mode 100755
index ccd57d5..0000000
--- a/lib/app/ui/widgets/weather/daily/daily_card_info.dart
+++ /dev/null
@@ -1,348 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:iconsax_plus/iconsax_plus.dart';
-import 'package:intl/intl.dart';
-import 'package:rain/app/data/db.dart';
-import 'package:rain/app/ui/widgets/weather/desc/desc_container.dart';
-import 'package:rain/app/ui/widgets/weather/desc/message.dart';
-import 'package:rain/app/ui/widgets/weather/hourly.dart';
-import 'package:rain/app/ui/widgets/weather/now.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_data.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_weather.dart';
-import 'package:rain/app/ui/widgets/weather/sunset_sunrise.dart';
-import 'package:rain/main.dart';
-import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';
-
-class DailyCardInfo extends StatefulWidget {
-  const DailyCardInfo({
-    super.key,
-    required this.weatherData,
-    required this.index,
-  });
-
-  final WeatherCard weatherData;
-  final int index;
-
-  @override
-  State<DailyCardInfo> createState() => _DailyCardInfoState();
-}
-
-class _DailyCardInfoState extends State<DailyCardInfo> {
-  final statusWeather = StatusWeather();
-  final statusData = StatusData();
-  final message = Message();
-  late PageController pageController;
-  int pageIndex = 0;
-  int hourOfDay = 0;
-
-  @override
-  void initState() {
-    pageController = PageController(initialPage: widget.index);
-    pageIndex = widget.index;
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    pageController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final weatherData = widget.weatherData;
-    final timeDaily = weatherData.timeDaily ?? [];
-
-    final textTheme = context.textTheme;
-
-    return Scaffold(
-      appBar: _buildAppBar(context, textTheme, timeDaily),
-      body: SafeArea(
-        child: PageView.builder(
-          controller: pageController,
-          onPageChanged: (index) {
-            setState(() {
-              pageIndex = index;
-              hourOfDay = 0;
-            });
-          },
-          itemCount: timeDaily.length,
-          itemBuilder: (context, index) {
-            return _buildPageContent(context, weatherData, index);
-          },
-        ),
-      ),
-    );
-  }
-
-  AppBar _buildAppBar(
-    BuildContext context,
-    TextTheme textTheme,
-    List<DateTime> timeDaily,
-  ) {
-    return AppBar(
-      automaticallyImplyLeading: false,
-      centerTitle: true,
-      leading: IconButton(
-        onPressed: () => Get.back(),
-        icon: const Icon(IconsaxPlusLinear.arrow_left_3, size: 20),
-        splashColor: Colors.transparent,
-        highlightColor: Colors.transparent,
-      ),
-      title: Text(
-        DateFormat.MMMMEEEEd(locale.languageCode).format(timeDaily[pageIndex]),
-        style: textTheme.titleMedium?.copyWith(
-          fontWeight: FontWeight.w600,
-          fontSize: 18,
-        ),
-      ),
-    );
-  }
-
-  Widget _buildPageContent(
-    BuildContext context,
-    WeatherCard weatherData,
-    int index,
-  ) {
-    final weatherCodeDaily = weatherData.weathercodeDaily?[index];
-    if (weatherCodeDaily == null) {
-      return Container();
-    }
-
-    final startIndex = index * 24;
-    final temperature2MMin = weatherData.temperature2MMin?[index];
-    final temperature2MMax = weatherData.temperature2MMax?[index];
-    final apparentTemperatureMin = weatherData.apparentTemperatureMin?[index];
-    final apparentTemperatureMax = weatherData.apparentTemperatureMax?[index];
-    final uvIndexMax = weatherData.uvIndexMax?[index];
-    final windDirection10MDominant =
-        weatherData.winddirection10MDominant?[index];
-    final windSpeed10MMax = weatherData.windspeed10MMax?[index];
-    final windGusts10MMax = weatherData.windgusts10MMax?[index];
-    final precipitationProbabilityMax =
-        weatherData.precipitationProbabilityMax?[index];
-    final rainSum = weatherData.rainSum?[index];
-    final precipitationSum = weatherData.precipitationSum?[index];
-    final sunrise = weatherData.sunrise?[index];
-    final sunset = weatherData.sunset?[index];
-
-    if (sunrise == null || sunset == null) {
-      return Container();
-    }
-
-    return Container(
-      margin: const EdgeInsets.symmetric(horizontal: 10),
-      child: ListView(
-        children: [
-          _buildNowWidget(
-            weatherData,
-            index,
-            startIndex,
-            hourOfDay,
-            sunrise,
-            sunset,
-          ),
-          _buildHourlyList(context, weatherData, startIndex, sunrise, sunset),
-          _buildSunsetSunriseWidget(sunrise, sunset),
-          _buildHourlyDescContainer(weatherData, startIndex, hourOfDay),
-          _buildDailyDescContainer(
-            weatherData,
-            temperature2MMin,
-            temperature2MMax,
-            apparentTemperatureMin,
-            apparentTemperatureMax,
-            uvIndexMax,
-            windDirection10MDominant,
-            windSpeed10MMax,
-            windGusts10MMax,
-            precipitationProbabilityMax,
-            rainSum,
-            precipitationSum,
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildNowWidget(
-    WeatherCard weatherData,
-    int index,
-    int startIndex,
-    int hourOfDay,
-    String sunrise,
-    String sunset,
-  ) {
-    final weatherCode = weatherData.weathercode?[startIndex + hourOfDay];
-    final temperature = weatherData.temperature2M?[startIndex + hourOfDay];
-    final feels = weatherData.apparentTemperature?[startIndex + hourOfDay];
-    final time = weatherData.time?[startIndex + hourOfDay];
-    final tempMax = weatherData.temperature2MMax?[index];
-    final tempMin = weatherData.temperature2MMin?[index];
-
-    if (weatherCode == null ||
-        temperature == null ||
-        feels == null ||
-        time == null ||
-        tempMax == null ||
-        tempMin == null) {
-      return Container();
-    }
-
-    return Now(
-      weather: weatherCode,
-      degree: temperature,
-      feels: feels,
-      time: time,
-      timeDay: sunrise,
-      timeNight: sunset,
-      tempMax: tempMax,
-      tempMin: tempMin,
-    );
-  }
-
-  Widget _buildHourlyList(
-    BuildContext context,
-    WeatherCard weatherData,
-    int startIndex,
-    String sunrise,
-    String sunset,
-  ) {
-    return Card(
-      margin: const EdgeInsets.only(bottom: 15),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
-        child: SizedBox(
-          height: 135,
-          child: ScrollablePositionedList.separated(
-            separatorBuilder: (BuildContext context, int index) {
-              return const VerticalDivider(
-                width: 10,
-                indent: 40,
-                endIndent: 40,
-              );
-            },
-            scrollDirection: Axis.horizontal,
-            itemCount: 24,
-            itemBuilder: (ctx, i) {
-              return _buildHourlyItem(
-                context,
-                weatherData,
-                startIndex,
-                i,
-                sunrise,
-                sunset,
-              );
-            },
-          ),
-        ),
-      ),
-    );
-  }
-
-  Widget _buildHourlyItem(
-    BuildContext context,
-    WeatherCard weatherData,
-    int startIndex,
-    int i,
-    String sunrise,
-    String sunset,
-  ) {
-    int hourlyIndex = startIndex + i;
-    bool isSelected = i == hourOfDay;
-
-    final time = weatherData.time?[hourlyIndex];
-    final weatherCode = weatherData.weathercode?[hourlyIndex];
-    final temperature = weatherData.temperature2M?[hourlyIndex];
-
-    if (time == null || weatherCode == null || temperature == null) {
-      return Container();
-    }
-
-    return GestureDetector(
-      onTap: () {
-        setState(() {
-          hourOfDay = i;
-        });
-      },
-      child: Container(
-        margin: const EdgeInsets.symmetric(vertical: 5),
-        padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 5),
-        decoration: BoxDecoration(
-          color: isSelected
-              ? context.theme.colorScheme.secondaryContainer
-              : Colors.transparent,
-          borderRadius: const BorderRadius.all(Radius.circular(20)),
-        ),
-        child: Hourly(
-          time: time,
-          weather: weatherCode,
-          degree: temperature,
-          timeDay: sunrise,
-          timeNight: sunset,
-        ),
-      ),
-    );
-  }
-
-  Widget _buildSunsetSunriseWidget(String sunrise, String sunset) {
-    return SunsetSunrise(timeSunrise: sunrise, timeSunset: sunset);
-  }
-
-  Widget _buildHourlyDescContainer(
-    WeatherCard weatherData,
-    int startIndex,
-    int hourOfDay,
-  ) {
-    final hourlyIndex = startIndex + hourOfDay;
-
-    return DescContainer(
-      humidity: weatherData.relativehumidity2M?[hourlyIndex],
-      wind: weatherData.windspeed10M?[hourlyIndex],
-      visibility: weatherData.visibility?[hourlyIndex],
-      feels: weatherData.apparentTemperature?[hourlyIndex],
-      evaporation: weatherData.evapotranspiration?[hourlyIndex],
-      precipitation: weatherData.precipitation?[hourlyIndex],
-      direction: weatherData.winddirection10M?[hourlyIndex],
-      pressure: weatherData.surfacePressure?[hourlyIndex],
-      rain: weatherData.rain?[hourlyIndex],
-      cloudcover: weatherData.cloudcover?[hourlyIndex],
-      windgusts: weatherData.windgusts10M?[hourlyIndex],
-      uvIndex: weatherData.uvIndex?[hourlyIndex],
-      dewpoint2M: weatherData.dewpoint2M?[hourlyIndex],
-      precipitationProbability:
-          weatherData.precipitationProbability?[hourlyIndex],
-      shortwaveRadiation: weatherData.shortwaveRadiation?[hourlyIndex],
-      initiallyExpanded: true,
-      title: 'hourlyVariables'.tr,
-    );
-  }
-
-  Widget _buildDailyDescContainer(
-    WeatherCard weatherData,
-    double? temperature2MMin,
-    double? temperature2MMax,
-    double? apparentTemperatureMin,
-    double? apparentTemperatureMax,
-    double? uvIndexMax,
-    int? windDirection10MDominant,
-    double? windSpeed10MMax,
-    double? windGusts10MMax,
-    int? precipitationProbabilityMax,
-    double? rainSum,
-    double? precipitationSum,
-  ) {
-    return DescContainer(
-      apparentTemperatureMin: apparentTemperatureMin,
-      apparentTemperatureMax: apparentTemperatureMax,
-      uvIndexMax: uvIndexMax,
-      windDirection10MDominant: windDirection10MDominant,
-      windSpeed10MMax: windSpeed10MMax,
-      windGusts10MMax: windGusts10MMax,
-      precipitationProbabilityMax: precipitationProbabilityMax,
-      rainSum: rainSum,
-      precipitationSum: precipitationSum,
-      initiallyExpanded: true,
-      title: 'dailyVariables'.tr,
-    );
-  }
-}
diff --git a/lib/app/ui/widgets/weather/daily/daily_card_list.dart b/lib/app/ui/widgets/weather/daily/daily_card_list.dart
deleted file mode 100755
index a8e1b46..0000000
--- a/lib/app/ui/widgets/weather/daily/daily_card_list.dart
+++ /dev/null
@@ -1,84 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:iconsax_plus/iconsax_plus.dart';
-import 'package:rain/app/data/db.dart';
-import 'package:rain/app/ui/widgets/weather/daily/daily_card_info.dart';
-import 'package:rain/app/ui/widgets/weather/daily/daily_card.dart';
-
-class DailyCardList extends StatefulWidget {
-  const DailyCardList({super.key, required this.weatherData});
-  final WeatherCard weatherData;
-
-  @override
-  State<DailyCardList> createState() => _DailyCardListState();
-}
-
-class _DailyCardListState extends State<DailyCardList> {
-  @override
-  Widget build(BuildContext context) {
-    final weatherData = widget.weatherData;
-    final timeDaily = weatherData.timeDaily ?? [];
-
-    return Scaffold(
-      appBar: _buildAppBar(context),
-      body: SafeArea(
-        child: ListView.builder(
-          itemCount: timeDaily.length,
-          itemBuilder: (context, index) =>
-              _buildDailyCardItem(context, weatherData, index),
-        ),
-      ),
-    );
-  }
-
-  AppBar _buildAppBar(BuildContext context) {
-    return AppBar(
-      automaticallyImplyLeading: false,
-      centerTitle: true,
-      leading: IconButton(
-        onPressed: () => Get.back(),
-        icon: const Icon(IconsaxPlusLinear.arrow_left_3, size: 20),
-        splashColor: Colors.transparent,
-        highlightColor: Colors.transparent,
-      ),
-      title: Text(
-        'weatherMore'.tr,
-        style: context.textTheme.titleMedium?.copyWith(
-          fontWeight: FontWeight.w600,
-          fontSize: 18,
-        ),
-      ),
-    );
-  }
-
-  Widget _buildDailyCardItem(
-    BuildContext context,
-    WeatherCard weatherData,
-    int index,
-  ) {
-    final timeDaily = weatherData.timeDaily?[index];
-    final weathercodeDaily = weatherData.weathercodeDaily?[index];
-    final temperature2MMax = weatherData.temperature2MMax?[index];
-    final temperature2MMin = weatherData.temperature2MMin?[index];
-
-    if (timeDaily == null ||
-        weathercodeDaily == null ||
-        temperature2MMax == null ||
-        temperature2MMin == null) {
-      return Container();
-    }
-
-    return GestureDetector(
-      onTap: () => Get.to(
-        () => DailyCardInfo(weatherData: weatherData, index: index),
-        transition: Transition.downToUp,
-      ),
-      child: DailyCard(
-        timeDaily: timeDaily,
-        weathercodeDaily: weathercodeDaily,
-        temperature2MMax: temperature2MMax,
-        temperature2MMin: temperature2MMin,
-      ),
-    );
-  }
-}
diff --git a/lib/app/ui/widgets/weather/daily/daily_container.dart b/lib/app/ui/widgets/weather/daily/daily_container.dart
deleted file mode 100755
index a63667c..0000000
--- a/lib/app/ui/widgets/weather/daily/daily_container.dart
+++ /dev/null
@@ -1,206 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
-import 'package:get/get.dart';
-import 'package:intl/intl.dart';
-import 'package:rain/app/data/db.dart';
-import 'package:rain/app/ui/widgets/weather/daily/daily_card_info.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_data.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_weather.dart';
-import 'package:rain/main.dart';
-
-class DailyContainer extends StatefulWidget {
-  const DailyContainer({
-    super.key,
-    required this.weatherData,
-    required this.onTap,
-  });
-
-  final WeatherCard weatherData;
-  final VoidCallback onTap;
-
-  @override
-  State<DailyContainer> createState() => _DailyContainerState();
-}
-
-class _DailyContainerState extends State<DailyContainer> {
-  final statusWeather = StatusWeather();
-  final statusData = StatusData();
-
-  @override
-  Widget build(BuildContext context) {
-    final splashColor = context.theme.colorScheme.primary.withValues(
-      alpha: 0.4,
-    );
-    const inkWellBorderRadius = BorderRadius.all(Radius.circular(16));
-
-    final weatherData = widget.weatherData;
-    final weatherCodeDaily = weatherData.weathercodeDaily ?? [];
-    final textTheme = context.textTheme;
-    final labelLarge = textTheme.labelLarge;
-
-    return Card(
-      margin: const EdgeInsets.only(bottom: 15),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 15, vertical: 5),
-        child: Column(
-          children: [
-            _buildDailyListView(
-              context,
-              weatherData,
-              weatherCodeDaily,
-              labelLarge,
-            ),
-            const Divider(),
-            _buildMoreInfoButton(context, splashColor, inkWellBorderRadius),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildDailyListView(
-    BuildContext context,
-    WeatherCard weatherData,
-    List<int?> weatherCodeDaily,
-    TextStyle? labelLarge,
-  ) {
-    return ListView.builder(
-      shrinkWrap: true,
-      physics: const NeverScrollableScrollPhysics(),
-      itemCount: 7,
-      itemBuilder: (ctx, index) {
-        return _buildDailyItem(
-          context,
-          weatherData,
-          weatherCodeDaily,
-          index,
-          labelLarge,
-        );
-      },
-    );
-  }
-
-  Widget _buildDailyItem(
-    BuildContext context,
-    WeatherCard weatherData,
-    List<int?> weatherCodeDaily,
-    int index,
-    TextStyle? labelLarge,
-  ) {
-    final splashColor = context.theme.colorScheme.primary.withValues(
-      alpha: 0.4,
-    );
-    const inkWellBorderRadius = BorderRadius.all(Radius.circular(16));
-
-    return InkWell(
-      splashColor: splashColor,
-      borderRadius: inkWellBorderRadius,
-      onTap: () => Get.to(
-        () => DailyCardInfo(weatherData: weatherData, index: index),
-        transition: Transition.downToUp,
-      ),
-      child: Container(
-        margin: const EdgeInsets.symmetric(vertical: 12),
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            _buildDayText(weatherData, index, labelLarge),
-            _buildWeatherInfo(weatherCodeDaily, index, labelLarge),
-            _buildTemperatureRange(weatherData, index, labelLarge),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildDayText(
-    WeatherCard weatherData,
-    int index,
-    TextStyle? labelLarge,
-  ) {
-    return Expanded(
-      child: Text(
-        DateFormat.EEEE(
-          locale.languageCode,
-        ).format((weatherData.timeDaily ?? [])[index]),
-        style: labelLarge,
-        overflow: TextOverflow.ellipsis,
-      ),
-    );
-  }
-
-  Widget _buildWeatherInfo(
-    List<int?> weatherCodeDaily,
-    int index,
-    TextStyle? labelLarge,
-  ) {
-    final weatherCode = weatherCodeDaily[index];
-    if (weatherCode == null) {
-      return const Expanded(child: SizedBox.shrink());
-    }
-
-    return Expanded(
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Image.asset(statusWeather.getImage7Day(weatherCode), scale: 3),
-          const Gap(5),
-          Expanded(
-            child: Text(
-              statusWeather.getText(weatherCode),
-              style: labelLarge,
-              overflow: TextOverflow.ellipsis,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildTemperatureRange(
-    WeatherCard weatherData,
-    int index,
-    TextStyle? labelLarge,
-  ) {
-    return Expanded(
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.end,
-        children: [
-          Text(
-            statusData.getDegree(
-              (weatherData.temperature2MMax ?? [])[index]?.round(),
-            ),
-            style: labelLarge,
-          ),
-          Text(' / ', style: labelLarge),
-          Text(
-            statusData.getDegree(
-              (weatherData.temperature2MMin ?? [])[index]?.round(),
-            ),
-            style: labelLarge,
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildMoreInfoButton(
-    BuildContext context,
-    Color splashColor,
-    BorderRadius inkWellBorderRadius,
-  ) {
-    return InkWell(
-      splashColor: splashColor,
-      borderRadius: inkWellBorderRadius,
-      onTap: widget.onTap,
-      child: Padding(
-        padding: const EdgeInsets.symmetric(vertical: 10),
-        child: Text(
-          'weatherMore'.tr,
-          style: context.textTheme.titleMedium,
-          overflow: TextOverflow.ellipsis,
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/app/ui/widgets/weather/desc/desc_container.dart b/lib/app/ui/widgets/weather/desc/desc_container.dart
deleted file mode 100755
index 8354cad..0000000
--- a/lib/app/ui/widgets/weather/desc/desc_container.dart
+++ /dev/null
@@ -1,263 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:rain/app/ui/widgets/weather/desc/desc.dart';
-import 'package:rain/app/ui/widgets/weather/desc/message.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_data.dart';
-
-class DescContainer extends StatefulWidget {
-  const DescContainer({
-    super.key,
-    this.humidity,
-    this.wind,
-    this.visibility,
-    this.feels,
-    this.evaporation,
-    this.precipitation,
-    this.direction,
-    this.pressure,
-    this.rain,
-    this.cloudcover,
-    this.windgusts,
-    this.uvIndex,
-    this.dewpoint2M,
-    this.precipitationProbability,
-    this.shortwaveRadiation,
-    this.apparentTemperatureMin,
-    this.apparentTemperatureMax,
-    this.uvIndexMax,
-    this.windDirection10MDominant,
-    this.windSpeed10MMax,
-    this.windGusts10MMax,
-    this.precipitationProbabilityMax,
-    this.rainSum,
-    this.precipitationSum,
-    required this.initiallyExpanded,
-    required this.title,
-  });
-
-  final int? humidity;
-  final double? wind;
-  final double? visibility;
-  final double? feels;
-  final double? evaporation;
-  final double? precipitation;
-  final int? direction;
-  final double? pressure;
-  final double? rain;
-  final int? cloudcover;
-  final double? windgusts;
-  final double? uvIndex;
-  final double? dewpoint2M;
-  final int? precipitationProbability;
-  final double? shortwaveRadiation;
-  final double? apparentTemperatureMin;
-  final double? apparentTemperatureMax;
-  final double? uvIndexMax;
-  final int? windDirection10MDominant;
-  final double? windSpeed10MMax;
-  final double? windGusts10MMax;
-  final int? precipitationProbabilityMax;
-  final double? rainSum;
-  final double? precipitationSum;
-  final bool initiallyExpanded;
-  final String title;
-
-  @override
-  State<DescContainer> createState() => _DescContainerState();
-}
-
-class _DescContainerState extends State<DescContainer> {
-  final statusData = StatusData();
-  final message = Message();
-
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      margin: const EdgeInsets.only(bottom: 15),
-      child: ExpansionTile(
-        shape: const Border(),
-        title: Text(widget.title, style: context.textTheme.labelLarge),
-        initiallyExpanded: widget.initiallyExpanded,
-        children: [
-          Padding(
-            padding: const EdgeInsets.only(top: 20, bottom: 5),
-            child: Wrap(
-              alignment: WrapAlignment.spaceEvenly,
-              spacing: 5,
-              children: _buildWeatherDescriptions(context),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  List<Widget> _buildWeatherDescriptions(BuildContext context) {
-    final List<Widget> descriptions = [];
-
-    void addDescriptionIfNotNull({
-      required dynamic value,
-      required String imageName,
-      required String desc,
-      String? message,
-    }) {
-      if (value != null &&
-          value != '' &&
-          value != 'null°C' &&
-          value != 'null°F' &&
-          value != 'null°' &&
-          value != 'null%' &&
-          value != 'null ${'W/m2'.tr}') {
-        descriptions.add(
-          DescWeather(
-            imageName: imageName,
-            value: value.toString(),
-            desc: desc,
-            message: message ?? '',
-          ),
-        );
-      } else {
-        descriptions.add(Container());
-      }
-    }
-
-    final weatherData = [
-      {
-        'value': statusData.getDegree(widget.apparentTemperatureMin?.round()),
-        'imageName': 'assets/images/cold.png',
-        'desc': 'apparentTemperatureMin'.tr,
-      },
-      {
-        'value': statusData.getDegree(widget.apparentTemperatureMax?.round()),
-        'imageName': 'assets/images/hot.png',
-        'desc': 'apparentTemperatureMax'.tr,
-      },
-      {
-        'value': widget.uvIndexMax?.round(),
-        'imageName': 'assets/images/uv.png',
-        'desc': 'uvIndex'.tr,
-        'message': message.getUvIndex(widget.uvIndexMax?.round()),
-      },
-      {
-        'value': '${widget.windDirection10MDominant}°',
-        'imageName': 'assets/images/windsock.png',
-        'desc': 'direction'.tr,
-        'message': message.getDirection(widget.windDirection10MDominant),
-      },
-      {
-        'value': statusData.getSpeed(widget.windSpeed10MMax?.round()),
-        'imageName': 'assets/images/wind.png',
-        'desc': 'wind'.tr,
-      },
-      {
-        'value': statusData.getSpeed(widget.windGusts10MMax?.round()),
-        'imageName': 'assets/images/windgusts.png',
-        'desc': 'windgusts'.tr,
-      },
-      {
-        'value': '${widget.precipitationProbabilityMax}%',
-        'imageName': 'assets/images/precipitation_probability.png',
-        'desc': 'precipitationProbability'.tr,
-      },
-      {
-        'value': statusData.getPrecipitation(widget.rainSum),
-        'imageName': 'assets/images/water.png',
-        'desc': 'rain'.tr,
-      },
-      {
-        'value': statusData.getPrecipitation(widget.precipitationSum),
-        'imageName': 'assets/images/rainfall.png',
-        'desc': 'precipitation'.tr,
-      },
-      {
-        'value': statusData.getDegree(widget.dewpoint2M?.round()),
-        'imageName': 'assets/images/dew.png',
-        'desc': 'dewpoint'.tr,
-      },
-      {
-        'value': statusData.getDegree(widget.feels?.round()),
-        'imageName': 'assets/images/temperature.png',
-        'desc': 'feels'.tr,
-      },
-      {
-        'value': statusData.getVisibility(widget.visibility),
-        'imageName': 'assets/images/fog.png',
-        'desc': 'visibility'.tr,
-      },
-      {
-        'value': '${widget.direction}°',
-        'imageName': 'assets/images/windsock.png',
-        'desc': 'direction'.tr,
-        'message': message.getDirection(widget.direction),
-      },
-      {
-        'value': statusData.getSpeed(widget.wind?.round()),
-        'imageName': 'assets/images/wind.png',
-        'desc': 'wind'.tr,
-      },
-      {
-        'value': statusData.getSpeed(widget.windgusts?.round()),
-        'imageName': 'assets/images/windgusts.png',
-        'desc': 'windgusts'.tr,
-      },
-      {
-        'value': statusData.getPrecipitation(widget.evaporation?.abs()),
-        'imageName': 'assets/images/evaporation.png',
-        'desc': 'evaporation'.tr,
-      },
-      {
-        'value': statusData.getPrecipitation(widget.precipitation),
-        'imageName': 'assets/images/rainfall.png',
-        'desc': 'precipitation'.tr,
-      },
-      {
-        'value': statusData.getPrecipitation(widget.rain),
-        'imageName': 'assets/images/water.png',
-        'desc': 'rain'.tr,
-      },
-      {
-        'value': '${widget.precipitationProbability}%',
-        'imageName': 'assets/images/precipitation_probability.png',
-        'desc': 'precipitationProbability'.tr,
-      },
-      {
-        'value': '${widget.humidity}%',
-        'imageName': 'assets/images/humidity.png',
-        'desc': 'humidity'.tr,
-      },
-      {
-        'value': '${widget.cloudcover}%',
-        'imageName': 'assets/images/cloudy.png',
-        'desc': 'cloudcover'.tr,
-      },
-      {
-        'value': statusData.getPressure(widget.pressure?.round()),
-        'imageName': 'assets/images/atmospheric.png',
-        'desc': 'pressure'.tr,
-        'message': message.getPressure(widget.pressure?.round()),
-      },
-      {
-        'value': widget.uvIndex?.round(),
-        'imageName': 'assets/images/uv.png',
-        'desc': 'uvIndex'.tr,
-        'message': message.getUvIndex(widget.uvIndex?.round()),
-      },
-      {
-        'value': '${widget.shortwaveRadiation?.round()} ${'W/m2'.tr}',
-        'imageName': 'assets/images/shortwave_radiation.png',
-        'desc': 'shortwaveRadiation'.tr,
-      },
-    ];
-
-    for (var data in weatherData) {
-      addDescriptionIfNotNull(
-        value: data['value'],
-        imageName: '${data['imageName']}',
-        desc: '${data['desc']}',
-        message: '${data['message']}',
-      );
-    }
-
-    return descriptions;
-  }
-}
diff --git a/lib/app/ui/widgets/weather/desc/message.dart b/lib/app/ui/widgets/weather/desc/message.dart
deleted file mode 100755
index 1a5bcba..0000000
--- a/lib/app/ui/widgets/weather/desc/message.dart
+++ /dev/null
@@ -1,65 +0,0 @@
-import 'package:get/get.dart';
-
-class Message {
-  String getPressure(int? pressure) {
-    return _getPressureDescription(pressure);
-  }
-
-  String getUvIndex(int? uvIndex) {
-    return _getUvIndexDescription(uvIndex);
-  }
-
-  String getDirection(int? direction) {
-    return _getDirectionDescription(direction);
-  }
-
-  String _getPressureDescription(int? pressure) {
-    if (pressure == null) return '';
-
-    if (pressure < 1000) {
-      return 'low'.tr;
-    } else if (pressure > 1020) {
-      return 'high'.tr;
-    } else {
-      return 'normal'.tr;
-    }
-  }
-
-  String _getUvIndexDescription(int? uvIndex) {
-    if (uvIndex == null) return '';
-
-    if (uvIndex < 3) {
-      return 'uvLow'.tr;
-    } else if (uvIndex < 6) {
-      return 'uvAverage'.tr;
-    } else if (uvIndex < 8) {
-      return 'uvHigh'.tr;
-    } else if (uvIndex < 11) {
-      return 'uvVeryHigh'.tr;
-    } else {
-      return 'uvExtreme'.tr;
-    }
-  }
-
-  String _getDirectionDescription(int? direction) {
-    if (direction == null) return '';
-
-    if (direction >= 337.5 || direction < 22.5) {
-      return 'north'.tr;
-    } else if (direction >= 22.5 && direction < 67.5) {
-      return 'northeast'.tr;
-    } else if (direction >= 67.5 && direction < 112.5) {
-      return 'east'.tr;
-    } else if (direction >= 112.5 && direction < 157.5) {
-      return 'southeast'.tr;
-    } else if (direction >= 157.5 && direction < 202.5) {
-      return 'south'.tr;
-    } else if (direction >= 202.5 && direction < 247.5) {
-      return 'southwest'.tr;
-    } else if (direction >= 247.5 && direction < 292.5) {
-      return 'west'.tr;
-    } else {
-      return 'northwest'.tr;
-    }
-  }
-}
diff --git a/lib/app/ui/widgets/weather/hourly.dart b/lib/app/ui/widgets/weather/hourly.dart
deleted file mode 100755
index 3bc93f4..0000000
--- a/lib/app/ui/widgets/weather/hourly.dart
+++ /dev/null
@@ -1,77 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:intl/intl.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_data.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_weather.dart';
-import 'package:rain/main.dart';
-
-class Hourly extends StatefulWidget {
-  const Hourly({
-    super.key,
-    required this.time,
-    required this.weather,
-    required this.degree,
-    required this.timeDay,
-    required this.timeNight,
-  });
-
-  final String time;
-  final String timeDay;
-  final String timeNight;
-  final int weather;
-  final double degree;
-
-  @override
-  State<Hourly> createState() => _HourlyState();
-}
-
-class _HourlyState extends State<Hourly> {
-  final statusWeather = StatusWeather();
-  final statusData = StatusData();
-
-  @override
-  Widget build(BuildContext context) {
-    final textTheme = context.textTheme;
-    final time = widget.time;
-
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-      children: [
-        _buildTimeText(textTheme, time),
-        _buildWeatherImage(),
-        _buildTemperatureText(textTheme),
-      ],
-    );
-  }
-
-  Widget _buildTimeText(TextTheme textTheme, String time) {
-    return Column(
-      children: [
-        Text(statusData.getTimeFormat(time), style: textTheme.labelLarge),
-        Text(
-          DateFormat('E', locale.languageCode).format(DateTime.tryParse(time)!),
-          style: textTheme.labelLarge?.copyWith(color: Colors.grey),
-        ),
-      ],
-    );
-  }
-
-  Widget _buildWeatherImage() {
-    return Image.asset(
-      statusWeather.getImageToday(
-        widget.weather,
-        widget.time,
-        widget.timeDay,
-        widget.timeNight,
-      ),
-      scale: 3,
-    );
-  }
-
-  Widget _buildTemperatureText(TextTheme textTheme) {
-    return Text(
-      statusData.getDegree(widget.degree.round()),
-      style: textTheme.titleMedium?.copyWith(fontWeight: FontWeight.w600),
-    );
-  }
-}
diff --git a/lib/app/ui/widgets/weather/now.dart b/lib/app/ui/widgets/weather/now.dart
deleted file mode 100755
index 1805479..0000000
--- a/lib/app/ui/widgets/weather/now.dart
+++ /dev/null
@@ -1,182 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
-import 'package:get/get.dart';
-import 'package:intl/intl.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_data.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_weather.dart';
-import 'package:rain/main.dart';
-
-class Now extends StatefulWidget {
-  const Now({
-    super.key,
-    required this.weather,
-    required this.degree,
-    required this.time,
-    required this.timeDay,
-    required this.timeNight,
-    required this.tempMax,
-    required this.tempMin,
-    required this.feels,
-  });
-
-  final String time;
-  final String timeDay;
-  final String timeNight;
-  final int weather;
-  final double degree;
-  final double tempMax;
-  final double tempMin;
-  final double feels;
-
-  @override
-  State<Now> createState() => _NowState();
-}
-
-class _NowState extends State<Now> {
-  final statusWeather = StatusWeather();
-  final statusData = StatusData();
-
-  @override
-  Widget build(BuildContext context) {
-    return largeElement
-        ? _buildLargeElementLayout(context)
-        : _buildCompactElementLayout(context);
-  }
-
-  Widget _buildLargeElementLayout(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 15),
-      child: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          const Gap(15),
-          _buildWeatherImage(200),
-          _buildTemperatureText(context, widget.degree, 90),
-          Text(
-            statusWeather.getText(widget.weather),
-            style: context.textTheme.titleLarge,
-          ),
-          const Gap(5),
-          _buildDateText(context),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildCompactElementLayout(BuildContext context) {
-    return Card(
-      margin: const EdgeInsets.only(bottom: 15),
-      child: Padding(
-        padding: const EdgeInsets.only(
-          top: 18,
-          bottom: 18,
-          left: 25,
-          right: 15,
-        ),
-        child: Row(
-          crossAxisAlignment: CrossAxisAlignment.center,
-          children: [
-            Expanded(
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  _buildDateText(context),
-                  const Gap(5),
-                  Text(
-                    statusWeather.getText(widget.weather),
-                    style: context.textTheme.titleLarge?.copyWith(fontSize: 20),
-                  ),
-                  _buildFeelsLikeText(context),
-                  const Gap(30),
-                  _buildTemperatureCompactText(context, widget.degree),
-                  const Gap(5),
-                  _buildMinMaxTemperatureText(context),
-                ],
-              ),
-            ),
-            _buildWeatherImage(140),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildWeatherImage(double height) {
-    return Image(
-      image: AssetImage(
-        statusWeather.getImageNow(
-          widget.weather,
-          widget.time,
-          widget.timeDay,
-          widget.timeNight,
-        ),
-      ),
-      fit: BoxFit.fill,
-      height: height,
-    );
-  }
-
-  Widget _buildTemperatureText(
-    BuildContext context,
-    double degree,
-    double? fontSize,
-  ) {
-    return Text(
-      '${roundDegree ? degree.round() : degree}',
-      style: context.textTheme.displayLarge?.copyWith(
-        fontSize: fontSize,
-        fontWeight: FontWeight.w800,
-        shadows: const [Shadow(blurRadius: 15, offset: Offset(5, 5))],
-      ),
-    );
-  }
-
-  Widget _buildTemperatureCompactText(BuildContext context, double degree) {
-    return Text(
-      statusData.getDegree(roundDegree ? widget.degree.round() : widget.degree),
-      style: context.textTheme.displayMedium?.copyWith(
-        fontWeight: FontWeight.w800,
-      ),
-    );
-  }
-
-  Widget _buildDateText(BuildContext context) {
-    return Text(
-      DateFormat.MMMMEEEEd(
-        locale.languageCode,
-      ).format(DateTime.parse(widget.time)),
-      style: context.textTheme.labelLarge?.copyWith(color: Colors.grey),
-    );
-  }
-
-  Widget _buildFeelsLikeText(BuildContext context) {
-    return Row(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text('feels'.tr, style: context.textTheme.bodyMedium),
-        Text(' • ', style: context.textTheme.bodyMedium),
-        Text(
-          statusData.getDegree(widget.feels.round()),
-          style: context.textTheme.bodyMedium,
-        ),
-      ],
-    );
-  }
-
-  Widget _buildMinMaxTemperatureText(BuildContext context) {
-    return Row(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          statusData.getDegree((widget.tempMin.round())),
-          style: context.textTheme.labelLarge,
-        ),
-        Text(' / ', style: context.textTheme.labelLarge),
-        Text(
-          statusData.getDegree((widget.tempMax.round())),
-          style: context.textTheme.labelLarge,
-        ),
-      ],
-    );
-  }
-}
diff --git a/lib/app/ui/widgets/weather/status/status_data.dart b/lib/app/ui/widgets/weather/status/status_data.dart
deleted file mode 100755
index 568c145..0000000
--- a/lib/app/ui/widgets/weather/status/status_data.dart
+++ /dev/null
@@ -1,127 +0,0 @@
-import 'package:get/get.dart';
-import 'package:intl/intl.dart';
-import 'package:rain/main.dart';
-import 'package:timezone/timezone.dart';
-
-class StatusData {
-  String getDegree(dynamic degree) {
-    return _formatDegree(degree);
-  }
-
-  String getSpeed(int? speed) {
-    return _formatSpeed(speed);
-  }
-
-  String getPressure(int? pressure) {
-    return _formatPressure(pressure);
-  }
-
-  String getVisibility(double? length) {
-    return _formatVisibility(length);
-  }
-
-  String getPrecipitation(double? precipitation) {
-    return _formatPrecipitation(precipitation);
-  }
-
-  String getTimeFormat(String time) {
-    return _formatTime(time);
-  }
-
-  String getTimeFormatTz(TZDateTime time) {
-    return _formatTimeTz(time);
-  }
-
-  String _formatDegree(dynamic degree) {
-    switch (settings.degrees) {
-      case 'celsius':
-        return '$degree°C';
-      case 'fahrenheit':
-        return '$degree°F';
-      default:
-        return '$degree°C';
-    }
-  }
-
-  String _formatSpeed(int? speed) {
-    if (speed == null) return '';
-
-    switch (settings.measurements) {
-      case 'metric':
-        return settings.wind == 'm/s'
-            ? '${(speed * (5 / 18)).toPrecision(1)} ${'m/s'.tr}'
-            : '$speed ${'kph'.tr}';
-      case 'imperial':
-        return '$speed ${'mph'.tr}';
-      default:
-        return '$speed ${'kph'.tr}';
-    }
-  }
-
-  String _formatPressure(int? pressure) {
-    if (pressure == null) return '';
-
-    return settings.pressure == 'mmHg'
-        ? '${(pressure * (3 / 4)).toPrecision(1)} ${'mmHg'.tr}'
-        : '$pressure ${'hPa'.tr}';
-  }
-
-  String _formatVisibility(double? length) {
-    if (length == null) return '';
-
-    switch (settings.measurements) {
-      case 'metric':
-        return _formatMetricVisibility(length);
-      case 'imperial':
-        return _formatImperialVisibility(length);
-      default:
-        return _formatMetricVisibility(length);
-    }
-  }
-
-  String _formatMetricVisibility(double length) {
-    return '${length > 1000 ? (length / 1000).round() : (length / 1000).toStringAsFixed(2)} ${'km'.tr}';
-  }
-
-  String _formatImperialVisibility(double length) {
-    return '${length > 5280 ? (length / 5280).round() : (length / 5280).toStringAsFixed(2)} ${'mi'.tr}';
-  }
-
-  String _formatPrecipitation(double? precipitation) {
-    if (precipitation == null) return '';
-
-    switch (settings.measurements) {
-      case 'metric':
-        return '$precipitation ${'mm'.tr}';
-      case 'imperial':
-        return '$precipitation ${'inch'.tr}';
-      default:
-        return '$precipitation ${'mm'.tr}';
-    }
-  }
-
-  String _formatTime(String time) {
-    final parsedTime = DateTime.tryParse(time);
-    if (parsedTime == null) return '';
-
-    switch (settings.timeformat) {
-      case '12':
-        return DateFormat.jm(locale.languageCode).format(parsedTime);
-      case '24':
-        return DateFormat.Hm(locale.languageCode).format(parsedTime);
-      default:
-        return DateFormat.Hm(locale.languageCode).format(parsedTime);
-    }
-  }
-
-  String _formatTimeTz(TZDateTime time) {
-    switch (settings.timeformat) {
-      case '12':
-        return DateFormat.jm(locale.languageCode).format(time);
-      case '24':
-        return DateFormat.Hm(locale.languageCode).format(time);
-      default:
-        return DateFormat.Hm(locale.languageCode).format(time);
-    }
-  }
-}
diff --git a/lib/app/ui/widgets/weather/status/status_weather.dart b/lib/app/ui/widgets/weather/status/status_weather.dart
deleted file mode 100755
index 6bc8516..0000000
--- a/lib/app/ui/widgets/weather/status/status_weather.dart
+++ /dev/null
@@ -1,385 +0,0 @@
-import 'package:get/get.dart';
-
-const assetImageRoot = 'assets/images/';
-
-class StatusWeather {
-  String getImageNow(
-    int weather,
-    String time,
-    String timeDay,
-    String timeNight,
-  ) {
-    return _getImageBasedOnTime(
-      weather,
-      time,
-      timeDay,
-      timeNight,
-      _getDayNightImagePaths,
-    );
-  }
-
-  String getImageNowDaily(int? weather) {
-    return _getDailyImage(weather);
-  }
-
-  String getImageToday(
-    int weather,
-    String time,
-    String timeDay,
-    String timeNight,
-  ) {
-    return _getImageBasedOnTime(
-      weather,
-      time,
-      timeDay,
-      timeNight,
-      _getTodayImagePaths,
-    );
-  }
-
-  String getImage7Day(int? weather) {
-    return _getDailyImage(weather, isDay: true);
-  }
-
-  String getText(int? weather) {
-    return _getWeatherText(weather);
-  }
-
-  String getImageNotification(
-    int weather,
-    String time,
-    String timeDay,
-    String timeNight,
-  ) {
-    return _getImageBasedOnTime(
-      weather,
-      time,
-      timeDay,
-      timeNight,
-      _getNotificationImagePaths,
-    );
-  }
-
-  String _getImageBasedOnTime(
-    int weather,
-    String time,
-    String timeDay,
-    String timeNight,
-    Map<int, Map<bool, String>> imagePaths,
-  ) {
-    final currentTime = DateTime.parse(time);
-    final day = DateTime.parse(timeDay);
-    final night = DateTime.parse(timeNight);
-
-    final dayTime = DateTime(
-      day.year,
-      day.month,
-      day.day,
-      day.hour,
-      day.minute,
-    );
-    final nightTime = DateTime(
-      night.year,
-      night.month,
-      night.day,
-      night.hour,
-      night.minute,
-    );
-
-    final isDayTime =
-        currentTime.isAfter(dayTime) && currentTime.isBefore(nightTime);
-
-    return imagePaths[weather]?[isDayTime] ?? '';
-  }
-
-  String _getDailyImage(int? weather, {bool isDay = false}) {
-    switch (weather) {
-      case 0:
-        return '$assetImageRoot${isDay ? 'clear_day' : 'sun'}.png';
-      case 1:
-      case 2:
-      case 3:
-        return '$assetImageRoot${isDay ? 'cloudy_day' : 'cloud'}.png';
-      case 45:
-      case 48:
-        return '${assetImageRoot}fog${isDay ? '_day' : ''}.png';
-      case 51:
-      case 53:
-      case 55:
-      case 56:
-      case 57:
-      case 61:
-      case 63:
-      case 65:
-      case 66:
-      case 67:
-      case 80:
-      case 81:
-      case 82:
-        return '${assetImageRoot}rain${isDay ? '_day' : ''}.png';
-      case 71:
-      case 73:
-      case 75:
-      case 77:
-      case 85:
-      case 86:
-        return '${assetImageRoot}snow${isDay ? '_day' : ''}.png';
-      case 95:
-      case 96:
-      case 99:
-        return '${assetImageRoot}thunder${isDay ? '_day' : ''}.png';
-      default:
-        return '';
-    }
-  }
-
-  String _getWeatherText(int? weather) {
-    switch (weather) {
-      case 0:
-        return 'clear_sky'.tr;
-      case 1:
-      case 2:
-        return 'cloudy'.tr;
-      case 3:
-        return 'overcast'.tr;
-      case 45:
-      case 48:
-        return 'fog'.tr;
-      case 51:
-      case 53:
-      case 55:
-        return 'drizzle'.tr;
-      case 56:
-      case 57:
-        return 'drizzling_rain'.tr;
-      case 61:
-      case 63:
-      case 65:
-        return 'rain'.tr;
-      case 66:
-      case 67:
-        return 'freezing_rain'.tr;
-      case 80:
-      case 81:
-      case 82:
-        return 'heavy_rains'.tr;
-      case 71:
-      case 73:
-      case 75:
-      case 77:
-      case 85:
-      case 86:
-        return 'snow'.tr;
-      case 95:
-      case 96:
-      case 99:
-        return 'thunderstorm'.tr;
-      default:
-        return '';
-    }
-  }
-
-  final Map<int, Map<bool, String>> _getDayNightImagePaths = {
-    0: {
-      true: '${assetImageRoot}sun.png',
-      false: '${assetImageRoot}full-moon.png',
-    },
-    1: {true: '${assetImageRoot}cloud.png', false: '${assetImageRoot}moon.png'},
-    2: {true: '${assetImageRoot}cloud.png', false: '${assetImageRoot}moon.png'},
-    3: {true: '${assetImageRoot}cloud.png', false: '${assetImageRoot}moon.png'},
-    45: {
-      true: '${assetImageRoot}fog.png',
-      false: '${assetImageRoot}fog_moon.png',
-    },
-    48: {
-      true: '${assetImageRoot}fog.png',
-      false: '${assetImageRoot}fog_moon.png',
-    },
-    51: {true: '${assetImageRoot}rain.png', false: '${assetImageRoot}rain.png'},
-    53: {true: '${assetImageRoot}rain.png', false: '${assetImageRoot}rain.png'},
-    55: {true: '${assetImageRoot}rain.png', false: '${assetImageRoot}rain.png'},
-    56: {true: '${assetImageRoot}rain.png', false: '${assetImageRoot}rain.png'},
-    57: {true: '${assetImageRoot}rain.png', false: '${assetImageRoot}rain.png'},
-    61: {true: '${assetImageRoot}rain.png', false: '${assetImageRoot}rain.png'},
-    63: {true: '${assetImageRoot}rain.png', false: '${assetImageRoot}rain.png'},
-    65: {true: '${assetImageRoot}rain.png', false: '${assetImageRoot}rain.png'},
-    66: {true: '${assetImageRoot}rain.png', false: '${assetImageRoot}rain.png'},
-    67: {true: '${assetImageRoot}rain.png', false: '${assetImageRoot}rain.png'},
-    80: {
-      true: '${assetImageRoot}rain-fall.png',
-      false: '${assetImageRoot}rain-fall.png',
-    },
-    81: {
-      true: '${assetImageRoot}rain-fall.png',
-      false: '${assetImageRoot}rain-fall.png',
-    },
-    82: {
-      true: '${assetImageRoot}rain-fall.png',
-      false: '${assetImageRoot}rain-fall.png',
-    },
-    71: {true: '${assetImageRoot}snow.png', false: '${assetImageRoot}snow.png'},
-    73: {true: '${assetImageRoot}snow.png', false: '${assetImageRoot}snow.png'},
-    75: {true: '${assetImageRoot}snow.png', false: '${assetImageRoot}snow.png'},
-    77: {true: '${assetImageRoot}snow.png', false: '${assetImageRoot}snow.png'},
-    85: {true: '${assetImageRoot}snow.png', false: '${assetImageRoot}snow.png'},
-    86: {true: '${assetImageRoot}snow.png', false: '${assetImageRoot}snow.png'},
-    95: {
-      true: '${assetImageRoot}thunder.png',
-      false: '${assetImageRoot}thunder.png',
-    },
-    96: {
-      true: '${assetImageRoot}storm.png',
-      false: '${assetImageRoot}storm.png',
-    },
-    99: {
-      true: '${assetImageRoot}storm.png',
-      false: '${assetImageRoot}storm.png',
-    },
-  };
-
-  final Map<int, Map<bool, String>> _getTodayImagePaths = {
-    0: {
-      true: '${assetImageRoot}clear_day.png',
-      false: '${assetImageRoot}clear_night.png',
-    },
-    1: {
-      true: '${assetImageRoot}cloudy_day.png',
-      false: '${assetImageRoot}cloudy_night.png',
-    },
-    2: {
-      true: '${assetImageRoot}cloudy_day.png',
-      false: '${assetImageRoot}cloudy_night.png',
-    },
-    3: {
-      true: '${assetImageRoot}cloudy_day.png',
-      false: '${assetImageRoot}cloudy_night.png',
-    },
-    45: {
-      true: '${assetImageRoot}fog_day.png',
-      false: '${assetImageRoot}fog_night.png',
-    },
-    48: {
-      true: '${assetImageRoot}fog_day.png',
-      false: '${assetImageRoot}fog_night.png',
-    },
-    51: {
-      true: '${assetImageRoot}rain_day.png',
-      false: '${assetImageRoot}rain_night.png',
-    },
-    53: {
-      true: '${assetImageRoot}rain_day.png',
-      false: '${assetImageRoot}rain_night.png',
-    },
-    55: {
-      true: '${assetImageRoot}rain_day.png',
-      false: '${assetImageRoot}rain_night.png',
-    },
-    56: {
-      true: '${assetImageRoot}rain_day.png',
-      false: '${assetImageRoot}rain_night.png',
-    },
-    57: {
-      true: '${assetImageRoot}rain_day.png',
-      false: '${assetImageRoot}rain_night.png',
-    },
-    61: {
-      true: '${assetImageRoot}rain_day.png',
-      false: '${assetImageRoot}rain_night.png',
-    },
-    63: {
-      true: '${assetImageRoot}rain_day.png',
-      false: '${assetImageRoot}rain_night.png',
-    },
-    65: {
-      true: '${assetImageRoot}rain_day.png',
-      false: '${assetImageRoot}rain_night.png',
-    },
-    66: {
-      true: '${assetImageRoot}rain_day.png',
-      false: '${assetImageRoot}rain_night.png',
-    },
-    67: {
-      true: '${assetImageRoot}rain_day.png',
-      false: '${assetImageRoot}rain_night.png',
-    },
-    80: {
-      true: '${assetImageRoot}rain_day.png',
-      false: '${assetImageRoot}rain_night.png',
-    },
-    81: {
-      true: '${assetImageRoot}rain_day.png',
-      false: '${assetImageRoot}rain_night.png',
-    },
-    82: {
-      true: '${assetImageRoot}rain_day.png',
-      false: '${assetImageRoot}rain_night.png',
-    },
-    71: {
-      true: '${assetImageRoot}snow_day.png',
-      false: '${assetImageRoot}snow_night.png',
-    },
-    73: {
-      true: '${assetImageRoot}snow_day.png',
-      false: '${assetImageRoot}snow_night.png',
-    },
-    75: {
-      true: '${assetImageRoot}snow_day.png',
-      false: '${assetImageRoot}snow_night.png',
-    },
-    77: {
-      true: '${assetImageRoot}snow_day.png',
-      false: '${assetImageRoot}snow_night.png',
-    },
-    85: {
-      true: '${assetImageRoot}snow_day.png',
-      false: '${assetImageRoot}snow_night.png',
-    },
-    86: {
-      true: '${assetImageRoot}snow_day.png',
-      false: '${assetImageRoot}snow_night.png',
-    },
-    95: {
-      true: '${assetImageRoot}thunder_day.png',
-      false: '${assetImageRoot}thunder_night.png',
-    },
-    96: {
-      true: '${assetImageRoot}thunder_day.png',
-      false: '${assetImageRoot}thunder_night.png',
-    },
-    99: {
-      true: '${assetImageRoot}thunder_day.png',
-      false: '${assetImageRoot}thunder_night.png',
-    },
-  };
-
-  final Map<int, Map<bool, String>> _getNotificationImagePaths = {
-    0: {true: 'sun.png', false: 'full-moon.png'},
-    1: {true: 'cloud.png', false: 'moon.png'},
-    2: {true: 'cloud.png', false: 'moon.png'},
-    3: {true: 'cloud.png', false: 'moon.png'},
-    45: {true: 'fog.png', false: 'fog_moon.png'},
-    48: {true: 'fog.png', false: 'fog_moon.png'},
-    51: {true: 'rain.png', false: 'rain.png'},
-    53: {true: 'rain.png', false: 'rain.png'},
-    55: {true: 'rain.png', false: 'rain.png'},
-    56: {true: 'rain.png', false: 'rain.png'},
-    57: {true: 'rain.png', false: 'rain.png'},
-    61: {true: 'rain.png', false: 'rain.png'},
-    63: {true: 'rain.png', false: 'rain.png'},
-    65: {true: 'rain.png', false: 'rain.png'},
-    66: {true: 'rain.png', false: 'rain.png'},
-    67: {true: 'rain.png', false: 'rain.png'},
-    80: {true: 'rain-fall.png', false: 'rain-fall.png'},
-    81: {true: 'rain-fall.png', false: 'rain-fall.png'},
-    82: {true: 'rain-fall.png', false: 'rain-fall.png'},
-    71: {true: 'snow.png', false: 'snow.png'},
-    73: {true: 'snow.png', false: 'snow.png'},
-    75: {true: 'snow.png', false: 'snow.png'},
-    77: {true: 'snow.png', false: 'snow.png'},
-    85: {true: 'snow.png', false: 'snow.png'},
-    86: {true: 'snow.png', false: 'snow.png'},
-    95: {true: 'thunder.png', false: 'thunder.png'},
-    96: {true: 'storm.png', false: 'storm.png'},
-    99: {true: 'storm.png', false: 'storm.png'},
-  };
-}
diff --git a/lib/app/ui/widgets/weather/sunset_sunrise.dart b/lib/app/ui/widgets/weather/sunset_sunrise.dart
deleted file mode 100755
index 5078e4c..0000000
--- a/lib/app/ui/widgets/weather/sunset_sunrise.dart
+++ /dev/null
@@ -1,85 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:gap/gap.dart';
-import 'package:rain/app/ui/widgets/weather/status/status_data.dart';
-
-class SunsetSunrise extends StatefulWidget {
-  const SunsetSunrise({
-    super.key,
-    required this.timeSunrise,
-    required this.timeSunset,
-  });
-
-  final String timeSunrise;
-  final String timeSunset;
-
-  @override
-  State<SunsetSunrise> createState() => _SunsetSunriseState();
-}
-
-class _SunsetSunriseState extends State<SunsetSunrise> {
-  final statusData = StatusData();
-
-  @override
-  Widget build(BuildContext context) {
-    final textTheme = context.textTheme;
-    final titleSmall = textTheme.titleSmall;
-    final titleLarge = textTheme.titleLarge;
-
-    return Card(
-      margin: const EdgeInsets.only(bottom: 15),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 20),
-        child: Row(
-          children: [
-            _buildSunTimeColumn(
-              context,
-              'sunrise'.tr,
-              statusData.getTimeFormat(widget.timeSunrise),
-              'assets/images/sunrise.png',
-              titleSmall,
-              titleLarge,
-            ),
-            _buildSunTimeColumn(
-              context,
-              'sunset'.tr,
-              statusData.getTimeFormat(widget.timeSunset),
-              'assets/images/sunset.png',
-              titleSmall,
-              titleLarge,
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildSunTimeColumn(
-    BuildContext context,
-    String label,
-    String time,
-    String imagePath,
-    TextStyle? labelStyle,
-    TextStyle? timeStyle,
-  ) {
-    return Expanded(
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Expanded(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Text(label, style: labelStyle, overflow: TextOverflow.ellipsis),
-                const Gap(2),
-                Text(time, style: timeStyle),
-              ],
-            ),
-          ),
-          const Gap(5),
-          Flexible(child: Image.asset(imagePath, scale: 10)),
-        ],
-      ),
-    );
-  }
-}
diff --git a/lib/app/utils/color_converter.dart b/lib/app/utils/color_converter.dart
deleted file mode 100755
index e573021..0000000
--- a/lib/app/utils/color_converter.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-import 'dart:ui';
-
-extension HexColor on Color {
-  /// String is in the format "aabbcc" or "ffaabbcc" with an optional leading "#".
-  static Color fromHex(String hexString) {
-    final buffer = StringBuffer();
-    if (hexString.length == 6 || hexString.length == 7) buffer.write('ff');
-    buffer.write(hexString.replaceFirst('#', ''));
-    return Color(int.parse(buffer.toString(), radix: 16));
-  }
-
-  /// Prefixes a hash sign if [leadingHashSign] is set to `true` (default is `true`).
-  String toHex({bool leadingHashSign = true}) {
-    final argb = toARGB32(); // Get 32-bit integer representation
-    final a = (argb >> 24) & 0xFF;
-    final r = (argb >> 16) & 0xFF;
-    final g = (argb >> 8) & 0xFF;
-    final b = argb & 0xFF;
-
-    return '${leadingHashSign ? '#' : ''}'
-        '${a.toRadixString(16).padLeft(2, '0')}'
-        '${r.toRadixString(16).padLeft(2, '0')}'
-        '${g.toRadixString(16).padLeft(2, '0')}'
-        '${b.toRadixString(16).padLeft(2, '0')}';
-  }
-}
diff --git a/lib/app/utils/device_info.dart b/lib/app/utils/device_info.dart
deleted file mode 100755
index 61d8a93..0000000
--- a/lib/app/utils/device_info.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-import 'package:device_info_plus/device_info_plus.dart';
-import 'package:flutter/foundation.dart';
-
-class DeviceFeature {
-  DeviceFeature._internal();
-
-  static final DeviceFeature _singleton = DeviceFeature._internal();
-
-  factory DeviceFeature() {
-    return _singleton;
-  }
-
-  final _deviceInfoPlugin = DeviceInfoPlugin();
-
-  AndroidDeviceInfo? _androidDeviceInfo;
-
-  Future<void> init() async {
-    try {
-      _androidDeviceInfo = await _deviceInfoPlugin.androidInfo;
-    } catch (e) {
-      if (kDebugMode) {
-        print('Error initializing device info: $e');
-      }
-    }
-  }
-
-  bool isEdgeToEdgeAvailable() {
-    return _androidDeviceInfo != null &&
-        _androidDeviceInfo!.version.sdkInt > 28;
-  }
-}
diff --git a/lib/app/utils/notification.dart b/lib/app/utils/notification.dart
deleted file mode 100755
index d0f8f9a..0000000
--- a/lib/app/utils/notification.dart
+++ /dev/null
@@ -1,58 +0,0 @@
-import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:rain/app/controller/controller.dart';
-import 'package:rain/main.dart';
-import 'package:timezone/timezone.dart' as tz;
-
-class NotificationShow {
-  static const String _channelId = 'Rain';
-  static const String _channelName = 'DARK NIGHT';
-
-  Future<void> showNotification(
-    int id,
-    String title,
-    String body,
-    DateTime date,
-    String icon,
-  ) async {
-    try {
-      final imagePath = await _getLocalImagePath(icon);
-      final notificationDetails = await _buildNotificationDetails(imagePath);
-      final scheduledTime = _getScheduledTime(date);
-
-      await flutterLocalNotificationsPlugin.zonedSchedule(
-        id,
-        title,
-        body,
-        scheduledTime,
-        notificationDetails,
-        androidScheduleMode: AndroidScheduleMode.exactAllowWhileIdle,
-        payload: imagePath,
-      );
-    } catch (e) {
-      print('Error showing notification: $e');
-    }
-  }
-
-  Future<String> _getLocalImagePath(String icon) async {
-    return await WeatherController().getLocalImagePath(icon);
-  }
-
-  Future<NotificationDetails> _buildNotificationDetails(
-    String imagePath,
-  ) async {
-    final androidNotificationDetails = AndroidNotificationDetails(
-      _channelId,
-      _channelName,
-      priority: Priority.high,
-      importance: Importance.max,
-      playSound: false,
-      enableVibration: false,
-      largeIcon: FilePathAndroidBitmap(imagePath),
-    );
-    return NotificationDetails(android: androidNotificationDetails);
-  }
-
-  tz.TZDateTime _getScheduledTime(DateTime date) {
-    return tz.TZDateTime.from(date, tz.local);
-  }
-}
diff --git a/lib/app/utils/show_snack_bar.dart b/lib/app/utils/show_snack_bar.dart
deleted file mode 100755
index 4ccf103..0000000
--- a/lib/app/utils/show_snack_bar.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-
-final GlobalKey<ScaffoldMessengerState> globalKey =
-    GlobalKey<ScaffoldMessengerState>();
-
-void showSnackBar({required String content, VoidCallback? onPressed}) {
-  globalKey.currentState?.showSnackBar(
-    SnackBar(
-      content: Text(content),
-      action:
-          onPressed != null
-              ? SnackBarAction(label: 'settings'.tr, onPressed: onPressed)
-              : null,
-    ),
-  );
-}
diff --git a/lib/app/widgets/button.dart b/lib/app/widgets/button.dart
new file mode 100644
index 0000000..939380c
--- /dev/null
+++ b/lib/app/widgets/button.dart
@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+class MyTextButton extends StatelessWidget {
+  const MyTextButton({
+    super.key,
+    required this.buttonName,
+    required this.onPressed,
+  });
+  final String buttonName;
+  final VoidCallback onPressed;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      height: 50,
+      width: double.infinity,
+      child: ElevatedButton(
+        onPressed: onPressed,
+        child: Text(
+          buttonName,
+          style: context.textTheme.titleMedium,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/app/widgets/daily/info_daily_card.dart b/lib/app/widgets/daily/info_daily_card.dart
new file mode 100644
index 0000000..71b634d
--- /dev/null
+++ b/lib/app/widgets/daily/info_daily_card.dart
@@ -0,0 +1,250 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_glow/flutter_glow.dart';
+import 'package:get/get.dart';
+import 'package:iconsax/iconsax.dart';
+import 'package:intl/intl.dart';
+import 'package:rain/app/data/weather.dart';
+import 'package:rain/app/widgets/desc/desc.dart';
+import 'package:rain/app/widgets/desc/message.dart';
+import 'package:rain/app/widgets/status/status_data.dart';
+import 'package:rain/app/widgets/status/status_weather.dart';
+import 'package:rain/app/widgets/sun_moon/sunset_sunrise.dart';
+import 'package:rain/main.dart';
+
+class InfoDailyCard extends StatefulWidget {
+  const InfoDailyCard({
+    super.key,
+    required this.weatherData,
+    required this.index,
+  });
+
+  final WeatherCard weatherData;
+  final int index;
+
+  @override
+  State<InfoDailyCard> createState() => _InfoDailyCardState();
+}
+
+class _InfoDailyCardState extends State<InfoDailyCard> {
+  final statusWeather = StatusWeather();
+  final statusData = StatusData();
+  final message = Message();
+  late PageController pageController;
+  int pageIndex = 0;
+
+  @override
+  void initState() {
+    pageController = PageController(initialPage: widget.index);
+    pageIndex = widget.index;
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    pageController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final weatherData = widget.weatherData;
+    final timeDaily = weatherData.timeDaily ?? [];
+    final weatherCodeDaily = weatherData.weathercodeDaily ?? [];
+
+    final textTheme = context.textTheme;
+
+    return Scaffold(
+      appBar: AppBar(
+        automaticallyImplyLeading: false,
+        centerTitle: true,
+        leading: IconButton(
+          onPressed: () {
+            Get.back();
+          },
+          icon: const Icon(
+            Iconsax.arrow_left_1,
+            size: 20,
+          ),
+          splashColor: Colors.transparent,
+          highlightColor: Colors.transparent,
+        ),
+        title: Text(
+          DateFormat.MMMMEEEEd(locale.languageCode)
+              .format(timeDaily[pageIndex]),
+          style: textTheme.titleMedium?.copyWith(
+            fontWeight: FontWeight.w600,
+            fontSize: 18,
+          ),
+        ),
+      ),
+      body: SafeArea(
+        child: PageView.builder(
+          controller: pageController,
+          onPageChanged: (index) {
+            setState(() {
+              pageIndex = index;
+            });
+          },
+          itemCount: timeDaily.length,
+          itemBuilder: (context, index) {
+            final indexedWeatherCodeDaily = weatherCodeDaily[index];
+            final apparentTemperatureMin =
+                weatherData.apparentTemperatureMin?[index];
+            final apparentTemperatureMax =
+                weatherData.apparentTemperatureMax?[index];
+            final uvIndexMax = weatherData.uvIndexMax?[index];
+            final windDirection10MDominant =
+                weatherData.winddirection10MDominant?[index];
+            final windSpeed10MMax = weatherData.windspeed10MMax?[index];
+            final windGusts10MMax = weatherData.windgusts10MMax?[index];
+            final precipitationProbabilityMax =
+                weatherData.precipitationProbabilityMax?[index];
+            final rainSum = weatherData.rainSum?[index];
+            final precipitationSum = weatherData.precipitationSum?[index];
+
+            return indexedWeatherCodeDaily == null
+                ? null
+                : Container(
+                    margin: const EdgeInsets.symmetric(horizontal: 10),
+                    child: ListView(
+                      children: [
+                        Column(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: [
+                            const SizedBox(height: 15),
+                            Image(
+                              image: AssetImage(
+                                statusWeather
+                                    .getImageNowDaily(indexedWeatherCodeDaily),
+                              ),
+                              fit: BoxFit.fill,
+                              height: 200,
+                            ),
+                            const SizedBox(height: 10),
+                            GlowText(
+                              '${weatherData.temperature2MMin![index]?.round()} / ${weatherData.temperature2MMax![index]?.round()}',
+                              style: textTheme.titleLarge?.copyWith(
+                                fontSize: 35,
+                                fontWeight: FontWeight.w800,
+                              ),
+                              blurRadius: 4,
+                            ),
+                            const SizedBox(height: 5),
+                            Text(
+                              statusWeather.getText(indexedWeatherCodeDaily),
+                              style: textTheme.titleLarge,
+                            ),
+                            const SizedBox(height: 5),
+                            Text(
+                              DateFormat.MMMMEEEEd(locale.languageCode)
+                                  .format(timeDaily[index]),
+                              style: textTheme.labelLarge?.copyWith(
+                                color: Colors.grey,
+                                fontSize: 16,
+                              ),
+                            ),
+                          ],
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.only(top: 15),
+                          child: SunsetSunrise(
+                            timeSunrise: weatherData.sunrise![index],
+                            timeSunset: weatherData.sunset![index],
+                          ),
+                        ),
+                        Card(
+                          margin: const EdgeInsets.only(bottom: 15),
+                          child: Padding(
+                            padding: const EdgeInsets.only(top: 20, bottom: 5),
+                            child: Wrap(
+                              alignment: WrapAlignment.spaceEvenly,
+                              spacing: 5,
+                              children: [
+                                apparentTemperatureMin == null
+                                    ? const Offstage()
+                                    : DescWeather(
+                                        imageName: 'assets/images/cold.png',
+                                        value: statusData.getDegree(
+                                            apparentTemperatureMin.round()),
+                                        desc: 'apparentTemperatureMin'.tr,
+                                      ),
+                                apparentTemperatureMax == null
+                                    ? const Offstage()
+                                    : DescWeather(
+                                        imageName: 'assets/images/hot.png',
+                                        value: statusData.getDegree(
+                                            apparentTemperatureMax.round()),
+                                        desc: 'apparentTemperatureMax'.tr,
+                                      ),
+                                uvIndexMax == null
+                                    ? const Offstage()
+                                    : DescWeather(
+                                        imageName: 'assets/images/uv.png',
+                                        value: '${uvIndexMax.round()}',
+                                        desc: 'uvIndex'.tr,
+                                        message: message
+                                            .getUvIndex(uvIndexMax.round()),
+                                      ),
+                                windDirection10MDominant == null
+                                    ? const Offstage()
+                                    : DescWeather(
+                                        imageName: 'assets/images/windsock.png',
+                                        value: '$windDirection10MDominant°',
+                                        desc: 'direction'.tr,
+                                        message: message.getDirection(
+                                            windDirection10MDominant),
+                                      ),
+                                windSpeed10MMax == null
+                                    ? const Offstage()
+                                    : DescWeather(
+                                        imageName: 'assets/images/wind.png',
+                                        value: statusData
+                                            .getSpeed(windSpeed10MMax.round()),
+                                        desc: 'wind'.tr,
+                                      ),
+                                windGusts10MMax == null
+                                    ? const Offstage()
+                                    : DescWeather(
+                                        imageName:
+                                            'assets/images/windgusts.png',
+                                        value: statusData
+                                            .getSpeed(windGusts10MMax.round()),
+                                        desc: 'windgusts'.tr,
+                                      ),
+                                precipitationProbabilityMax == null
+                                    ? const Offstage()
+                                    : DescWeather(
+                                        imageName:
+                                            'assets/images/precipitation_probability.png',
+                                        value: '$precipitationProbabilityMax%',
+                                        desc: 'precipitationProbability'.tr,
+                                      ),
+                                rainSum == null
+                                    ? const Offstage()
+                                    : DescWeather(
+                                        imageName: 'assets/images/water.png',
+                                        value: statusData
+                                            .getPrecipitation(rainSum),
+                                        desc: 'rain'.tr,
+                                      ),
+                                precipitationSum == null
+                                    ? const Offstage()
+                                    : DescWeather(
+                                        imageName: 'assets/images/rainfall.png',
+                                        value: statusData
+                                            .getPrecipitation(precipitationSum),
+                                        desc: 'precipitation'.tr,
+                                      ),
+                              ],
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  );
+          },
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/app/widgets/daily/list_daily_card.dart b/lib/app/widgets/daily/list_daily_card.dart
new file mode 100644
index 0000000..4b9ecd4
--- /dev/null
+++ b/lib/app/widgets/daily/list_daily_card.dart
@@ -0,0 +1,80 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:intl/intl.dart';
+import 'package:rain/app/widgets/status/status_weather.dart';
+import 'package:rain/app/widgets/status/status_data.dart';
+import 'package:rain/main.dart';
+
+class ListDailyCard extends StatefulWidget {
+  const ListDailyCard({
+    super.key,
+    required this.timeDaily,
+    required this.weathercodeDaily,
+    required this.temperature2MMax,
+    required this.temperature2MMin,
+  });
+  final DateTime timeDaily;
+  final int? weathercodeDaily;
+  final double? temperature2MMax;
+  final double? temperature2MMin;
+
+  @override
+  State<ListDailyCard> createState() => _ListDailyCardState();
+}
+
+class _ListDailyCardState extends State<ListDailyCard> {
+  final statusWeather = StatusWeather();
+  final statusData = StatusData();
+
+  @override
+  Widget build(BuildContext context) {
+    return widget.weathercodeDaily == null
+        ? Container()
+        : Card(
+            margin: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+            child: Padding(
+              padding: const EdgeInsets.symmetric(vertical: 15, horizontal: 20),
+              child: Row(
+                children: [
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          '${statusData.getDegree(widget.temperature2MMin?.round())} / ${statusData.getDegree(widget.temperature2MMax?.round())}',
+                          style: context.textTheme.titleLarge?.copyWith(
+                            fontSize: 22,
+                            fontWeight: FontWeight.w600,
+                          ),
+                        ),
+                        const SizedBox(height: 5),
+                        Text(
+                          DateFormat.MMMMEEEEd(locale.languageCode)
+                              .format(widget.timeDaily),
+                          style: context.textTheme.titleMedium?.copyWith(
+                            color: Colors.grey,
+                            fontWeight: FontWeight.w400,
+                          ),
+                        ),
+                        const SizedBox(height: 5),
+                        Text(
+                          statusWeather.getText(widget.weathercodeDaily),
+                          style: context.textTheme.titleMedium?.copyWith(
+                            color: Colors.grey,
+                            fontWeight: FontWeight.w400,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  const SizedBox(width: 5),
+                  Image.asset(
+                    statusWeather.getImageNowDaily(widget.weathercodeDaily),
+                    scale: 6.5,
+                  ),
+                ],
+              ),
+            ),
+          );
+  }
+}
diff --git a/lib/app/widgets/daily/weather_daily.dart b/lib/app/widgets/daily/weather_daily.dart
new file mode 100644
index 0000000..a16b395
--- /dev/null
+++ b/lib/app/widgets/daily/weather_daily.dart
@@ -0,0 +1,146 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:intl/intl.dart';
+import 'package:rain/app/data/weather.dart';
+import 'package:rain/app/widgets/daily/info_daily_card.dart';
+import 'package:rain/app/widgets/status/status_data.dart';
+import 'package:rain/app/widgets/status/status_weather.dart';
+import 'package:rain/main.dart';
+
+class WeatherDaily extends StatefulWidget {
+  const WeatherDaily({
+    super.key,
+    required this.weatherData,
+    required this.onTap,
+  });
+
+  final WeatherCard weatherData;
+  final VoidCallback onTap;
+
+  @override
+  State<WeatherDaily> createState() => _WeatherDailyState();
+}
+
+class _WeatherDailyState extends State<WeatherDaily> {
+  final statusWeather = StatusWeather();
+  final statusData = StatusData();
+
+  @override
+  Widget build(BuildContext context) {
+    final splashColor = context.theme.colorScheme.primary.withOpacity(0.4);
+    const inkWellBorderRadius = BorderRadius.all(
+      Radius.circular(16),
+    );
+
+    final weatherData = widget.weatherData;
+    final weatherCodeDaily = weatherData.weathercodeDaily ?? [];
+    final textTheme = context.textTheme;
+    final labelLarge = textTheme.labelLarge;
+    final bodyMediumGrey = textTheme.bodyMedium?.copyWith(
+      color: Colors.grey,
+    );
+
+    return Card(
+      margin: const EdgeInsets.only(bottom: 15),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 15, vertical: 5),
+        child: Column(
+          children: [
+            ListView.builder(
+              shrinkWrap: true,
+              physics: const NeverScrollableScrollPhysics(),
+              itemCount: 7,
+              itemBuilder: (ctx, index) {
+                return InkWell(
+                  splashColor: splashColor,
+                  borderRadius: inkWellBorderRadius,
+                  onTap: () => Get.to(
+                    () => InfoDailyCard(
+                      weatherData: weatherData,
+                      index: index,
+                    ),
+                    transition: Transition.downToUp,
+                  ),
+                  child: Container(
+                    margin: const EdgeInsets.symmetric(vertical: 12),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Expanded(
+                          child: Text(
+                            DateFormat.EEEE(locale.languageCode)
+                                .format((weatherData.timeDaily ?? [])[index]),
+                            style: labelLarge,
+                            overflow: TextOverflow.ellipsis,
+                          ),
+                        ),
+                        Expanded(
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.center,
+                            children: [
+                              Image.asset(
+                                statusWeather
+                                    .getImage7Day(weatherCodeDaily[index]),
+                                scale: 3,
+                              ),
+                              const SizedBox(width: 5),
+                              Expanded(
+                                child: Text(
+                                  statusWeather
+                                      .getText(weatherCodeDaily[index]),
+                                  style: labelLarge,
+                                  overflow: TextOverflow.ellipsis,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                        Expanded(
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.end,
+                            children: [
+                              Text(
+                                statusData.getDegree(
+                                    (weatherData.temperature2MMin ?? [])[index]
+                                        ?.round()),
+                                style: labelLarge,
+                              ),
+                              Text(
+                                ' / ',
+                                style: bodyMediumGrey,
+                              ),
+                              Text(
+                                statusData.getDegree(
+                                    (weatherData.temperature2MMax ?? [])[index]
+                                        ?.round()),
+                                style: bodyMediumGrey,
+                              ),
+                            ],
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                );
+              },
+            ),
+            const Divider(),
+            InkWell(
+              splashColor: splashColor,
+              borderRadius: inkWellBorderRadius,
+              onTap: widget.onTap,
+              child: Padding(
+                padding: const EdgeInsets.symmetric(vertical: 10),
+                child: Text(
+                  'weatherMore'.tr,
+                  style: textTheme.titleMedium,
+                  overflow: TextOverflow.ellipsis,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/app/widgets/daily/weather_more.dart b/lib/app/widgets/daily/weather_more.dart
new file mode 100644
index 0000000..328bcfd
--- /dev/null
+++ b/lib/app/widgets/daily/weather_more.dart
@@ -0,0 +1,71 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:iconsax/iconsax.dart';
+import 'package:rain/app/data/weather.dart';
+import 'package:rain/app/widgets/daily/info_daily_card.dart';
+import 'package:rain/app/widgets/daily/list_daily_card.dart';
+
+class WeatherMore extends StatefulWidget {
+  const WeatherMore({
+    super.key,
+    required this.weatherData,
+  });
+  final WeatherCard weatherData;
+
+  @override
+  State<WeatherMore> createState() => _WeatherMoreState();
+}
+
+class _WeatherMoreState extends State<WeatherMore> {
+  @override
+  Widget build(BuildContext context) {
+    const transparent = Colors.transparent;
+    final weatherData = widget.weatherData;
+    final timeDaily = weatherData.timeDaily ?? [];
+
+    return Scaffold(
+      appBar: AppBar(
+        automaticallyImplyLeading: false,
+        centerTitle: true,
+        leading: IconButton(
+          onPressed: () {
+            Get.back();
+          },
+          icon: const Icon(
+            Iconsax.arrow_left_1,
+            size: 20,
+          ),
+          splashColor: transparent,
+          highlightColor: transparent,
+        ),
+        title: Text(
+          'weatherMore'.tr,
+          style: context.textTheme.titleMedium?.copyWith(
+            fontWeight: FontWeight.w600,
+            fontSize: 18,
+          ),
+        ),
+      ),
+      body: SafeArea(
+        child: ListView.builder(
+          itemCount: timeDaily.length,
+          itemBuilder: (context, index) => GestureDetector(
+            onTap: () => Get.to(
+              () => InfoDailyCard(
+                weatherData: weatherData,
+                index: index,
+              ),
+              transition: Transition.downToUp,
+            ),
+            child: ListDailyCard(
+              timeDaily: timeDaily[index],
+              weathercodeDaily: weatherData.weathercodeDaily![index],
+              temperature2MMax: weatherData.temperature2MMax![index],
+              temperature2MMin: weatherData.temperature2MMin![index],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/app/ui/widgets/weather/desc/desc.dart b/lib/app/widgets/desc/desc.dart
old mode 100755
new mode 100644
similarity index 50%
rename from lib/app/ui/widgets/weather/desc/desc.dart
rename to lib/app/widgets/desc/desc.dart
index 20a2c7c..5e42975
--- a/lib/app/ui/widgets/weather/desc/desc.dart
+++ b/lib/app/widgets/desc/desc.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
 import 'package:get/get.dart';
 
 class DescWeather extends StatefulWidget {
@@ -10,7 +9,6 @@ class DescWeather extends StatefulWidget {
     required this.desc,
     this.message = '',
   });
-
   final String imageName;
   final String value;
   final String desc;
@@ -27,42 +25,36 @@ class _DescWeatherState extends State<DescWeather> {
   Widget build(BuildContext context) {
     final textTheme = context.textTheme;
     return GestureDetector(
-      onTap: _toggleDescriptionVisibility,
+      onTap: () => setState(() => hide = !hide),
       child: Tooltip(
         message: widget.message,
         child: SizedBox(
           height: 90,
           width: 100,
-          child: _buildContent(textTheme),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Image.asset(
+                widget.imageName,
+                scale: 20,
+              ),
+              const SizedBox(height: 5),
+              Text(
+                widget.value,
+                style: textTheme.labelLarge,
+              ),
+              Expanded(
+                child: Text(
+                  widget.desc,
+                  style: textTheme.bodySmall,
+                  overflow: hide ? TextOverflow.ellipsis : TextOverflow.visible,
+                  textAlign: TextAlign.center,
+                ),
+              ),
+            ],
+          ),
         ),
       ),
     );
   }
-
-  void _toggleDescriptionVisibility() {
-    setState(() => hide = !hide);
-  }
-
-  Widget _buildContent(TextTheme textTheme) {
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: [
-        Image.asset(widget.imageName, scale: 20),
-        const Gap(5),
-        Text(
-          widget.value,
-          style: textTheme.labelLarge,
-          overflow: TextOverflow.ellipsis,
-        ),
-        Expanded(
-          child: Text(
-            widget.desc,
-            style: textTheme.bodySmall,
-            overflow: hide ? TextOverflow.ellipsis : TextOverflow.visible,
-            textAlign: TextAlign.center,
-          ),
-        ),
-      ],
-    );
-  }
 }
diff --git a/lib/app/widgets/desc/desc_container.dart b/lib/app/widgets/desc/desc_container.dart
new file mode 100644
index 0000000..0681ac0
--- /dev/null
+++ b/lib/app/widgets/desc/desc_container.dart
@@ -0,0 +1,189 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:rain/app/widgets/desc/desc.dart';
+import 'package:rain/app/widgets/desc/message.dart';
+import 'package:rain/app/widgets/status/status_data.dart';
+
+class DescContainer extends StatefulWidget {
+  const DescContainer({
+    super.key,
+    required this.humidity,
+    required this.wind,
+    required this.visibility,
+    required this.feels,
+    required this.evaporation,
+    required this.precipitation,
+    required this.direction,
+    required this.pressure,
+    required this.rain,
+    required this.cloudcover,
+    required this.windgusts,
+    required this.uvIndex,
+    required this.dewpoint2M,
+    required this.precipitationProbability,
+    required this.shortwaveRadiation,
+  });
+  final int? humidity;
+  final double? wind;
+  final double? visibility;
+  final double? feels;
+  final double? evaporation;
+  final double? precipitation;
+  final int? direction;
+  final double? pressure;
+  final double? rain;
+  final int? cloudcover;
+  final double? windgusts;
+  final double? uvIndex;
+  final double? dewpoint2M;
+  final int? precipitationProbability;
+  final double? shortwaveRadiation;
+
+  @override
+  State<DescContainer> createState() => _DescContainerState();
+}
+
+class _DescContainerState extends State<DescContainer> {
+  final statusData = StatusData();
+  final message = Message();
+
+  @override
+  Widget build(BuildContext context) {
+    final dewpoint2M = widget.dewpoint2M?.round();
+    final feels = widget.feels;
+    final visibility = widget.visibility;
+    final direction = widget.direction;
+    final wind = widget.wind;
+    final windgusts = widget.windgusts;
+    final evaporation = widget.evaporation;
+    final precipitation = widget.precipitation;
+    final rain = widget.rain;
+    final precipitationProbability = widget.precipitationProbability;
+    final humidity = widget.humidity;
+    final cloudcover = widget.cloudcover;
+    final pressure = widget.pressure;
+    final uvIndex = widget.uvIndex;
+    final shortwaveRadiation = widget.shortwaveRadiation;
+
+    return Card(
+      margin: const EdgeInsets.only(bottom: 15),
+      child: Padding(
+        padding: const EdgeInsets.only(top: 22, bottom: 5),
+        child: Wrap(
+          alignment: WrapAlignment.spaceEvenly,
+          spacing: 5,
+          children: [
+            dewpoint2M == null
+                ? const Offstage()
+                : DescWeather(
+                    imageName: 'assets/images/dew.png',
+                    value: statusData.getDegree(dewpoint2M.round()),
+                    desc: 'dewpoint'.tr,
+                  ),
+            feels == null
+                ? const Offstage()
+                : DescWeather(
+                    imageName: 'assets/images/temperature.png',
+                    value: statusData.getDegree(feels.round()),
+                    desc: 'feels'.tr,
+                  ),
+            visibility == null
+                ? const Offstage()
+                : DescWeather(
+                    imageName: 'assets/images/fog.png',
+                    value: statusData.getVisibility(visibility),
+                    desc: 'visibility'.tr,
+                  ),
+            direction == null
+                ? const Offstage()
+                : DescWeather(
+                    imageName: 'assets/images/windsock.png',
+                    value: '$direction°',
+                    desc: 'direction'.tr,
+                    message: message.getDirection(direction),
+                  ),
+            wind == null
+                ? const Offstage()
+                : DescWeather(
+                    imageName: 'assets/images/wind.png',
+                    value: statusData.getSpeed(wind.round()),
+                    desc: 'wind'.tr,
+                  ),
+            windgusts == null
+                ? const Offstage()
+                : DescWeather(
+                    imageName: 'assets/images/windgusts.png',
+                    value: statusData.getSpeed(windgusts.round()),
+                    desc: 'windgusts'.tr,
+                  ),
+            evaporation == null
+                ? const Offstage()
+                : DescWeather(
+                    imageName: 'assets/images/evaporation.png',
+                    value: statusData.getPrecipitation(evaporation.abs()),
+                    desc: 'evaporation'.tr,
+                  ),
+            precipitation == null
+                ? const Offstage()
+                : DescWeather(
+                    imageName: 'assets/images/rainfall.png',
+                    value: statusData.getPrecipitation(precipitation),
+                    desc: 'precipitation'.tr,
+                  ),
+            rain == null
+                ? const Offstage()
+                : DescWeather(
+                    imageName: 'assets/images/water.png',
+                    value: statusData.getPrecipitation(rain),
+                    desc: 'rain'.tr,
+                  ),
+            precipitationProbability == null
+                ? const Offstage()
+                : DescWeather(
+                    imageName: 'assets/images/precipitation_probability.png',
+                    value: '$precipitationProbability%',
+                    desc: 'precipitationProbability'.tr,
+                  ),
+            humidity == null
+                ? const Offstage()
+                : DescWeather(
+                    imageName: 'assets/images/humidity.png',
+                    value: '$humidity%',
+                    desc: 'humidity'.tr,
+                  ),
+            cloudcover == null
+                ? const Offstage()
+                : DescWeather(
+                    imageName: 'assets/images/cloudy.png',
+                    value: '$cloudcover%',
+                    desc: 'cloudcover'.tr,
+                  ),
+            pressure == null
+                ? const Offstage()
+                : DescWeather(
+                    imageName: 'assets/images/atmospheric.png',
+                    value: '${pressure.round()} ${'hPa'.tr}',
+                    desc: 'pressure'.tr,
+                    message: message.getPressure(pressure.round()),
+                  ),
+            uvIndex == null
+                ? const Offstage()
+                : DescWeather(
+                    imageName: 'assets/images/uv.png',
+                    value: '${uvIndex.round()}',
+                    desc: 'uvIndex'.tr,
+                    message: message.getUvIndex(uvIndex.round()),
+                  ),
+            shortwaveRadiation == null
+                ? const Offstage()
+                : DescWeather(
+                    imageName: 'assets/images/shortwave_radiation.png',
+                    value: '${shortwaveRadiation.round()} ${'W/m2'.tr}',
+                    desc: 'shortwaveRadiation'.tr,
+                  ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/app/widgets/desc/message.dart b/lib/app/widgets/desc/message.dart
new file mode 100644
index 0000000..9254848
--- /dev/null
+++ b/lib/app/widgets/desc/message.dart
@@ -0,0 +1,59 @@
+import 'package:get/get.dart';
+
+class Message {
+  String getPressure(int? pressure) {
+    if (pressure != null) {
+      if (pressure < 1000) {
+        return 'low'.tr;
+      } else if (pressure > 1020) {
+        return 'high'.tr;
+      } else {
+        return 'normal'.tr;
+      }
+    } else {
+      return '';
+    }
+  }
+
+  String getUvIndex(int? uvIndex) {
+    if (uvIndex != null) {
+      if (uvIndex < 3) {
+        return 'uvLow'.tr;
+      } else if (uvIndex < 6) {
+        return 'uvAverage'.tr;
+      } else if (uvIndex < 8) {
+        return 'uvHigh'.tr;
+      } else if (uvIndex < 11) {
+        return 'uvVeryHigh'.tr;
+      } else {
+        return 'uvExtreme'.tr;
+      }
+    } else {
+      return '';
+    }
+  }
+
+  String getDirection(int? direction) {
+    if (direction != null) {
+      if (direction >= 337.5 || direction < 22.5) {
+        return 'north'.tr;
+      } else if (direction >= 22.5 && direction < 67.5) {
+        return 'northeast'.tr;
+      } else if (direction >= 67.5 && direction < 112.5) {
+        return 'east'.tr;
+      } else if (direction >= 112.5 && direction < 157.5) {
+        return 'southeast'.tr;
+      } else if (direction >= 157.5 && direction < 202.5) {
+        return 'south'.tr;
+      } else if (direction >= 202.5 && direction < 247.5) {
+        return 'southwest'.tr;
+      } else if (direction >= 247.5 && direction < 292.5) {
+        return 'west'.tr;
+      } else {
+        return 'northwest'.tr;
+      }
+    } else {
+      return '';
+    }
+  }
+}
diff --git a/lib/app/widgets/hourly/weather_hourly.dart b/lib/app/widgets/hourly/weather_hourly.dart
new file mode 100644
index 0000000..ecc9051
--- /dev/null
+++ b/lib/app/widgets/hourly/weather_hourly.dart
@@ -0,0 +1,71 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:intl/intl.dart';
+import 'package:rain/app/widgets/status/status_data.dart';
+import 'package:rain/app/widgets/status/status_weather.dart';
+import 'package:rain/main.dart';
+
+class WeatherHourly extends StatefulWidget {
+  const WeatherHourly({
+    super.key,
+    required this.time,
+    required this.weather,
+    required this.degree,
+    required this.timeDay,
+    required this.timeNight,
+  });
+  final String time;
+  final String timeDay;
+  final String timeNight;
+  final int weather;
+  final double degree;
+
+  @override
+  State<WeatherHourly> createState() => _WeatherHourlyState();
+}
+
+class _WeatherHourlyState extends State<WeatherHourly> {
+  final statusWeather = StatusWeather();
+  final statusData = StatusData();
+
+  @override
+  Widget build(BuildContext context) {
+    final textTheme = context.textTheme;
+    final time = widget.time;
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+      children: [
+        Column(
+          children: [
+            Text(
+              statusData.getTimeFormat(time),
+              style: textTheme.labelLarge,
+            ),
+            Text(
+              DateFormat('E', locale.languageCode)
+                  .format(DateTime.tryParse(time)!),
+              style: textTheme.labelLarge?.copyWith(
+                color: Colors.grey,
+              ),
+            ),
+          ],
+        ),
+        Image.asset(
+          statusWeather.getImageToday(
+            widget.weather,
+            time,
+            widget.timeDay,
+            widget.timeNight,
+          ),
+          scale: 3,
+        ),
+        Text(
+          statusData.getDegree(widget.degree.round()),
+          style: textTheme.titleMedium?.copyWith(
+            fontWeight: FontWeight.w600,
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/app/widgets/now/weather_now.dart b/lib/app/widgets/now/weather_now.dart
new file mode 100644
index 0000000..3f58d33
--- /dev/null
+++ b/lib/app/widgets/now/weather_now.dart
@@ -0,0 +1,65 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_glow/flutter_glow.dart';
+import 'package:get/get.dart';
+import 'package:intl/intl.dart';
+import 'package:rain/app/widgets/status/status_weather.dart';
+import 'package:rain/main.dart';
+
+class WeatherNow extends StatefulWidget {
+  const WeatherNow({
+    super.key,
+    required this.weather,
+    required this.degree,
+    required this.time,
+    required this.timeDay,
+    required this.timeNight,
+  });
+  final String time;
+  final String timeDay;
+  final String timeNight;
+  final int weather;
+  final double degree;
+
+  @override
+  State<WeatherNow> createState() => _WeatherNowState();
+}
+
+class _WeatherNowState extends State<WeatherNow> {
+  final statusWeather = StatusWeather();
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        const SizedBox(height: 15),
+        Image(
+          image: AssetImage(statusWeather.getImageNow(
+              widget.weather, widget.time, widget.timeDay, widget.timeNight)),
+          fit: BoxFit.fill,
+          height: 200,
+        ),
+        GlowText(
+          '${roundDegree ? widget.degree.round() : widget.degree}',
+          style: context.textTheme.displayLarge?.copyWith(
+            fontSize: 90,
+            fontWeight: FontWeight.w800,
+          ),
+        ),
+        Text(
+          statusWeather.getText(widget.weather),
+          style: context.textTheme.titleLarge,
+        ),
+        const SizedBox(height: 5),
+        Text(
+          DateFormat.MMMMEEEEd(locale.languageCode).format(
+            DateTime.parse(widget.time),
+          ),
+          style: context.textTheme.labelLarge?.copyWith(
+            color: Colors.grey,
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/app/ui/widgets/shimmer.dart b/lib/app/widgets/shimmer.dart
old mode 100755
new mode 100644
similarity index 55%
rename from lib/app/ui/widgets/shimmer.dart
rename to lib/app/widgets/shimmer.dart
index f470e1d..24a19ec
--- a/lib/app/ui/widgets/shimmer.dart
+++ b/lib/app/widgets/shimmer.dart
@@ -3,21 +3,25 @@ import 'package:get/get.dart';
 import 'package:shimmer/shimmer.dart';
 
 class MyShimmer extends StatelessWidget {
-  const MyShimmer({super.key, required this.height, this.margin});
-
-  final double height;
-  final EdgeInsets? margin;
+  const MyShimmer({
+    super.key,
+    required this.hight,
+    this.edgeInsetsMargin,
+  });
+  final double hight;
+  final EdgeInsets? edgeInsetsMargin;
 
   @override
   Widget build(BuildContext context) {
     return Shimmer.fromColors(
       baseColor: context.theme.cardColor,
       highlightColor: context.theme.primaryColor,
-      child: _buildShimmerCard(),
+      child: Card(
+        margin: edgeInsetsMargin,
+        child: SizedBox(
+          height: hight,
+        ),
+      ),
     );
   }
-
-  Widget _buildShimmerCard() {
-    return Card(margin: margin, child: SizedBox(height: height));
-  }
 }
diff --git a/lib/app/widgets/status/status_data.dart b/lib/app/widgets/status/status_data.dart
new file mode 100644
index 0000000..097f0b3
--- /dev/null
+++ b/lib/app/widgets/status/status_data.dart
@@ -0,0 +1,76 @@
+import 'package:get/get.dart';
+import 'package:intl/intl.dart';
+import 'package:rain/main.dart';
+import 'package:timezone/timezone.dart';
+
+class StatusData {
+  String getDegree(int? degree) {
+    switch (settings.degrees) {
+      case 'celsius':
+        return '$degree°C';
+      case 'fahrenheit':
+        return '$degree°F';
+      default:
+        return '$degree°C';
+    }
+  }
+
+  String getSpeed(int? speed) {
+    switch (settings.measurements) {
+      case 'metric':
+        return '$speed ${'kph'.tr}';
+      case 'imperial':
+        return '$speed ${'mph'.tr}';
+      default:
+        return '$speed ${'kph'.tr}';
+    }
+  }
+
+  String getVisibility(double? length) {
+    if (length != null) {
+      switch (settings.measurements) {
+        case 'metric':
+          return '${length > 1000 ? (length / 1000).round() : (length / 1000).toStringAsFixed(2)} ${'km'.tr}';
+        case 'imperial':
+          return '${length > 5280 ? (length / 5280).round() : (length / 5280).toStringAsFixed(2)} ${'mi'.tr}';
+        default:
+          return '${length > 1000 ? (length / 1000).round() : (length / 1000).toStringAsFixed(2)} ${'km'.tr}';
+      }
+    } else {
+      return '';
+    }
+  }
+
+  String getPrecipitation(double? precipitation) {
+    switch (settings.measurements) {
+      case 'metric':
+        return '$precipitation ${'mm'.tr}';
+      case 'imperial':
+        return '$precipitation ${'inch'.tr}';
+      default:
+        return '$precipitation ${'mm'.tr}';
+    }
+  }
+
+  String getTimeFormat(String time) {
+    switch (settings.timeformat) {
+      case '12':
+        return DateFormat.jm().format(DateTime.tryParse(time)!);
+      case '24':
+        return DateFormat.Hm().format(DateTime.tryParse(time)!);
+      default:
+        return DateFormat.Hm().format(DateTime.tryParse(time)!);
+    }
+  }
+
+  String getTimeFormatTz(TZDateTime time) {
+    switch (settings.timeformat) {
+      case '12':
+        return DateFormat.jm().format(time);
+      case '24':
+        return DateFormat.Hm().format(time);
+      default:
+        return DateFormat.Hm().format(time);
+    }
+  }
+}
diff --git a/lib/app/widgets/status/status_weather.dart b/lib/app/widgets/status/status_weather.dart
new file mode 100644
index 0000000..b33d8c1
--- /dev/null
+++ b/lib/app/widgets/status/status_weather.dart
@@ -0,0 +1,340 @@
+import 'package:get/get.dart';
+
+const assetImageRoot = 'assets/images/';
+
+class StatusWeather {
+  String getImageNow(
+      int weather, String time, String timeDay, String timeNight) {
+    final currentTime = DateTime.parse(time);
+    final day = DateTime.parse(timeDay);
+    final night = DateTime.parse(timeNight);
+
+    final dayTime =
+        DateTime(day.year, day.month, day.day, day.hour, day.minute);
+    final nightTime =
+        DateTime(night.year, night.month, night.day, night.hour, night.minute);
+
+    switch (weather) {
+      case 0:
+        if (currentTime.isAfter(dayTime) && currentTime.isBefore(nightTime)) {
+          return '${assetImageRoot}sun.png';
+        } else {
+          return '${assetImageRoot}full-moon.png';
+        }
+      case 1:
+      case 2:
+      case 3:
+        if (currentTime.isAfter(dayTime) && currentTime.isBefore(nightTime)) {
+          return '${assetImageRoot}cloud.png';
+        } else {
+          return '${assetImageRoot}moon.png';
+        }
+      case 45:
+      case 48:
+        if (currentTime.isAfter(dayTime) && currentTime.isBefore(nightTime)) {
+          return '${assetImageRoot}fog.png';
+        } else {
+          return '${assetImageRoot}fog_moon.png';
+        }
+      case 51:
+      case 53:
+      case 55:
+      case 56:
+      case 57:
+      case 61:
+      case 63:
+      case 65:
+      case 66:
+      case 67:
+        return '${assetImageRoot}rain.png';
+      case 80:
+      case 81:
+      case 82:
+        return '${assetImageRoot}rain-fall.png';
+      case 71:
+      case 73:
+      case 75:
+      case 77:
+      case 85:
+      case 86:
+        return '${assetImageRoot}snow.png';
+      case 95:
+        return '${assetImageRoot}thunder.png';
+      case 96:
+      case 99:
+        return '${assetImageRoot}storm.png';
+      default:
+        return '';
+    }
+  }
+
+  String getImageNowDaily(int? weather) {
+    switch (weather) {
+      case 0:
+        return '${assetImageRoot}sun.png';
+      case 1:
+      case 2:
+      case 3:
+        return '${assetImageRoot}cloud.png';
+      case 45:
+      case 48:
+        return '${assetImageRoot}fog.png';
+      case 51:
+      case 53:
+      case 55:
+      case 56:
+      case 57:
+      case 61:
+      case 63:
+      case 65:
+      case 66:
+      case 67:
+        return '${assetImageRoot}rain.png';
+      case 80:
+      case 81:
+      case 82:
+        return '${assetImageRoot}rain-fall.png';
+      case 71:
+      case 73:
+      case 75:
+      case 77:
+      case 85:
+      case 86:
+        return '${assetImageRoot}snow.png';
+      case 95:
+        return '${assetImageRoot}thunder.png';
+      case 96:
+      case 99:
+        return '${assetImageRoot}storm.png';
+      default:
+        return '';
+    }
+  }
+
+  String getImageToday(
+      int weather, String time, String timeDay, String timeNight) {
+    final currentTime = DateTime.parse(time);
+    final day = DateTime.parse(timeDay);
+    final night = DateTime.parse(timeNight);
+
+    final dayTime =
+        DateTime(day.year, day.month, day.day, day.hour, day.minute);
+    final nightTime =
+        DateTime(night.year, night.month, night.day, night.hour, night.minute);
+
+    switch (weather) {
+      case 0:
+        if (currentTime.isAfter(dayTime) && currentTime.isBefore(nightTime)) {
+          return '${assetImageRoot}clear_day.png';
+        } else {
+          return '${assetImageRoot}clear_night.png';
+        }
+      case 1:
+      case 2:
+      case 3:
+        if (currentTime.isAfter(dayTime) && currentTime.isBefore(nightTime)) {
+          return '${assetImageRoot}cloudy_day.png';
+        } else {
+          return '${assetImageRoot}cloudy_night.png';
+        }
+      case 45:
+      case 48:
+        if (currentTime.isAfter(dayTime) && currentTime.isBefore(nightTime)) {
+          return '${assetImageRoot}fog_day.png';
+        } else {
+          return '${assetImageRoot}fog_night.png';
+        }
+      case 51:
+      case 53:
+      case 55:
+      case 56:
+      case 57:
+      case 61:
+      case 63:
+      case 65:
+      case 66:
+      case 67:
+      case 80:
+      case 81:
+      case 82:
+        if (currentTime.isAfter(dayTime) && currentTime.isBefore(nightTime)) {
+          return '${assetImageRoot}rain_day.png';
+        } else {
+          return '${assetImageRoot}rain_night.png';
+        }
+      case 71:
+      case 73:
+      case 75:
+      case 77:
+      case 85:
+      case 86:
+        if (currentTime.isAfter(dayTime) && currentTime.isBefore(nightTime)) {
+          return '${assetImageRoot}snow_day.png';
+        } else {
+          return '${assetImageRoot}snow_night.png';
+        }
+      case 95:
+      case 96:
+      case 99:
+        if (currentTime.isAfter(dayTime) && currentTime.isBefore(nightTime)) {
+          return '${assetImageRoot}thunder_day.png';
+        } else {
+          return '${assetImageRoot}thunder_night.png';
+        }
+      default:
+        return '';
+    }
+  }
+
+  String getImage7Day(int? weather) {
+    switch (weather) {
+      case 0:
+        return '${assetImageRoot}clear_day.png';
+      case 1:
+      case 2:
+      case 3:
+        return '${assetImageRoot}cloudy_day.png';
+      case 45:
+      case 48:
+        return '${assetImageRoot}fog_day.png';
+      case 51:
+      case 53:
+      case 55:
+      case 56:
+      case 57:
+      case 61:
+      case 63:
+      case 65:
+      case 66:
+      case 67:
+      case 80:
+      case 81:
+      case 82:
+        return '${assetImageRoot}rain_day.png';
+      case 71:
+      case 73:
+      case 75:
+      case 77:
+      case 85:
+      case 86:
+        return '${assetImageRoot}snow_day.png';
+      case 95:
+      case 96:
+      case 99:
+        return '${assetImageRoot}thunder_day.png';
+      default:
+        return '';
+    }
+  }
+
+  String getText(int? weather) {
+    switch (weather) {
+      case 0:
+        return 'clear_sky'.tr;
+      case 1:
+      case 2:
+        return 'cloudy'.tr;
+      case 3:
+        return 'overcast'.tr;
+      case 45:
+      case 48:
+        return 'fog'.tr;
+      case 51:
+      case 53:
+      case 55:
+        return 'drizzle'.tr;
+      case 56:
+      case 57:
+        return 'drizzling_rain'.tr;
+      case 61:
+      case 63:
+      case 65:
+        return 'rain'.tr;
+      case 66:
+      case 67:
+        return 'freezing_rain'.tr;
+      case 80:
+      case 81:
+      case 82:
+        return 'heavy_rains'.tr;
+      case 71:
+      case 73:
+      case 75:
+      case 77:
+      case 85:
+      case 86:
+        return 'snow'.tr;
+      case 95:
+      case 96:
+      case 99:
+        return 'thunderstorm'.tr;
+      default:
+        return '';
+    }
+  }
+
+  String getImageNotification(
+      int weather, String time, String timeDay, String timeNight) {
+    final currentTime = DateTime.parse(time);
+    final day = DateTime.parse(timeDay);
+    final night = DateTime.parse(timeNight);
+
+    final dayTime =
+        DateTime(day.year, day.month, day.day, day.hour, day.minute);
+    final nightTime =
+        DateTime(night.year, night.month, night.day, night.hour, night.minute);
+
+    switch (weather) {
+      case 0:
+        if (currentTime.isAfter(dayTime) && currentTime.isBefore(nightTime)) {
+          return 'sun.png';
+        } else {
+          return 'full-moon.png';
+        }
+      case 1:
+      case 2:
+      case 3:
+        if (currentTime.isAfter(dayTime) && currentTime.isBefore(nightTime)) {
+          return 'cloud.png';
+        } else {
+          return 'moon.png';
+        }
+      case 45:
+      case 48:
+        if (currentTime.isAfter(dayTime) && currentTime.isBefore(nightTime)) {
+          return 'fog.png';
+        } else {
+          return 'fog_moon.png';
+        }
+      case 51:
+      case 53:
+      case 55:
+      case 56:
+      case 57:
+      case 61:
+      case 63:
+      case 65:
+      case 66:
+      case 67:
+        return 'rain.png';
+      case 80:
+      case 81:
+      case 82:
+        return 'rain-fall.png';
+      case 71:
+      case 73:
+      case 75:
+      case 77:
+      case 85:
+      case 86:
+        return 'snow.png';
+      case 95:
+        return 'thunder.png';
+      case 96:
+      case 99:
+        return 'storm.png';
+      default:
+        return '';
+    }
+  }
+}
diff --git a/lib/app/widgets/sun_moon/sunset_sunrise.dart b/lib/app/widgets/sun_moon/sunset_sunrise.dart
new file mode 100644
index 0000000..e6f1909
--- /dev/null
+++ b/lib/app/widgets/sun_moon/sunset_sunrise.dart
@@ -0,0 +1,104 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:rain/app/widgets/status/status_data.dart';
+
+class SunsetSunrise extends StatefulWidget {
+  const SunsetSunrise({
+    super.key,
+    required this.timeSunrise,
+    required this.timeSunset,
+  });
+
+  final String timeSunrise;
+  final String timeSunset;
+
+  @override
+  State<SunsetSunrise> createState() => _SunsetSunriseState();
+}
+
+class _SunsetSunriseState extends State<SunsetSunrise> {
+  final statusData = StatusData();
+
+  @override
+  Widget build(BuildContext context) {
+    const crossAxisCenterAlignment = CrossAxisAlignment.center;
+    final textTheme = context.textTheme;
+    final titleSmall = textTheme.titleSmall;
+    final titleLarge = textTheme.titleLarge;
+
+    return Card(
+      margin: const EdgeInsets.only(bottom: 15),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 20),
+        child: Row(
+          children: [
+            Expanded(
+              child: Row(
+                crossAxisAlignment: crossAxisCenterAlignment,
+                children: [
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: crossAxisCenterAlignment,
+                      children: [
+                        Text(
+                          'sunrise'.tr,
+                          style: titleSmall,
+                          overflow: TextOverflow.ellipsis,
+                          textAlign: TextAlign.center,
+                        ),
+                        const SizedBox(height: 2),
+                        Text(
+                          statusData.getTimeFormat(widget.timeSunrise),
+                          style: titleLarge,
+                        ),
+                      ],
+                    ),
+                  ),
+                  const SizedBox(width: 5),
+                  Flexible(
+                    child: Image.asset(
+                      'assets/images/sunrise.png',
+                      scale: 10,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            Expanded(
+              child: Row(
+                crossAxisAlignment: crossAxisCenterAlignment,
+                children: [
+                  Expanded(
+                    child: Column(
+                      crossAxisAlignment: crossAxisCenterAlignment,
+                      children: [
+                        Text(
+                          'sunset'.tr,
+                          style: titleSmall,
+                          overflow: TextOverflow.ellipsis,
+                          textAlign: TextAlign.center,
+                        ),
+                        const SizedBox(height: 2),
+                        Text(
+                          statusData.getTimeFormat(widget.timeSunset),
+                          style: titleLarge,
+                        ),
+                      ],
+                    ),
+                  ),
+                  const SizedBox(width: 5),
+                  Flexible(
+                    child: Image.asset(
+                      'assets/images/sunset.png',
+                      scale: 10,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/app/ui/widgets/text_form.dart b/lib/app/widgets/text_form.dart
old mode 100755
new mode 100644
similarity index 53%
rename from lib/app/ui/widgets/text_form.dart
rename to lib/app/widgets/text_form.dart
index 3c67219..24757b0
--- a/lib/app/ui/widgets/text_form.dart
+++ b/lib/app/widgets/text_form.dart
@@ -13,9 +13,7 @@ class MyTextForm extends StatelessWidget {
     this.validator,
     this.elevation,
     this.focusNode,
-    this.onChanged,
   });
-
   final String labelText;
   final TextInputType type;
   final Icon icon;
@@ -25,35 +23,24 @@ class MyTextForm extends StatelessWidget {
   final String? Function(String?)? validator;
   final double? elevation;
   final FocusNode? focusNode;
-  final Function(String)? onChanged;
 
   @override
   Widget build(BuildContext context) {
     return Card(
       elevation: elevation,
       margin: margin,
-      child: _buildTextFormField(context),
-    );
-  }
-
-  Widget _buildTextFormField(BuildContext context) {
-    return TextFormField(
-      focusNode: focusNode,
-      controller: controller,
-      keyboardType: type,
-      style: context.textTheme.labelLarge,
-      decoration: _buildInputDecoration(),
-      validator: validator,
-      onChanged: onChanged,
-    );
-  }
-
-  InputDecoration _buildInputDecoration() {
-    return InputDecoration(
-      contentPadding: const EdgeInsets.symmetric(horizontal: 12.5, vertical: 0),
-      prefixIcon: icon,
-      suffixIcon: iconButton,
-      labelText: labelText,
+      child: TextFormField(
+        focusNode: focusNode,
+        controller: controller,
+        keyboardType: type,
+        style: context.textTheme.labelLarge,
+        decoration: InputDecoration(
+          prefixIcon: icon,
+          suffixIcon: iconButton,
+          labelText: labelText,
+        ),
+        validator: validator,
+      ),
     );
   }
 }
diff --git a/lib/main.dart b/lib/main.dart
old mode 100755
new mode 100644
index 45d365e..f2a3126
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -10,36 +10,30 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_timezone/flutter_timezone.dart';
 import 'package:get/get.dart';
 import 'package:home_widget/home_widget.dart';
-import 'package:internet_connection_checker_plus/internet_connection_checker_plus.dart';
 import 'package:isar/isar.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:rain/app/controller/controller.dart';
-import 'package:rain/app/data/db.dart';
-import 'package:rain/app/ui/geolocation.dart';
-import 'package:rain/app/ui/home.dart';
-import 'package:rain/app/ui/onboarding.dart';
+import 'package:rain/app/modules/home.dart';
+import 'package:rain/app/modules/onboarding.dart';
 import 'package:rain/theme/theme.dart';
-import 'package:rain/theme/theme_controller.dart';
-import 'package:rain/translation/translation.dart';
-import 'package:rain/app/utils/device_info.dart';
+import 'package:time_machine/time_machine.dart';
 import 'package:timezone/data/latest_all.dart' as tz;
 import 'package:timezone/timezone.dart' as tz;
 import 'package:workmanager/workmanager.dart';
+import 'app/data/weather.dart';
+import 'theme/theme_controller.dart';
+import 'translation/translation.dart';
 
 late Isar isar;
 late Settings settings;
-late LocationCache locationCache;
-final ValueNotifier<Future<bool>> isOnline = ValueNotifier(
-  InternetConnection().hasInternetAccess,
-);
+bool isOnline = false;
 
-final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
+FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
     FlutterLocalNotificationsPlugin();
 
 bool amoledTheme = false;
 bool materialColor = false;
 bool roundDegree = false;
-bool largeElement = false;
 Locale locale = const Locale('en', 'US');
 int timeRange = 1;
 String timeStart = '09:00';
@@ -47,36 +41,32 @@ String timeEnd = '21:00';
 String widgetBackgroundColor = '';
 String widgetTextColor = '';
 
+final List appLanguages = [
+  {'name': 'বাংলা', 'locale': const Locale('bn', 'IN')},
+  {'name': 'Čeština', 'locale': const Locale('cs', 'CZ')},
+  {'name': 'Deutsch', 'locale': const Locale('de', 'DE')},
+  {'name': 'English', 'locale': const Locale('en', 'US')},
+  {'name': 'Español', 'locale': const Locale('es', 'ES')},
+  {'name': 'Français', 'locale': const Locale('fr', 'FR')},
+  // {'name': 'Gaeilge', 'locale': const Locale('ga', 'IE')},
+  {'name': 'हिन्दी', 'locale': const Locale('hi', 'IN')},
+  {'name': 'Magyar', 'locale': const Locale('hu', 'HU')},
+  {'name': 'Italiano', 'locale': const Locale('it', 'IT')},
+  {'name': 'ქართული', 'locale': const Locale('ka', 'GE')},
+  {'name': 'Nederlands', 'locale': const Locale('nl', 'NL')},
+  {'name': 'Polski', 'locale': const Locale('pl', 'PL')},
+  {'name': 'Português (Brasil)', 'locale': const Locale('pt', 'BR')},
+  {'name': 'Română', 'locale': const Locale('ro', 'RO')},
+  {'name': 'Русский', 'locale': const Locale('ru', 'RU')},
+  {'name': 'Slovenčina', 'locale': const Locale('sk', 'SK')},
+  {'name': 'Türkçe', 'locale': const Locale('tr', 'TR')},
+  {'name': 'اردو', 'locale': const Locale('ur', 'PK')},
+  {'name': '中文', 'locale': const Locale('zh', 'CN')},
+];
+
 const String appGroupId = 'DARK NIGHT';
 const String androidWidgetName = 'OreoWidget';
 
-const List<Map<String, dynamic>> appLanguages = [
-  {'name': 'বাংলা', 'locale': Locale('bn', 'IN')},
-  {'name': 'Čeština', 'locale': Locale('cs', 'CZ')},
-  {'name': 'Dansk', 'locale': Locale('da', 'DK')},
-  {'name': 'Deutsch', 'locale': Locale('de', 'DE')},
-  {'name': 'English', 'locale': Locale('en', 'US')},
-  {'name': 'Español', 'locale': Locale('es', 'ES')},
-  {'name': 'Français', 'locale': Locale('fr', 'FR')},
-  // {'name': 'Gaeilge', 'locale':  Locale('ga', 'IE')},
-  {'name': 'हिन्दी', 'locale': Locale('hi', 'IN')},
-  {'name': 'Magyar', 'locale': Locale('hu', 'HU')},
-  {'name': 'Italiano', 'locale': Locale('it', 'IT')},
-  {'name': '한국어', 'locale': Locale('ko', 'KR')},
-  {'name': 'فارسی', 'locale': Locale('fa', 'IR')},
-  {'name': 'ქართული', 'locale': Locale('ka', 'GE')},
-  {'name': 'Nederlands', 'locale': Locale('nl', 'NL')},
-  {'name': 'Polski', 'locale': Locale('pl', 'PL')},
-  {'name': 'Português (Brasil)', 'locale': Locale('pt', 'BR')},
-  {'name': 'Română', 'locale': Locale('ro', 'RO')},
-  {'name': 'Русский', 'locale': Locale('ru', 'RU')},
-  {'name': 'Slovenčina', 'locale': Locale('sk', 'SK')},
-  {'name': 'Türkçe', 'locale': Locale('tr', 'TR')},
-  {'name': 'اردو', 'locale': Locale('ur', 'PK')},
-  {'name': '中文(简体)', 'locale': Locale('zh', 'CN')},
-  {'name': '中文(繁體)', 'locale': Locale('zh', 'TW')},
-];
-
 @pragma('vm:entry-point')
 void callbackDispatcher() {
   Workmanager().executeTask((task, inputData) {
@@ -85,40 +75,55 @@ void callbackDispatcher() {
 }
 
 void main() async {
+  final String timeZoneName;
   WidgetsFlutterBinding.ensureInitialized();
-  await initializeApp();
+  Connectivity().onConnectivityChanged.listen((ConnectivityResult result) {
+    result == ConnectivityResult.none ? isOnline = false : isOnline = true;
+  });
+  SystemChrome.setSystemUIOverlayStyle(
+      const SystemUiOverlayStyle(systemNavigationBarColor: Colors.black));
+  if (Platform.isAndroid) {
+    Workmanager().initialize(callbackDispatcher, isInDebugMode: kDebugMode);
+    await setOptimalDisplayMode();
+  }
+  if (Platform.isAndroid || Platform.isIOS) {
+    timeZoneName = await FlutterTimezone.getLocalTimezone();
+  } else {
+    timeZoneName = '${DateTimeZone.local}';
+  }
+  tz.initializeTimeZones();
+  tz.setLocalLocation(tz.getLocation(timeZoneName));
+  await isarInit();
+  const AndroidInitializationSettings initializationSettingsAndroid =
+      AndroidInitializationSettings('@mipmap/ic_launcher');
+  const DarwinInitializationSettings initializationSettingsDarwin =
+      DarwinInitializationSettings();
+  const LinuxInitializationSettings initializationSettingsLinux =
+      LinuxInitializationSettings(defaultActionName: 'Rain');
+  const InitializationSettings initializationSettings = InitializationSettings(
+    android: initializationSettingsAndroid,
+    iOS: initializationSettingsDarwin,
+    linux: initializationSettingsLinux,
+  );
+  await flutterLocalNotificationsPlugin.initialize(initializationSettings);
   runApp(const MyApp());
 }
 
-Future<void> initializeApp() async {
-  setupConnectivityListener();
-  await initializeTimeZone();
-  await initializeIsar();
-  await initializeNotifications();
-  if (Platform.isAndroid) {
-    await setOptimalDisplayMode();
-    Workmanager().initialize(callbackDispatcher, isInDebugMode: kDebugMode);
-    HomeWidget.setAppGroupId(appGroupId);
-  }
-  DeviceFeature().init();
+Future<void> setOptimalDisplayMode() async {
+  final List<DisplayMode> supported = await FlutterDisplayMode.supported;
+  final DisplayMode active = await FlutterDisplayMode.active;
+  final List<DisplayMode> sameResolution = supported
+      .where((DisplayMode m) =>
+          m.width == active.width && m.height == active.height)
+      .toList()
+    ..sort((DisplayMode a, DisplayMode b) =>
+        b.refreshRate.compareTo(a.refreshRate));
+  final DisplayMode mostOptimalMode =
+      sameResolution.isNotEmpty ? sameResolution.first : active;
+  await FlutterDisplayMode.setPreferredMode(mostOptimalMode);
 }
 
-void setupConnectivityListener() {
-  Connectivity().onConnectivityChanged.listen((result) {
-    isOnline.value =
-        result.contains(ConnectivityResult.none)
-            ? Future.value(false)
-            : InternetConnection().hasInternetAccess;
-  });
-}
-
-Future<void> initializeTimeZone() async {
-  final timeZoneName = await FlutterTimezone.getLocalTimezone();
-  tz.initializeTimeZones();
-  tz.setLocalLocation(tz.getLocation(timeZoneName));
-}
-
-Future<void> initializeIsar() async {
+Future<void> isarInit() async {
   isar = await Isar.open([
     SettingsSchema,
     MainWeatherCacheSchema,
@@ -126,8 +131,6 @@ Future<void> initializeIsar() async {
     WeatherCardSchema,
   ], directory: (await getApplicationSupportDirectory()).path);
   settings = isar.settings.where().findFirstSync() ?? Settings();
-  locationCache =
-      isar.locationCaches.where().findFirstSync() ?? LocationCache();
 
   if (settings.language == null) {
     settings.language = '${Get.deviceLocale}';
@@ -140,28 +143,6 @@ Future<void> initializeIsar() async {
   }
 }
 
-Future<void> initializeNotifications() async {
-  const initializationSettings = InitializationSettings(
-    android: AndroidInitializationSettings('@mipmap/ic_launcher'),
-    iOS: DarwinInitializationSettings(),
-    linux: LinuxInitializationSettings(defaultActionName: 'Rain'),
-  );
-  await flutterLocalNotificationsPlugin.initialize(initializationSettings);
-}
-
-Future<void> setOptimalDisplayMode() async {
-  final supported = await FlutterDisplayMode.supported;
-  final active = await FlutterDisplayMode.active;
-  final sameResolution =
-      supported
-          .where((m) => m.width == active.width && m.height == active.height)
-          .toList()
-        ..sort((a, b) => b.refreshRate.compareTo(a.refreshRate));
-  final mostOptimalMode =
-      sameResolution.isNotEmpty ? sameResolution.first : active;
-  await FlutterDisplayMode.setPreferredMode(mostOptimalMode);
-}
-
 class MyApp extends StatefulWidget {
   const MyApp({super.key});
 
@@ -170,7 +151,6 @@ class MyApp extends StatefulWidget {
     bool? newAmoledTheme,
     bool? newMaterialColor,
     bool? newRoundDegree,
-    bool? newLargeElement,
     Locale? newLocale,
     int? newTimeRange,
     String? newTimeStart,
@@ -180,14 +160,27 @@ class MyApp extends StatefulWidget {
   }) async {
     final state = context.findAncestorStateOfType<_MyAppState>()!;
 
-    if (newAmoledTheme != null) state.changeAmoledTheme(newAmoledTheme);
-    if (newMaterialColor != null) state.changeMarerialTheme(newMaterialColor);
-    if (newRoundDegree != null) state.changeRoundDegree(newRoundDegree);
-    if (newLargeElement != null) state.changeLargeElement(newLargeElement);
-    if (newLocale != null) state.changeLocale(newLocale);
-    if (newTimeRange != null) state.changeTimeRange(newTimeRange);
-    if (newTimeStart != null) state.changeTimeStart(newTimeStart);
-    if (newTimeEnd != null) state.changeTimeEnd(newTimeEnd);
+    if (newAmoledTheme != null) {
+      state.changeAmoledTheme(newAmoledTheme);
+    }
+    if (newMaterialColor != null) {
+      state.changeMarerialTheme(newMaterialColor);
+    }
+    if (newRoundDegree != null) {
+      state.changeRoundDegree(newRoundDegree);
+    }
+    if (newLocale != null) {
+      state.changeLocale(newLocale);
+    }
+    if (newTimeRange != null) {
+      state.changeTimeRange(newTimeRange);
+    }
+    if (newTimeStart != null) {
+      state.changeTimeStart(newTimeStart);
+    }
+    if (newTimeEnd != null) {
+      state.changeTimeEnd(newTimeEnd);
+    }
     if (newWidgetBackgroundColor != null) {
       state.changeWidgetBackgroundColor(newWidgetBackgroundColor);
     }
@@ -203,136 +196,120 @@ class MyApp extends StatefulWidget {
 class _MyAppState extends State<MyApp> {
   final themeController = Get.put(ThemeController());
 
-  void changeAmoledTheme(bool newAmoledTheme) =>
-      setState(() => amoledTheme = newAmoledTheme);
-  void changeMarerialTheme(bool newMaterialColor) =>
-      setState(() => materialColor = newMaterialColor);
-  void changeRoundDegree(bool newRoundDegree) =>
-      setState(() => roundDegree = newRoundDegree);
-  void changeLargeElement(bool newLargeElement) =>
-      setState(() => largeElement = newLargeElement);
-  void changeTimeRange(int newTimeRange) =>
-      setState(() => timeRange = newTimeRange);
-  void changeTimeStart(String newTimeStart) =>
-      setState(() => timeStart = newTimeStart);
-  void changeTimeEnd(String newTimeEnd) => setState(() => timeEnd = newTimeEnd);
-  void changeLocale(Locale newLocale) => setState(() => locale = newLocale);
-  void changeWidgetBackgroundColor(String newWidgetBackgroundColor) =>
-      setState(() => widgetBackgroundColor = newWidgetBackgroundColor);
-  void changeWidgetTextColor(String newWidgetTextColor) =>
-      setState(() => widgetTextColor = newWidgetTextColor);
+  void changeAmoledTheme(bool newAmoledTheme) {
+    setState(() {
+      amoledTheme = newAmoledTheme;
+    });
+  }
+
+  void changeMarerialTheme(bool newMaterialColor) {
+    setState(() {
+      materialColor = newMaterialColor;
+    });
+  }
+
+  void changeRoundDegree(bool newRoundDegree) {
+    setState(() {
+      roundDegree = newRoundDegree;
+    });
+  }
+
+  void changeTimeRange(int newTimeRange) {
+    setState(() {
+      timeRange = newTimeRange;
+    });
+  }
+
+  void changeTimeStart(String newTimeStart) {
+    setState(() {
+      timeStart = newTimeStart;
+    });
+  }
+
+  void changeTimeEnd(String newTimeEnd) {
+    setState(() {
+      timeEnd = newTimeEnd;
+    });
+  }
+
+  void changeLocale(Locale newLocale) {
+    setState(() {
+      locale = newLocale;
+    });
+  }
+
+  void changeWidgetBackgroundColor(String newWidgetBackgroundColor) {
+    setState(() {
+      widgetBackgroundColor = newWidgetBackgroundColor;
+    });
+  }
+
+  void changeWidgetTextColor(String newWidgetTextColor) {
+    setState(() {
+      widgetTextColor = newWidgetTextColor;
+    });
+  }
 
   @override
   void initState() {
-    super.initState();
     amoledTheme = settings.amoledTheme;
     materialColor = settings.materialColor;
     roundDegree = settings.roundDegree;
-    largeElement = settings.largeElement;
     locale = Locale(
-      settings.language!.substring(0, 2),
-      settings.language!.substring(3),
-    );
+        settings.language!.substring(0, 2), settings.language!.substring(3));
     timeRange = settings.timeRange ?? 1;
     timeStart = settings.timeStart ?? '09:00';
     timeEnd = settings.timeEnd ?? '21:00';
     widgetBackgroundColor = settings.widgetBackgroundColor ?? '';
     widgetTextColor = settings.widgetTextColor ?? '';
+    if (Platform.isAndroid) {
+      HomeWidget.setAppGroupId(appGroupId);
+    }
+    super.initState();
   }
 
   @override
   Widget build(BuildContext context) {
-    final edgeToEdgeAvailable = DeviceFeature().isEdgeToEdgeAvailable();
-    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+    return DynamicColorBuilder(
+      builder: (lightColorScheme, darkColorScheme) {
+        final lightMaterialTheme =
+            lightTheme(lightColorScheme?.surface, lightColorScheme);
+        final darkMaterialTheme =
+            darkTheme(darkColorScheme?.surface, darkColorScheme);
+        final darkMaterialThemeOled = darkTheme(oledColor, darkColorScheme);
 
-    return GestureDetector(
-      onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
-      child: DynamicColorBuilder(
-        builder: (lightColorScheme, darkColorScheme) {
-          final lightMaterialTheme = lightTheme(
-            lightColorScheme?.surface,
-            lightColorScheme,
-            edgeToEdgeAvailable,
-          );
-          final darkMaterialTheme = darkTheme(
-            darkColorScheme?.surface,
-            darkColorScheme,
-            edgeToEdgeAvailable,
-          );
-          final darkMaterialThemeOled = darkTheme(
-            oledColor,
-            darkColorScheme,
-            edgeToEdgeAvailable,
-          );
-
-          return GetMaterialApp(
-            themeMode: themeController.theme,
-            theme:
-                materialColor
-                    ? lightColorScheme != null
-                        ? lightMaterialTheme
-                        : lightTheme(
-                          lightColor,
-                          colorSchemeLight,
-                          edgeToEdgeAvailable,
-                        )
-                    : lightTheme(
-                      lightColor,
-                      colorSchemeLight,
-                      edgeToEdgeAvailable,
-                    ),
-            darkTheme:
-                amoledTheme
-                    ? materialColor
-                        ? darkColorScheme != null
-                            ? darkMaterialThemeOled
-                            : darkTheme(
-                              oledColor,
-                              colorSchemeDark,
-                              edgeToEdgeAvailable,
-                            )
-                        : darkTheme(
-                          oledColor,
-                          colorSchemeDark,
-                          edgeToEdgeAvailable,
-                        )
-                    : materialColor
-                    ? darkColorScheme != null
-                        ? darkMaterialTheme
-                        : darkTheme(
-                          darkColor,
-                          colorSchemeDark,
-                          edgeToEdgeAvailable,
-                        )
-                    : darkTheme(
-                      darkColor,
-                      colorSchemeDark,
-                      edgeToEdgeAvailable,
-                    ),
-            localizationsDelegates: const [
-              GlobalMaterialLocalizations.delegate,
-              GlobalWidgetsLocalizations.delegate,
-              GlobalCupertinoLocalizations.delegate,
-            ],
-            translations: Translation(),
-            locale: locale,
-            fallbackLocale: const Locale('en', 'US'),
-            supportedLocales:
-                appLanguages.map((e) => e['locale'] as Locale).toList(),
-            debugShowCheckedModeBanner: false,
-            home:
-                settings.onboard
-                    ? (locationCache.city == null ||
-                            locationCache.district == null ||
-                            locationCache.lat == null ||
-                            locationCache.lon == null)
-                        ? const SelectGeolocation(isStart: true)
-                        : const HomePage()
-                    : const OnBording(),
-            title: 'Rain',
-          );
-        },
-      ),
+        return GetMaterialApp(
+          themeMode: themeController.theme,
+          theme: materialColor
+              ? lightColorScheme != null
+                  ? lightMaterialTheme
+                  : lightTheme(lightColor, colorSchemeLight)
+              : lightTheme(lightColor, colorSchemeLight),
+          darkTheme: amoledTheme
+              ? materialColor
+                  ? darkColorScheme != null
+                      ? darkMaterialThemeOled
+                      : darkTheme(oledColor, colorSchemeDark)
+                  : darkTheme(oledColor, colorSchemeDark)
+              : materialColor
+                  ? darkColorScheme != null
+                      ? darkMaterialTheme
+                      : darkTheme(darkColor, colorSchemeDark)
+                  : darkTheme(darkColor, colorSchemeDark),
+          localizationsDelegates: const [
+            GlobalMaterialLocalizations.delegate,
+            GlobalWidgetsLocalizations.delegate,
+            GlobalCupertinoLocalizations.delegate,
+          ],
+          translations: Translation(),
+          locale: locale,
+          fallbackLocale: const Locale('en', 'US'),
+          supportedLocales:
+              appLanguages.map((e) => e['locale'] as Locale).toList(),
+          debugShowCheckedModeBanner: false,
+          home: settings.onboard ? const HomePage() : const OnBording(),
+        );
+      },
     );
   }
 }
diff --git a/lib/theme/theme.dart b/lib/theme/theme.dart
old mode 100755
new mode 100644
index 17882f4..61bf1c1
--- a/lib/theme/theme.dart
+++ b/lib/theme/theme.dart
@@ -1,9 +1,8 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:dynamic_color/dynamic_color.dart';
+import 'package:flutter/material.dart';
+import 'package:google_fonts/google_fonts.dart';
 
-final ThemeData baseLight = ThemeData.light(useMaterial3: true);
+final ThemeData baseLigth = ThemeData.light(useMaterial3: true);
 final ThemeData baseDark = ThemeData.dark(useMaterial3: true);
 
 const Color lightColor = Colors.white;
@@ -14,146 +13,108 @@ ColorScheme colorSchemeLight = ColorScheme.fromSeed(
   seedColor: Colors.deepPurple,
   brightness: Brightness.light,
 );
-
 ColorScheme colorSchemeDark = ColorScheme.fromSeed(
   seedColor: Colors.deepPurple,
   brightness: Brightness.dark,
 );
 
-ThemeData lightTheme(
-  Color? color,
-  ColorScheme? colorScheme,
-  bool edgeToEdgeAvailable,
-) {
-  return _buildTheme(
-    baseTheme: baseLight,
+ThemeData lightTheme(Color? color, ColorScheme? colorScheme) {
+  return baseLigth.copyWith(
     brightness: Brightness.light,
-    color: color,
-    colorScheme: colorScheme,
-    edgeToEdgeAvailable: edgeToEdgeAvailable,
-  );
-}
-
-ThemeData darkTheme(
-  Color? color,
-  ColorScheme? colorScheme,
-  bool edgeToEdgeAvailable,
-) {
-  return _buildTheme(
-    baseTheme: baseDark,
-    brightness: Brightness.dark,
-    color: color,
-    colorScheme: colorScheme,
-    edgeToEdgeAvailable: edgeToEdgeAvailable,
-  );
-}
-
-ThemeData _buildTheme({
-  required ThemeData baseTheme,
-  required Brightness brightness,
-  required Color? color,
-  required ColorScheme? colorScheme,
-  required bool edgeToEdgeAvailable,
-}) {
-  final harmonizedColorScheme =
-      colorScheme
-          ?.copyWith(
-            brightness: brightness,
-            surface: baseTheme.colorScheme.surface,
-          )
-          .harmonized();
-
-  return baseTheme.copyWith(
-    brightness: brightness,
-    colorScheme: harmonizedColorScheme,
-    textTheme: GoogleFonts.ubuntuTextTheme(baseTheme.textTheme),
-    appBarTheme: _buildAppBarTheme(
-      color,
-      baseTheme.colorScheme.onSurface,
-      edgeToEdgeAvailable,
-      brightness,
-      harmonizedColorScheme,
+    colorScheme: colorScheme
+        ?.copyWith(
+          brightness: Brightness.light,
+          background: color,
+          surface: baseLigth.colorScheme.background,
+        )
+        .harmonized(),
+    textTheme: GoogleFonts.ubuntuTextTheme(baseLigth.textTheme),
+    appBarTheme: AppBarTheme(
+      backgroundColor: color,
+      foregroundColor: baseLigth.colorScheme.onSurface,
+      shadowColor: Colors.transparent,
+      surfaceTintColor: Colors.transparent,
+      elevation: 0,
     ),
     primaryColor: color,
     canvasColor: color,
     scaffoldBackgroundColor: color,
-    cardTheme: _buildCardTheme(color, harmonizedColorScheme),
-    bottomSheetTheme: _buildBottomSheetTheme(color, harmonizedColorScheme),
-    navigationRailTheme: baseTheme.navigationRailTheme.copyWith(
+    cardTheme: baseLigth.cardTheme.copyWith(
+      color: color,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(20),
+      ),
+      shadowColor: Colors.transparent,
+    ),
+    bottomSheetTheme: baseLigth.bottomSheetTheme.copyWith(
       backgroundColor: color,
     ),
-    navigationBarTheme: _buildNavigationBarTheme(color, harmonizedColorScheme),
-    inputDecorationTheme: _buildInputDecorationTheme(),
+    navigationRailTheme: baseLigth.navigationRailTheme.copyWith(
+      backgroundColor: color,
+    ),
+    navigationBarTheme: baseLigth.navigationBarTheme.copyWith(
+      backgroundColor: color,
+    ),
+    inputDecorationTheme: baseLigth.inputDecorationTheme.copyWith(
+      labelStyle: MaterialStateTextStyle.resolveWith(
+        (Set<MaterialState> states) {
+          return const TextStyle(fontSize: 14);
+        },
+      ),
+      border: InputBorder.none,
+      focusedBorder: InputBorder.none,
+      enabledBorder: InputBorder.none,
+    ),
+    indicatorColor: Colors.black,
   );
 }
 
-AppBarTheme _buildAppBarTheme(
-  Color? color,
-  Color? onSurfaceColor,
-  bool edgeToEdgeAvailable,
-  Brightness brightness,
-  ColorScheme? colorScheme,
-) {
-  return AppBarTheme(
-    backgroundColor: color,
-    foregroundColor: onSurfaceColor,
-    shadowColor: Colors.transparent,
-    surfaceTintColor: Colors.transparent,
-    elevation: 0,
-    systemOverlayStyle: SystemUiOverlayStyle(
-      statusBarIconBrightness:
-          brightness == Brightness.light ? Brightness.dark : Brightness.light,
-      statusBarColor: Colors.transparent,
-      systemStatusBarContrastEnforced: false,
-      systemNavigationBarContrastEnforced: false,
-      systemNavigationBarDividerColor: Colors.transparent,
-      systemNavigationBarIconBrightness:
-          brightness == Brightness.light ? Brightness.dark : Brightness.light,
-      systemNavigationBarColor:
-          edgeToEdgeAvailable ? Colors.transparent : colorScheme?.surface,
+ThemeData darkTheme(Color? color, ColorScheme? colorScheme) {
+  return baseDark.copyWith(
+    brightness: Brightness.dark,
+    colorScheme: colorScheme
+        ?.copyWith(
+          brightness: Brightness.dark,
+          background: color,
+          surface: baseDark.colorScheme.background,
+        )
+        .harmonized(),
+    textTheme: GoogleFonts.ubuntuTextTheme(baseDark.textTheme),
+    appBarTheme: AppBarTheme(
+      backgroundColor: color,
+      foregroundColor: baseDark.colorScheme.onSurface,
+      shadowColor: Colors.transparent,
+      surfaceTintColor: Colors.transparent,
+      elevation: 0,
+    ),
+    primaryColor: color,
+    canvasColor: color,
+    scaffoldBackgroundColor: color,
+    cardTheme: baseDark.cardTheme.copyWith(
+      color: color,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(20),
+      ),
+      shadowColor: Colors.transparent,
+    ),
+    bottomSheetTheme: baseDark.bottomSheetTheme.copyWith(
+      backgroundColor: color,
+    ),
+    navigationRailTheme: baseDark.navigationRailTheme.copyWith(
+      backgroundColor: color,
+    ),
+    navigationBarTheme: baseDark.navigationBarTheme.copyWith(
+      backgroundColor: color,
+    ),
+    inputDecorationTheme: baseDark.inputDecorationTheme.copyWith(
+      labelStyle: MaterialStateTextStyle.resolveWith(
+        (Set<MaterialState> states) {
+          return const TextStyle(fontSize: 14);
+        },
+      ),
+      border: InputBorder.none,
+      focusedBorder: InputBorder.none,
+      enabledBorder: InputBorder.none,
     ),
   );
 }
-
-CardThemeData _buildCardTheme(Color? color, ColorScheme? colorScheme) {
-  return CardThemeData(
-    color: color,
-    surfaceTintColor:
-        color == oledColor ? Colors.transparent : colorScheme?.surfaceTint,
-    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
-    shadowColor: Colors.transparent,
-  );
-}
-
-BottomSheetThemeData _buildBottomSheetTheme(
-  Color? color,
-  ColorScheme? colorScheme,
-) {
-  return BottomSheetThemeData(
-    backgroundColor: color,
-    surfaceTintColor:
-        color == oledColor ? Colors.transparent : colorScheme?.surfaceTint,
-  );
-}
-
-NavigationBarThemeData _buildNavigationBarTheme(
-  Color? color,
-  ColorScheme? colorScheme,
-) {
-  return NavigationBarThemeData(
-    backgroundColor: color,
-    surfaceTintColor:
-        color == oledColor ? Colors.transparent : colorScheme?.surfaceTint,
-  );
-}
-
-InputDecorationTheme _buildInputDecorationTheme() {
-  return InputDecorationTheme(
-    labelStyle: WidgetStateTextStyle.resolveWith((Set<WidgetState> states) {
-      return const TextStyle(fontSize: 14);
-    }),
-    border: InputBorder.none,
-    focusedBorder: InputBorder.none,
-    enabledBorder: InputBorder.none,
-  );
-}
diff --git a/lib/theme/theme_controller.dart b/lib/theme/theme_controller.dart
old mode 100755
new mode 100644
index 86d1c77..e72d6e2
--- a/lib/theme/theme_controller.dart
+++ b/lib/theme/theme_controller.dart
@@ -1,40 +1,31 @@
 import 'package:get/get.dart';
 import 'package:flutter/material.dart';
-import 'package:rain/app/data/db.dart';
+import 'package:rain/app/data/weather.dart';
 import 'package:rain/main.dart';
 
 class ThemeController extends GetxController {
-  ThemeMode get theme => _getThemeMode();
+  ThemeMode get theme => settings.theme == 'system'
+      ? ThemeMode.system
+      : settings.theme == 'dark'
+          ? ThemeMode.dark
+          : ThemeMode.light;
 
   void saveOledTheme(bool isOled) {
-    _updateSetting((settings) => settings.amoledTheme = isOled);
+    settings.amoledTheme = isOled;
+    isar.writeTxnSync(() => isar.settings.putSync(settings));
   }
 
   void saveMaterialTheme(bool isMaterial) {
-    _updateSetting((settings) => settings.materialColor = isMaterial);
+    settings.materialColor = isMaterial;
+    isar.writeTxnSync(() => isar.settings.putSync(settings));
   }
 
   void saveTheme(String themeMode) {
-    _updateSetting((settings) => settings.theme = themeMode);
+    settings.theme = themeMode;
+    isar.writeTxnSync(() => isar.settings.putSync(settings));
   }
 
   void changeTheme(ThemeData theme) => Get.changeTheme(theme);
 
   void changeThemeMode(ThemeMode themeMode) => Get.changeThemeMode(themeMode);
-
-  ThemeMode _getThemeMode() {
-    switch (settings.theme) {
-      case 'system':
-        return ThemeMode.system;
-      case 'dark':
-        return ThemeMode.dark;
-      default:
-        return ThemeMode.light;
-    }
-  }
-
-  void _updateSetting(void Function(Settings) update) {
-    update(settings);
-    isar.writeTxnSync(() => isar.settings.putSync(settings));
-  }
 }
diff --git a/lib/translation/bn_in.dart b/lib/translation/bn_in.dart
old mode 100755
new mode 100644
index 7aff547..c5ac048
--- a/lib/translation/bn_in.dart
+++ b/lib/translation/bn_in.dart
@@ -1,141 +1,126 @@
 class BnIn {
   Map<String, String> get messages => {
-    'start': 'শুরু করুন',
-    'description':
-        'প্রতি ঘণ্টায়, দিনে এবং সপ্তাহের জন্য প্রতিষ্ঠানের জন্য সক্রিয় পূর্বাভাস সহ আবহাওয়া অ্যাপ্লিকেশন।',
-    'name': 'আবহাওয়া',
-    'name2': 'সুবিধাজনক ডিজাইন',
-    'name3': 'আমাদের সাথে যোগাযোগ করুন',
-    'description2':
-        'সমস্ত নেভিগেশনটি এমনভাবে তৈরি করা হয়েছে যাতে আপনি অ্যাপ্লিকেশনে সর্বোত্তম সুবিধায় এবং দ্রুত ইন্টারঅ্যাক্ট করতে পারেন।',
-    'description3':
-        'আপনার যদি কোনও সমস্যা হয়, অনুগ্রহ করে ইমেল বা অ্যাপ্লিকেশন পর্যালোচনার মাধ্যমে আমাদের সাথে যোগাযোগ করুন।',
-    'next': 'পরবর্তী',
-    'search': 'অনুসন্ধান...',
-    'loading': 'লোড হচ্ছে...',
-    'searchCity': 'আপনার শহর খুঁজুন',
-    'humidity': 'আর্দ্ধমন্দ',
-    'wind': 'বায়ু',
-    'visibility': 'দৃশ্যতা',
-    'feels': 'অনুভব',
-    'evaporation': 'অবপাত ও প্রবাহ',
-    'precipitation': 'বৃষ্টিপাত',
-    'direction': 'দিশা',
-    'pressure': 'চাপ',
-    'rain': 'বৃষ্টি',
-    'clear_sky': 'পরিষ্কার আকাশ',
-    'cloudy': 'মেঘলা',
-    'overcast': 'মেঘাচ্ছন্ন',
-    'fog': 'কুয়াশা',
-    'drizzle': 'বৃষ্টি বৃষ্টি',
-    'freezing_drizzle': 'শীতল বৃষ্টি',
-    'freezing_rain': 'শীতল বৃষ্টি',
-    'rain_showers': 'বৃষ্টির বৃষ্টি',
-    'snow': 'তুষার',
-    'thunderstorm': 'বজ্রপাত',
-    'kph': 'কিমি/ঘণ্টা',
-    'mph': 'মাইল/ঘণ্টা',
-    'm/s': 'মি/সে',
-    'mmHg': 'মিমি Hg',
-    'mi': 'মাইল',
-    'km': 'কিমি',
-    'inch': 'ইঞ্চ',
-    'mm': 'মিমি',
-    'hPa': 'হেক্টোপাস্কল',
-    'settings': 'সেটিংস',
-    'no_inter': 'ইন্টারনেট নেই',
-    'on_inter': 'মেটিয়োরোলজিক তথ্য পেতে ইন্টারনেট চালু করুন।',
-    'location': 'অবস্থান',
-    'no_location':
-        'বর্তমান অবস্থানের জন্য আবহাওয়া ডেটা পেতে অবস্থান সেবা সক্রিয় করুন।',
-    'theme': 'থিম',
-    'low': 'নিম্ন',
-    'high': 'উচ্চ',
-    'normal': 'সাধারণ',
-    'lat': 'অক্ষাংশ',
-    'lon': 'দ্রাঘিমাংশ',
-    'create': 'তৈরি করুন',
-    'city': 'শহর',
-    'district': 'জেলা',
-    'noWeatherCard': 'একটি শহর যোগ করুন',
-    'deletedCardWeather': 'একটি শহর মুছে ফেলা হচ্ছে',
-    'deletedCardWeatherQuery': 'আপনি কি নিশ্চিত যে আপনি শহরটি মুছতে চান?',
-    'delete': 'মুছে ফেলুন',
-    'cancel': 'বাতিল করুন',
-    'time': 'শহরে সময়',
-    'validateName': 'দয়া করে নাম লিখুন',
-    'measurements': 'মাপনের সিস্টেম',
-    'degrees': 'ডিগ্রি',
-    'celsius': 'সেলসিয়াস',
-    'fahrenheit': 'ফারেনহাইট',
-    'imperial': 'ইমপেরিয়াল',
-    'metric': 'মেট্রিক',
-    'validateValue': 'দয়া করে একটি মান লিখুন',
-    'validateNumber': 'দয়া করে একটি বৈধ সংখ্যা লিখুন',
-    'validate90': 'মান -৯০ থেকে ৯০ মধ্যে হতে হবে',
-    'validate180': 'মান -১৮০ থেকে ১৮০ মধ্যে হতে হবে',
-    'notifications': 'বিজ্ঞপ্তি',
-    'sunrise': 'সূর্যোদয়',
-    'sunset': 'সূর্যাস্ত',
-    'timeformat': 'সময় বিন্যাস',
-    '12': '১২-ঘণ্টা',
-    '24': '২৪-ঘণ্টা',
-    'cloudcover': 'মেঘপর্দা',
-    'uvIndex': 'আল্ট্রাভায়োলেট-সূচী',
-    'materialColor': 'গতিবিধির রঙ',
-    'uvLow': 'নিম্ন',
-    'uvAverage': 'মধ্যম',
-    'uvHigh': 'উচ্চ',
-    'uvVeryHigh': 'অত্যন্ত উচ্চ',
-    'uvExtreme': 'একাধিক',
-    'weatherMore': '১২-দিনের আবহাওয়া পূর্বানুমান',
-    'windgusts': 'ঝংকার',
-    'north': 'উত্তর',
-    'northeast': 'উত্তরপূর্ব',
-    'east': 'পূর্ব',
-    'southeast': 'দক্ষিণপূর্ব',
-    'south': 'দক্ষিণ',
-    'southwest': 'দক্ষিণপশ্চিম',
-    'west': 'পশ্চিম',
-    'northwest': 'উত্তরপশ্চিম',
-    'project': 'প্রকল্প',
-    'version': 'অ্যাপ্লিকেশন সংস্করণ',
-    'precipitationProbability': 'বৃষ্টিপাতের সম্ভাবনা',
-    'apparentTemperatureMin':
-        'ন্যায্য ন্যায্য তাপমাত্রা ন্যায্য ন্যায্য ন্যায্য ন্যায্য ন্যায্য ন্যায্য ন্যায্য',
-    'apparentTemperatureMax': 'সর্বাধিক ন্যায্য তাপমাত্রা',
-    'amoledTheme': 'এমোলেড-থিম',
-    'appearance': 'উপস্থিতি',
-    'functions': 'কার্য',
-    'data': 'ডেটা',
-    'language': 'ভাষা',
-    'timeRange': 'সময় পরিস্থিতি (ঘণ্টায়)',
-    'timeStart': 'শুরুর সময়',
-    'timeEnd': 'শেষ সময়',
-    'support': 'সাহায্য',
-    'system': 'সিস্টেম',
-    'dark': 'ডার্ক',
-    'light': 'আলো',
-    'license': 'লাইসেন্স',
-    'widget': 'উইজেট',
-    'widgetBackground': 'উইজেট পেশা',
-    'widgetText': 'উইজেট টেক্সট',
-    'dewpoint': 'তুষার বিন্দু',
-    'shortwaveRadiation': 'সংক্ষেপণ তরঙ্গ প্রকৃতি',
-    'W/m2': 'ডব্লিউ/মিটার বর্গ',
-    'roundDegree': 'ডিগ্রি রাউন্ড করুন',
-    'settings_full': 'সেটিংস',
-    'cities': 'শহর',
-    'groups': 'আমাদের দলগুলি',
-    'openMeteo': 'Open-Meteo থেকে ডেটা (CC-BY 4.0)',
-    'hourlyVariables': 'ঘণ্টায় আবহাওয়ার পরিবর্তনশীল',
-    'dailyVariables': 'দৈনিক আবহাওয়ার পরিবর্তনশীল',
-    'largeElement': 'বড় আবহাওয়া ডিসপ্লে',
-    'map': 'মানচিত্র',
-    'clearCacheStore': 'ক্যাশ পরিষ্কার করুন',
-    'deletedCacheStore': 'ক্যাশ পরিষ্কার করা হচ্ছে',
-    'deletedCacheStoreQuery': 'আপনি কি সত্যিই ক্যাশ পরিষ্কার করতে চান?',
-    'addWidget': 'উইজেট যোগ করুন',
-    'hideMap': 'মানচিত্র লুকান',
-  };
+        'start': 'শুরু করুন',
+        'description':
+            'প্রতি ঘণ্টায়, দিনে এবং সপ্তাহের জন্য প্রতিষ্ঠানের জন্য সক্রিয় পূর্বাভাস সহ আবহাওয়া অ্যাপ্লিকেশন।',
+        'name': 'আবহাওয়া',
+        'name2': 'সুবিধাজনক ডিজাইন',
+        'name3': 'আমাদের সাথে যোগাযোগ করুন',
+        'description2':
+            'সমস্ত নেভিগেশনটি এমনভাবে তৈরি করা হয়েছে যাতে আপনি অ্যাপ্লিকেশনে সর্বোত্তম সুবিধায় এবং দ্রুত ইন্টারঅ্যাক্ট করতে পারেন।',
+        'description3':
+            'আপনার যদি কোনও সমস্যা হয়, অনুগ্রহ করে ইমেল বা অ্যাপ্লিকেশন পর্যালোচনার মাধ্যমে আমাদের সাথে যোগাযোগ করুন।',
+        'next': 'পরবর্তী',
+        'search': 'অনুসন্ধান...',
+        'loading': 'লোড হচ্ছে...',
+        'searchCity': 'আপনার শহর খুঁজুন',
+        'humidity': 'আর্দ্ধমন্দ',
+        'wind': 'বায়ু',
+        'visibility': 'দৃশ্যতা',
+        'feels': 'অনুভব',
+        'evaporation': 'অবপাত ও প্রবাহ',
+        'precipitation': 'বৃষ্টিপাত',
+        'direction': 'দিশা',
+        'pressure': 'চাপ',
+        'rain': 'বৃষ্টি',
+        'clear_sky': 'পরিষ্কার আকাশ',
+        'cloudy': 'মেঘলা',
+        'overcast': 'মেঘাচ্ছন্ন',
+        'fog': 'কুয়াশা',
+        'drizzle': 'বৃষ্টি বৃষ্টি',
+        'freezing_drizzle': 'শীতল বৃষ্টি',
+        'freezing_rain': 'শীতল বৃষ্টি',
+        'rain_showers': 'বৃষ্টির বৃষ্টি',
+        'snow': 'তুষার',
+        'thunderstorm': 'বজ্রপাত',
+        'kph': 'কিমি/ঘণ্টা',
+        'mph': 'মাইল/ঘণ্টা',
+        'mi': 'মাইল',
+        'km': 'কিমি',
+        'inch': 'ইঞ্চ',
+        'mm': 'মিমি',
+        'hPa': 'হেক্টোপাস্কল',
+        'settings': 'সেটিংস',
+        'no_inter': 'ইন্টারনেট নেই',
+        'on_inter': 'মেটিয়োরোলজিক তথ্য পেতে ইন্টারনেট চালু করুন।',
+        'location': 'অবস্থান',
+        'no_location':
+            'বর্তমান অবস্থানের জন্য আবহাওয়া ডেটা পেতে অবস্থান সেবা সক্রিয় করুন।',
+        'theme': 'থিম',
+        'low': 'নিম্ন',
+        'high': 'উচ্চ',
+        'normal': 'সাধারণ',
+        'lat': 'অক্ষাংশ',
+        'lon': 'দ্রাঘিমাংশ',
+        'create': 'তৈরি করুন',
+        'city': 'শহর',
+        'district': 'জেলা',
+        'noWeatherCard': 'একটি শহর যোগ করুন',
+        'deletedCardWeather': 'একটি শহর মুছে ফেলা হচ্ছে',
+        'deletedCardWeatherQuery': 'আপনি কি নিশ্চিত যে আপনি শহরটি মুছতে চান?',
+        'delete': 'মুছে ফেলুন',
+        'cancel': 'বাতিল করুন',
+        'time': 'শহরে সময়',
+        'validateName': 'দয়া করে নাম লিখুন',
+        'measurements': 'মাপনের সিস্টেম',
+        'degrees': 'ডিগ্রি',
+        'celsius': 'সেলসিয়াস',
+        'fahrenheit': 'ফারেনহাইট',
+        'imperial': 'ইমপেরিয়াল',
+        'metric': 'মেট্রিক',
+        'validateValue': 'দয়া করে একটি মান লিখুন',
+        'validateNumber': 'দয়া করে একটি বৈধ সংখ্যা লিখুন',
+        'validate90': 'মান -৯০ থেকে ৯০ মধ্যে হতে হবে',
+        'validate180': 'মান -১৮০ থেকে ১৮০ মধ্যে হতে হবে',
+        'notifications': 'বিজ্ঞপ্তি',
+        'sunrise': 'সূর্যোদয়',
+        'sunset': 'সূর্যাস্ত',
+        'timeformat': 'সময় বিন্যাস',
+        '12': '১২-ঘণ্টা',
+        '24': '২৪-ঘণ্টা',
+        'cloudcover': 'মেঘপর্দা',
+        'uvIndex': 'আল্ট্রাভায়োলেট-সূচী',
+        'materialColor': 'গতিবিধির রঙ',
+        'uvLow': 'নিম্ন',
+        'uvAverage': 'মধ্যম',
+        'uvHigh': 'উচ্চ',
+        'uvVeryHigh': 'অত্যন্ত উচ্চ',
+        'uvExtreme': 'একাধিক',
+        'weatherMore': '১২-দিনের আবহাওয়া পূর্বানুমান',
+        'windgusts': 'ঝংকার',
+        'north': 'উত্তর',
+        'northeast': 'উত্তরপূর্ব',
+        'east': 'পূর্ব',
+        'southeast': 'দক্ষিণপূর্ব',
+        'south': 'দক্ষিণ',
+        'southwest': 'দক্ষিণপশ্চিম',
+        'west': 'পশ্চিম',
+        'northwest': 'উত্তরপশ্চিম',
+        'project': 'প্রকল্প',
+        'version': 'অ্যাপ্লিকেশন সংস্করণ',
+        'precipitationProbability': 'বৃষ্টিপাতের সম্ভাবনা',
+        'apparentTemperatureMin':
+            'ন্যায্য ন্যায্য তাপমাত্রা ন্যায্য ন্যায্য ন্যায্য ন্যায্য ন্যায্য ন্যায্য ন্যায্য',
+        'apparentTemperatureMax': 'সর্বাধিক ন্যায্য তাপমাত্রা',
+        'amoledTheme': 'এমোলেড-থিম',
+        'appearance': 'উপস্থিতি',
+        'functions': 'কার্য',
+        'data': 'ডেটা',
+        'language': 'ভাষা',
+        'timeRange': 'সময় পরিস্থিতি (ঘণ্টায়)',
+        'timeStart': 'শুরুর সময়',
+        'timeEnd': 'শেষ সময়',
+        'support': 'সাহায্য',
+        'system': 'সিস্টেম',
+        'dark': 'ডার্ক',
+        'light': 'আলো',
+        'license': 'লাইসেন্স',
+        'widget': 'উইজেট',
+        'widgetBackground': 'উইজেট পেশা',
+        'widgetText': 'উইজেট টেক্সট',
+        'dewpoint': 'তুষার বিন্দু',
+        'shortwaveRadiation': 'সংক্ষেপণ তরঙ্গ প্রকৃতি',
+        'W/m2': 'ডব্লিউ/মিটার বর্গ',
+        'roundDegree': 'ডিগ্রি রাউন্ড করুন',
+      };
 }
diff --git a/lib/translation/cs_cz.dart b/lib/translation/cs_cz.dart
old mode 100755
new mode 100644
index da112f0..85d2151
--- a/lib/translation/cs_cz.dart
+++ b/lib/translation/cs_cz.dart
@@ -1,141 +1,124 @@
 class CsCz {
   Map<String, String> get messages => {
-    'start': 'Začít',
-    'description':
-        'Aplikace počasí s aktuálním předpovědí na každou hodinu, den a týden pro libovolné místo.',
-    'name': 'Počasí',
-    'name2': 'Pohodlný design',
-    'name3': 'Kontaktujte nás',
-    'description2':
-        'Celá navigace je navržena tak, aby bylo možné s aplikací co nejpohodlněji a nejrychleji interagovat.',
-    'description3':
-        'Pokud narazíte na nějaké potíže, kontaktujte nás prosím e-mailem nebo v recenzích aplikace.',
-    'next': 'Další',
-    'search': 'Hledat...',
-    'loading': 'Načítá se...',
-    'searchCity': 'Najděte své místo',
-    'humidity': 'Vlhkost',
-    'wind': 'Vítr',
-    'visibility': 'Viditelnost',
-    'feels': 'Pocitová teplota',
-    'evaporation': 'Evapotranspirace',
-    'precipitation': 'Srážky',
-    'direction': 'Směr',
-    'pressure': 'Tlak',
-    'rain': 'Déšť',
-    'clear_sky': 'Jasno',
-    'cloudy': 'Oblačno',
-    'overcast': 'Zataženo',
-    'fog': 'Mlha',
-    'drizzle': 'Mrholení',
-    'drizzling_rain': 'Mrznúce mrholení',
-    'freezing_rain': 'Mrazivý déšť',
-    'heavy_rains': 'Přeháňky',
-    'snow': 'Sníh',
-    'thunderstorm': 'Bouřka',
-    'kph': 'km/h',
-    'mph': 'mph',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'mi': 'mi',
-    'km': 'km',
-    'inch': 'inch',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'Nast.',
-    'no_inter': 'Žádný internet',
-    'on_inter': 'Připojte se k internetu a získejte meteorologické údaje.',
-    'location': 'Poloha',
-    'no_location':
-        'Chcete-li získat údaje o počasí pro aktuální polohu, povolte službu určování polohy.',
-    'theme': 'Téma',
-    'low': 'Nízký',
-    'high': 'Vysoký',
-    'normal': 'Normální',
-    'lat': 'Zeměpisná šířka',
-    'lon': 'Zemepisná délka',
-    'create': 'Vytvořit',
-    'city': 'Místo',
-    'district': 'Okres',
-    'noWeatherCard': 'Přidat město',
-    'deletedCardWeather': 'Vymazat město',
-    'deletedCardWeatherQuery': 'Opravdu chcete odstranit město?',
-    'delete': 'Odstranit',
-    'cancel': 'Zrušit',
-    'time': 'Čas ve městě',
-    'validateName': 'Prosím zadejte název',
-    'measurements': 'Jednotky měření',
-    'degrees': 'Stupně',
-    'celsius': 'Celzius',
-    'fahrenheit': 'Fahrenheit',
-    'imperial': 'Imperiální',
-    'metric': 'Metrické',
-    'validateValue': 'Zadejte hodnotu',
-    'validateNumber': 'Zadejte platné číslo',
-    'validate90': 'Hodnota musí být mezi -90 a 90',
-    'validate180': 'Hodnota musí být mezi -180 a 180',
-    'notifications': 'Notifikace',
-    'sunrise': 'Východ slunce',
-    'sunset': 'Západ slunce',
-    'timeformat': 'Formát času',
-    '12': '12-hodinový',
-    '24': '24-hodinový',
-    'cloudcover': 'Oblačnost',
-    'uvIndex': 'UV-index',
-    'materialColor': 'Dynamické Barvy',
-    'uvLow': 'Nízký',
-    'uvAverage': 'Mírný',
-    'uvHigh': 'Vysoký',
-    'uvVeryHigh': 'Velmi vysoký',
-    'uvExtreme': 'Extrémní',
-    'weatherMore': 'Předpověď počasí na 12 dní',
-    'windgusts': 'Nárazy větru',
-    'north': 'Sever',
-    'northeast': 'Severo-Východ',
-    'east': 'Východ',
-    'southeast': 'Juhovýchod',
-    'south': 'Juž',
-    'southwest': 'Juhozápad',
-    'west': 'Západ',
-    'northwest': 'Severo-Západ',
-    'project': 'Projekt na',
-    'version': 'Verzia aplikace',
-    'precipitationProbability': 'Pravděpodobnost srážek',
-    'apparentTemperatureMin': 'Minimální pocitová teplota',
-    'apparentTemperatureMax': 'Maximální pocitová teplota',
-    'amoledTheme': 'AMOLED-téma',
-    'appearance': 'Vzhled',
-    'functions': 'Funkce',
-    'data': 'Data',
-    'language': 'Jazyk',
-    'timeRange': 'Frekvence (v hodinách)',
-    'timeStart': 'Čas začátku',
-    'timeEnd': 'Čas ukončení',
-    'support': 'Podpora',
-    'system': 'Systém',
-    'dark': 'Tmavá',
-    'light': 'Světlá',
-    'license': 'Licence',
-    'widget': 'Widget',
-    'widgetBackground': 'Pozadí widgetu',
-    'widgetText': 'Text widgetu',
-    'dewpoint': 'Rosný bod',
-    'shortwaveRadiation': 'Krátká vlnová radiace',
-    'roundDegree': 'Zaokrouhlit stupně',
-    'settings_full': 'Nastavení',
-    'cities': 'Města',
-    'searchMethod': 'Použijte hledání nebo geolokaci',
-    'done': 'Hotovo',
-    'groups': 'Naše skupiny',
-    'openMeteo': 'Data z Open-Meteo (CC-BY 4.0)',
-    'hourlyVariables': 'Hodinové meteorologické proměnné',
-    'dailyVariables': 'Denní meteorologické proměnné',
-    'largeElement': 'Velké zobrazení počasí',
-    'map': 'Mapa',
-    'clearCacheStore': 'Vymazat mezipaměť',
-    'deletedCacheStore': 'Čištění mezipaměti',
-    'deletedCacheStoreQuery': 'Opravdu chcete vymazat mezipaměť?',
-    'addWidget': 'Přidat widget',
-    'hideMap': 'Skrýt mapu',
-  };
+        'start': 'Začít',
+        'description':
+            'Aplikace počasí s aktuálním předpovědí na každou hodinu, den a týden pro libovolné místo.',
+        'name': 'Počasí',
+        'name2': 'Pohodlný design',
+        'name3': 'Kontaktujte nás',
+        'description2':
+            'Celá navigace je navržena tak, aby bylo možné s aplikací co nejpohodlněji a nejrychleji interagovat.',
+        'description3':
+            'Pokud narazíte na nějaké potíže, kontaktujte nás prosím e-mailem nebo v recenzích aplikace.',
+        'next': 'Další',
+        'search': 'Hledat...',
+        'loading': 'Načítá se...',
+        'searchCity': 'Najděte své místo',
+        'humidity': 'Vlhkost',
+        'wind': 'Vítr',
+        'visibility': 'Viditelnost',
+        'feels': 'Pocitová teplota',
+        'evaporation': 'Evapotranspirace',
+        'precipitation': 'Srážky',
+        'direction': 'Směr',
+        'pressure': 'Tlak',
+        'rain': 'Déšť',
+        'clear_sky': 'Jasno',
+        'cloudy': 'Oblačno',
+        'overcast': 'Zataženo',
+        'fog': 'Mlha',
+        'drizzle': 'Mrholení',
+        'drizzling_rain': 'Mrznúce mrholení',
+        'freezing_rain': 'Mrazivý déšť',
+        'heavy_rains': 'Přeháňky',
+        'snow': 'Sníh',
+        'thunderstorm': 'Bouřka',
+        'kph': 'km/h',
+        'mph': 'mph',
+        'mi': 'mi',
+        'km': 'km',
+        'inch': 'inch',
+        'mm': 'mm',
+        'hPa': 'hPa',
+        'settings': 'Nast.',
+        'no_inter': 'Žádný internet',
+        'on_inter': 'Připojte se k internetu a získejte meteorologické údaje.',
+        'location': 'Poloha',
+        'no_location':
+            'Chcete-li získat údaje o počasí pro aktuální polohu, povolte službu určování polohy.',
+        'theme': 'Téma',
+        'low': 'Nízký',
+        'high': 'Vysoký',
+        'normal': 'Normální',
+        'lat': 'Zeměpisná šířka',
+        'lon': 'Zemepisná délka',
+        'create': 'Vytvořit',
+        'city': 'Místo',
+        'district': 'Okres',
+        'noWeatherCard': 'Přidat město',
+        'deletedCardWeather': 'Vymazat město',
+        'deletedCardWeatherQuery': 'Opravdu chcete odstranit město?',
+        'delete': 'Odstranit',
+        'cancel': 'Zrušit',
+        'time': 'Čas ve městě',
+        'validateName': 'Prosím zadejte název',
+        'measurements': 'Jednotky měření',
+        'degrees': 'Stupně',
+        'celsius': 'Celzius',
+        'fahrenheit': 'Fahrenheit',
+        'imperial': 'Imperiální',
+        'metric': 'Metrické',
+        'validateValue': 'Zadejte hodnotu',
+        'validateNumber': 'Zadejte platné číslo',
+        'validate90': 'Hodnota musí být mezi -90 a 90',
+        'validate180': 'Hodnota musí být mezi -180 a 180',
+        'notifications': 'Notifikace',
+        'sunrise': 'Východ slunce',
+        'sunset': 'Západ slunce',
+        'timeformat': 'Formát času',
+        '12': '12-hodinový',
+        '24': '24-hodinový',
+        'cloudcover': 'Oblačnost',
+        'uvIndex': 'UV-index',
+        'materialColor': 'Dynamické Barvy',
+        'uvLow': 'Nízký',
+        'uvAverage': 'Mírný',
+        'uvHigh': 'Vysoký',
+        'uvVeryHigh': 'Velmi vysoký',
+        'uvExtreme': 'Extrémní',
+        'weatherMore': 'Předpověď počasí na 12 dní',
+        'windgusts': 'Nárazy větru',
+        'north': 'Sever',
+        'northeast': 'Severo-Východ',
+        'east': 'Východ',
+        'southeast': 'Juhovýchod',
+        'south': 'Juž',
+        'southwest': 'Juhozápad',
+        'west': 'Západ',
+        'northwest': 'Severo-Západ',
+        'project': 'Projekt na',
+        'version': 'Verzia aplikace',
+        'precipitationProbability': 'Pravděpodobnost srážek',
+        'apparentTemperatureMin': 'Minimální pocitová teplota',
+        'apparentTemperatureMax': 'Maximální pocitová teplota',
+        'amoledTheme': 'AMOLED-téma',
+        'appearance': 'Vzhled',
+        'functions': 'Funkce',
+        'data': 'Data',
+        'language': 'Jazyk',
+        'timeRange': 'Frekvence (v hodinách)',
+        'timeStart': 'Čas začátku',
+        'timeEnd': 'Čas ukončení',
+        'support': 'Podpora',
+        'system': 'Systém',
+        'dark': 'Tmavá',
+        'light': 'Světlá',
+        'license': 'Licence',
+        'widget': 'Widget',
+        'widgetBackground': 'Pozadí widgetu',
+        'widgetText': 'Text widgetu',
+        'dewpoint': 'Rosný bod',
+        'shortwaveRadiation': 'Krátká vlnová radiace',
+        'roundDegree': 'Zaokrouhlit stupně',
+      };
 }
diff --git a/lib/translation/da_dk.dart b/lib/translation/da_dk.dart
deleted file mode 100755
index a23b26f..0000000
--- a/lib/translation/da_dk.dart
+++ /dev/null
@@ -1,142 +0,0 @@
-class DaDk {
-  Map<String, String> get messages => {
-    'start': 'Kom i gang',
-    'description':
-        'Vejr app med en opdateret vejrudsigt for hver time, dag og uge for ethvert sted.',
-    'name': 'Vejr',
-    'name2': 'Praktisk design',
-    'name3': 'Kontakt os',
-    'description2':
-        'Al navigation er designet til at interagere med appen så bekvemt og hurtigt som muligt.',
-    'description3':
-        'Hvis du støder på problemer, må du meget gerne kontakte os via e-mail eller i app anmeldelserne.',
-    'next': 'Næste',
-    'search': 'Søg...',
-    'loading': 'Henter...',
-    'searchCity': 'Find din by',
-    'humidity': 'Luftfugtighed',
-    'wind': 'Vind',
-    'visibility': 'Sigtbarhed',
-    'feels': 'Føles som',
-    'evaporation': 'Fordampning',
-    'precipitation': 'Nedbør',
-    'direction': 'Retning',
-    'pressure': 'Tryk',
-    'rain': 'Regn',
-    'clear_sky': 'Skyfri himmel',
-    'cloudy': 'Skyet',
-    'overcast': 'Overskyet',
-    'fog': 'Tåge',
-    'drizzle': 'Støv regn',
-    'drizzling_rain': 'Frysende støvregn',
-    'freezing_rain': 'Frostregn',
-    'heavy_rains': 'Regnskyl',
-    'snow': 'Sne',
-    'thunderstorm': 'Tordenvejr',
-    'kph': 'km/h',
-    'mph': 'mph',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'mi': 'mi',
-    'km': 'km',
-    'inch': 'tommer',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'Inds.',
-    'no_inter': 'Ingen Internet',
-    'on_inter': 'Tænd for internettet for at få meteorologisk data.',
-    'location': 'Placering',
-    'no_location':
-        'Aktiver placeringer for at få vejrdata for den aktuelle placering.',
-    'theme': 'Tema',
-    'low': 'Lav',
-    'high': 'Høj',
-    'normal': 'Normal',
-    'lat': 'Breddegrad',
-    'lon': 'Længdegrad',
-    'create': 'Opret',
-    'city': 'By',
-    'district': 'Distrikt',
-    'noWeatherCard': 'Tilføj en by',
-    'deletedCardWeather': 'Slet en by',
-    'deletedCardWeatherQuery': 'Er du sikker på at du vil slette denne by?',
-    'delete': 'Slet',
-    'cancel': 'Annullere',
-    'time': 'Tid i byen',
-    'validateName': 'Indtast venligst navnet',
-    'measurements': 'Foranstaltningssystemet',
-    'degrees': 'Grader',
-    'celsius': 'Celsius',
-    'fahrenheit': 'Fahrenheit',
-    'imperial': 'Imperialistisk',
-    'metric': 'Metrisk',
-    'validateValue': 'Indtast en værdi',
-    'validateNumber': 'Indtast et gyldigt nummer',
-    'validate90': 'Værdien skal være mellem -90 og 90',
-    'validate180': 'Værdien skal være mellem -180 og 180',
-    'notifications': 'Notifikationer',
-    'sunrise': 'Solopgang',
-    'sunset': 'Solnedgang',
-    'timeformat': 'Tids format',
-    '12': '12-timer',
-    '24': '24-timer',
-    'cloudcover': 'skydække',
-    'uvIndex': 'UV-index',
-    'materialColor': 'Dynamiske farver',
-    'uvLow': 'Lav',
-    'uvAverage': 'Moderat',
-    'uvHigh': 'Høj',
-    'uvVeryHigh': 'Meget højt',
-    'uvExtreme': 'Ekstrem',
-    'weatherMore': '12 dages vejrudsigt',
-    'windgusts': 'Vindstød',
-    'north': 'Nord',
-    'northeast': 'Nordøst',
-    'east': 'Øst',
-    'southeast': 'Sydøst',
-    'south': 'Syd',
-    'southwest': 'Sydvest',
-    'west': 'Vest',
-    'northwest': 'Nordvest',
-    'project': 'Projektet findes på',
-    'version': 'App version',
-    'precipitationProbability': 'Sandsynlighed for nedbør',
-    'apparentTemperatureMin': 'Minimum temperature',
-    'apparentTemperatureMax': 'Maksimal temperatur',
-    'amoledTheme': 'AMOLED-tema',
-    'appearance': 'Udseende',
-    'functions': 'Funktioner',
-    'data': 'Data',
-    'language': 'Sprog',
-    'timeRange': 'Hyppighed (i timer)',
-    'timeStart': 'Start tid',
-    'timeEnd': 'Slut tid',
-    'support': 'Support',
-    'system': 'System',
-    'dark': 'Mørk',
-    'light': 'Lys',
-    'license': 'Licenser',
-    'widget': 'Widget',
-    'widgetBackground': 'Widget baggrund',
-    'widgetText': 'Widget tekst',
-    'dewpoint': 'Dugpunktet',
-    'shortwaveRadiation': 'Kortbølgestråling',
-    'W/m2': 'W/m2',
-    'roundDegree': 'Afrundede grader',
-    'settings_full': 'Indstillinger',
-    'cities': 'Byer',
-    'searchMethod': 'Brug søgning eller geolokation',
-    'done': 'Færdig',
-    'groups': 'Vores grupper',
-    'openMeteo': 'Data fra Open-Meteo (CC-BY 4.0)',
-    'hourlyVariables': 'Timevise vejrfaktorer',
-    'dailyVariables': 'Daglige vejrfaktorer',
-    'largeElement': 'Stort vejrdisplay',
-    'map': 'Kort',
-    'clearCacheStore': 'Ryd cache',
-    'deletedCacheStore': 'Rydder cache',
-    'deletedCacheStoreQuery': 'Er du sikker på, at du vil rydde cachen?',
-    'addWidget': 'Tilføj widget',
-    'hideMap': 'Skjul kort',
-  };
-}
diff --git a/lib/translation/de_de.dart b/lib/translation/de_de.dart
old mode 100755
new mode 100644
index 3f6e697..86fad15
--- a/lib/translation/de_de.dart
+++ b/lib/translation/de_de.dart
@@ -1,144 +1,126 @@
 class DeDe {
   Map<String, String> get messages => {
-    'start': 'Los gehts',
-    'description':
-        'Wetteranwendung mit einer aktuellen Prognose für jede Stunde, Tag und Woche für jeden Ort.',
-    'name': 'Wetter',
-    'name2': 'Bequemes Design',
-    'name3': 'Kontaktiere uns',
-    'description2':
-        'Die gesamte Navigation ist so gestaltet, dass die Interaktion mit der Anwendung so bequem und schnell wie möglich erfolgt.',
-    'description3':
-        'Wenn Sie auf Probleme stoßen, kontaktieren Sie uns bitte per E-Mail oder in den Bewertungen der Anwendung.',
-    'next': 'Weiter',
-    'search': 'Suchen...',
-    'loading': 'Lädt...',
-    'searchCity': 'Finde deine Stadt',
-    'humidity': 'Luftfeuchtigkeit',
-    'wind': 'Wind',
-    'visibility': 'Sichtweite',
-    'feels': 'Gefühlt',
-    'evaporation': 'Verdunstung',
-    'precipitation': 'Niederschlag',
-    'direction': 'Richtung',
-    'pressure': 'Druck',
-    'rain': 'Regen',
-    'clear_sky': 'Klarer Himmel',
-    'cloudy': 'Bewölkt',
-    'overcast': 'Bedeckt',
-    'fog': 'Nebel',
-    'drizzle': 'Nieselregen',
-    'drizzling_rain': 'Gefrierender Nieselregen',
-    'freezing_rain': 'Gefrierender Regen',
-    'heavy_rains': 'Regenschauer',
-    'snow': 'Schnee',
-    'thunderstorm': 'Gewitter',
-    'kph': 'km/h',
-    'mph': 'mph',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'mi': 'mi',
-    'km': 'km',
-    'inch': 'inch',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'Einstellungen',
-    'no_inter': 'Keine Internetverbindung',
-    'on_inter':
-        'Schalte das Internet ein, um meteorologische Daten zu erhalten.',
-    'location': 'Standort',
-    'no_location':
-        'Aktiviere den Standortdienst, um Wetterdaten für den aktuellen Standort zu erhalten.',
-    'theme': 'Thema',
-    'low': 'Niedrig',
-    'high': 'Hoch',
-    'normal': 'Normal',
-    'lat': 'Breitengrad',
-    'lon': 'Längengrad',
-    'create': 'Erstellen',
-    'city': 'Stadt',
-    'district': 'Bezirk',
-    'noWeatherCard': 'Füge eine Stadt hinzu',
-    'deletedCardWeather': 'Stadt löschen',
-    'deletedCardWeatherQuery':
-        'Sind Sie sicher, dass Sie die Stadt löschen möchten?',
-    'delete': 'Löschen',
-    'cancel': 'Abbrechen',
-    'time': 'Ortszeit',
-    'validateName': 'Bitte geben Sie den Namen ein',
-    'measurements': 'Einheitensystem',
-    'degrees': 'Grade',
-    'celsius': 'Celsius',
-    'fahrenheit': 'Fahrenheit',
-    'imperial': 'Imperial',
-    'metric': 'Metrisch',
-    'validateValue': 'Bitte geben Sie einen Wert ein',
-    'validateNumber': 'Bitte geben Sie eine Nummer ein',
-    'validate90': 'Der Wert muss zwischen -90 und 90 liegen',
-    'validate180': 'Der Wert muss zwischen -180 und 180 liegen',
-    'notifications': 'Benachrichtigungen',
-    'sunrise': 'Sonnenaufgang',
-    'sunset': 'Sonnenuntergang',
-    'timeformat': 'Zeitformat',
-    '12': '12-stunden',
-    '24': '24-stunden',
-    'cloudcover': 'Wolkenbedeckung',
-    'uvIndex': 'UV-index',
-    'materialColor': 'Dynamische Farben',
-    'uvLow': 'Niedrig',
-    'uvAverage': 'Mäßig',
-    'uvHigh': 'Hoch',
-    'uvVeryHigh': 'Sehr hoch',
-    'uvExtreme': 'Extrem',
-    'weatherMore': '12-Tage-Wettervorhersage',
-    'windgusts': 'Böe',
-    'north': 'Norden',
-    'northeast': 'Nordosten',
-    'east': 'Osten',
-    'southeast': 'Südosten',
-    'south': 'Süden',
-    'southwest': 'Südwesten',
-    'west': 'Westen',
-    'northwest': 'Nordwesten',
-    'project': 'Projekt auf',
-    'version': 'Anwendungsversion',
-    'precipitationProbability': 'Niederschlagswahrscheinlichkeit',
-    'apparentTemperatureMin': 'Minimale gefühlte Temperatur',
-    'apparentTemperatureMax': 'Maximale gefühlte Temperatur',
-    'amoledTheme': 'AMOLED-thema',
-    'appearance': 'Erscheinungsbild',
-    'functions': 'Funktionen',
-    'data': 'Daten',
-    'language': 'Sprache',
-    'timeRange': 'Häufigkeit (in Stunden)',
-    'timeStart': 'Startzeit',
-    'timeEnd': 'Endzeit',
-    'support': 'Unterstützung',
-    'system': 'System',
-    'dark': 'Dunkel',
-    'light': 'Hell',
-    'license': 'Lizenzen',
-    'widget': 'Widget',
-    'widgetBackground': 'Widget-Hintergrund',
-    'widgetText': 'Widget-Text',
-    'dewpoint': 'Taupunkt',
-    'shortwaveRadiation': 'Kurzwellenstrahlung',
-    'roundDegree': 'Grad runden',
-    'settings_full': 'Einstellungen',
-    'cities': 'Städte',
-    'searchMethod': 'Verwenden Sie die Suche oder die Geolokalisierung',
-    'done': 'Fertig',
-    'groups': 'Unsere gruppen',
-    'openMeteo': 'Daten von Open-Meteo (CC-BY 4.0)',
-    'hourlyVariables': 'Stündliche Wettervariablen',
-    'dailyVariables': 'Tägliche Wettervariablen',
-    'largeElement': 'Große Wetteranzeige',
-    'map': 'Karte',
-    'clearCacheStore': 'Cache leeren',
-    'deletedCacheStore': 'Cache wird geleert',
-    'deletedCacheStoreQuery':
-        'Sind Sie sicher, dass Sie den Cache leeren möchten?',
-    'addWidget': 'Widget hinzufügen',
-    'hideMap': 'Karte ausblenden',
-  };
+        'start': 'Los gehts',
+        'description':
+            'Wetteranwendung mit einer aktuellen Prognose für jede Stunde, Tag und Woche für jeden Ort.',
+        'name': 'Wetter',
+        'name2': 'Bequemes Design',
+        'name3': 'Kontaktiere uns',
+        'description2':
+            'Die gesamte Navigation ist so gestaltet, dass die Interaktion mit der Anwendung so bequem und schnell wie möglich erfolgt.',
+        'description3':
+            'Wenn Sie auf Probleme stoßen, kontaktieren Sie uns bitte per E-Mail oder in den Bewertungen der Anwendung.',
+        'next': 'Weiter',
+        'search': 'Suchen...',
+        'loading': 'Lädt...',
+        'searchCity': 'Finde deine Stadt',
+        'humidity': 'Luftfeuchtigkeit',
+        'wind': 'Wind',
+        'visibility': 'Sichtweite',
+        'feels': 'Gefühlt',
+        'evaporation': 'Verdunstung',
+        'precipitation': 'Niederschlag',
+        'direction': 'Richtung',
+        'pressure': 'Druck',
+        'rain': 'Regen',
+        'clear_sky': 'Klarer Himmel',
+        'cloudy': 'Bewölkt',
+        'overcast': 'Bedeckt',
+        'fog': 'Nebel',
+        'drizzle': 'Nieselregen',
+        'drizzling_rain': 'Gefrierender Nieselregen',
+        'freezing_rain': 'Gefrierender Regen',
+        'heavy_rains': 'Regenschauer',
+        'snow': 'Schnee',
+        'thunderstorm': 'Gewitter',
+        'kph': 'km/h',
+        'mph': 'mph',
+        'mi': 'mi',
+        'km': 'km',
+        'inch': 'inch',
+        'mm': 'mm',
+        'hPa': 'hPa',
+        'settings': 'Einstellungen',
+        'no_inter': 'Keine Internetverbindung',
+        'on_inter':
+            'Schalte das Internet ein, um meteorologische Daten zu erhalten.',
+        'location': 'Standort',
+        'no_location':
+            'Aktiviere den Standortdienst, um Wetterdaten für den aktuellen Standort zu erhalten.',
+        'theme': 'Thema',
+        'low': 'Niedrig',
+        'high': 'Hoch',
+        'normal': 'Normal',
+        'lat': 'Breitengrad',
+        'lon': 'Längengrad',
+        'create': 'Erstellen',
+        'city': 'Stadt',
+        'district': 'Bezirk',
+        'noWeatherCard': 'Füge eine Stadt hinzu',
+        'deletedCardWeather': 'Stadt löschen',
+        'deletedCardWeatherQuery':
+            'Sind Sie sicher, dass Sie die Stadt löschen möchten?',
+        'delete': 'Löschen',
+        'cancel': 'Abbrechen',
+        'time': 'Ortszeit',
+        'validateName': 'Bitte geben Sie den Namen ein',
+        'measurements': 'Einheitensystem',
+        'degrees': 'Grade',
+        'celsius': 'Celsius',
+        'fahrenheit': 'Fahrenheit',
+        'imperial': 'Imperial',
+        'metric': 'Metrisch',
+        'validateValue': 'Bitte geben Sie einen Wert ein',
+        'validateNumber': 'Bitte geben Sie eine Nummer ein',
+        'validate90': 'Der Wert muss zwischen -90 und 90 liegen',
+        'validate180': 'Der Wert muss zwischen -180 und 180 liegen',
+        'notifications': 'Benachrichtigungen',
+        'sunrise': 'Sonnenaufgang',
+        'sunset': 'Sonnenuntergang',
+        'timeformat': 'Zeitformat',
+        '12': '12-stunden',
+        '24': '24-stunden',
+        'cloudcover': 'Wolkenbedeckung',
+        'uvIndex': 'UV-index',
+        'materialColor': 'Dynamische Farben',
+        'uvLow': 'Niedrig',
+        'uvAverage': 'Mäßig',
+        'uvHigh': 'Hoch',
+        'uvVeryHigh': 'Sehr hoch',
+        'uvExtreme': 'Extrem',
+        'weatherMore': '12-Tage-Wettervorhersage',
+        'windgusts': 'Böe',
+        'north': 'Norden',
+        'northeast': 'Nordosten',
+        'east': 'Osten',
+        'southeast': 'Südosten',
+        'south': 'Süden',
+        'southwest': 'Südwesten',
+        'west': 'Westen',
+        'northwest': 'Nordwesten',
+        'project': 'Projekt auf',
+        'version': 'Anwendungsversion',
+        'precipitationProbability': 'Niederschlagswahrscheinlichkeit',
+        'apparentTemperatureMin': 'Minimale gefühlte Temperatur',
+        'apparentTemperatureMax': 'Maximale gefühlte Temperatur',
+        'amoledTheme': 'AMOLED-thema',
+        'appearance': 'Erscheinungsbild',
+        'functions': 'Funktionen',
+        'data': 'Daten',
+        'language': 'Sprache',
+        'timeRange': 'Häufigkeit (in Stunden)',
+        'timeStart': 'Startzeit',
+        'timeEnd': 'Endzeit',
+        'support': 'Unterstützung',
+        'system': 'System',
+        'dark': 'Dunkel',
+        'light': 'Hell',
+        'license': 'Lizenzen',
+        'widget': 'Widget',
+        'widgetBackground': 'Widget-Hintergrund',
+        'widgetText': 'Widget-Text',
+        'dewpoint': 'Taupunkt',
+        'shortwaveRadiation': 'Kurzwellenstrahlung',
+        'roundDegree': 'Grad runden',
+      };
 }
diff --git a/lib/translation/en_us.dart b/lib/translation/en_us.dart
old mode 100755
new mode 100644
index 344545f..fd4d9b0
--- a/lib/translation/en_us.dart
+++ b/lib/translation/en_us.dart
@@ -1,142 +1,125 @@
 class EnUs {
   Map<String, String> get messages => {
-    'start': 'Get Started',
-    'description':
-        'Weather application with an up-to-date forecast for each hour, day, and week for any location.',
-    'name': 'Weather',
-    'name2': 'Convenient Design',
-    'name3': 'Contact Us',
-    'description2':
-        'All navigation is designed to interact with the application as conveniently and quickly as possible.',
-    'description3':
-        'If you encounter any issues, please contact us via email or in the application reviews.',
-    'next': 'Next',
-    'search': 'Search...',
-    'loading': 'Loading...',
-    'searchCity': 'Find your city',
-    'humidity': 'Humidity',
-    'wind': 'Wind',
-    'visibility': 'Visibility',
-    'feels': 'Feels',
-    'evaporation': 'Evapotranspiration',
-    'precipitation': 'Precipitation',
-    'direction': 'Direction',
-    'pressure': 'Pressure',
-    'rain': 'Rain',
-    'clear_sky': 'Clear sky',
-    'cloudy': 'Cloudy',
-    'overcast': 'Overcast',
-    'fog': 'Fog',
-    'drizzle': 'Drizzle',
-    'drizzling_rain': 'Freezing Drizzle',
-    'freezing_rain': 'Freezing Rain',
-    'heavy_rains': 'Rain showers',
-    'snow': 'Snow',
-    'thunderstorm': 'Thunderstorm',
-    'kph': 'km/h',
-    'mph': 'mph',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'mi': 'mi',
-    'km': 'km',
-    'inch': 'inch',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'Set.',
-    'no_inter': 'No Internet',
-    'on_inter': 'Turn on the Internet to get meteorological data.',
-    'location': 'Location',
-    'no_location':
-        'Enable the location service to get weather data for the current location.',
-    'theme': 'Theme',
-    'low': 'Low',
-    'high': 'High',
-    'normal': 'Normal',
-    'lat': 'Latitude',
-    'lon': 'Longitude',
-    'create': 'Create',
-    'city': 'City',
-    'district': 'District',
-    'noWeatherCard': 'Add a city',
-    'deletedCardWeather': 'Deleting a city',
-    'deletedCardWeatherQuery': 'Are you sure you want to delete the city?',
-    'delete': 'Delete',
-    'cancel': 'Cancel',
-    'time': 'Time in the city',
-    'validateName': 'Please enter the name',
-    'measurements': 'System of measures',
-    'degrees': 'Degrees',
-    'celsius': 'Celsius',
-    'fahrenheit': 'Fahrenheit',
-    'imperial': 'Imperial',
-    'metric': 'Metric',
-    'validateValue': 'Please enter a value',
-    'validateNumber': 'Please enter a valid number',
-    'validate90': 'Value must be between -90 and 90',
-    'validate180': 'Value must be between -180 and 180',
-    'notifications': 'Notifications',
-    'sunrise': 'Sunrise',
-    'sunset': 'Sunset',
-    'timeformat': 'Time format',
-    '12': '12-hour',
-    '24': '24-hour',
-    'cloudcover': 'Cloudcover',
-    'uvIndex': 'UV-index',
-    'materialColor': 'Dynamic colors',
-    'uvLow': 'Low',
-    'uvAverage': 'Moderate',
-    'uvHigh': 'High',
-    'uvVeryHigh': 'Very high',
-    'uvExtreme': 'Extreme',
-    'weatherMore': '12-day weather forecast',
-    'windgusts': 'Gust',
-    'north': 'North',
-    'northeast': 'Northeast',
-    'east': 'East',
-    'southeast': 'Southeast',
-    'south': 'South',
-    'southwest': 'Southwest',
-    'west': 'West',
-    'northwest': 'Northwest',
-    'project': 'Project on',
-    'version': 'Application version',
-    'precipitationProbability': 'Precipitation probability',
-    'apparentTemperatureMin': 'Minimum apparent temperature',
-    'apparentTemperatureMax': 'Maximum apparent temperature',
-    'amoledTheme': 'AMOLED-theme',
-    'appearance': 'Appearance',
-    'functions': 'Functions',
-    'data': 'Data',
-    'language': 'Language',
-    'timeRange': 'Frequency (in hours)',
-    'timeStart': 'Start time',
-    'timeEnd': 'End time',
-    'support': 'Donate',
-    'system': 'System',
-    'dark': 'Dark',
-    'light': 'Light',
-    'license': 'Licenses',
-    'widget': 'Widget',
-    'widgetBackground': 'Widget background',
-    'widgetText': 'Widget text',
-    'dewpoint': 'Dewpoint',
-    'shortwaveRadiation': 'Shortwave radiation',
-    'W/m2': 'W/m2',
-    'roundDegree': 'Round degrees',
-    'settings_full': 'Settings',
-    'cities': 'Cities',
-    'searchMethod': 'Use search or geolocation',
-    'done': 'Done',
-    'groups': 'Our groups',
-    'openMeteo': 'Data by Open-Meteo (CC-BY 4.0)',
-    'hourlyVariables': 'Hourly weather variables',
-    'dailyVariables': 'Daily weather variables',
-    'largeElement': 'Large weather display',
-    'map': 'Map',
-    'clearCacheStore': 'Clear cache',
-    'deletedCacheStore': 'Clearing the cache',
-    'deletedCacheStoreQuery': 'Are you sure you want to clear the cache?',
-    'addWidget': 'Add widget',
-    'hideMap': 'Hide map',
-  };
+        'start': 'Get Started',
+        'description':
+            'Weather application with an up-to-date forecast for each hour, day, and week for any location.',
+        'name': 'Weather',
+        'name2': 'Convenient Design',
+        'name3': 'Contact Us',
+        'description2':
+            'All navigation is designed to interact with the application as conveniently and quickly as possible.',
+        'description3':
+            'If you encounter any issues, please contact us via email or in the application reviews.',
+        'next': 'Next',
+        'search': 'Search...',
+        'loading': 'Loading...',
+        'searchCity': 'Find your city',
+        'humidity': 'Humidity',
+        'wind': 'Wind',
+        'visibility': 'Visibility',
+        'feels': 'Feels',
+        'evaporation': 'Evapotranspiration',
+        'precipitation': 'Precipitation',
+        'direction': 'Direction',
+        'pressure': 'Pressure',
+        'rain': 'Rain',
+        'clear_sky': 'Clear sky',
+        'cloudy': 'Cloudy',
+        'overcast': 'Overcast',
+        'fog': 'Fog',
+        'drizzle': 'Drizzle',
+        'drizzling_rain': 'Freezing Drizzle',
+        'freezing_rain': 'Freezing Rain',
+        'heavy_rains': 'Rain showers',
+        'snow': 'Snow',
+        'thunderstorm': 'Thunderstorm',
+        'kph': 'km/h',
+        'mph': 'mph',
+        'mi': 'mi',
+        'km': 'km',
+        'inch': 'inch',
+        'mm': 'mm',
+        'hPa': 'hPa',
+        'settings': 'Set.',
+        'no_inter': 'No Internet',
+        'on_inter': 'Turn on the Internet to get meteorological data.',
+        'location': 'Location',
+        'no_location':
+            'Enable the location service to get weather data for the current location.',
+        'theme': 'Theme',
+        'low': 'Low',
+        'high': 'High',
+        'normal': 'Normal',
+        'lat': 'Latitude',
+        'lon': 'Longitude',
+        'create': 'Create',
+        'city': 'City',
+        'district': 'District',
+        'noWeatherCard': 'Add a city',
+        'deletedCardWeather': 'Deleting a city',
+        'deletedCardWeatherQuery': 'Are you sure you want to delete the city?',
+        'delete': 'Delete',
+        'cancel': 'Cancel',
+        'time': 'Time in the city',
+        'validateName': 'Please enter the name',
+        'measurements': 'System of measures',
+        'degrees': 'Degrees',
+        'celsius': 'Celsius',
+        'fahrenheit': 'Fahrenheit',
+        'imperial': 'Imperial',
+        'metric': 'Metric',
+        'validateValue': 'Please enter a value',
+        'validateNumber': 'Please enter a valid number',
+        'validate90': 'Value must be between -90 and 90',
+        'validate180': 'Value must be between -180 and 180',
+        'notifications': 'Notifications',
+        'sunrise': 'Sunrise',
+        'sunset': 'Sunset',
+        'timeformat': 'Time format',
+        '12': '12-hour',
+        '24': '24-hour',
+        'cloudcover': 'Сloudcover',
+        'uvIndex': 'UV-index',
+        'materialColor': 'Dynamic colors',
+        'uvLow': 'Low',
+        'uvAverage': 'Moderate',
+        'uvHigh': 'High',
+        'uvVeryHigh': 'Very high',
+        'uvExtreme': 'Extreme',
+        'weatherMore': '12-day weather forecast',
+        'windgusts': 'Gust',
+        'north': 'North',
+        'northeast': 'Northeast',
+        'east': 'East',
+        'southeast': 'Southeast',
+        'south': 'South',
+        'southwest': 'Southwest',
+        'west': 'West',
+        'northwest': 'Northwest',
+        'project': 'Project on',
+        'version': 'Application version',
+        'precipitationProbability': 'Precipitation probability',
+        'apparentTemperatureMin': 'Minimum apparent temperature',
+        'apparentTemperatureMax': 'Maximum apparent temperature',
+        'amoledTheme': 'AMOLED-theme',
+        'appearance': 'Appearance',
+        'functions': 'Functions',
+        'data': 'Data',
+        'language': 'Language',
+        'timeRange': 'Frequency (in hours)',
+        'timeStart': 'Start time',
+        'timeEnd': 'End time',
+        'support': 'Support',
+        'system': 'System',
+        'dark': 'Dark',
+        'light': 'Light',
+        'license': 'Licenses',
+        'widget': 'Widget',
+        'widgetBackground': 'Widget background',
+        'widgetText': 'Widget text',
+        'dewpoint': 'Dewpoint',
+        'shortwaveRadiation': 'Shortwave radiation',
+        'W/m2': 'W/m2',
+        'roundDegree': 'Round degrees',
+      };
 }
diff --git a/lib/translation/es_es.dart b/lib/translation/es_es.dart
old mode 100755
new mode 100644
index 0aad197..36fe8e2
--- a/lib/translation/es_es.dart
+++ b/lib/translation/es_es.dart
@@ -1,142 +1,126 @@
 class EsEs {
   Map<String, String> get messages => {
-    'start': 'Empezar',
-    'description':
-        'Aplicación meteorológica con un pronóstico actualizado para cada hora, día y semana para cualquier lugar.',
-    'name': 'Tiempo',
-    'name2': 'Diseño Conveniente',
-    'name3': 'Contáctenos',
-    'description2':
-        'Toda la navegación está diseñada para interactuar con la aplicación de la manera más cómoda y rápida posible.',
-    'description3':
-        'Si encuentra algún problema, contáctenos por correo electrónico o en las reseñas de la aplicación.',
-    'next': 'Siguiente',
-    'search': 'Buscar...',
-    'loading': 'Cargando...',
-    'searchCity': 'Busca tu ciudad',
-    'humidity': 'Humedad',
-    'wind': 'Viento',
-    'visibility': 'Visibilidad',
-    'feels': 'Sensación térmica',
-    'evaporation': 'Evaporación',
-    'precipitation': 'Precipitación',
-    'direction': 'Dirección',
-    'pressure': 'Presión',
-    'rain': 'Lluvia',
-    'clear_sky': 'Cielo despejado',
-    'cloudy': 'Nuboso',
-    'overcast': 'Cubierto de nubes',
-    'fog': 'Niebla',
-    'drizzle': 'Llovizna',
-    'drizzling_rain': 'Llovizna helada',
-    'freezing_rain': 'Lluvia helada',
-    'heavy_rains': 'Chubasco intenso',
-    'snow': 'Nieve',
-    'thunderstorm': 'Tormenta',
-    'kph': 'km/h',
-    'mph': 'mph',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'mi': 'mi',
-    'km': 'km',
-    'inch': 'inch',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'Ajustes',
-    'no_inter': 'Sin conexión a Internet',
-    'on_inter': 'Conéctate a Internet para obtener información meteorológica.',
-    'location': 'Ubicación',
-    'no_location':
-        'Activa la localización para obtener información meteorológica para tu ubicación actual.',
-    'theme': 'Tema',
-    'low': 'Bajo',
-    'high': 'Alto',
-    'normal': 'Normal',
-    'lat': 'Latitud',
-    'lon': 'Longitud',
-    'create': 'Crear',
-    'city': 'Ciudad',
-    'district': 'Distrito',
-    'noWeatherCard': 'Añadir una ciudad',
-    'deletedCardWeather': 'Eliminar una ciudad',
-    'deletedCardWeatherQuery':
-        '¿Estás seguro de que quieres eliminar la ciudad?',
-    'delete': 'Eliminar',
-    'cancel': 'Cancelar',
-    'time': 'Hora en la ciudad',
-    'validateName': 'Por favor, introduce un nombre',
-    'measurements': 'Sistema de medidas',
-    'degrees': 'Grados',
-    'celsius': 'Celsius',
-    'fahrenheit': 'Fahrenheit',
-    'imperial': 'Imperial',
-    'metric': 'Métrico',
-    'validateValue': 'Por favor, introduce un valor',
-    'validateNumber': 'Por favor, introduce un número válido',
-    'validate90': 'El valor tiene que estar entre -90 y 90',
-    'validate180': 'El valor tiene que estar entre -180 y 180',
-    'notifications': 'Notificaciones',
-    'sunrise': 'Amanecer',
-    'sunset': 'Atardecer',
-    'timeformat': 'Formato de hora',
-    '12': '12 horas',
-    '24': '24 horas',
-    'cloudcover': 'Cobertura de nubes',
-    'uvIndex': 'UV-índice',
-    'materialColor': 'Colores Dinámicos',
-    'uvLow': 'Bajo',
-    'uvAverage': 'Moderado',
-    'uvHigh': 'Alto',
-    'uvVeryHigh': 'Muy alto',
-    'uvExtreme': 'Extremo',
-    'weatherMore': 'Pronóstico del tiempo para 12 días',
-    'windgusts': 'Ráfagas',
-    'north': 'Norte',
-    'northeast': 'Noreste',
-    'east': 'Este',
-    'southeast': 'Sureste',
-    'south': 'Sur',
-    'southwest': 'Suroeste',
-    'west': 'Oeste',
-    'northwest': 'Noroeste',
-    'project': 'Proyecto en',
-    'version': 'Versión de la aplicación',
-    'precipitationProbability': 'Probabilidad de precipitación',
-    'apparentTemperatureMin': 'Temperatura aparente mínima',
-    'apparentTemperatureMax': 'Temperatura aparente máxima',
-    'amoledTheme': 'AMOLED-tema',
-    'appearance': 'Apariencia',
-    'functions': 'Funciones',
-    'data': 'Datos',
-    'language': 'Idioma',
-    'timeRange': 'Frecuencia (en horas)',
-    'timeStart': 'Hora de inicio',
-    'timeEnd': 'Hora de finalización',
-    'support': 'Soporte',
-    'system': 'Sistema',
-    'dark': 'Oscuro',
-    'light': 'Claro',
-    'license': 'Licencias',
-    'widget': 'Widget',
-    'widgetBackground': 'Fondo del widget',
-    'widgetText': 'Texto del widget',
-    'dewpoint': 'Punto de rocío',
-    'shortwaveRadiation': 'Radiación de onda corta',
-    'roundDegree': 'Redondear grados',
-    'settings_full': 'Configuración',
-    'cities': 'Ciudades',
-    'searchMethod': 'Usa la búsqueda o la geolocalización',
-    'done': 'Hecho',
-    'groups': 'Nuestros grupos',
-    'openMeteo': 'Datos de Open-Meteo (CC-BY 4.0)',
-    'hourlyVariables': 'Variables meteorológicas horarias',
-    'dailyVariables': 'Variables meteorológicas diarias',
-    'largeElement': 'Visualización grande del clima',
-    'map': 'Mapa',
-    'clearCacheStore': 'Borrar caché',
-    'deletedCacheStore': 'Borrando caché',
-    'deletedCacheStoreQuery': '¿Estás seguro de que quieres borrar el caché?',
-    'addWidget': 'Agregar widget',
-    'hideMap': 'Ocultar mapa',
-  };
+        'start': 'Empezar',
+        'description':
+            'Aplicación meteorológica con un pronóstico actualizado para cada hora, día y semana para cualquier lugar.',
+        'name': 'Tiempo',
+        'name2': 'Diseño Conveniente',
+        'name3': 'Contáctenos',
+        'description2':
+            'Toda la navegación está diseñada para interactuar con la aplicación de la manera más cómoda y rápida posible.',
+        'description3':
+            'Si encuentra algún problema, contáctenos por correo electrónico o en las reseñas de la aplicación.',
+        'next': 'Siguiente',
+        'search': 'Buscar...',
+        'loading': 'Cargando...',
+        'searchCity': 'Busca tu ciudad',
+        'humidity': 'Humedad',
+        'wind': 'Viento',
+        'visibility': 'Visibilidad',
+        'feels': 'Sensación térmica',
+        'evaporation': 'Evaporación',
+        'precipitation': 'Precipitación',
+        'direction': 'Dirección',
+        'pressure': 'Presión',
+        'rain': 'Lluvia',
+        'clear_sky': 'Cielo despejado',
+        'cloudy': 'Nuboso',
+        'overcast': 'Cubierto de nubes',
+        'fog': 'Niebla',
+        'drizzle': 'Llovizna',
+        'drizzling_rain': 'Llovizna helada',
+        'freezing_rain': 'Lluvia helada',
+        'heavy_rains': 'Chubasco intenso',
+        'snow': 'Nieve',
+        'thunderstorm': 'Tormenta',
+        'kph': 'km/h',
+        'mph': 'mph',
+        'mi': 'mi',
+        'km': 'km',
+        'inch': 'inch',
+        'mm': 'mm',
+        'hPa': 'hPa',
+        'settings': 'Ajustes',
+        'no_inter': 'Sin conexión a Internet',
+        'on_inter':
+            'Conéctate a Internet para obtener información meteorológica.',
+        'location': 'Ubicación',
+        'no_location':
+            'Activa la localización para obtener información meteorológica para tu ubicación actual.',
+        'theme': 'Tema',
+        'low': 'Bajo',
+        'high': 'Alto',
+        'normal': 'Normal',
+        'lat': 'Latitud',
+        'lon': 'Longitud',
+        'create': 'Crear',
+        'city': 'Ciudad',
+        'district': 'Distrito',
+        'noWeatherCard': 'Añadir una ciudad',
+        'deletedCardWeather': 'Eliminar una ciudad',
+        'deletedCardWeatherQuery':
+            '¿Estás seguro de que quieres eliminar la ciudad?',
+        'delete': 'Eliminar',
+        'cancel': 'Cancelar',
+        'time': 'Hora en la ciudad',
+        'validateName': 'Por favor, introduce un nombre',
+        'measurements': 'Sistema de medidas',
+        'degrees': 'Grados',
+        'celsius': 'Celsius',
+        'fahrenheit': 'Fahrenheit',
+        'imperial': 'Imperial',
+        'metric': 'Métrico',
+        'validateValue': 'Por favor, introduce un valor',
+        'validateNumber': 'Por favor, introduce un número válido',
+        'validate90': 'El valor tiene que estar entre -90 y 90',
+        'validate180': 'El valor tiene que estar entre -180 y 180',
+        'notifications': 'Notificaciones',
+        'sunrise': 'Amanecer',
+        'sunset': 'Atardecer',
+        'timeformat': 'Formato de hora',
+        '12': '12 horas',
+        '24': '24 horas',
+        'cloudcover': 'Cobertura de nubes',
+        'uvIndex': 'UV-índice',
+        'materialColor': 'Colores Dinámicos',
+        'uvLow': 'Bajo',
+        'uvAverage': 'Moderado',
+        'uvHigh': 'Alto',
+        'uvVeryHigh': 'Muy alto',
+        'uvExtreme': 'Extremo',
+        'weatherMore': 'Pronóstico del tiempo para 12 días',
+        'windgusts': 'Ráfagas',
+        'north': 'Norte',
+        'northeast': 'Noreste',
+        'east': 'Este',
+        'southeast': 'Sureste',
+        'south': 'Sur',
+        'southwest': 'Suroeste',
+        'west': 'Oeste',
+        'northwest': 'Noroeste',
+        'project': 'Proyecto en',
+        'version': 'Versión de la aplicación',
+        'precipitationProbability': 'Probabilidad de precipitación',
+        'apparentTemperatureMin': 'Temperatura aparente mínima',
+        'apparentTemperatureMax': 'Temperatura aparente máxima',
+        'amoledTheme': 'AMOLED-tema',
+        'appearance': 'Apariencia',
+        'functions': 'Funciones',
+        'data': 'Datos',
+        'language': 'Idioma',
+        'timeRange': 'Frecuencia (en horas)',
+        'timeStart': 'Hora de inicio',
+        'timeEnd': 'Hora de finalización',
+        'support': 'Soporte',
+        'system': 'Sistema',
+        'dark': 'Oscuro',
+        'light': 'Claro',
+        'license': 'Licencias',
+        'widget': 'Widget',
+        'widgetBackground': 'Fondo del widget',
+        'widgetText': 'Texto del widget',
+        'dewpoint': 'Punto de rocío',
+        'shortwaveRadiation': 'Radiación de onda corta',
+        'roundDegree': 'Redondear grados',
+      };
 }
diff --git a/lib/translation/fa_ir.dart b/lib/translation/fa_ir.dart
deleted file mode 100755
index 3aa9be7..0000000
--- a/lib/translation/fa_ir.dart
+++ /dev/null
@@ -1,143 +0,0 @@
-class FaIr {
-  Map<String, String> get messages => {
-    'start': 'شروع کنید',
-    'description':
-        'یک برنامه هواشناسی با پیش‌بینی به روز برای هر ساعت، روز و هفته و هر مکان',
-    'name': 'آب و هوا',
-    'name2': 'طراحی راحت',
-    'name3': 'ارتباط باما',
-    'description2':
-        'برنامه به گونه ای طراحی شده است تا به راحتی بتوانید با آن ارتباط بگیرید.',
-    'description3':
-        'اگر با مشکلی روبرو شدید، لطفاً با ما از طریق ایمیل و یا نظرات برنامه ارتباط بگیرید.',
-    'next': 'بعدی',
-    'search': 'جستجو....',
-    'loading': 'درحال بارگذاری...',
-    'searchCity': 'شهر خود را پیدا کنید',
-    'humidity': 'رطوبت',
-    'wind': 'باد',
-    'visibility': 'میزان دید',
-    'feels': 'دما',
-    'evaporation': 'تبخیر و تعرق',
-    'precipitation': 'ته‌نشینی',
-    'direction': 'جهت',
-    'pressure': 'فشار',
-    'rain': 'باران',
-    'clear_sky': 'آسمان صاف',
-    'cloudy': 'ابری',
-    'overcast': 'ابری',
-    'fog': 'مه',
-    'drizzle': 'ریز باران',
-    'drizzling_rain': 'تگرگ',
-    'freezing_rain': 'باران یخ‌زن',
-    'heavy_rains': 'باران شدید',
-    'snow': 'برف',
-    'thunderstorm': 'طوفان',
-    'kph': 'km/h',
-    'mph': 'mph',
-    'mi': 'mi',
-    'km': 'km',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'inch': 'inch',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'تنظیمات',
-    'no_inter': 'عدم اتصال به اینترنت',
-    'on_inter': 'برای دریافت تغییرات جوی اینترنت خود را روشن کنید.',
-    'location': 'مکان',
-    'no_location':
-        'برای دریافت اطلاعات آب و هوا برای مکان فعلی، سرویس مکان را فعال کنید.',
-    'theme': 'پوسته',
-    'low': 'کم',
-    'high': 'زیاد',
-    'normal': 'عادی',
-    'lat': 'عرض جغرافیایی',
-    'lon': 'طول جغرافیایی',
-    'create': 'ایجاد',
-    'city': 'شهر',
-    'district': 'ناحیه',
-    'noWeatherCard': 'یک شهر اضافه کنید',
-    'deletedCardWeather': 'حذف یک شهر',
-    'deletedCardWeatherQuery': 'آیا از حذف این شهر اطمینان دارید؟',
-    'delete': 'حذف',
-    'cancel': 'صرف نظر',
-    'time': 'زمان در این شهر',
-    'validateName': 'لطفاً نام را وارد کنید.',
-    'measurements': 'سیستم اندازه گیری',
-    'degrees': 'درجه',
-    'celsius': 'سلسیوس',
-    'fahrenheit': 'فارنهایت',
-    'imperial': 'بریتانیایی',
-    'metric': 'متریک',
-    'validateValue': 'لطفاً یک مقدار را وارد کنید.',
-    'validateNumber': 'لطفاً یک مقدار معتبر وارد کنید.',
-    'validate90': 'مقدار شما باید بین -۹۰ و ۹۰ باشد.',
-    'validate180': 'مقدار شما باید بین -۱۸۰ و ۱۸۰ باشد.',
-    'notifications': 'اعلانات',
-    'sunrise': 'طلوع آفتاب',
-    'sunset': 'غروب آفتاب',
-    'timeformat': 'نوع زمان',
-    '12': '۱۲ ساعته',
-    '24': '۲۴ ساعته',
-    'cloudcover': 'پوشش ابری',
-    'uvIndex': 'شاخص اشعه ماوراء بنفش',
-    'materialColor': 'رنگ های پویا',
-    'uvLow': 'کم',
-    'uvAverage': 'متوسط',
-    'uvHigh': 'زیاد',
-    'uvVeryHigh': 'خیلی زیاد',
-    'uvExtreme': 'شدید',
-    'weatherMore': 'پیش بینی آب و هوا 12 روزه',
-    'windgusts': 'وزش باد',
-    'north': 'شمال',
-    'northeast': 'شمال شرقی',
-    'east': 'شرق',
-    'southeast': 'جنوب شرقی',
-    'south': 'جنوب',
-    'southwest': 'جنوب غربی',
-    'west': 'غرب',
-    'northwest': 'شمال غربی',
-    'project': 'Project on',
-    'version': 'نگارش برنامه',
-    'precipitationProbability': 'احتمال بارش',
-    'apparentTemperatureMin': 'حداقل دمای ظاهری',
-    'apparentTemperatureMax': 'حداکثر دمای ظاهری',
-    'amoledTheme': 'پوسته امولد',
-    'appearance': 'ظاهر',
-    'functions': 'کارکرد',
-    'data': 'داده ها',
-    'language': 'زبان',
-    'timeRange': 'فرکانس (بر حسب ساعت)',
-    'timeStart': 'زمان شروع',
-    'timeEnd': 'زمان پایان',
-    'support': 'پشتیبانی',
-    'system': 'سیستم',
-    'dark': 'تیره',
-    'light': 'روشن',
-    'license': 'مجوز',
-    'widget': 'ویجت',
-    'widgetBackground': 'پس زمینه ویجت',
-    'widgetText': 'متن ویجت',
-    'dewpoint': 'نقطه شبنم',
-    'shortwaveRadiation': 'تابش موج کوتاه',
-    'W/m2': 'W/m2',
-    'roundDegree': 'درجه گرد',
-    'settings_full': 'تنظیمات',
-    'cities': 'شهر ها',
-    'searchMethod': 'از جستجو یا موقعیت جغرافیایی استفاده کنید',
-    'done': 'پایان',
-    'groups': 'گروه‌های ما',
-    'openMeteo': 'داده‌ها از Open-Meteo (CC-BY 4.0)',
-    'hourlyVariables': 'متغیرهای ساعتی هواشناسی',
-    'dailyVariables': 'متغیرهای روزانه هواشناسی',
-    'largeElement': 'نمایش هواشناسی بزرگ',
-    'map': 'نقشه',
-    'clearCacheStore': 'پاک کردن حافظه نهان',
-    'deletedCacheStore': 'در حال پاک کردن حافظه نهان',
-    'deletedCacheStoreQuery':
-        'آیا مطمئن هستید که می‌خواهید حافظه نهان را پاک کنید؟',
-    'addWidget': 'افزودن ویجت',
-    'hideMap': 'پنهان کردن نقشه',
-  };
-}
diff --git a/lib/translation/fr_fr.dart b/lib/translation/fr_fr.dart
old mode 100755
new mode 100644
index 6a4536b..f35773e
--- a/lib/translation/fr_fr.dart
+++ b/lib/translation/fr_fr.dart
@@ -1,142 +1,126 @@
 class FrFr {
   Map<String, String> get messages => {
-    'start': 'Démarrer',
-    'description':
-        'Application météo avec un pronostic à jour pour chaque heure, jour et semaine pour n\'importe quel endroit.',
-    'name': 'Météo',
-    'name2': 'Design pratique',
-    'name3': 'Nous contacter',
-    'description2':
-        'Toute la navigation est conçue pour interagir avec l\'application de la manière la plus pratique et la plus rapide possible.',
-    'description3':
-        'Si vous rencontrez des problèmes, veuillez nous contacter par e-mail ou dans les avis de l\'application.',
-    'next': 'Suivant',
-    'search': 'Rechercher...',
-    'loading': 'Chargement...',
-    'searchCity': 'Trouver votre ville',
-    'humidity': 'Humidité',
-    'wind': 'Vent',
-    'visibility': 'Visibilité',
-    'feels': 'Ressenti',
-    'evaporation': 'Evaporation',
-    'precipitation': 'Précipitation',
-    'direction': 'Direction',
-    'pressure': 'Pression',
-    'rain': 'Pluie',
-    'clear_sky': 'Ciel dégagé',
-    'cloudy': 'Nuageux',
-    'overcast': 'Couvert',
-    'fog': 'Brouillard',
-    'drizzle': 'Bruine',
-    'drizzling_rain': 'Brouillard givrant',
-    'freezing_rain': 'Pluie verglaçante',
-    'heavy_rains': 'Averses de pluie',
-    'snow': 'Neige',
-    'thunderstorm': 'Orage',
-    'kph': 'km/h',
-    'mph': 'mph',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'mi': 'mi',
-    'km': 'km',
-    'inch': 'inch',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'Par.',
-    'no_inter': 'Pas de réseau',
-    'on_inter':
-        'Connectez-vous à internet pour obtenir des données météorologiques.',
-    'location': 'Localisation',
-    'no_location':
-        'Activez le service de localisation pour obtenir les données météorologiques de l\'endroit actuel.',
-    'theme': 'Thème',
-    'low': 'Bas',
-    'high': 'Haut',
-    'normal': 'Normal',
-    'lat': 'Latitude',
-    'lon': 'Longitude',
-    'create': 'Créer',
-    'city': 'Ville',
-    'district': 'District',
-    'noWeatherCard': 'Ajouter une ville',
-    'deletedCardWeather': 'Supprimer une ville',
-    'deletedCardWeatherQuery': 'Êtes-vous sûr de vouloir supprimer la ville ?',
-    'delete': 'Supprimer',
-    'cancel': 'Annuler',
-    'time': 'Heure locale',
-    'validateName': 'Veuillez saisir le nom',
-    'measurements': 'Système de mesures',
-    'degrees': 'Degrés',
-    'celsius': 'Celsius',
-    'fahrenheit': 'Fahrenheit',
-    'imperial': 'Imperial',
-    'metric': 'Métrique',
-    'validateValue': 'Veuillez saisir une valeur',
-    'validateNumber': 'Veuillez saisir un numéro valide',
-    'validate90': 'La valeur doit être comprise entre -90 et 90',
-    'validate180': 'La valeur doit être comprise entre -180 et 180',
-    'notifications': 'Notifications',
-    'sunrise': 'Lever du soleil',
-    'sunset': 'Coucher du soleil',
-    'timeformat': 'Format horaire',
-    '12': '12 heures',
-    '24': '24 heures',
-    'cloudcover': 'Сouverture nuageuse',
-    'uvIndex': 'UV-indice',
-    'materialColor': 'Couleurs Dynamiques',
-    'uvLow': 'Faible',
-    'uvAverage': 'Modéré',
-    'uvHigh': 'Élevé',
-    'uvVeryHigh': 'Très élevé',
-    'uvExtreme': 'Extrême',
-    'weatherMore': 'Prévisions météo pour 12 jours',
-    'windgusts': 'Rafale',
-    'north': 'Nord',
-    'northeast': 'Nord-Est',
-    'east': 'Est',
-    'southeast': 'Sud-Est',
-    'south': 'Sud',
-    'southwest': 'Sud-Ouest',
-    'west': 'Ouest',
-    'northwest': 'Nord-Ouest',
-    'project': 'Project on',
-    'version': 'Application version',
-    'precipitationProbability': 'Probabilité de précipitation',
-    'apparentTemperatureMin': 'Température apparente minimale',
-    'apparentTemperatureMax': 'Température apparente maximale',
-    'amoledTheme': 'AMOLED-thème',
-    'appearance': 'Apparence',
-    'functions': 'Fonctions',
-    'data': 'Données',
-    'language': 'Langue',
-    'timeRange': 'Fréquence (en heures)',
-    'timeStart': 'Heure de début',
-    'timeEnd': 'Heure de fin',
-    'support': 'Support',
-    'system': 'Système',
-    'dark': 'Sombre',
-    'light': 'Clair',
-    'license': 'Licences',
-    'widget': 'Widget',
-    'widgetBackground': 'Fond du widget',
-    'widgetText': 'Texte du widget',
-    'dewpoint': 'Point de rosée',
-    'shortwaveRadiation': 'Rayonnement à ondes courtes',
-    'roundDegree': 'Arrondir les degrés',
-    'settings_full': 'Paramètres',
-    'cities': 'Villes',
-    'searchMethod': 'Utilisez la recherche ou la géolocalisation',
-    'done': 'Terminé',
-    'groups': 'Nos groupes',
-    'openMeteo': 'Données de Open-Meteo (CC-BY 4.0)',
-    'hourlyVariables': 'Variables météorologiques horaires',
-    'dailyVariables': 'Variables météorologiques quotidiennes',
-    'largeElement': 'Affichage météo grand format',
-    'map': 'Carte',
-    'clearCacheStore': 'Effacer le cache',
-    'deletedCacheStore': 'Effacement du cache',
-    'deletedCacheStoreQuery': 'Êtes-vous sûr de vouloir effacer le cache?',
-    'addWidget': 'Ajouter un widget',
-    'hideMap': 'Cacher la carte',
-  };
+        'start': 'Démarrer',
+        'description':
+            'Application météo avec un pronostic à jour pour chaque heure, jour et semaine pour n\'importe quel endroit.',
+        'name': 'Météo',
+        'name2': 'Design pratique',
+        'name3': 'Nous contacter',
+        'description2':
+            'Toute la navigation est conçue pour interagir avec l\'application de la manière la plus pratique et la plus rapide possible.',
+        'description3':
+            'Si vous rencontrez des problèmes, veuillez nous contacter par e-mail ou dans les avis de l\'application.',
+        'next': 'Suivant',
+        'search': 'Rechercher...',
+        'loading': 'Chargement...',
+        'searchCity': 'Trouver votre ville',
+        'humidity': 'Humidité',
+        'wind': 'Vent',
+        'visibility': 'Visibilité',
+        'feels': 'Ressenti',
+        'evaporation': 'Evaporation',
+        'precipitation': 'Précipitation',
+        'direction': 'Direction',
+        'pressure': 'Pression',
+        'rain': 'Pluie',
+        'clear_sky': 'Ciel dégagé',
+        'cloudy': 'Nuageux',
+        'overcast': 'Couvert',
+        'fog': 'Brouillard',
+        'drizzle': 'Bruine',
+        'drizzling_rain': 'Brouillard givrant',
+        'freezing_rain': 'Pluie verglaçante',
+        'heavy_rains': 'Averses de pluie',
+        'snow': 'Neige',
+        'thunderstorm': 'Orage',
+        'kph': 'km/h',
+        'mph': 'mph',
+        'mi': 'mi',
+        'km': 'km',
+        'inch': 'inch',
+        'mm': 'mm',
+        'hPa': 'hPa',
+        'settings': 'Par.',
+        'no_inter': 'Pas de réseau',
+        'on_inter':
+            'Connectez-vous à internet pour obtenir des données météorologiques.',
+        'location': 'Localisation',
+        'no_location':
+            'Activez le service de localisation pour obtenir les données météorologiques de l\'endroit actuel.',
+        'theme': 'Thème',
+        'low': 'Bas',
+        'high': 'Haut',
+        'normal': 'Normal',
+        'lat': 'Latitude',
+        'lon': 'Longitude',
+        'create': 'Créer',
+        'city': 'Ville',
+        'district': 'District',
+        'noWeatherCard': 'Ajouter une ville',
+        'deletedCardWeather': 'Supprimer une ville',
+        'deletedCardWeatherQuery':
+            'Êtes-vous sûr de vouloir supprimer la ville ?',
+        'delete': 'Supprimer',
+        'cancel': 'Annuler',
+        'time': 'Heure locale',
+        'validateName': 'Veuillez saisir le nom',
+        'measurements': 'Système de mesures',
+        'degrees': 'Degrés',
+        'celsius': 'Celsius',
+        'fahrenheit': 'Fahrenheit',
+        'imperial': 'Imperial',
+        'metric': 'Métrique',
+        'validateValue': 'Veuillez saisir une valeur',
+        'validateNumber': 'Veuillez saisir un numéro valide',
+        'validate90': 'La valeur doit être comprise entre -90 et 90',
+        'validate180': 'La valeur doit être comprise entre -180 et 180',
+        'notifications': 'Notifications',
+        'sunrise': 'Lever du soleil',
+        'sunset': 'Coucher du soleil',
+        'timeformat': 'Format horaire',
+        '12': '12 heures',
+        '24': '24 heures',
+        'cloudcover': 'Сouverture nuageuse',
+        'uvIndex': 'UV-indice',
+        'materialColor': 'Couleurs Dynamiques',
+        'uvLow': 'Faible',
+        'uvAverage': 'Modéré',
+        'uvHigh': 'Élevé',
+        'uvVeryHigh': 'Très élevé',
+        'uvExtreme': 'Extrême',
+        'weatherMore': 'Prévisions météo pour 12 jours',
+        'windgusts': 'Rafale',
+        'north': 'Nord',
+        'northeast': 'Nord-Est',
+        'east': 'Est',
+        'southeast': 'Sud-Est',
+        'south': 'Sud',
+        'southwest': 'Sud-Ouest',
+        'west': 'Ouest',
+        'northwest': 'Nord-Ouest',
+        'project': 'Project on',
+        'version': 'Application version',
+        'precipitationProbability': 'Probabilité de précipitation',
+        'apparentTemperatureMin': 'Température apparente minimale',
+        'apparentTemperatureMax': 'Température apparente maximale',
+        'amoledTheme': 'AMOLED-thème',
+        'appearance': 'Apparence',
+        'functions': 'Fonctions',
+        'data': 'Données',
+        'language': 'Langue',
+        'timeRange': 'Fréquence (en heures)',
+        'timeStart': 'Heure de début',
+        'timeEnd': 'Heure de fin',
+        'support': 'Support',
+        'system': 'Système',
+        'dark': 'Sombre',
+        'light': 'Clair',
+        'license': 'Licences',
+        'widget': 'Widget',
+        'widgetBackground': 'Fond du widget',
+        'widgetText': 'Texte du widget',
+        'dewpoint': 'Point de rosée',
+        'shortwaveRadiation': 'Rayonnement à ondes courtes',
+        'roundDegree': 'Arrondir les degrés',
+      };
 }
diff --git a/lib/translation/ga_ie.dart b/lib/translation/ga_ie.dart
old mode 100755
new mode 100644
index c9cd726..36258c9
--- a/lib/translation/ga_ie.dart
+++ b/lib/translation/ga_ie.dart
@@ -1,144 +1,126 @@
 class GaIe {
   Map<String, String> get messages => {
-    'start': 'Tosaigh',
-    'description':
-        'Aip aimsire le réamhaisnéis láithreach do gach uair, lá, agus seachtain do gach áit.',
-    'name': 'Aimsir',
-    'name2': 'Dearadh Éasca',
-    'name3': 'Déan teagmháil linn',
-    'description2':
-        'Tá gach treoir déanta chun éascaíocht agus gniomhachtú a dhéanamh leis an aip chomh héasca agus chomh tapa agus is féidir.',
-    'description3':
-        'Má tá fadhb ar bith agat, déan teagmháil linn trí Ríomhphost nó trí phlé an aip.',
-    'next': 'Ar Aghaidh',
-    'search': 'Cuardaigh...',
-    'loading': 'Ag Lódáil...',
-    'searchCity': 'Aimsigh do chathair',
-    'humidity': 'Measarthaíocht Géimneachta',
-    'wind': 'Gaoth',
-    'visibility': 'Radharc',
-    'feels': 'Brath',
-    'evaporation': 'Buirtheasaiteacht',
-    'precipitation': 'Tuirlingt',
-    'direction': 'Treorach',
-    'pressure': 'Brú',
-    'rain': 'Fearthainn',
-    'clear_sky': 'Spéir Ghlán',
-    'cloudy': 'Scamallach',
-    'overcast': 'Tromscamallach',
-    'fog': 'Ceo',
-    'drizzle': 'Táilliú',
-    'drizzling_rain': 'Táilliú Ag Fuarthainn',
-    'freezing_rain': 'Tuirlingt Fuara',
-    'heavy_rains': 'Scáil fearthainne',
-    'snow': 'Sneachta',
-    'thunderstorm': 'Tornaí',
-    'kph': 'km/u',
-    'mph': 'mi/u',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'mi': 'míle',
-    'km': 'km',
-    'inch': 'úinse',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'Socrú',
-    'no_inter': 'Gan Idirlíon',
-    'on_inter': 'Cuir ar Idirlíon chun sonraí aeráide a fháil.',
-    'location': 'Áit',
-    'no_location':
-        'Cumasaigh seirbhís na háite chun sonraí aimsire a fháil don áit reatha.',
-    'theme': 'Téama',
-    'low': 'Íseal',
-    'high': 'Ard',
-    'normal': 'Gnáth',
-    'lat': 'Éilt',
-    'lon': 'Long',
-    'create': 'Cruthaigh',
-    'city': 'Cathair',
-    'district': 'Ceantar',
-    'noWeatherCard': 'Cuir cathair leis',
-    'deletedCardWeather': 'Áireamh cathair á scriosadh',
-    'deletedCardWeatherQuery':
-        'An bhfuil tú cinnte go bhfuil tú ag iarraidh an chathair a scriosadh?',
-    'delete': 'Scrios',
-    'cancel': 'Cealaigh',
-    'time': 'Am sa chathair',
-    'validateName': 'Cuir ainm isteach, le do thoil',
-    'measurements': 'Córas Mheáchain',
-    'degrees': 'Céim',
-    'celsius': 'Céim Celsius',
-    'fahrenheit': 'Céim Fahrenheit',
-    'imperial': 'Impireach',
-    'metric': 'Mheitric',
-    'validateValue': 'Cuir luach isteach, le do thoil',
-    'validateNumber': 'Cuir uimhir bailí isteach, le do thoil',
-    'validate90': 'Caithfidh luach a bheith idir -90 agus 90',
-    'validate180': 'Caithfidh luach a bheith idir -180 agus 180',
-    'notifications': 'Fógraí',
-    'sunrise': 'Éirí na Gréine',
-    'sunset': 'Dul faoi na Gréine',
-    'timeformat': 'Formáid Am',
-    '12': '12-uair',
-    '24': '24-uair',
-    'cloudcover': 'Clúdach Scamall',
-    'uvIndex': 'Indéacs UV',
-    'materialColor': 'Dathanna Dinimiciúla',
-    'uvLow': 'Íseal',
-    'uvAverage': 'Meánach',
-    'uvHigh': 'Ard',
-    'uvVeryHigh': 'An-Árd',
-    'uvExtreme': 'Éachtach',
-    'weatherMore': 'Réamhaisnéis Aimsire 12 lá',
-    'windgusts': 'Tonna Gaoithe',
-    'north': 'Tuaisceart',
-    'northeast': 'Tuaisceart-Thoir',
-    'east': 'Thoir',
-    'southeast': 'Deisceart-Thoir',
-    'south': 'Deisceart',
-    'southwest': 'Deisceart-Iarthar',
-    'west': 'Iarthar',
-    'northwest': 'Tuaisceart-Iarthar',
-    'project': 'Tionscadal ar siúl',
-    'version': 'Leagan Feidhmchláir',
-    'precipitationProbability': 'Ionsaíocht Tuirlingt',
-    'apparentTemperatureMin': 'Teocht Shamhlaithe Ísle',
-    'apparentTemperatureMax': 'Teocht Shamhlaithe Uachtarach',
-    'amoledTheme': 'Téama AMOLED',
-    'appearance': 'Amharc',
-    'functions': 'Feidhmeanna',
-    'data': 'Sonraí',
-    'language': 'Teanga',
-    'timeRange': 'Raon Am (i n-uaireanta)',
-    'timeStart': 'Tús Am',
-    'timeEnd': 'Críoch Am',
-    'support': 'Tacaíocht',
-    'system': 'Córas',
-    'dark': 'Téama Dorcha',
-    'light': 'Téama Soiléir',
-    'license': 'Ceadúnas',
-    'widget': 'Rón',
-    'widgetBackground': 'Cúlra an Rón',
-    'widgetText': 'Téacs an Rón',
-    'dewpoint': 'Poinnte Dé',
-    'shortwaveRadiation': 'Fuinneamh Ghearrfhad',
-    'W/m2': 'W/m2',
-    'roundDegree': 'Timpeall na Gráid',
-    'settings_full': 'Socruithe',
-    'cities': 'Cathracha',
-    'searchMethod': 'Úsáid ceangal nó geolocáid',
-    'done': 'Críochnaithe',
-    'groups': 'Ár ngrúpaí',
-    'openMeteo': 'Sonraí ó Open-Meteo (CC-BY 4.0)',
-    'hourlyVariables': 'Athrógacha aimsire uaireanta',
-    'dailyVariables': 'Athrógacha aimsire laethúla',
-    'largeElement': 'Taispeáint mór na haimsire',
-    'map': 'Léarscáil',
-    'clearCacheStore': 'Glan taisce',
-    'deletedCacheStore': 'Ag glanadh an taisce',
-    'deletedCacheStoreQuery':
-        'An bhfuil tú cinnte gur mian leat an taisce a ghlanadh?',
-    'addWidget': 'Cuir giuirléid leis',
-    'hideMap': 'Folaigh léarscáil',
-  };
+        'start': 'Tosaigh',
+        'description':
+            'Aip aimsire le réamhaisnéis láithreach do gach uair, lá, agus seachtain do gach áit.',
+        'name': 'Aimsir',
+        'name2': 'Dearadh Éasca',
+        'name3': 'Déan teagmháil linn',
+        'description2':
+            'Tá gach treoir déanta chun éascaíocht agus gniomhachtú a dhéanamh leis an aip chomh héasca agus chomh tapa agus is féidir.',
+        'description3':
+            'Má tá fadhb ar bith agat, déan teagmháil linn trí Ríomhphost nó trí phlé an aip.',
+        'next': 'Ar Aghaidh',
+        'search': 'Cuardaigh...',
+        'loading': 'Ag Lódáil...',
+        'searchCity': 'Aimsigh do chathair',
+        'humidity': 'Measarthaíocht Géimneachta',
+        'wind': 'Gaoth',
+        'visibility': 'Radharc',
+        'feels': 'Brath',
+        'evaporation': 'Buirtheasaiteacht',
+        'precipitation': 'Tuirlingt',
+        'direction': 'Treorach',
+        'pressure': 'Brú',
+        'rain': 'Fearthainn',
+        'clear_sky': 'Spéir Ghlán',
+        'cloudy': 'Scamallach',
+        'overcast': 'Tromscamallach',
+        'fog': 'Ceo',
+        'drizzle': 'Táilliú',
+        'drizzling_rain': 'Táilliú Ag Fuarthainn',
+        'freezing_rain': 'Tuirlingt Fuara',
+        'heavy_rains': 'Scáil fearthainne',
+        'snow': 'Sneachta',
+        'thunderstorm': 'Tornaí',
+        'kph': 'km/u',
+        'mph': 'mi/u',
+        'mi': 'míle',
+        'km': 'km',
+        'inch': 'úinse',
+        'mm': 'mm',
+        'hPa': 'hPa',
+        'settings': 'Socrú',
+        'no_inter': 'Gan Idirlíon',
+        'on_inter': 'Cuir ar Idirlíon chun sonraí aeráide a fháil.',
+        'location': 'Áit',
+        'no_location':
+            'Cumasaigh seirbhís na háite chun sonraí aimsire a fháil don áit reatha.',
+        'theme': 'Téama',
+        'low': 'Íseal',
+        'high': 'Ard',
+        'normal': 'Gnáth',
+        'lat': 'Éilt',
+        'lon': 'Long',
+        'create': 'Cruthaigh',
+        'city': 'Cathair',
+        'district': 'Ceantar',
+        'noWeatherCard': 'Cuir cathair leis',
+        'deletedCardWeather': 'Áireamh cathair á scriosadh',
+        'deletedCardWeatherQuery':
+            'An bhfuil tú cinnte go bhfuil tú ag iarraidh an chathair a scriosadh?',
+        'delete': 'Scrios',
+        'cancel': 'Cealaigh',
+        'time': 'Am sa chathair',
+        'validateName': 'Cuir ainm isteach, le do thoil',
+        'measurements': 'Córas Mheáchain',
+        'degrees': 'Céim',
+        'celsius': 'Céim Celsius',
+        'fahrenheit': 'Céim Fahrenheit',
+        'imperial': 'Impireach',
+        'metric': 'Mheitric',
+        'validateValue': 'Cuir luach isteach, le do thoil',
+        'validateNumber': 'Cuir uimhir bailí isteach, le do thoil',
+        'validate90': 'Caithfidh luach a bheith idir -90 agus 90',
+        'validate180': 'Caithfidh luach a bheith idir -180 agus 180',
+        'notifications': 'Fógraí',
+        'sunrise': 'Éirí na Gréine',
+        'sunset': 'Dul faoi na Gréine',
+        'timeformat': 'Formáid Am',
+        '12': '12-uair',
+        '24': '24-uair',
+        'cloudcover': 'Clúdach Scamall',
+        'uvIndex': 'Indéacs UV',
+        'materialColor': 'Dathanna Dinimiciúla',
+        'uvLow': 'Íseal',
+        'uvAverage': 'Meánach',
+        'uvHigh': 'Ard',
+        'uvVeryHigh': 'An-Árd',
+        'uvExtreme': 'Éachtach',
+        'weatherMore': 'Réamhaisnéis Aimsire 12 lá',
+        'windgusts': 'Tonna Gaoithe',
+        'north': 'Tuaisceart',
+        'northeast': 'Tuaisceart-Thoir',
+        'east': 'Thoir',
+        'southeast': 'Deisceart-Thoir',
+        'south': 'Deisceart',
+        'southwest': 'Deisceart-Iarthar',
+        'west': 'Iarthar',
+        'northwest': 'Tuaisceart-Iarthar',
+        'project': 'Tionscadal ar siúl',
+        'version': 'Leagan Feidhmchláir',
+        'precipitationProbability': 'Ionsaíocht Tuirlingt',
+        'apparentTemperatureMin': 'Teocht Shamhlaithe Ísle',
+        'apparentTemperatureMax': 'Teocht Shamhlaithe Uachtarach',
+        'amoledTheme': 'Téama AMOLED',
+        'appearance': 'Amharc',
+        'functions': 'Feidhmeanna',
+        'data': 'Sonraí',
+        'language': 'Teanga',
+        'timeRange': 'Raon Am (i n-uaireanta)',
+        'timeStart': 'Tús Am',
+        'timeEnd': 'Críoch Am',
+        'support': 'Tacaíocht',
+        'system': 'Córas',
+        'dark': 'Téama Dorcha',
+        'light': 'Téama Soiléir',
+        'license': 'Ceadúnas',
+        'widget': 'Rón',
+        'widgetBackground': 'Cúlra an Rón',
+        'widgetText': 'Téacs an Rón',
+        'dewpoint': 'Poinnte Dé',
+        'shortwaveRadiation': 'Fuinneamh Ghearrfhad',
+        'W/m2': 'W/m2',
+        'roundDegree': 'Timpeall na Gráid',
+      };
 }
diff --git a/lib/translation/hi_in.dart b/lib/translation/hi_in.dart
old mode 100755
new mode 100644
index 10986d5..1a25f88
--- a/lib/translation/hi_in.dart
+++ b/lib/translation/hi_in.dart
@@ -1,140 +1,123 @@
 class HiIn {
   Map<String, String> get messages => {
-    'start': 'शुरू करें',
-    'description':
-        'प्रति घंटे, दिन और सप्ताह के लिए किसी भी स्थान के लिए आधुनिक पूर्वानुमान के साथ मौसम एप्लिकेशन।',
-    'name': 'मौसम',
-    'name2': 'आसान डिजाइन',
-    'name3': 'हमे संपर्क करें',
-    'description2':
-        'सभी नेविगेशन को इस प्रकार तैयार किया गया है ताकि आप एप्लिकेशन के साथ सर्वोत्तम रूप से और तेजी से संवाद कर सकें।',
-    'description3':
-        'यदि आपको कोई समस्या आती है, तो कृपया हमसे ईमेल या एप्लिकेशन समीक्षा के माध्यम से संपर्क करें।',
-    'next': 'आगे',
-    'search': 'खोजें...',
-    'loading': 'लोड हो रहा है...',
-    'searchCity': 'अपना शहर खोजें',
-    'humidity': 'नमी',
-    'wind': 'हवा',
-    'visibility': 'दृश्यता',
-    'feels': 'अनुभव',
-    'evaporation': 'वाष्पीकरण',
-    'precipitation': 'वर्षा',
-    'direction': 'दिशा',
-    'pressure': 'दबाव',
-    'rain': 'बारिश',
-    'clear_sky': 'साफ आकाश',
-    'cloudy': 'मेघपाली',
-    'overcast': 'बादलबस्ती',
-    'fog': 'कोहरा',
-    'drizzle': 'बूंदाबांदी',
-    'drizzling_rain': 'हिमवृष्टि',
-    'freezing_rain': 'हिमस्खलन',
-    'heavy_rains': 'बारिश की बौछारें',
-    'snow': 'बर्फबारी',
-    'thunderstorm': 'बिजली चमक',
-    'kph': 'किमी/घंटा',
-    'mph': 'मील/घंटा',
-    'm/s': 'मी/से',
-    'mmHg': 'मिमी एचजी',
-    'mi': 'मील',
-    'km': 'किमी',
-    'inch': 'इंच',
-    'mm': 'मिलीमीटर',
-    'hPa': 'हेक्टोपास्कल',
-    'settings': 'सेटिंग्स',
-    'no_inter': 'कोई इंटरनेट नहीं है',
-    'on_inter': 'मौसमी आंकड़े प्राप्त करने के लिए इंटरनेट को चालू करें।',
-    'location': 'स्थान',
-    'no_location': 'वर्तमान स्थान के लिए मौसम डेटा प्राप्त करने के',
-    'theme': 'थीम',
-    'low': 'निम्न',
-    'high': 'उच्च',
-    'normal': 'सामान्य',
-    'lat': 'अक्षांश',
-    'lon': 'देशांतर',
-    'create': 'बनाएँ',
-    'city': 'शहर',
-    'district': 'जिला',
-    'noWeatherCard': 'शहर जोड़ें',
-    'deletedCardWeather': 'शहर हटाना',
-    'deletedCardWeatherQuery': 'क्या आप वाकई शहर को हटाना चाहते हैं?',
-    'delete': 'हटाएँ',
-    'cancel': 'रद्द करें',
-    'time': 'शहर में समय',
-    'validateName': 'कृपया नाम दर्ज करें',
-    'measurements': 'मापन प्रणाली',
-    'degrees': 'डिग्री',
-    'celsius': 'सेल्सियस',
-    'fahrenheit': 'फ़ारेनहाइट',
-    'imperial': 'इम्पीरियल',
-    'metric': 'मीट्रिक',
-    'validateValue': 'कृपया मान दर्ज करें',
-    'validateNumber': 'कृपया एक मान्य संख्या दर्ज करें',
-    'validate90': 'मान -९० और ९० के बीच होना चाहिए',
-    'validate180': 'मान -१८० और १८० के बीच होना चाहिए',
-    'notifications': 'सूचनाएं',
-    'sunrise': 'सूर्योदय',
-    'sunset': 'सूर्यास्त',
-    'timeformat': 'समय प्रारूप',
-    '12': '१२ घंटा',
-    '24': '२४ घंटा',
-    'cloudcover': 'बादलों का कवर',
-    'uvIndex': 'यूवी-सूचकांक',
-    'materialColor': 'गतिशील रंग',
-    'uvLow': 'कम',
-    'uvAverage': 'माध्यम',
-    'uvHigh': 'उच्च',
-    'uvVeryHigh': 'बहुत उच्च',
-    'uvExtreme': 'अत्यधिक',
-    'weatherMore': '१२ - दिवसीय मौसम पूर',
-    'windgusts': 'गुस्त',
-    'north': 'उत्तर',
-    'northeast': 'उत्तर-पूर्व',
-    'east': 'पूर्व',
-    'southeast': 'दक्षिण-पूर्व',
-    'south': 'दक्षिण',
-    'southwest': 'दक्षिण-पश्चिम',
-    'west': 'पश्चिम',
-    'northwest': 'उत्तर-पश्चिम',
-    'project': 'परियोजना पर',
-    'version': 'एप्लिकेशन संस्करण',
-    'precipitationProbability': 'वर्षा संभावना',
-    'apparentTemperatureMin': 'न्यूनतम प्रतीत तापमान',
-    'apparentTemperatureMax': 'अधिकतम प्रतीत तापमान',
-    'amoledTheme': 'AMOLED थीम',
-    'appearance': 'दिखावट',
-    'functions': 'कार्य',
-    'data': 'डेटा',
-    'language': 'भाषा',
-    'timeRange': 'अवधि (घंटों में)',
-    'timeStart': 'प्रारंभ समय',
-    'timeEnd': 'समाप्ति समय',
-    'support': 'समर्थन',
-    'system': 'सिस्टम',
-    'dark': 'डार्क',
-    'light': 'लाइट',
-    'license': 'लाइसेंस',
-    'widget': 'विजेट',
-    'widgetBackground': 'विजेट कि पृष्ठभूमि',
-    'widgetText': 'विजेट पाठ',
-    'dewpoint': 'बर्फ़ के बिंदु',
-    'shortwaveRadiation': 'शॉर्टवेव विकिरण',
-    'roundDegree': 'डिग्री गोली मारें',
-    'settings_full': 'सेटिंग्स',
-    'cities': 'शहर',
-    'searchMethod': 'खोज या स्थानगति का उपयोग करें',
-    'done': 'किया',
-    'groups': 'हमारे समूह',
-    'openMeteo': 'Open-Meteo से डेटा (CC-BY 4.0)',
-    'hourlyVariables': 'घंटेवार मौसम चर',
-    'dailyVariables': 'दैनिक मौसम चर',
-    'largeElement': 'बड़े मौसम का प्रदर्शन',
-    'map': 'मानचित्र',
-    'clearCacheStore': 'कैश साफ़ करें',
-    'deletedCacheStore': 'कैश साफ़ हो रहा है',
-    'deletedCacheStoreQuery': 'क्या आप वाकई कैश साफ़ करना चाहते हैं?',
-    'addWidget': 'विजेट जोड़ें',
-    'hideMap': 'मानचित्र छिपाएँ',
-  };
+        'start': 'शुरू करें',
+        'description':
+            'प्रति घंटे, दिन और सप्ताह के लिए किसी भी स्थान के लिए आधुनिक पूर्वानुमान के साथ मौसम एप्लिकेशन।',
+        'name': 'मौसम',
+        'name2': 'आसान डिजाइन',
+        'name3': 'हमसे संपर्क करें',
+        'description2':
+            'सभी नेविगेशन को इस प्रकार तैयार किया गया है ताकि आप एप्लिकेशन के साथ सर्वोत्तम रूप से और तेजी से संवाद कर सकें।',
+        'description3':
+            'यदि आपको कोई समस्या आती है, तो कृपया हमसे ईमेल या एप्लिकेशन समीक्षा के माध्यम से संपर्क करें।',
+        'next': 'आगे',
+        'search': 'खोजें...',
+        'loading': 'लोड हो रहा है...',
+        'searchCity': 'अपना शहर खोजें',
+        'humidity': 'नमी',
+        'wind': 'हवा',
+        'visibility': 'दृश्यता',
+        'feels': 'अनुभव',
+        'evaporation': 'वाष्पीकरण',
+        'precipitation': 'वर्षा',
+        'direction': 'दिशा',
+        'pressure': 'दबाव',
+        'rain': 'बारिश',
+        'clear_sky': 'साफ आकाश',
+        'cloudy': 'मेघपाली',
+        'overcast': 'बादलबस्ती',
+        'fog': 'कोहरा',
+        'drizzle': 'बूंदाबांदी',
+        'drizzling_rain': 'हिमवृष्टि',
+        'freezing_rain': 'हिमस्खलन',
+        'heavy_rains': 'बारिश की बौछारें',
+        'snow': 'बर्फबारी',
+        'thunderstorm': 'बिजली चमक',
+        'kph': 'किमी/घंटा',
+        'mph': 'मील/घंटा',
+        'mi': 'मील',
+        'km': 'किमी',
+        'inch': 'इंच',
+        'mm': 'मिलीमीटर',
+        'hPa': 'हेक्टोपास्कल',
+        'settings': 'सेटिंग्स',
+        'no_inter': 'कोई इंटरनेट नहीं है',
+        'on_inter': 'मौसमी आंकड़े प्राप्त करने के लिए इंटरनेट को चालू करें।',
+        'location': 'स्थान',
+        'no_location': 'वर्तमान स्थान के लिए मौसम डेटा प्राप्त करने के',
+        'theme': 'थीम',
+        'low': 'निम्न',
+        'high': 'उच्च',
+        'normal': 'सामान्य',
+        'lat': 'अक्षांश',
+        'lon': 'देशांतर',
+        'create': 'बनाएँ',
+        'city': 'शहर',
+        'district': 'जिला',
+        'noWeatherCard': 'शहर जोड़ें',
+        'deletedCardWeather': 'शहर हटाना',
+        'deletedCardWeatherQuery': 'क्या आप वाकई शहर को हटाना चाहते हैं?',
+        'delete': 'हटाएँ',
+        'cancel': 'रद्द करें',
+        'time': 'शहर में समय',
+        'validateName': 'कृपया नाम दर्ज करें',
+        'measurements': 'मापन प्रणाली',
+        'degrees': 'डिग्री',
+        'celsius': 'सेल्सियस',
+        'fahrenheit': 'फ़ारेनहाइट',
+        'imperial': 'इम्पीरियल',
+        'metric': 'मीट्रिक',
+        'validateValue': 'कृपया मान दर्ज करें',
+        'validateNumber': 'कृपया एक मान्य संख्या दर्ज करें',
+        'validate90': 'मान -90 और 90 के बीच होना चाहिए',
+        'validate180': 'मान -180 और 180 के बीच होना चाहिए',
+        'notifications': 'सूचनाएं',
+        'sunrise': 'सूर्योदय',
+        'sunset': 'सूर्यास्त',
+        'timeformat': 'समय प्रारूप',
+        '12': '12 घंटा',
+        '24': '24 घंटा',
+        'cloudcover': 'बादलों का कवर',
+        'uvIndex': 'यूवी-सूचकांक',
+        'materialColor': 'गतिशील रंग',
+        'uvLow': 'कम',
+        'uvAverage': 'माध्यम',
+        'uvHigh': 'उच्च',
+        'uvVeryHigh': 'बहुत उच्च',
+        'uvExtreme': 'अत्यधिक',
+        'weatherMore': '12-दिवसीय मौसम पूर',
+        'windgusts': 'गुस्त',
+        'north': 'उत्तर',
+        'northeast': 'उत्तर-पूर्व',
+        'east': 'पूर्व',
+        'southeast': 'दक्षिण-पूर्व',
+        'south': 'दक्षिण',
+        'southwest': 'दक्षिण-पश्चिम',
+        'west': 'पश्चिम',
+        'northwest': 'उत्तर-पश्चिम',
+        'project': 'परियोजना पर',
+        'version': 'एप्लिकेशन संस्करण',
+        'precipitationProbability': 'वर्षा संभावना',
+        'apparentTemperatureMin': 'न्यूनतम प्रतीत तापमान',
+        'apparentTemperatureMax': 'अधिकतम प्रतीत तापमान',
+        'amoledTheme': 'AMOLED थीम',
+        'appearance': 'दिखावट',
+        'functions': 'कार्य',
+        'data': 'डेटा',
+        'language': 'भाषा',
+        'timeRange': 'अवधि (घंटों में)',
+        'timeStart': 'प्रारंभ समय',
+        'timeEnd': 'समाप्ति समय',
+        'support': 'समर्थन',
+        'system': 'सिस्टम',
+        'dark': 'डार्क',
+        'light': 'लाइट',
+        'license': 'लाइसेंस',
+        'widget': 'विजेट',
+        'widgetBackground': 'विजेट का पृष्ठभूमि',
+        'widgetText': 'विजेट पाठ',
+        'dewpoint': 'बर्फ़ के बिंदु',
+        'shortwaveRadiation': 'शॉर्टवेव विकिरण',
+        'roundDegree': 'डिग्री गोली मारें',
+      };
 }
diff --git a/lib/translation/hu_hu.dart b/lib/translation/hu_hu.dart
old mode 100755
new mode 100644
index 43f983a..15268ee
--- a/lib/translation/hu_hu.dart
+++ b/lib/translation/hu_hu.dart
@@ -1,142 +1,126 @@
 class HuHu {
   Map<String, String> get messages => {
-    'start': 'Kezdés',
-    'description':
-        'Időjárás alkalmazás a friss óránkénti, napi és heti előrejelzéssel bármely helyszínre.',
-    'name': 'Időjárás',
-    'name2': 'Kényelmes tervezés',
-    'name3': 'Kapcsolatfelvétel velünk',
-    'description2':
-        'Az összes navigáció úgy van kialakítva, hogy maximálisan kényelmes és gyors legyen az alkalmazással való interakció.',
-    'description3':
-        'Ha bármilyen problémája adódik, kérjük, lépjen kapcsolatba velünk e-mailben vagy az alkalmazás értékeléseiben.',
-    'next': 'Tovább',
-    'search': 'Keresés...',
-    'loading': 'Betöltés...',
-    'searchCity': 'Keresse meg a városát',
-    'humidity': 'Páratartalom',
-    'wind': 'Szél',
-    'visibility': 'Láthatóság',
-    'feels': 'Hőérzet',
-    'evaporation': 'Párolgás',
-    'precipitation': 'Csapadék',
-    'direction': 'Irány',
-    'pressure': 'Nyomás',
-    'rain': 'Eső',
-    'clear_sky': 'Tiszta ég',
-    'cloudy': 'Felhős',
-    'overcast': 'Borult',
-    'fog': 'Köd',
-    'drizzle': 'Szitálás',
-    'drizzling_rain': 'Fagyos szitálás',
-    'freezing_rain': 'Fagyos eső',
-    'heavy_rains': 'Zivataros záporok',
-    'snow': 'Hó',
-    'thunderstorm': 'Zivatar',
-    'kph': 'km/óra',
-    'mph': 'mph',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'mi': 'mérföld',
-    'km': 'km',
-    'inch': 'hüvelyk',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'Beállítások',
-    'no_inter': 'Nincs internet',
-    'on_inter': 'Kapcsolja be az internetet az időjárási adatok lekéréséhez.',
-    'location': 'Hely',
-    'no_location':
-        'Engedélyezze a helyszolgáltatást az aktuális hely időjárásadatainak megszerzéséhez.',
-    'theme': 'Téma',
-    'low': 'Alacsony',
-    'high': 'Magas',
-    'normal': 'Normál',
-    'lat': 'Szélesség',
-    'lon': 'Hosszúság',
-    'create': 'Létrehozás',
-    'city': 'Város',
-    'district': 'Kerület',
-    'noWeatherCard': 'Adjon hozzá egy várost',
-    'deletedCardWeather': 'Város törlése',
-    'deletedCardWeatherQuery': 'Biztosan törölni szeretné a várost?',
-    'delete': 'Törlés',
-    'cancel': 'Mégse',
-    'time': 'Idő a városban',
-    'validateName': 'Kérjük, adja meg a nevet',
-    'measurements': 'Mérési rendszer',
-    'degrees': 'Fok',
-    'celsius': 'Celsius',
-    'fahrenheit': 'Fahrenheit',
-    'imperial': 'Angol mértékegység',
-    'metric': 'Metrikus mértékegység',
-    'validateValue': 'Kérjük, adjon meg egy értéket',
-    'validateNumber': 'Kérjük, adjon meg érvényes számot',
-    'validate90': 'Az érték -90 és 90 közötti kell legyen',
-    'validate180': 'Az érték -180 és 180 közötti kell legyen',
-    'notifications': 'Értesítések',
-    'sunrise': 'Napkelte',
-    'sunset': 'Napnyugta',
-    'timeformat': 'Időformátum',
-    '12': '12 órás',
-    '24': '24 órás',
-    'cloudcover': 'Felhőzet',
-    'uvIndex': 'UV-index',
-    'materialColor': 'Dinamikus színek',
-    'uvLow': 'Alacsony',
-    'uvAverage': 'Mérsékelt',
-    'uvHigh': 'Magas',
-    'uvVeryHigh': 'Nagyon magas',
-    'uvExtreme': 'Extrém',
-    'weatherMore': '12 napos időjárás előrejelzés',
-    'windgusts': 'Szélrohamok',
-    'north': 'Észak',
-    'northeast': 'Északkelet',
-    'east': 'Kelet',
-    'southeast': 'Délkelet',
-    'south': 'Dél',
-    'southwest': 'Délkelet',
-    'west': 'Nyugat',
-    'northwest': 'Északnyugat',
-    'project': 'Projekt',
-    'version': 'Alkalmazás verzió',
-    'precipitationProbability': 'Csapadék valószínűsége',
-    'apparentTemperatureMin': 'Minimális látszólagos hőmérséklet',
-    'apparentTemperatureMax': 'Maximális látszólagos hőmérséklet',
-    'amoledTheme': 'AMOLED téma',
-    'appearance': 'Megjelenés',
-    'functions': 'Funkciók',
-    'data': 'Adatok',
-    'language': 'Nyelv',
-    'timeRange': 'Gyakoriság (órákban)',
-    'timeStart': 'Kezdési idő',
-    'timeEnd': 'Befejezési idő',
-    'support': 'Támogatás',
-    'system': 'Rendszer',
-    'dark': 'Sötét',
-    'light': 'Világos',
-    'license': 'Licenc',
-    'widget': 'Widget',
-    'widgetBackground': 'Widget háttér',
-    'widgetText': 'Widget szöveg',
-    'dewpoint': 'Harmatpont',
-    'shortwaveRadiation': 'Rövidhullámú sugárzás',
-    'W/m2': 'W/m2',
-    'roundDegree': 'Fokok Kerekítése',
-    'settings_full': 'Beállítások',
-    'cities': 'Városok',
-    'searchMethod': 'Használja a keresést vagy a földrajzi helyet',
-    'done': 'Kész',
-    'groups': 'Csoportjaink',
-    'openMeteo': 'Adatok az Open-Meteo-tól (CC-BY 4.0)',
-    'hourlyVariables': 'Óránkénti időjárási változók',
-    'dailyVariables': 'Napi időjárási változók',
-    'largeElement': 'Nagy méretű időjárás megjelenítése',
-    'map': 'Térkép',
-    'clearCacheStore': 'Gyorsítótár törlése',
-    'deletedCacheStore': 'Gyorsítótár törlése folyamatban',
-    'deletedCacheStoreQuery': 'Biztosan törölni szeretné a gyorsítótárat?',
-    'addWidget': 'Widget hozzáadása',
-    'hideMap': 'Térkép elrejtése',
-  };
+        'start': 'Kezdés',
+        'description':
+            'Időjárás alkalmazás a friss óránkénti, napi és heti előrejelzéssel bármely helyszínre.',
+        'name': 'Időjárás',
+        'name2': 'Kényelmes tervezés',
+        'name3': 'Kapcsolatfelvétel velünk',
+        'description2':
+            'Az összes navigáció úgy van kialakítva, hogy maximálisan kényelmes és gyors legyen az alkalmazással való interakció.',
+        'description3':
+            'Ha bármilyen problémája adódik, kérjük, lépjen kapcsolatba velünk e-mailben vagy az alkalmazás értékeléseiben.',
+        'next': 'Tovább',
+        'search': 'Keresés...',
+        'loading': 'Betöltés...',
+        'searchCity': 'Keresse meg a városát',
+        'humidity': 'Páratartalom',
+        'wind': 'Szél',
+        'visibility': 'Láthatóság',
+        'feels': 'Hőérzet',
+        'evaporation': 'Párolgás',
+        'precipitation': 'Csapadék',
+        'direction': 'Irány',
+        'pressure': 'Nyomás',
+        'rain': 'Eső',
+        'clear_sky': 'Tiszta ég',
+        'cloudy': 'Felhős',
+        'overcast': 'Borult',
+        'fog': 'Köd',
+        'drizzle': 'Szitálás',
+        'drizzling_rain': 'Fagyos szitálás',
+        'freezing_rain': 'Fagyos eső',
+        'heavy_rains': 'Zivataros záporok',
+        'snow': 'Hó',
+        'thunderstorm': 'Zivatar',
+        'kph': 'km/óra',
+        'mph': 'mph',
+        'mi': 'mérföld',
+        'km': 'km',
+        'inch': 'hüvelyk',
+        'mm': 'mm',
+        'hPa': 'hPa',
+        'settings': 'Beállítások',
+        'no_inter': 'Nincs internet',
+        'on_inter':
+            'Kapcsolja be az internetet az időjárási adatok lekéréséhez.',
+        'location': 'Hely',
+        'no_location':
+            'Engedélyezze a helyszolgáltatást az aktuális hely időjárásadatainak megszerzéséhez.',
+        'theme': 'Téma',
+        'low': 'Alacsony',
+        'high': 'Magas',
+        'normal': 'Normál',
+        'lat': 'Szélesség',
+        'lon': 'Hosszúság',
+        'create': 'Létrehozás',
+        'city': 'Város',
+        'district': 'Kerület',
+        'noWeatherCard': 'Adjon hozzá egy várost',
+        'deletedCardWeather': 'Város törlése',
+        'deletedCardWeatherQuery': 'Biztosan törölni szeretné a várost?',
+        'delete': 'Törlés',
+        'cancel': 'Mégse',
+        'time': 'Idő a városban',
+        'validateName': 'Kérjük, adja meg a nevet',
+        'measurements': 'Mérési rendszer',
+        'degrees': 'Fok',
+        'celsius': 'Celsius',
+        'fahrenheit': 'Fahrenheit',
+        'imperial': 'Angol mértékegység',
+        'metric': 'Metrikus mértékegység',
+        'validateValue': 'Kérjük, adjon meg egy értéket',
+        'validateNumber': 'Kérjük, adjon meg érvényes számot',
+        'validate90': 'Az érték -90 és 90 közötti kell legyen',
+        'validate180': 'Az érték -180 és 180 közötti kell legyen',
+        'notifications': 'Értesítések',
+        'sunrise': 'Napkelte',
+        'sunset': 'Napnyugta',
+        'timeformat': 'Időformátum',
+        '12': '12 órás',
+        '24': '24 órás',
+        'cloudcover': 'Felhőzet',
+        'uvIndex': 'UV-index',
+        'materialColor': 'Dinamikus színek',
+        'uvLow': 'Alacsony',
+        'uvAverage': 'Mérsékelt',
+        'uvHigh': 'Magas',
+        'uvVeryHigh': 'Nagyon magas',
+        'uvExtreme': 'Extrém',
+        'weatherMore': '12 napos időjárás előrejelzés',
+        'windgusts': 'Szélrohamok',
+        'north': 'Észak',
+        'northeast': 'Északkelet',
+        'east': 'Kelet',
+        'southeast': 'Délkelet',
+        'south': 'Dél',
+        'southwest': 'Délkelet',
+        'west': 'Nyugat',
+        'northwest': 'Északnyugat',
+        'project': 'Projekt',
+        'version': 'Alkalmazás verzió',
+        'precipitationProbability': 'Csapadék valószínűsége',
+        'apparentTemperatureMin': 'Minimális látszólagos hőmérséklet',
+        'apparentTemperatureMax': 'Maximális látszólagos hőmérséklet',
+        'amoledTheme': 'AMOLED téma',
+        'appearance': 'Megjelenés',
+        'functions': 'Funkciók',
+        'data': 'Adatok',
+        'language': 'Nyelv',
+        'timeRange': 'Gyakoriság (órákban)',
+        'timeStart': 'Kezdési idő',
+        'timeEnd': 'Befejezési idő',
+        'support': 'Támogatás',
+        'system': 'Rendszer',
+        'dark': 'Sötét',
+        'light': 'Világos',
+        'license': 'Licenc',
+        'widget': 'Widget',
+        'widgetBackground': 'Widget háttér',
+        'widgetText': 'Widget szöveg',
+        'dewpoint': 'Harmatpont',
+        'shortwaveRadiation': 'Rövidhullámú sugárzás',
+        'W/m2': 'W/m2',
+        'roundDegree': 'Fokok Kerekítése',
+      };
 }
diff --git a/lib/translation/it_it.dart b/lib/translation/it_it.dart
old mode 100755
new mode 100644
index 63bf7d0..de4e978
--- a/lib/translation/it_it.dart
+++ b/lib/translation/it_it.dart
@@ -1,141 +1,126 @@
 class ItIt {
   Map<String, String> get messages => {
-    'start': 'Clicca per iniziare',
-    'description':
-        'Applicazione meteo con una previsione aggiornata per ogni ora, giorno e settimana per qualsiasi luogo.',
-    'name': 'Meteo',
-    'name2': 'Design comodo',
-    'name3': 'Contattaci',
-    'description2':
-        'Tutta la navigazione è progettata per interagire con l\'applicazione nel modo più comodo e veloce possibile.',
-    'description3':
-        'Se incontri problemi, contattaci via email o nelle recensioni dell\'applicazione.',
-    'next': 'Avanti',
-    'search': 'Cerca...',
-    'loading': 'Caricamento...',
-    'searchCity': 'Trova la tua città',
-    'humidity': 'Umidità',
-    'wind': 'Vento',
-    'visibility': 'Visibilità',
-    'feels': 'Percepiti',
-    'evaporation': 'Evaporazione',
-    'precipitation': 'Precipitazione',
-    'direction': 'Direzione',
-    'pressure': 'Pressione',
-    'rain': 'Pioggia',
-    'clear_sky': 'Sereno',
-    'cloudy': 'Nuvoloso',
-    'overcast': 'Coperto',
-    'fog': 'Nebbia',
-    'drizzle': 'Pioggerella',
-    'drizzling_rain': 'Pioggerella Gelata',
-    'freezing_rain': 'Pioggia Gelata',
-    'heavy_rains': 'Acquazzone',
-    'snow': 'Neve',
-    'thunderstorm': 'Temporale',
-    'kph': 'km/h',
-    'mph': 'mph',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'mi': 'mi',
-    'km': 'km',
-    'inch': 'inch',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'Imposta.',
-    'no_inter': 'Non c\'è connessione Internet',
-    'on_inter': 'Attiva la connessione Internet per avere dati meteorologici.',
-    'location': 'Posizione',
-    'no_location':
-        'Abilita il servizio di localizzazione per ottenere i dati meteo per la posizione corrente.',
-    'theme': 'Tema',
-    'low': 'Basso',
-    'high': 'Alto',
-    'normal': 'Normale',
-    'lat': 'Latitudine',
-    'lon': 'Longitudine',
-    'create': 'Creare',
-    'city': 'Città',
-    'district': 'Regione',
-    'noWeatherCard': 'Aggiungi una città',
-    'deletedCardWeather': 'Rimozione della città',
-    'deletedCardWeatherQuery': 'Sei sicuro di voler rimuovere questa città?',
-    'delete': 'Elimina',
-    'cancel': 'Annulla',
-    'time': 'Orario locale',
-    'validateName': 'Si prega di inserire il nome',
-    'measurements': 'Sistema di misure',
-    'degrees': 'Gradi',
-    'celsius': 'Celsius',
-    'fahrenheit': 'Fahrenheit',
-    'imperial': 'Imperiale',
-    'metric': 'Metrico',
-    'validateValue': 'Si prega di inserire il valore',
-    'validateNumber': 'Si prega di inserire il numero',
-    'validate90': 'Il valore deve essere compreso tra -90 e 90',
-    'validate180': 'Il valore deve essere compreso tra -180 e 180',
-    'notifications': 'Notifiche',
-    'sunrise': 'Alba',
-    'sunset': 'Tramonto',
-    'timeformat': 'Formato ora',
-    '12': '12 ore',
-    '24': '24 ore',
-    'cloudcover': 'Copertura nuvolosa',
-    'uvIndex': 'Indice UV',
-    'materialColor': 'Colori Dinamici',
-    'uvLow': 'Basso',
-    'uvAverage': 'Moderato',
-    'uvHigh': 'Alto',
-    'uvVeryHigh': 'Molto alto',
-    'uvExtreme': 'Estremo',
-    'weatherMore': 'Previsioni del tempo per 12 giorni',
-    'windgusts': 'Raffica',
-    'north': 'Nord',
-    'northeast': 'Nord-est',
-    'east': 'Est',
-    'southeast': 'Sud-est',
-    'south': 'Sud',
-    'southwest': 'Sud-ovest',
-    'west': 'Ovest',
-    'northwest': 'Nord-ovest',
-    'project': 'Progetto su',
-    'version': 'Versione dell\'applicazione',
-    'precipitationProbability': 'Probabilità di precipitazione',
-    'apparentTemperatureMin': 'Temperatura minima percepita',
-    'apparentTemperatureMax': 'Temperatura massima percepita',
-    'amoledTheme': 'AMOLED-tema',
-    'appearance': 'Aspetto',
-    'functions': 'Funzioni',
-    'data': 'Dati',
-    'language': 'Lingua',
-    'timeRange': 'Frequenza (in ore)',
-    'timeStart': 'Ora di inizio',
-    'timeEnd': 'Ora di fine',
-    'support': 'Supporto',
-    'system': 'Sistema',
-    'dark': 'Scuro',
-    'light': 'Chiaro',
-    'license': 'Licenze',
-    'widget': 'Widget',
-    'widgetBackground': 'Sfondo del widget',
-    'widgetText': 'Testo del widget',
-    'dewpoint': 'Punto di rugiada',
-    'shortwaveRadiation': 'Radiazione a onde corte',
-    'roundDegree': 'Arrotonda i gradi',
-    'settings_full': 'Impostazioni',
-    'cities': 'Città',
-    'searchMethod': 'Utilizza la ricerca o la geolocalizzazione',
-    'done': 'Fatto',
-    'groups': 'I nostri gruppi',
-    'openMeteo': 'Dati da Open-Meteo (CC-BY 4.0)',
-    'hourlyVariables': 'Variabili meteorologiche orarie',
-    'dailyVariables': 'Variabili meteorologiche giornaliere',
-    'largeElement': 'Visualizzazione grande elemento meteo',
-    'map': 'Mappa',
-    'clearCacheStore': 'Cancella cache',
-    'deletedCacheStore': 'Cancellazione della cache',
-    'deletedCacheStoreQuery': 'Sei sicuro di voler cancellare la cache?',
-    'addWidget': 'Aggiungi widget',
-    'hideMap': 'Nascondi mappa',
-  };
+        'start': 'Clicca per iniziare',
+        'description':
+            'Applicazione meteo con una previsione aggiornata per ogni ora, giorno e settimana per qualsiasi luogo.',
+        'name': 'Meteo',
+        'name2': 'Design comodo',
+        'name3': 'Contattaci',
+        'description2':
+            'Tutta la navigazione è progettata per interagire con l\'applicazione nel modo più comodo e veloce possibile.',
+        'description3':
+            'Se incontri problemi, contattaci via email o nelle recensioni dell\'applicazione.',
+        'next': 'Avanti',
+        'search': 'Cerca...',
+        'loading': 'Caricamento...',
+        'searchCity': 'Trova la tua città',
+        'humidity': 'Umidità',
+        'wind': 'Vento',
+        'visibility': 'Visibilità',
+        'feels': 'Percepiti',
+        'evaporation': 'Evaporazione',
+        'precipitation': 'Precipitazione',
+        'direction': 'Direzione',
+        'pressure': 'Pressione',
+        'rain': 'Pioggia',
+        'clear_sky': 'Sereno',
+        'cloudy': 'Nuvoloso',
+        'overcast': 'Coperto',
+        'fog': 'Nebbia',
+        'drizzle': 'Pioggerella',
+        'drizzling_rain': 'Pioggerella Gelata',
+        'freezing_rain': 'Pioggia Gelata',
+        'heavy_rains': 'Acquazzone',
+        'snow': 'Neve',
+        'thunderstorm': 'Temporale',
+        'kph': 'km/h',
+        'mph': 'mph',
+        'mi': 'mi',
+        'km': 'km',
+        'inch': 'inch',
+        'mm': 'mm',
+        'hPa': 'hPa',
+        'settings': 'Imposta.',
+        'no_inter': 'Non c\'è connessione Internet',
+        'on_inter':
+            'Attiva la connessione Internet per avere dati meteorologici.',
+        'location': 'Posizione',
+        'no_location':
+            'Abilita il servizio di localizzazione per ottenere i dati meteo per la posizione corrente.',
+        'theme': 'Tema',
+        'low': 'Basso',
+        'high': 'Alto',
+        'normal': 'Normale',
+        'lat': 'Latitudine',
+        'lon': 'Longitudine',
+        'create': 'Creare',
+        'city': 'Città',
+        'district': 'Regione',
+        'noWeatherCard': 'Aggiungi una città',
+        'deletedCardWeather': 'Rimozione della città',
+        'deletedCardWeatherQuery':
+            'Sei sicuro di voler rimuovere questa città?',
+        'delete': 'Elimina',
+        'cancel': 'Annulla',
+        'time': 'Orario locale',
+        'validateName': 'Si prega di inserire il nome',
+        'measurements': 'Sistema di misure',
+        'degrees': 'Gradi',
+        'celsius': 'Celsius',
+        'fahrenheit': 'Fahrenheit',
+        'imperial': 'Imperiale',
+        'metric': 'Metrico',
+        'validateValue': 'Si prega di inserire il valore',
+        'validateNumber': 'Si prega di inserire il numero',
+        'validate90': 'Il valore deve essere compreso tra -90 e 90',
+        'validate180': 'Il valore deve essere compreso tra -180 e 180',
+        'notifications': 'Notifiche',
+        'sunrise': 'Alba',
+        'sunset': 'Tramonto',
+        'timeformat': 'Formato ora',
+        '12': '12 ore',
+        '24': '24 ore',
+        'cloudcover': 'Copertura nuvolosa',
+        'uvIndex': 'Indice UV',
+        'materialColor': 'Colori Dinamici',
+        'uvLow': 'Basso',
+        'uvAverage': 'Moderato',
+        'uvHigh': 'Alto',
+        'uvVeryHigh': 'Molto alto',
+        'uvExtreme': 'Estremo',
+        'weatherMore': 'Previsioni del tempo per 12 giorni',
+        'windgusts': 'Raffica',
+        'north': 'Nord',
+        'northeast': 'Nord-est',
+        'east': 'Est',
+        'southeast': 'Sud-est',
+        'south': 'Sud',
+        'southwest': 'Sud-ovest',
+        'west': 'Ovest',
+        'northwest': 'Nord-ovest',
+        'project': 'Progetto su',
+        'version': 'Versione dell\'applicazione',
+        'precipitationProbability': 'Probabilità di precipitazione',
+        'apparentTemperatureMin': 'Temperatura minima percepita',
+        'apparentTemperatureMax': 'Temperatura massima percepita',
+        'amoledTheme': 'AMOLED-tema',
+        'appearance': 'Aspetto',
+        'functions': 'Funzioni',
+        'data': 'Dati',
+        'language': 'Lingua',
+        'timeRange': 'Frequenza (in ore)',
+        'timeStart': 'Ora di inizio',
+        'timeEnd': 'Ora di fine',
+        'support': 'Supporto',
+        'system': 'Sistema',
+        'dark': 'Scuro',
+        'light': 'Chiaro',
+        'license': 'Licenze',
+        'widget': 'Widget',
+        'widgetBackground': 'Sfondo del widget',
+        'widgetText': 'Testo del widget',
+        'dewpoint': 'Punto di rugiada',
+        'shortwaveRadiation': 'Radiazione a onde corte',
+        'roundDegree': 'Arrotonda i gradi',
+      };
 }
diff --git a/lib/translation/ka_ge.dart b/lib/translation/ka_ge.dart
old mode 100755
new mode 100644
index ec1ad88..d1e385b
--- a/lib/translation/ka_ge.dart
+++ b/lib/translation/ka_ge.dart
@@ -1,141 +1,125 @@
 class KaGe {
   Map<String, String> get messages => {
-    'start': 'დაიწყე',
-    'description':
-        'აპლიკაცია ამჟამად პროგნოზით ყოველ საათზე, დღეზე და კვირაზე ნებისმიერ ადგილისთვის.',
-    'name': 'ამინდი',
-    'name2': 'მართვის კომფორტი',
-    'name3': 'შეგვეხმიანე',
-    'description2':
-        'ყველა ნავიგაცია შექმნილია ისე, რომ შეგიძლიათ მაქსიმალურად კომფორტულად და სწრაფად იქონოთ აპლიკაციით.',
-    'description3':
-        'თუ გექნებათ ნებისმიერი პრობლემა, გთხოვთ, დაგვეკონტაქტოთ ელ-ფოსტით ან აპლიკაციის მიმოხილვის გვერდზე.',
-    'next': 'შემდეგ',
-    'search': 'ძიება...',
-    'loading': 'დატვირთვა...',
-    'searchCity': 'იპოვეთ თქვენი ქალაქი',
-    'humidity': 'ტენიანობა',
-    'wind': 'ქარი',
-    'visibility': 'ხილვადობა',
-    'feels': 'გრძნობს',
-    'evaporation': 'აორთქლება',
-    'precipitation': 'ნალექი',
-    'direction': 'მიმართულება',
-    'pressure': 'წნევა',
-    'rain': 'წვიმა',
-    'clear_sky': 'წმინდა ცა',
-    'cloudy': 'მოღრუბლული',
-    'overcast': 'მოსაწყენი',
-    'fog': 'ნისლი',
-    'drizzle': 'წვიმა',
-    'drizzling_rain': 'დრიზლინგი წვიმა',
-    'freezing_rain': 'გაყინვის წვიმა',
-    'heavy_rains': 'ძლიერი წვიმები',
-    'snow': 'თოვლი',
-    'thunderstorm': 'ჭექა-ქუხილი',
-    'kph': 'კმ/სთ',
-    'mph': 'მილი/სთ',
-    'm/s': 'მ/წმ',
-    'mmHg': 'მმHg',
-    'mi': 'მილი',
-    'km': 'კმ',
-    'inch': 'ინჩი',
-    'mm': 'მმ',
-    'hPa': 'ჰპა',
-    'settings': 'პარამ.',
-    'no_inter': 'ინტერნეტი არ არის',
-    'on_inter': 'ჩართეთ ინტერნეტი მეტეოროლოგიური მონაცემების მისაღებად.',
-    'location': 'ადგილმდებარეობა',
-    'no_location':
-        'ჩართეთ მდებარეობის სერვისი, რომ მიიღოთ ამინდის მონაცემები მიმდინარე ადგილმდებარეობისთვის.',
-    'theme': 'თემა',
-    'low': 'დაბალი',
-    'high': 'მაღალი',
-    'normal': 'ნორმალური',
-    'lat': 'სიგანე',
-    'lon': 'გრძედი',
-    'create': 'შექმნა',
-    'city': 'ქალაქი',
-    'district': 'რაიონი',
-    'noWeatherCard': 'დაამატეთ ქალაქი',
-    'deletedCardWeather': 'ქალაქის წაშლა',
-    'deletedCardWeatherQuery': 'დარწმუნებული ხართ, რომ გსურთ ქალაქის წაშლა?',
-    'delete': 'ამოღება',
-    'cancel': 'გაუქმება',
-    'time': 'დრო ქალაქში',
-    'validateName': 'გთხოვთ შეიყვანოთ სახელი',
-    'measurements': 'საზომი სისტემა',
-    'degrees': 'გრადუსი',
-    'celsius': 'ცელსიუსი',
-    'fahrenheit': 'ფარენჰაიტი',
-    'imperial': 'იმპერიული',
-    'metric': 'მეტრული',
-    'validateValue': 'გთხოვთ შეიყვანოთ მნიშვნელობა',
-    'validateNumber': 'გთხოვთ შეიყვანოთ ნომერი',
-    'validate90': 'მნიშვნელობა უნდა იყოს -90-დან 90-მდე',
-    'validate180': 'მნიშვნელობა უნდა იყოს -180-დან 180-მდე',
-    'notifications': 'შეტყობინებები',
-    'sunrise': 'მზის ამოსვლა',
-    'sunset': 'მზის ჩასვლა',
-    'timeformat': 'დროის ფორმატი',
-    '12': '12-საათი',
-    '24': '24-საათი',
-    'cloudcover': 'ღრუბლის საფარი',
-    'uvIndex': 'UV-ინდექსი',
-    'materialColor': 'დინამიური ფერები',
-    'uvLow': 'დაბალი',
-    'uvAverage': 'ზომიერი',
-    'uvHigh': 'მაღალი',
-    'uvVeryHigh': 'ძალიან მაღალი',
-    'uvExtreme': 'ძლევა ზედა',
-    'weatherMore': '12-დღიანი ამინდის პროგნოზი',
-    'windgusts': 'ნაკადი',
-    'north': 'ჩრდილოეთი',
-    'northeast': 'ჩრდილო-აღმოსავლეთი',
-    'east': 'აღმოსავლეთი',
-    'southeast': 'სამხრეთ-აღმოსავლეთი',
-    'south': 'სამხრეთი',
-    'southwest': 'სამხრეთ-დასავლეთი',
-    'west': 'დასავლეთი',
-    'northwest': 'ჩრდილო-დასავლეთი',
-    'project': 'პროექტი ჩართულია',
-    'version': 'განაცხადის ვერსია',
-    'precipitationProbability': 'ნალექების ალბათობა',
-    'apparentTemperatureMin': 'მინიმალური აშკარა ტემპერატურა',
-    'apparentTemperatureMax': 'მაქსიმალური აშკარა ტემპერატურა',
-    'amoledTheme': 'AMOLED-თემა',
-    'appearance': 'გარეგნობა',
-    'functions': 'ფუნქციები',
-    'data': 'მონაცემები',
-    'language': 'ენა',
-    'timeRange': 'სიხშირე (საათებში)',
-    'timeStart': 'დაწყების დრო',
-    'timeEnd': 'დასრულების დრო',
-    'support': 'მხარდაჭერა',
-    'system': 'სისტემა',
-    'dark': 'ბნელი',
-    'light': 'სინათლე',
-    'license': 'ლიცენზიები',
-    'widget': 'ვიჯეტი',
-    'widgetBackground': 'ვიჯეტის ფონი',
-    'widgetText': 'ვიჯეტის ტექსტი',
-    'dewpoint': 'დევპოინტი',
-    'shortwaveRadiation': 'მოკლე ტალღის გამოსხივება',
-    'roundDegree': 'ხარისხი მიჯნურობა',
-    'settings_full': 'პარამეტრები',
-    'cities': 'ქალაქები',
-    'searchMethod': 'გამოიყენეთ ძებნა ან გეოლოკაცია',
-    'done': 'დასრულებულია',
-    'groups': 'ჩვენი ჯგუფები',
-    'openMeteo': 'მონაცემები Open-Meteo-დან (CC-BY 4.0)',
-    'hourlyVariables': 'საათობრივი ამინდის ცვლადები',
-    'dailyVariables': 'ყოველდღიური ამინდის ცვლადები',
-    'largeElement': 'გადიდი ამინდის გამოჩენა',
-    'map': 'რუკა',
-    'clearCacheStore': 'ქეშის გასუფთავება',
-    'deletedCacheStore': 'ქეშის გასუფთავება მიმდინარეობს',
-    'deletedCacheStoreQuery': 'დარწმუნებული ხართ, რომ გსურთ ქეშის გასუფთავება?',
-    'addWidget': 'ვიდჯეტის დამატება',
-    'hideMap': 'რუკის დამალვა',
-  };
+        'start': 'დაიწყე',
+        'description':
+            'აპლიკაცია ამჟამად პროგნოზით ყოველ საათზე, დღეზე და კვირაზე ნებისმიერ ადგილისთვის.',
+        'name': 'ამინდი',
+        'name2': 'მართვის კომფორტი',
+        'name3': 'შეგვეხმიანე',
+        'description2':
+            'ყველა ნავიგაცია შექმნილია ისე, რომ შეგიძლიათ მაქსიმალურად კომფორტულად და სწრაფად იქონოთ აპლიკაციით.',
+        'description3':
+            'თუ გექნებათ ნებისმიერი პრობლემა, გთხოვთ, დაგვეკონტაქტოთ ელ-ფოსტით ან აპლიკაციის მიმოხილვის გვერდზე.',
+        'next': 'შემდეგ',
+        'search': 'ძიება...',
+        'loading': 'დატვირთვა...',
+        'searchCity': 'იპოვეთ თქვენი ქალაქი',
+        'humidity': 'ტენიანობა',
+        'wind': 'ქარი',
+        'visibility': 'ხილვადობა',
+        'feels': 'გრძნობს',
+        'evaporation': 'აორთქლება',
+        'precipitation': 'ნალექი',
+        'direction': 'მიმართულება',
+        'pressure': 'წნევა',
+        'rain': 'წვიმა',
+        'clear_sky': 'წმინდა ცა',
+        'cloudy': 'მოღრუბლული',
+        'overcast': 'მოსაწყენი',
+        'fog': 'ნისლი',
+        'drizzle': 'წვიმა',
+        'drizzling_rain': 'დრიზლინგი წვიმა',
+        'freezing_rain': 'გაყინვის წვიმა',
+        'heavy_rains': 'ძლიერი წვიმები',
+        'snow': 'თოვლი',
+        'thunderstorm': 'ჭექა-ქუხილი',
+        'kph': 'კმ/სთ',
+        'mph': 'მილი/სთ',
+        'mi': 'მილი',
+        'km': 'კმ',
+        'inch': 'ინჩი',
+        'mm': 'მმ',
+        'hPa': 'ჰპა',
+        'settings': 'პარამ.',
+        'no_inter': 'ინტერნეტი არ არის',
+        'on_inter': 'ჩართეთ ინტერნეტი მეტეოროლოგიური მონაცემების მისაღებად.',
+        'location': 'ადგილმდებარეობა',
+        'no_location':
+            'ჩართეთ მდებარეობის სერვისი, რომ მიიღოთ ამინდის მონაცემები მიმდინარე ადგილმდებარეობისთვის.',
+        'theme': 'თემა',
+        'low': 'დაბალი',
+        'high': 'მაღალი',
+        'normal': 'ნორმალური',
+        'lat': 'სიგანე',
+        'lon': 'გრძედი',
+        'create': 'შექმნა',
+        'city': 'ქალაქი',
+        'district': 'რაიონი',
+        'noWeatherCard': 'დაამატეთ ქალაქი',
+        'deletedCardWeather': 'ქალაქის წაშლა',
+        'deletedCardWeatherQuery':
+            'დარწმუნებული ხართ, რომ გსურთ ქალაქის წაშლა?',
+        'delete': 'ამოღება',
+        'cancel': 'გაუქმება',
+        'time': 'დრო ქალაქში',
+        'validateName': 'გთხოვთ შეიყვანოთ სახელი',
+        'measurements': 'საზომი სისტემა',
+        'degrees': 'გრადუსი',
+        'celsius': 'ცელსიუსი',
+        'fahrenheit': 'ფარენჰაიტი',
+        'imperial': 'იმპერიული',
+        'metric': 'მეტრული',
+        'validateValue': 'გთხოვთ შეიყვანოთ მნიშვნელობა',
+        'validateNumber': 'გთხოვთ შეიყვანოთ ნომერი',
+        'validate90': 'მნიშვნელობა უნდა იყოს -90-დან 90-მდე',
+        'validate180': 'მნიშვნელობა უნდა იყოს -180-დან 180-მდე',
+        'notifications': 'შეტყობინებები',
+        'sunrise': 'მზის ამოსვლა',
+        'sunset': 'მზის ჩასვლა',
+        'timeformat': 'დროის ფორმატი',
+        '12': '12-საათი',
+        '24': '24-საათი',
+        'cloudcover': 'ღრუბლის საფარი',
+        'uvIndex': 'UV-ინდექსი',
+        'materialColor': 'დინამიური ფერები',
+        'uvLow': 'დაბალი',
+        'uvAverage': 'ზომიერი',
+        'uvHigh': 'მაღალი',
+        'uvVeryHigh': 'ძალიან მაღალი',
+        'uvExtreme': 'ძლევა ზედა',
+        'weatherMore': '12-დღიანი ამინდის პროგნოზი',
+        'windgusts': 'ნაკადი',
+        'north': 'ჩრდილოეთი',
+        'northeast': 'ჩრდილო-აღმოსავლეთი',
+        'east': 'აღმოსავლეთი',
+        'southeast': 'სამხრეთ-აღმოსავლეთი',
+        'south': 'სამხრეთი',
+        'southwest': 'სამხრეთ-დასავლეთი',
+        'west': 'დასავლეთი',
+        'northwest': 'ჩრდილო-დასავლეთი',
+        'project': 'პროექტი ჩართულია',
+        'version': 'განაცხადის ვერსია',
+        'precipitationProbability': 'ნალექების ალბათობა',
+        'apparentTemperatureMin': 'მინიმალური აშკარა ტემპერატურა',
+        'apparentTemperatureMax': 'მაქსიმალური აშკარა ტემპერატურა',
+        'amoledTheme': 'AMOLED-თემა',
+        'appearance': 'გარეგნობა',
+        'functions': 'ფუნქციები',
+        'data': 'მონაცემები',
+        'language': 'ენა',
+        'timeRange': 'სიხშირე (საათებში)',
+        'timeStart': 'დაწყების დრო',
+        'timeEnd': 'დასრულების დრო',
+        'support': 'მხარდაჭერა',
+        'system': 'სისტემა',
+        'dark': 'ბნელი',
+        'light': 'სინათლე',
+        'license': 'ლიცენზიები',
+        'widget': 'ვიჯეტი',
+        'widgetBackground': 'ვიჯეტის ფონი',
+        'widgetText': 'ვიჯეტის ტექსტი',
+        'dewpoint': 'დევპოინტი',
+        'shortwaveRadiation': 'მოკლე ტალღის გამოსხივება',
+        'roundDegree': 'ხარისხი მიჯნურობა',
+      };
 }
diff --git a/lib/translation/ko_kr.dart b/lib/translation/ko_kr.dart
deleted file mode 100755
index a71c3bf..0000000
--- a/lib/translation/ko_kr.dart
+++ /dev/null
@@ -1,138 +0,0 @@
-class KoKr {
-  Map<String, String> get messages => {
-    'start': '시작하기',
-    'description': '어떤 곳이든, 어느 순간이든, 날씨를 확인하세요.',
-    'name': '날씨',
-    'name2': '편리한 디자인',
-    'name3': '문의하기',
-    'description2': '모든 내비게이션은 가능한 한 편리하고 빠르게 애플리케이션과 상호 작용하도록 설계되었습니다.',
-    'description3': '어떤 오류가 발생했다면, 이메일 또는 앱 리뷰로 문의해주세요.',
-    'next': '다음',
-    'search': '검색...',
-    'loading': '로딩 중...',
-    'searchCity': '도시를 찾아보세요',
-    'humidity': '습도',
-    'wind': '풍속',
-    'visibility': '가시거리',
-    'feels': '체감 온도',
-    'evaporation': '증발량',
-    'precipitation': '강수량',
-    'direction': '풍향',
-    'pressure': '기압',
-    'rain': '비',
-    'clear_sky': '맑음',
-    'cloudy': '구름 조금',
-    'overcast': '구름 많음',
-    'fog': '안개',
-    'drizzle': '이슬비',
-    'drizzling_rain': '얼어붙은 이슬비',
-    'freezing_rain': '얼어붙는 비',
-    'heavy_rains': '폭우',
-    'snow': '눈',
-    'thunderstorm': '천둥번개',
-    'kph': 'km/h',
-    'mph': 'mph',
-    'm/s': '미터/초',
-    'mmHg': '밀리미터 수은주',
-    'mi': 'mi',
-    'km': 'km',
-    'inch': '인치',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': '설정',
-    'no_inter': '인터넷 없음',
-    'on_inter': '현재 위치에 대한 정보를 얻기 위해서는 인터넷이 필요합니다.',
-    'location': '위치',
-    'no_location': '현재 위치에 대한 정보를 얻기 위해서는 위치 서비스를 활성화해야 합니다.',
-    'theme': '테마',
-    'low': '낮음',
-    'high': '높음',
-    'normal': '보통',
-    'lat': '위도',
-    'lon': '경도',
-    'create': '만들기',
-    'city': '도시',
-    'district': '지역',
-    'noWeatherCard': '도시를 추가하세요',
-    'deletedCardWeather': '도시 삭제하기',
-    'deletedCardWeatherQuery': '정말로 이 도시를 삭제하시겠나요?',
-    'delete': '삭제',
-    'cancel': '취소',
-    'time': '도시 시간',
-    'validateName': '이름을 입력해주세요',
-    'measurements': '표시 방식',
-    'degrees': '도',
-    'celsius': '섭씨',
-    'fahrenheit': '화씨',
-    'imperial': '인치',
-    'metric': '미터',
-    'validateValue': '값을 입력해주세요',
-    'validateNumber': '올바른 숫자를 입력해주세요',
-    'validate90': '-90과 90 사이의 값만 가능합니다',
-    'validate180': '-180과 180 사이의 값만 가능합니다',
-    'notifications': '알림',
-    'sunrise': '일출',
-    'sunset': '일몰',
-    'timeformat': '시간 형식',
-    '12': '12시간',
-    '24': '24시간',
-    'cloudcover': '구름',
-    'uvIndex': 'UV 정도',
-    'materialColor': '동적 색상',
-    'uvLow': '낮음',
-    'uvAverage': '보통',
-    'uvHigh': '높은',
-    'uvVeryHigh': '매우 높음',
-    'uvExtreme': '엄청남!',
-    'weatherMore': '12일 일기 예보',
-    'windgusts': '돌풍',
-    'north': '북',
-    'northeast': '북동',
-    'east': '동',
-    'southeast': '남동',
-    'south': '남',
-    'southwest': '남서',
-    'west': '서',
-    'northwest': '북서',
-    'project': '프로젝트 위치:',
-    'version': '버전',
-    'precipitationProbability': '깅수 확률',
-    'apparentTemperatureMin': '최저 기온',
-    'apparentTemperatureMax': '최고 기온',
-    'amoledTheme': 'AMOLED-테마',
-    'appearance': '디자인',
-    'functions': '기능',
-    'data': '데이터',
-    'language': '언어',
-    'timeRange': '빈도 (시간 단위)',
-    'timeStart': '시작 시간',
-    'timeEnd': '종료 시간',
-    'support': '후원하기',
-    'system': '시스템',
-    'dark': '어두운',
-    'light': '밝은',
-    'license': '라이선스',
-    'widget': '위젯',
-    'widgetBackground': '위젯 배경',
-    'widgetText': '위젯 텍스트',
-    'dewpoint': '이슬점',
-    'shortwaveRadiation': '단파 복사',
-    'W/m2': 'W/m2',
-    'roundDegree': '온도 반올림',
-    'settings_full': '설정',
-    'cities': '도시',
-    'searchMethod': '검색 또는 지리적 위치를 사용하세요',
-    'done': '완료',
-    'groups': '우리 그룹',
-    'openMeteo': 'Open-Meteo의 데이터 (CC-BY 4.0)',
-    'hourlyVariables': '시간별 날씨 변수',
-    'dailyVariables': '일별 날씨 변수',
-    'largeElement': '큰 날씨 표시',
-    'map': '지도',
-    'clearCacheStore': '캐시 지우기',
-    'deletedCacheStore': '캐시 삭제 중',
-    'deletedCacheStoreQuery': '캐시를 정말로 지우시겠습니까?',
-    'addWidget': '위젯 추가',
-    'hideMap': '지도를 숨기기',
-  };
-}
diff --git a/lib/translation/nl_nl.dart b/lib/translation/nl_nl.dart
old mode 100755
new mode 100644
index c9bb065..724f66c
--- a/lib/translation/nl_nl.dart
+++ b/lib/translation/nl_nl.dart
@@ -1,141 +1,126 @@
 class NlNl {
   Map<String, String> get messages => {
-    'start': 'Beginnen',
-    'description':
-        'Weer-applicatie met een actuele prognose voor elk uur, dag en week voor elke locatie.',
-    'name': 'Weer',
-    'name2': 'Handig Ontwerp',
-    'name3': 'Neem contact met ons op',
-    'description2':
-        'Alle navigatie is ontworpen om zo gemakkelijk en snel mogelijk met de applicatie te kunnen communiceren.',
-    'description3':
-        'Als u problemen ondervindt, neem dan contact met ons op via e-mail of in de recensies van de applicatie.',
-    'next': 'Volgende',
-    'search': 'Zoeken...',
-    'loading': 'Laden...',
-    'searchCity': 'Vind jouw stad',
-    'humidity': 'Luchtvochtigheid',
-    'wind': 'Wind',
-    'visibility': 'Zichtbaarheid',
-    'feels': 'Voelt',
-    'evaporation': 'Verdamping',
-    'precipitation': 'Neerslag',
-    'direction': 'Richting',
-    'pressure': 'Druk',
-    'rain': 'Regen',
-    'clear_sky': 'Heldere lucht',
-    'cloudy': 'Bewolkt',
-    'overcast': 'Betrokken',
-    'fog': 'Mist',
-    'drizzle': 'Motregen',
-    'drizzling_rain': 'Ijskoude motregen',
-    'freezing_rain': 'Ijskoude regen',
-    'heavy_rains': 'Regendouche',
-    'snow': 'Sneeuw',
-    'thunderstorm': 'Onweersbui',
-    'kph': 'km/h',
-    'mph': 'mph',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'mi': 'mi',
-    'km': 'km',
-    'inch': 'inch',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'Instellingen.',
-    'no_inter': 'Geen Internet',
-    'on_inter': 'Schakel Internet in om meteorologische gegevens te ontvangen.',
-    'location': 'Locatie',
-    'no_location':
-        'Schakel de locatiedienst in om weer gegevens voor de huidige locatie te ontvangen.',
-    'theme': 'Thema',
-    'low': 'Laag',
-    'high': 'Hoog',
-    'normal': 'Normaal',
-    'lat': 'Breedtegraad',
-    'lon': 'Lengtegraad',
-    'create': 'Creëer',
-    'city': 'Stad',
-    'district': 'District',
-    'noWeatherCard': 'Voeg een stad toe',
-    'deletedCardWeather': 'Verwijder een city',
-    'deletedCardWeatherQuery': 'Weet je zeker dat je de stad wilt verwijderen?',
-    'delete': 'Verwijder',
-    'cancel': 'Annuleer',
-    'time': 'Tijd in de stad',
-    'validateName': 'Vul de naam in',
-    'measurements': 'Meetsysteem',
-    'degrees': 'Graden',
-    'celsius': 'Celsius',
-    'fahrenheit': 'Fahrenheit',
-    'imperial': 'Imperiaal',
-    'metric': 'Metrisch',
-    'validateValue': 'Vul een waarde in',
-    'validateNumber': 'Vul een geldig nummer in',
-    'validate90': 'Waarde moet tussen -90 and 90 zijn',
-    'validate180': 'Waarde moet tussen -180 and 180 zijn',
-    'notifications': 'Notificaties',
-    'sunrise': 'Zonsopkomst',
-    'sunset': 'Zonsondergang',
-    'timeformat': 'Tijdnotatie',
-    '12': '12-uur',
-    '24': '24-uur',
-    'cloudcover': 'Bewolking',
-    'uvIndex': 'UV-index',
-    'materialColor': 'Dynamische Kleuren',
-    'uvLow': 'Laag',
-    'uvAverage': 'Matig',
-    'uvHigh': 'Hoog',
-    'uvVeryHigh': 'Erg hoog',
-    'uvExtreme': 'Extreem',
-    'weatherMore': '12-daagse weersverwachting',
-    'windgusts': 'Windstoten',
-    'north': 'Noord',
-    'northeast': 'Noordoost',
-    'east': 'Oost',
-    'southeast': 'Zuidoost',
-    'south': 'Zuid',
-    'southwest': 'Zuidwest',
-    'west': 'West',
-    'northwest': 'Noordwest',
-    'project': 'Project op',
-    'version': 'Applicatieversie',
-    'precipitationProbability': 'Kans op neerslag',
-    'apparentTemperatureMin': 'Minimum schijnbare temperatuur',
-    'apparentTemperatureMax': 'Maximale schijnbare temperatuur',
-    'amoledTheme': 'AMOLED-thema',
-    'appearance': 'Uiterlijk',
-    'functions': 'Functies',
-    'data': 'Gegevens',
-    'language': 'Taal',
-    'timeRange': 'Frequentie (in uren)',
-    'timeStart': 'Begintijd',
-    'timeEnd': 'Eindtijd',
-    'support': 'Ondersteuning',
-    'system': 'Systeem',
-    'dark': 'Donker',
-    'light': 'Licht',
-    'license': 'Licenties',
-    'widget': 'Widget',
-    'widgetBackground': 'Widget-achtergrond',
-    'widgetText': 'Tekst van widget',
-    'dewpoint': 'Dauwpunt',
-    'shortwaveRadiation': 'Korte golfstraling',
-    'roundDegree': 'Rond graden af',
-    'settings_full': 'Instellingen',
-    'cities': 'Steden',
-    'searchMethod': 'Gebruik zoeken of geolocatie',
-    'done': 'Klaar',
-    'groups': 'Onze groepen',
-    'openMeteo': 'Gegevens van Open-Meteo (CC-BY 4.0)',
-    'hourlyVariables': 'Uurlijkse weervariabelen',
-    'dailyVariables': 'Dagelijkse weervariabelen',
-    'largeElement': 'Groot weerbericht weergeven',
-    'map': 'Kaart',
-    'clearCacheStore': 'Cache wissen',
-    'deletedCacheStore': 'Cache wissen',
-    'deletedCacheStoreQuery': 'Weet je zeker dat je de cache wilt wissen?',
-    'addWidget': 'Widget toevoegen',
-    'hideMap': 'Kaart verbergen',
-  };
+        'start': 'Beginnen',
+        'description':
+            'Weer-applicatie met een actuele prognose voor elk uur, dag en week voor elke locatie.',
+        'name': 'Weer',
+        'name2': 'Handig Ontwerp',
+        'name3': 'Neem contact met ons op',
+        'description2':
+            'Alle navigatie is ontworpen om zo gemakkelijk en snel mogelijk met de applicatie te kunnen communiceren.',
+        'description3':
+            'Als u problemen ondervindt, neem dan contact met ons op via e-mail of in de recensies van de applicatie.',
+        'next': 'Volgende',
+        'search': 'Zoeken...',
+        'loading': 'Laden...',
+        'searchCity': 'Vind jouw stad',
+        'humidity': 'Luchtvochtigheid',
+        'wind': 'Wind',
+        'visibility': 'Zichtbaarheid',
+        'feels': 'Voelt',
+        'evaporation': 'Verdamping',
+        'precipitation': 'Neerslag',
+        'direction': 'Richting',
+        'pressure': 'Druk',
+        'rain': 'Regen',
+        'clear_sky': 'Heldere lucht',
+        'cloudy': 'Bewolkt',
+        'overcast': 'Betrokken',
+        'fog': 'Mist',
+        'drizzle': 'Motregen',
+        'drizzling_rain': 'Ijskoude motregen',
+        'freezing_rain': 'Ijskoude regen',
+        'heavy_rains': 'Regendouche',
+        'snow': 'Sneeuw',
+        'thunderstorm': 'Onweersbui',
+        'kph': 'km/h',
+        'mph': 'mph',
+        'mi': 'mi',
+        'km': 'km',
+        'inch': 'inch',
+        'mm': 'mm',
+        'hPa': 'hPa',
+        'settings': 'Instellingen.',
+        'no_inter': 'Geen Internet',
+        'on_inter':
+            'Schakel Internet in om meteorologische gegevens te ontvangen.',
+        'location': 'Locatie',
+        'no_location':
+            'Schakel de locatiedienst in om weer gegevens voor de huidige locatie te ontvangen.',
+        'theme': 'Thema',
+        'low': 'Laag',
+        'high': 'Hoog',
+        'normal': 'Normaal',
+        'lat': 'Breedtegraad',
+        'lon': 'Lengtegraad',
+        'create': 'Creëer',
+        'city': 'Stad',
+        'district': 'District',
+        'noWeatherCard': 'Voeg een stad toe',
+        'deletedCardWeather': 'Verwijder een city',
+        'deletedCardWeatherQuery':
+            'Weet je zeker dat je de stad wilt verwijderen?',
+        'delete': 'Verwijder',
+        'cancel': 'Annuleer',
+        'time': 'Tijd in de stad',
+        'validateName': 'Vul de naam in',
+        'measurements': 'Meetsysteem',
+        'degrees': 'Graden',
+        'celsius': 'Celsius',
+        'fahrenheit': 'Fahrenheit',
+        'imperial': 'Imperiaal',
+        'metric': 'Metrisch',
+        'validateValue': 'Vul een waarde in',
+        'validateNumber': 'Vul een geldig nummer in',
+        'validate90': 'Waarde moet tussen -90 and 90 zijn',
+        'validate180': 'Waarde moet tussen -180 and 180 zijn',
+        'notifications': 'Notificaties',
+        'sunrise': 'Zonsopkomst',
+        'sunset': 'Zonsondergang',
+        'timeformat': 'Tijdnotatie',
+        '12': '12-uur',
+        '24': '24-uur',
+        'cloudcover': 'Bewolking',
+        'uvIndex': 'UV-index',
+        'materialColor': 'Dynamische Kleuren',
+        'uvLow': 'Laag',
+        'uvAverage': 'Matig',
+        'uvHigh': 'Hoog',
+        'uvVeryHigh': 'Erg hoog',
+        'uvExtreme': 'Extreem',
+        'weatherMore': '12-daagse weersverwachting',
+        'windgusts': 'Windstoten',
+        'north': 'Noord',
+        'northeast': 'Noordoost',
+        'east': 'Oost',
+        'southeast': 'Zuidoost',
+        'south': 'Zuid',
+        'southwest': 'Zuidwest',
+        'west': 'West',
+        'northwest': 'Noordwest',
+        'project': 'Project op',
+        'version': 'Applicatieversie',
+        'precipitationProbability': 'Kans op neerslag',
+        'apparentTemperatureMin': 'Minimum schijnbare temperatuur',
+        'apparentTemperatureMax': 'Maximale schijnbare temperatuur',
+        'amoledTheme': 'AMOLED-thema',
+        'appearance': 'Uiterlijk',
+        'functions': 'Functies',
+        'data': 'Gegevens',
+        'language': 'Taal',
+        'timeRange': 'Frequentie (in uren)',
+        'timeStart': 'Begintijd',
+        'timeEnd': 'Eindtijd',
+        'support': 'Ondersteuning',
+        'system': 'Systeem',
+        'dark': 'Donker',
+        'light': 'Licht',
+        'license': 'Licenties',
+        'widget': 'Widget',
+        'widgetBackground': 'Widget-achtergrond',
+        'widgetText': 'Tekst van widget',
+        'dewpoint': 'Dauwpunt',
+        'shortwaveRadiation': 'Korte golfstraling',
+        'roundDegree': 'Rond graden af',
+      };
 }
diff --git a/lib/translation/pl_pl.dart b/lib/translation/pl_pl.dart
old mode 100755
new mode 100644
index 9dcc337..adc3412
--- a/lib/translation/pl_pl.dart
+++ b/lib/translation/pl_pl.dart
@@ -1,141 +1,124 @@
 class PlPl {
   Map<String, String> get messages => {
-    'start': 'Rozpocznij',
-    'description':
-        'Aplikacja pogodowa z aktualną prognozą na każdą godzinę, dzień i tydzień dla dowolnego miejsca.',
-    'name': 'Pogoda',
-    'name2': 'Wygodny design',
-    'name3': 'Skontaktuj się z nami',
-    'description2':
-        'Cała nawigacja jest zaprojektowana tak, aby można było jak najwygodniej i najszybciej współdziałać z aplikacją.',
-    'description3':
-        'Jeśli napotkasz jakiekolwiek problemy, skontaktuj się z nami drogą e-mailową lub w recenzjach aplikacji.',
-    'next': 'Dalej',
-    'search': 'Szukaj...',
-    'loading': 'Ładowanie...',
-    'searchCity': 'Znajdź swoje miasto',
-    'humidity': 'Wilgoć',
-    'wind': 'Wiatr',
-    'visibility': 'Widoczność',
-    'feels': 'Odczuwalna',
-    'evaporation': 'Parowanie',
-    'precipitation': 'Opad atmosferyczny',
-    'direction': 'Kierunek',
-    'pressure': 'Ciśnienie',
-    'rain': 'Deszcz',
-    'clear_sky': 'Czyste niebo',
-    'cloudy': 'Pochmurno',
-    'overcast': 'Pochmurnie',
-    'fog': 'Mgła',
-    'drizzle': 'Mżawka',
-    'drizzling_rain': 'Mroźna Mżawka',
-    'freezing_rain': 'Mroźny deszcz',
-    'heavy_rains': 'Przelotne opady deszczu',
-    'snow': 'Śnieg',
-    'thunderstorm': 'Burza z piorunami',
-    'kph': 'km/h',
-    'mph': 'mph',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'mi': 'mi',
-    'km': 'km',
-    'inch': 'inch',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'Ustaw.',
-    'no_inter': 'Brak internetu',
-    'on_inter': 'Włącz Internet, aby uzyskać dane meteorologiczne.',
-    'location': 'Lokalizacja',
-    'no_location':
-        'Włącz usługę lokalizacyjną, aby uzyskać dane pogodowe dla bieżącej lokalizacji.',
-    'theme': 'Motyw',
-    'low': 'Niski',
-    'high': 'Wysoki',
-    'normal': 'Normalny',
-    'lat': 'Latitude',
-    'lon': 'Longitude',
-    'create': 'Stwórz',
-    'city': 'Miasto',
-    'district': 'Dzielnica',
-    'noWeatherCard': 'Dodaj miasto',
-    'deletedCardWeather': 'Usuwanie miasta',
-    'deletedCardWeatherQuery': 'Czy na pewno chcesz usunąć miasto?',
-    'delete': 'Usuń',
-    'cancel': 'Anuluj',
-    'time': 'Czas w mieście',
-    'validateName': 'Wprowadź nazwę',
-    'measurements': 'System środków',
-    'degrees': 'Stopni',
-    'celsius': 'Celsjusz',
-    'fahrenheit': 'Fahrenheita',
-    'imperial': 'Imperial',
-    'metric': 'Metric',
-    'validateValue': 'Proszę wprowadzić wartość',
-    'validateNumber': 'Proszę wprowadzić poprawny numer',
-    'validate90': 'Wartość musi mieścić się w zakresie od -90 do 90',
-    'validate180': 'Wartość musi mieścić się w przedziale od -180 do 180',
-    'notifications': 'Powiadomienia',
-    'sunrise': 'Wschód słońca',
-    'sunset': 'Zachód słońca',
-    'timeformat': 'Format czasu',
-    '12': '12-hour',
-    '24': '24-hour',
-    'cloudcover': 'Zachmurzenie',
-    'uvIndex': 'Indeks UV',
-    'materialColor': 'Dynamiczne kolory',
-    'uvLow': 'Niski',
-    'uvAverage': 'Umiarkowany',
-    'uvHigh': 'Wysoki',
-    'uvVeryHigh': 'Bardzo wysoki',
-    'uvExtreme': 'Extremalny',
-    'weatherMore': 'Prognoza pogody na 12 dni',
-    'windgusts': 'Porywy wiatru',
-    'north': 'Północ',
-    'northeast': 'Północny wschód',
-    'east': 'Wschód',
-    'southeast': 'południowy wschód',
-    'south': 'Południe',
-    'southwest': 'Południowy zachód',
-    'west': 'Zachód',
-    'northwest': 'Północny zachód',
-    'project': 'Project on',
-    'version': 'Wersja aplikacji',
-    'precipitationProbability': 'Prawdopodobieństwo opadów',
-    'apparentTemperatureMin': 'Minimalna temperatura pozorna',
-    'apparentTemperatureMax': 'Maksymalna pozorna temperatura',
-    'amoledTheme': 'AMOLED-theme',
-    'appearance': 'Wygląd',
-    'functions': 'Funkcje',
-    'data': 'Data',
-    'language': 'Język',
-    'timeRange': 'Częstotliwość (w godzinach)',
-    'timeStart': 'Czas rozpoczęcia',
-    'timeEnd': 'Czas zakończenia',
-    'support': 'Wsparcie',
-    'system': 'System',
-    'dark': 'Ciemny',
-    'light': 'Jasny',
-    'license': 'Licencje',
-    'widget': 'Widget',
-    'widgetBackground': 'Tło widżetu',
-    'widgetText': 'Tekst widżetu',
-    'dewpoint': 'Punkt rosy',
-    'shortwaveRadiation': 'Promieniowanie krótkofalowe',
-    'roundDegree': 'Zaokrąglaj stopnie',
-    'settings_full': 'Ustawienia',
-    'cities': 'Miasta',
-    'searchMethod': 'Użyj wyszukiwania lub geolokalizacji',
-    'done': 'Gotowe',
-    'groups': 'Nasze grupy',
-    'openMeteo': 'Dane z Open-Meteo (CC-BY 4.0)',
-    'hourlyVariables': 'Godzinowe zmienne pogodowe',
-    'dailyVariables': 'Dzienne zmienne pogodowe',
-    'largeElement': 'Duże wyświetlanie pogody',
-    'map': 'Mapa',
-    'clearCacheStore': 'Wyczyść pamięć podręczną',
-    'deletedCacheStore': 'Czyszczenie pamięci podręcznej',
-    'deletedCacheStoreQuery': 'Czy na pewno chcesz wyczyścić pamięć podręczną?',
-    'addWidget': 'Dodaj widget',
-    'hideMap': 'Ukryj mapę',
-  };
+        'start': 'Rozpocznij',
+        'description':
+            'Aplikacja pogodowa z aktualną prognozą na każdą godzinę, dzień i tydzień dla dowolnego miejsca.',
+        'name': 'Pogoda',
+        'name2': 'Wygodny design',
+        'name3': 'Skontaktuj się z nami',
+        'description2':
+            'Cała nawigacja jest zaprojektowana tak, aby można było jak najwygodniej i najszybciej współdziałać z aplikacją.',
+        'description3':
+            'Jeśli napotkasz jakiekolwiek problemy, skontaktuj się z nami drogą e-mailową lub w recenzjach aplikacji.',
+        'next': 'Dalej',
+        'search': 'Szukaj...',
+        'loading': 'Ładowanie...',
+        'searchCity': 'Znajdź swoje miasto',
+        'humidity': 'Wilgoć',
+        'wind': 'Wiatr',
+        'visibility': 'Widoczność',
+        'feels': 'Odczuwalna',
+        'evaporation': 'Parowanie',
+        'precipitation': 'Opad atmosferyczny',
+        'direction': 'Kierunek',
+        'pressure': 'Ciśnienie',
+        'rain': 'Deszcz',
+        'clear_sky': 'Czyste niebo',
+        'cloudy': 'Pochmurno',
+        'overcast': 'Pochmurnie',
+        'fog': 'Mgła',
+        'drizzle': 'Mżawka',
+        'drizzling_rain': 'Mroźna Mżawka',
+        'freezing_rain': 'Mroźny deszcz',
+        'heavy_rains': 'Przelotne opady deszczu',
+        'snow': 'Śnieg',
+        'thunderstorm': 'Burza z piorunami',
+        'kph': 'km/h',
+        'mph': 'mph',
+        'mi': 'mi',
+        'km': 'km',
+        'inch': 'inch',
+        'mm': 'mm',
+        'hPa': 'hPa',
+        'settings': 'Ustaw.',
+        'no_inter': 'Brak internetu',
+        'on_inter': 'Włącz Internet, aby uzyskać dane meteorologiczne.',
+        'location': 'Lokalizacja',
+        'no_location':
+            'Włącz usługę lokalizacyjną, aby uzyskać dane pogodowe dla bieżącej lokalizacji.',
+        'theme': 'Motyw',
+        'low': 'Niski',
+        'high': 'Wysoki',
+        'normal': 'Normalny',
+        'lat': 'Latitude',
+        'lon': 'Longitude',
+        'create': 'Stwórz',
+        'city': 'Miasto',
+        'district': 'Dzielnica',
+        'noWeatherCard': 'Dodaj miasto',
+        'deletedCardWeather': 'Usuwanie miasta',
+        'deletedCardWeatherQuery': 'Czy na pewno chcesz usunąć miasto?',
+        'delete': 'Usuń',
+        'cancel': 'Anuluj',
+        'time': 'Czas w mieście',
+        'validateName': 'Wprowadź nazwę',
+        'measurements': 'System środków',
+        'degrees': 'Stopni',
+        'celsius': 'Celsjusz',
+        'fahrenheit': 'Fahrenheita',
+        'imperial': 'Imperial',
+        'metric': 'Metric',
+        'validateValue': 'Proszę wprowadzić wartość',
+        'validateNumber': 'Proszę wprowadzić poprawny numer',
+        'validate90': 'Wartość musi mieścić się w zakresie od -90 do 90',
+        'validate180': 'Wartość musi mieścić się w przedziale od -180 do 180',
+        'notifications': 'Powiadomienia',
+        'sunrise': 'Wschód słońca',
+        'sunset': 'Zachód słońca',
+        'timeformat': 'Format czasu',
+        '12': '12-hour',
+        '24': '24-hour',
+        'cloudcover': 'Zachmurzenie',
+        'uvIndex': 'Indeks UV',
+        'materialColor': 'Dynamiczne kolory',
+        'uvLow': 'Niski',
+        'uvAverage': 'Umiarkowany',
+        'uvHigh': 'Wysoki',
+        'uvVeryHigh': 'Bardzo wysoki',
+        'uvExtreme': 'Extremalny',
+        'weatherMore': 'Prognoza pogody na 12 dni',
+        'windgusts': 'Porywy wiatru',
+        'north': 'Północ',
+        'northeast': 'Północny wschód',
+        'east': 'Wschód',
+        'southeast': 'południowy wschód',
+        'south': 'Południe',
+        'southwest': 'Południowy zachód',
+        'west': 'Zachód',
+        'northwest': 'Północny zachód',
+        'project': 'Project on',
+        'version': 'Wersja aplikacji',
+        'precipitationProbability': 'Prawdopodobieństwo opadów',
+        'apparentTemperatureMin': 'Minimalna temperatura pozorna',
+        'apparentTemperatureMax': 'Maksymalna pozorna temperatura',
+        'amoledTheme': 'AMOLED-theme',
+        'appearance': 'Wygląd',
+        'functions': 'Funkcje',
+        'data': 'Data',
+        'language': 'Język',
+        'timeRange': 'Częstotliwość (w godzinach)',
+        'timeStart': 'Czas rozpoczęcia',
+        'timeEnd': 'Czas zakończenia',
+        'support': 'Wsparcie',
+        'system': 'System',
+        'dark': 'Ciemny',
+        'light': 'Jasny',
+        'license': 'Licencje',
+        'widget': 'Widget',
+        'widgetBackground': 'Tło widżetu',
+        'widgetText': 'Tekst widżetu',
+        'dewpoint': 'Punkt rosy',
+        'shortwaveRadiation': 'Promieniowanie krótkofalowe',
+        'roundDegree': 'Zaokrąglaj stopnie',
+      };
 }
diff --git a/lib/translation/pt_br.dart b/lib/translation/pt_br.dart
old mode 100755
new mode 100644
index 23755bb..8951e0e
--- a/lib/translation/pt_br.dart
+++ b/lib/translation/pt_br.dart
@@ -1,142 +1,125 @@
 class PtBr {
   Map<String, String> get messages => {
-    'start': 'Iniciar',
-    'description':
-        'Aplicativo de previsão do tempo com previsão atualizada para cada hora, dia e semana para qualquer local.',
-    'name': 'Clima',
-    'name2': 'Design Conveniente',
-    'name3': 'Entre em Contato Conosco',
-    'description2':
-        'Toda a navegação é projetada para interagir com o aplicativo da maneira mais conveniente e rápida possível.',
-    'description3':
-        'Se você encontrar algum problema, entre em contato conosco por e-mail ou nas avaliações do aplicativo.',
-    'next': 'Próximo',
-    'search': 'Pesquisar...',
-    'loading': 'Carregando...',
-    'searchCity': 'Procure sua cidade',
-    'humidity': 'Umidade',
-    'wind': 'Vento',
-    'visibility': 'Visibilidade',
-    'feels': 'Sensação',
-    'evaporation': 'Evapotranspirações',
-    'precipitation': 'Precipitação',
-    'direction': 'Direção',
-    'pressure': 'Pressão',
-    'rain': 'Chuva',
-    'clear_sky': 'Céu limpo',
-    'cloudy': 'Nublado',
-    'overcast': 'Encoberto',
-    'fog': 'Névoa',
-    'drizzle': 'Garoa',
-    'drizzling_rain': 'Chuva fraca',
-    'freezing_rain': 'Chuva congelante',
-    'heavy_rains': 'Chuva pesada',
-    'snow': 'Neve',
-    'thunderstorm': 'Tempestade',
-    'kph': 'km/h',
-    'mph': 'mph',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'mi': 'mi',
-    'km': 'km',
-    'inch': 'inch',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'Configurações.',
-    'no_inter': 'Sem conexão',
-    'on_inter': 'Conecte-se a internet para atualizar os dados de clima.',
-    'location': 'Localização',
-    'no_location':
-        'Habilite a localização para obter dados de clima do local atual.',
-    'theme': 'Tema',
-    'low': 'Baixo',
-    'high': 'Alto',
-    'normal': 'Normal',
-    'lat': 'Latitude',
-    'lon': 'Longitude',
-    'create': 'Criar',
-    'city': 'Cidade',
-    'district': 'Distrito',
-    'noWeatherCard': 'Adicione uma cidade',
-    'deletedCardWeather': 'Deletando a cidade',
-    'deletedCardWeatherQuery':
-        'Você tem certeza que deseja remover esta cidade?',
-    'delete': 'Deletar',
-    'cancel': 'Cancelar',
-    'time': 'Clima na cidade',
-    'validateName': 'Por favor escreva um nome',
-    'measurements': 'Sistema de medidas',
-    'degrees': 'Graus',
-    'celsius': 'Celsius',
-    'fahrenheit': 'Fahrenheit',
-    'imperial': 'Imperial',
-    'metric': 'Métrico',
-    'validateValue': 'Por favor escreva um valor',
-    'validateNumber': 'Por favor escreva um número válido',
-    'validate90': 'Valor deve estar entre -90 and 90',
-    'validate180': 'Valor deve estar entre -180 and 180',
-    'notifications': 'Notificações',
-    'sunrise': 'Nascer do sol',
-    'sunset': 'Pôr do sol',
-    'timeformat': 'Formato de hora',
-    '12': '12 horas',
-    '24': '24 horas',
-    'cloudcover': 'Сobertura de nuvens',
-    'uvIndex': 'UV-índice',
-    'materialColor': 'Cores Dinâmicas',
-    'uvLow': 'Baixo',
-    'uvAverage': 'Moderado',
-    'uvHigh': 'Alto',
-    'uvVeryHigh': 'Muito alto',
-    'uvExtreme': 'Extremo',
-    'weatherMore': 'Previsão do tempo para 12 dias',
-    'windgusts': 'Rajadas',
-    'north': 'Norte',
-    'northeast': 'Nordeste',
-    'east': 'Leste',
-    'southeast': 'Sudeste',
-    'south': 'Sul',
-    'southwest': 'Sudoeste',
-    'west': 'Oeste',
-    'northwest': 'Noroeste',
-    'project': 'Projeto em',
-    'version': 'Versão do aplicativo',
-    'precipitationProbability': 'Probabilidade de precipitação',
-    'apparentTemperatureMin': 'Temperatura aparente mínima',
-    'apparentTemperatureMax': 'Temperatura aparente máxima',
-    'amoledTheme': 'AMOLED-tema',
-    'appearance': 'Aparência',
-    'functions': 'Funções',
-    'data': 'Dados',
-    'language': 'Idioma',
-    'timeRange': 'Frequência (em horas)',
-    'timeStart': 'Hora de início',
-    'timeEnd': 'Hora de término',
-    'support': 'Suporte',
-    'system': 'Sistema',
-    'dark': 'Escuro',
-    'light': 'Claro',
-    'license': 'Licenças',
-    'widget': 'Widget',
-    'widgetBackground': 'Fundo do widget',
-    'widgetText': 'Texto do widget',
-    'dewpoint': 'Ponto de orvalho',
-    'shortwaveRadiation': 'Radiação de ondas curtas',
-    'roundDegree': 'Arredondar graus',
-    'settings_full': 'Configurações',
-    'cities': 'Cidades',
-    'searchMethod': 'Use a pesquisa ou a geolocalização',
-    'done': 'Concluído',
-    'groups': 'Nossos grupos',
-    'openMeteo': 'Dados do Open-Meteo (CC-BY 4.0)',
-    'hourlyVariables': 'Variáveis meteorológicas horárias',
-    'dailyVariables': 'Variáveis meteorológicas diárias',
-    'largeElement': 'Exibição grande do clima',
-    'map': 'Mapa',
-    'clearCacheStore': 'Limpar cache',
-    'deletedCacheStore': 'Limpando cache',
-    'deletedCacheStoreQuery': 'Tem certeza de que deseja limpar o cache?',
-    'addWidget': 'Adicionar widget',
-    'hideMap': 'Ocultar mapa',
-  };
+        'start': 'Iniciar',
+        'description':
+            'Aplicativo de previsão do tempo com previsão atualizada para cada hora, dia e semana para qualquer local.',
+        'name': 'Clima',
+        'name2': 'Design Conveniente',
+        'name3': 'Entre em Contato Conosco',
+        'description2':
+            'Toda a navegação é projetada para interagir com o aplicativo da maneira mais conveniente e rápida possível.',
+        'description3':
+            'Se você encontrar algum problema, entre em contato conosco por e-mail ou nas avaliações do aplicativo.',
+        'next': 'Próximo',
+        'search': 'Pesquisar...',
+        'loading': 'Carregando...',
+        'searchCity': 'Procure sua cidade',
+        'humidity': 'Umidade',
+        'wind': 'Vento',
+        'visibility': 'Visibilidade',
+        'feels': 'Sensação',
+        'evaporation': 'Evapotranspirações',
+        'precipitation': 'Precipitação',
+        'direction': 'Direção',
+        'pressure': 'Pressão',
+        'rain': 'Chuva',
+        'clear_sky': 'Céu limpo',
+        'cloudy': 'Nublado',
+        'overcast': 'Encoberto',
+        'fog': 'Névoa',
+        'drizzle': 'Garoa',
+        'drizzling_rain': 'Chuva fraca',
+        'freezing_rain': 'Chuva congelante',
+        'heavy_rains': 'Chuva pesada',
+        'snow': 'Neve',
+        'thunderstorm': 'Tempestade',
+        'kph': 'km/h',
+        'mph': 'mph',
+        'mi': 'mi',
+        'km': 'km',
+        'inch': 'inch',
+        'mm': 'mm',
+        'hPa': 'hPa',
+        'settings': 'Configurações.',
+        'no_inter': 'Sem conexão',
+        'on_inter': 'Conecte-se a internet para atualizar os dados de clima.',
+        'location': 'Localização',
+        'no_location':
+            'Habilite a localização para obter dados de clima do local atual.',
+        'theme': 'Tema',
+        'low': 'Baixo',
+        'high': 'Alto',
+        'normal': 'Normal',
+        'lat': 'Latitude',
+        'lon': 'Longitude',
+        'create': 'Criar',
+        'city': 'Cidade',
+        'district': 'Distrito',
+        'noWeatherCard': 'Adicione uma cidade',
+        'deletedCardWeather': 'Deletando a cidade',
+        'deletedCardWeatherQuery':
+            'Você tem certeza que deseja remover esta cidade?',
+        'delete': 'Deletar',
+        'cancel': 'Cancelar',
+        'time': 'Clima na cidade',
+        'validateName': 'Por favor escreva um nome',
+        'measurements': 'Sistema de medidas',
+        'degrees': 'Graus',
+        'celsius': 'Celsius',
+        'fahrenheit': 'Fahrenheit',
+        'imperial': 'Imperial',
+        'metric': 'Métrico',
+        'validateValue': 'Por favor escreva um valor',
+        'validateNumber': 'Por favor escreva um número válido',
+        'validate90': 'Valor deve estar entre -90 and 90',
+        'validate180': 'Valor deve estar entre -180 and 180',
+        'notifications': 'Notificações',
+        'sunrise': 'Nascer do sol',
+        'sunset': 'Pôr do sol',
+        'timeformat': 'Formato de hora',
+        '12': '12 horas',
+        '24': '24 horas',
+        'cloudcover': 'Сobertura de nuvens',
+        'uvIndex': 'UV-índice',
+        'materialColor': 'Cores Dinâmicas',
+        'uvLow': 'Baixo',
+        'uvAverage': 'Moderado',
+        'uvHigh': 'Alto',
+        'uvVeryHigh': 'Muito alto',
+        'uvExtreme': 'Extremo',
+        'weatherMore': 'Previsão do tempo para 12 dias',
+        'windgusts': 'Rajadas',
+        'north': 'Norte',
+        'northeast': 'Nordeste',
+        'east': 'Leste',
+        'southeast': 'Sudeste',
+        'south': 'Sul',
+        'southwest': 'Sudoeste',
+        'west': 'Oeste',
+        'northwest': 'Noroeste',
+        'project': 'Projeto em',
+        'version': 'Versão do aplicativo',
+        'precipitationProbability': 'Probabilidade de precipitação',
+        'apparentTemperatureMin': 'Temperatura aparente mínima',
+        'apparentTemperatureMax': 'Temperatura aparente máxima',
+        'amoledTheme': 'AMOLED-tema',
+        'appearance': 'Aparência',
+        'functions': 'Funções',
+        'data': 'Dados',
+        'language': 'Idioma',
+        'timeRange': 'Frequência (em horas)',
+        'timeStart': 'Hora de início',
+        'timeEnd': 'Hora de término',
+        'support': 'Suporte',
+        'system': 'Sistema',
+        'dark': 'Escuro',
+        'light': 'Claro',
+        'license': 'Licenças',
+        'widget': 'Widget',
+        'widgetBackground': 'Fundo do widget',
+        'widgetText': 'Texto do widget',
+        'dewpoint': 'Ponto de orvalho',
+        'shortwaveRadiation': 'Radiação de ondas curtas',
+        'roundDegree': 'Arredondar graus',
+      };
 }
diff --git a/lib/translation/ro_ro.dart b/lib/translation/ro_ro.dart
old mode 100755
new mode 100644
index 0dc7af8..6358c7d
--- a/lib/translation/ro_ro.dart
+++ b/lib/translation/ro_ro.dart
@@ -1,141 +1,124 @@
 class RoRo {
   Map<String, String> get messages => {
-    'start': 'Începe',
-    'description':
-        'Aplicație meteo cu o prognoză actualizată pentru fiecare oră, zi și săptămână pentru orice loc.',
-    'name': 'Vremea',
-    'name2': 'Design Convenabil',
-    'name3': 'Contactați-ne',
-    'description2':
-        'Toată navigarea este concepută pentru a interacționa cu aplicația în cel mai comod și rapid mod posibil.',
-    'description3':
-        'Dacă întâmpinați orice probleme, vă rugăm să ne contactați prin e-mail sau în recenziile aplicației.',
-    'next': 'Următorul',
-    'search': 'Caută...',
-    'loading': 'Încărcare...',
-    'searchCity': 'Caută oraș',
-    'humidity': 'Umiditate',
-    'wind': 'Vânt',
-    'visibility': 'Vizibilitate',
-    'feels': 'Se simt',
-    'evaporation': 'Evapotranspirație',
-    'precipitation': 'Precipitații',
-    'direction': 'Direcție',
-    'pressure': 'Presiune',
-    'rain': 'Ploaie',
-    'clear_sky': 'Senin',
-    'cloudy': 'Înnorat',
-    'overcast': 'Cer acoperit de nori',
-    'fog': 'Ceață',
-    'drizzle': 'Burniță',
-    'drizzling_rain': 'Burniță înghețată',
-    'freezing_rain': 'Ploaie înghețată',
-    'heavy_rains': 'Ploaie torențială',
-    'snow': 'Ninsoare',
-    'thunderstorm': 'Furtună',
-    'kph': 'km/h',
-    'mph': 'mph',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'mi': 'mi',
-    'km': 'km',
-    'inch': 'inch',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'Set.',
-    'no_inter': 'Fără Internet',
-    'on_inter': 'Pornește Internetul pentru a obține date meteorologice.',
-    'location': 'Locație',
-    'no_location':
-        'Activează serviciul de localizare pentru a obține date meteorologice pentru locația curentă.',
-    'theme': 'Temă',
-    'low': 'Scăzut',
-    'high': 'Ridicat',
-    'normal': 'Normal',
-    'lat': 'Latitudine',
-    'lon': 'Longitudine',
-    'create': 'Crează',
-    'city': 'Oraș',
-    'district': 'District',
-    'noWeatherCard': 'Adaugă un oraș',
-    'deletedCardWeather': 'Ștergerea orașului',
-    'deletedCardWeatherQuery': 'Ești sigur că vrei să ștergi orașul?',
-    'delete': 'Șterge',
-    'cancel': 'Anulează',
-    'time': 'Ora în oraș',
-    'validateName': 'Introdu numele',
-    'measurements': 'Sistemul de măsuri',
-    'degrees': 'Grade',
-    'celsius': 'Celsius',
-    'fahrenheit': 'Fahrenheit',
-    'imperial': 'Imperial',
-    'metric': 'Metric',
-    'validateValue': 'Introdu o valoare',
-    'validateNumber': 'Introdu un număr valid',
-    'validate90': 'Valoarea trebuie să fie între -90 și 90',
-    'validate180': 'Valoarea trebuie să fie între -180 și 180',
-    'notifications': 'Notificări',
-    'sunrise': 'Răsărit',
-    'sunset': 'Apus',
-    'timeformat': 'Format orar',
-    '12': '12 ore',
-    '24': '24 ore',
-    'cloudcover': 'Acoperirea norilor',
-    'uvIndex': 'Index UV',
-    'materialColor': 'Culori dinamice (Android 12+)',
-    'uvLow': 'Scăzut',
-    'uvAverage': 'Moderat',
-    'uvHigh': 'Ridicat',
-    'uvVeryHigh': 'Foarte ridicat',
-    'uvExtreme': 'Extrem',
-    'weatherMore': 'Prognoza pe 12 zile',
-    'windgusts': 'Rafale de vânt',
-    'north': 'Nord',
-    'northeast': 'Nord-est',
-    'east': 'Est',
-    'southeast': 'Sud-est',
-    'south': 'Sud',
-    'southwest': 'Sud-vest',
-    'west': 'Vest',
-    'northwest': 'Nord-vest',
-    'project': 'Proiectul pe',
-    'version': 'Versiunea aplicației',
-    'precipitationProbability': 'Probabilitatea precipitațiilor',
-    'apparentTemperatureMin': 'Temperatura minimă aparentă',
-    'apparentTemperatureMax': 'Temperatura maximă aparentă',
-    'amoledTheme': 'Temă AMOLED',
-    'appearance': 'Aspect',
-    'functions': 'Funcții',
-    'data': 'Data',
-    'language': 'Limba',
-    'timeRange': 'Frecvența (în ore)',
-    'timeStart': 'Ora de început',
-    'timeEnd': 'Ora de sfârșit',
-    'support': 'Suport',
-    'system': 'Sistem',
-    'dark': 'Întunecat',
-    'light': 'Luminos',
-    'license': 'Licențe',
-    'widget': 'Widget',
-    'widgetBackground': 'Fundal widget',
-    'widgetText': 'Text widget',
-    'dewpoint': 'Punct de rouă',
-    'shortwaveRadiation': 'Radiație cu unde scurte',
-    'roundDegree': 'Rotunjire grade',
-    'settings_full': 'Setări',
-    'cities': 'Orașe',
-    'searchMethod': 'Folosiți căutarea sau geolocația',
-    'done': 'Gata',
-    'groups': 'Grupurile noastre',
-    'openMeteo': 'Date de la Open-Meteo (CC-BY 4.0)',
-    'hourlyVariables': 'Variabile meteorologice orare',
-    'dailyVariables': 'Variabile meteorologice zilnice',
-    'largeElement': 'Afișare mare a vremii',
-    'map': 'Hartă',
-    'clearCacheStore': 'Șterge cache-ul',
-    'deletedCacheStore': 'Ștergerea cache-ului',
-    'deletedCacheStoreQuery': 'Ești sigur că vrei să ștergi cache-ul?',
-    'addWidget': 'Adaugă widget',
-    'hideMap': 'Ascunde harta',
-  };
+        'start': 'Începe',
+        'description':
+            'Aplicație meteo cu o prognoză actualizată pentru fiecare oră, zi și săptămână pentru orice loc.',
+        'name': 'Vremea',
+        'name2': 'Design Convenabil',
+        'name3': 'Contactați-ne',
+        'description2':
+            'Toată navigarea este concepută pentru a interacționa cu aplicația în cel mai comod și rapid mod posibil.',
+        'description3':
+            'Dacă întâmpinați orice probleme, vă rugăm să ne contactați prin e-mail sau în recenziile aplicației.',
+        'next': 'Următorul',
+        'search': 'Caută...',
+        'loading': 'Încărcare...',
+        'searchCity': 'Caută oraș',
+        'humidity': 'Umiditate',
+        'wind': 'Vânt',
+        'visibility': 'Vizibilitate',
+        'feels': 'Se simt',
+        'evaporation': 'Evapotranspirație',
+        'precipitation': 'Precipitații',
+        'direction': 'Direcție',
+        'pressure': 'Presiune',
+        'rain': 'Ploaie',
+        'clear_sky': 'Senin',
+        'cloudy': 'Înnorat',
+        'overcast': 'Cer acoperit de nori',
+        'fog': 'Ceață',
+        'drizzle': 'Burniță',
+        'drizzling_rain': 'Burniță înghețată',
+        'freezing_rain': 'Ploaie înghețată',
+        'heavy_rains': 'Ploaie torențială',
+        'snow': 'Ninsoare',
+        'thunderstorm': 'Furtună',
+        'kph': 'km/h',
+        'mph': 'mph',
+        'mi': 'mi',
+        'km': 'km',
+        'inch': 'inch',
+        'mm': 'mm',
+        'hPa': 'hPa',
+        'settings': 'Set.',
+        'no_inter': 'Fără Internet',
+        'on_inter': 'Pornește Internetul pentru a obține date meteorologice.',
+        'location': 'Locație',
+        'no_location':
+            'Activează serviciul de localizare pentru a obține date meteorologice pentru locația curentă.',
+        'theme': 'Temă',
+        'low': 'Scăzut',
+        'high': 'Ridicat',
+        'normal': 'Normal',
+        'lat': 'Latitudine',
+        'lon': 'Longitudine',
+        'create': 'Crează',
+        'city': 'Oraș',
+        'district': 'District',
+        'noWeatherCard': 'Adaugă un oraș',
+        'deletedCardWeather': 'Ștergerea orașului',
+        'deletedCardWeatherQuery': 'Ești sigur că vrei să ștergi orașul?',
+        'delete': 'Șterge',
+        'cancel': 'Anulează',
+        'time': 'Ora în oraș',
+        'validateName': 'Introdu numele',
+        'measurements': 'Sistemul de măsuri',
+        'degrees': 'Grade',
+        'celsius': 'Celsius',
+        'fahrenheit': 'Fahrenheit',
+        'imperial': 'Imperial',
+        'metric': 'Metric',
+        'validateValue': 'Introdu o valoare',
+        'validateNumber': 'Introdu un număr valid',
+        'validate90': 'Valoarea trebuie să fie între -90 și 90',
+        'validate180': 'Valoarea trebuie să fie între -180 și 180',
+        'notifications': 'Notificări',
+        'sunrise': 'Răsărit',
+        'sunset': 'Apus',
+        'timeformat': 'Format orar',
+        '12': '12 ore',
+        '24': '24 ore',
+        'cloudcover': 'Acoperirea norilor',
+        'uvIndex': 'Index UV',
+        'materialColor': 'Culori dinamice (Android 12+)',
+        'uvLow': 'Scăzut',
+        'uvAverage': 'Moderat',
+        'uvHigh': 'Ridicat',
+        'uvVeryHigh': 'Foarte ridicat',
+        'uvExtreme': 'Extrem',
+        'weatherMore': 'Prognoza pe 12 zile',
+        'windgusts': 'Rafale de vânt',
+        'north': 'Nord',
+        'northeast': 'Nord-est',
+        'east': 'Est',
+        'southeast': 'Sud-est',
+        'south': 'Sud',
+        'southwest': 'Sud-vest',
+        'west': 'Vest',
+        'northwest': 'Nord-vest',
+        'project': 'Proiectul pe',
+        'version': 'Versiunea aplicației',
+        'precipitationProbability': 'Probabilitatea precipitațiilor',
+        'apparentTemperatureMin': 'Temperatura minimă aparentă',
+        'apparentTemperatureMax': 'Temperatura maximă aparentă',
+        'amoledTheme': 'Temă AMOLED',
+        'appearance': 'Aspect',
+        'functions': 'Funcții',
+        'data': 'Data',
+        'language': 'Limba',
+        'timeRange': 'Frecvența (în ore)',
+        'timeStart': 'Ora de început',
+        'timeEnd': 'Ora de sfârșit',
+        'support': 'Suport',
+        'system': 'Sistem',
+        'dark': 'Întunecat',
+        'light': 'Luminos',
+        'license': 'Licențe',
+        'widget': 'Widget',
+        'widgetBackground': 'Fundal widget',
+        'widgetText': 'Text widget',
+        'dewpoint': 'Punct de rouă',
+        'shortwaveRadiation': 'Radiație cu unde scurte',
+        'roundDegree': 'Rotunjire grade',
+      };
 }
diff --git a/lib/translation/ru_ru.dart b/lib/translation/ru_ru.dart
old mode 100755
new mode 100644
index f041ab6..b118ef0
--- a/lib/translation/ru_ru.dart
+++ b/lib/translation/ru_ru.dart
@@ -1,142 +1,125 @@
 class RuRu {
   Map<String, String> get messages => {
-    'start': 'Начать',
-    'description':
-        'Приложение погоды с актуальным прогнозом на каждый час, день и неделю для любого места.',
-    'name': 'Погода',
-    'name2': 'Удобный дизайн',
-    'name3': 'Связаться с нами',
-    'description2':
-        'Вся навигация сделана таким образом, чтобы можно было взаимодействовать с приложением максимально удобно и быстро.',
-    'description3':
-        'Если у вас возникнут какие-либо проблемы, пожалуйста, свяжитесь с нами по электронной почте или в отзывах приложения.',
-    'next': 'Далее',
-    'search': 'Поиск...',
-    'loading': 'Загрузка...',
-    'searchCity': 'Найдите свой город',
-    'humidity': 'Влажность',
-    'wind': 'Ветер',
-    'visibility': 'Видимость',
-    'feels': 'Ощущается',
-    'evaporation': 'Испарения',
-    'precipitation': 'Осадки',
-    'direction': 'Направление',
-    'pressure': 'Давление',
-    'rain': 'Дождь',
-    'clear_sky': 'Чистое небо',
-    'cloudy': 'Облачно',
-    'overcast': 'Пасмурно',
-    'fog': 'Туман',
-    'drizzle': 'Морось',
-    'drizzling_rain': 'Моросящий дождь',
-    'freezing_rain': 'Ледяной дождь',
-    'heavy_rains': 'Ливневые дожди',
-    'snow': 'Снег',
-    'thunderstorm': 'Гроза',
-    'kph': 'км/ч',
-    'm/s': 'м/с',
-    'mmHg': 'мм рт. ст.',
-    'mph': 'миль/ч',
-    'mi': 'миль',
-    'km': 'км',
-    'inch': 'дюйм',
-    'mm': 'мм',
-    'hPa': 'гПа',
-    'settings': 'Настр.',
-    'no_inter': 'Нет интернета',
-    'on_inter': 'Включите интернет для получения метеорологических данных.',
-    'location': 'Местоположение',
-    'no_location':
-        'Включите службу определения местоположения для получения метеорологических данных для текущего местоположения.',
-    'theme': 'Тема',
-    'low': 'Низкое',
-    'high': 'Высокое',
-    'normal': 'Нормальное',
-    'lat': 'Широта',
-    'lon': 'Долгота',
-    'create': 'Создание',
-    'city': 'Город',
-    'district': 'Район',
-    'noWeatherCard': 'Добавьте город',
-    'deletedCardWeather': 'Удаление города',
-    'deletedCardWeatherQuery': 'Вы уверены, что хотите удалить город?',
-    'delete': 'Удалить',
-    'cancel': 'Отмена',
-    'time': 'Время в городе',
-    'validateName': 'Пожалуйста, введите название',
-    'measurements': 'Система мер',
-    'degrees': 'Градусы',
-    'celsius': 'Цельсия',
-    'fahrenheit': 'Фаренгейта',
-    'imperial': 'Имперская',
-    'metric': 'Метрическая',
-    'validateValue': 'Пожалуйста, введите значение',
-    'validateNumber': 'Пожалуйста, введите число',
-    'validate90': 'Значение должно быть в диапазоне от -90 до 90',
-    'validate180': 'Значение должно быть в диапазоне от -180 до 180',
-    'notifications': 'Уведомления',
-    'sunrise': 'Рассвет',
-    'sunset': 'Закат',
-    'timeformat': 'Формат времени',
-    '12': '12-часовой',
-    '24': '24-часовой',
-    'cloudcover': 'Облачный покров',
-    'uvIndex': 'УФ-индекс',
-    'materialColor': 'Динамические цвета',
-    'uvLow': 'Низкий',
-    'uvAverage': 'Умеренный',
-    'uvHigh': 'Высокий',
-    'uvVeryHigh': 'Очень высокий',
-    'uvExtreme': 'Экстремальный',
-    'weatherMore': 'Прогноз погоды на 12 дней',
-    'windgusts': 'Шквал',
-    'north': 'Север',
-    'northeast': 'Северо-восток',
-    'east': 'Восток',
-    'southeast': 'Юго-восток',
-    'south': 'Юг',
-    'southwest': 'Юго-запад',
-    'west': 'Запад',
-    'northwest': 'Северо-запад',
-    'project': 'Проект на',
-    'version': 'Версия приложения',
-    'precipitationProbability': 'Вероятность выпадения осадков',
-    'apparentTemperatureMin': 'Минимальная ощущаемая температура',
-    'apparentTemperatureMax': 'Максимальная ощущаемая температура',
-    'amoledTheme': 'AMOLED-тема',
-    'appearance': 'Внешний вид',
-    'functions': 'Функции',
-    'data': 'Данные',
-    'language': 'Язык',
-    'timeRange': 'Периодичность (в часах)',
-    'timeStart': 'Время начала',
-    'timeEnd': 'Время окончания',
-    'support': 'Поддержка',
-    'system': 'Системная',
-    'dark': 'Тёмная',
-    'light': 'Светлая',
-    'license': 'Лицензии',
-    'widget': 'Виджет',
-    'widgetBackground': 'Фон виджета',
-    'widgetText': 'Текст виджета',
-    'dewpoint': 'Точка росы',
-    'shortwaveRadiation': 'Коротковолновое излучение',
-    'W/m2': 'Вт/м2',
-    'roundDegree': 'Округлить градусы',
-    'settings_full': 'Настройки',
-    'cities': 'Города',
-    'searchMethod': 'Воспользуйтесь поиском или геолокацией',
-    'done': 'Готово',
-    'groups': 'Наши группы',
-    'openMeteo': 'Данные от Open-Meteo (CC-BY 4.0)',
-    'hourlyVariables': 'Почасовые погодные условия',
-    'dailyVariables': 'Ежедневные погодные условия',
-    'largeElement': 'Отображение погоды большим элементом',
-    'map': 'Карта',
-    'clearCacheStore': 'Очистить кэш',
-    'deletedCacheStore': 'Очистка кэша',
-    'deletedCacheStoreQuery': 'Вы уверены, что хотите очистить кэш?',
-    'addWidget': 'Добавить виджет',
-    'hideMap': 'Скрыть карту',
-  };
+        'start': 'Начать',
+        'description':
+            'Приложение погоды с актуальным прогнозом на каждый час, день и неделю для любого места.',
+        'name': 'Погода',
+        'name2': 'Удобный дизайн',
+        'name3': 'Связаться с нами',
+        'description2':
+            'Вся навигация сделана таким образом, чтобы можно было взаимодействовать с приложением максимально удобно и быстро.',
+        'description3':
+            'Если у вас возникнут какие-либо проблемы, пожалуйста, свяжитесь с нами по электронной почте или в отзывах приложения.',
+        'next': 'Далее',
+        'search': 'Поиск...',
+        'loading': 'Загрузка...',
+        'searchCity': 'Найдите свой город',
+        'humidity': 'Влажность',
+        'wind': 'Ветер',
+        'visibility': 'Видимость',
+        'feels': 'Ощущается',
+        'evaporation': 'Испарения',
+        'precipitation': 'Осадки',
+        'direction': 'Направление',
+        'pressure': 'Давление',
+        'rain': 'Дождь',
+        'clear_sky': 'Чистое небо',
+        'cloudy': 'Облачно',
+        'overcast': 'Пасмурно',
+        'fog': 'Туман',
+        'drizzle': 'Морось',
+        'drizzling_rain': 'Моросящий дождь',
+        'freezing_rain': 'Ледяной дождь',
+        'heavy_rains': 'Ливневые дожди',
+        'snow': 'Снег',
+        'thunderstorm': 'Гроза',
+        'kph': 'км/ч',
+        'mph': 'миль/ч',
+        'mi': 'миль',
+        'km': 'км',
+        'inch': 'дюйм',
+        'mm': 'мм',
+        'hPa': 'гПа',
+        'settings': 'Настр.',
+        'no_inter': 'Нет интернета',
+        'on_inter': 'Включите интернет для получения метеорологических данных.',
+        'location': 'Местоположение',
+        'no_location':
+            'Включите службу определения местоположения для получения метеорологических данных для текущего местоположения.',
+        'theme': 'Тема',
+        'low': 'Низкое',
+        'high': 'Высокое',
+        'normal': 'Нормальное',
+        'lat': 'Широта',
+        'lon': 'Долгота',
+        'create': 'Создание',
+        'city': 'Город',
+        'district': 'Район',
+        'noWeatherCard': 'Добавьте город',
+        'deletedCardWeather': 'Удаление города',
+        'deletedCardWeatherQuery': 'Вы уверены, что хотите удалить город?',
+        'delete': 'Удалить',
+        'cancel': 'Отмена',
+        'time': 'Время в городе',
+        'validateName': 'Пожалуйста, введите название',
+        'measurements': 'Система мер',
+        'degrees': 'Градусы',
+        'celsius': 'Цельсия',
+        'fahrenheit': 'Фаренгейта',
+        'imperial': 'Имперская',
+        'metric': 'Метрическая',
+        'validateValue': 'Пожалуйста, введите значение',
+        'validateNumber': 'Пожалуйста, введите число',
+        'validate90': 'Значение должно быть в диапазоне от -90 до 90',
+        'validate180': 'Значение должно быть в диапазоне от -180 до 180',
+        'notifications': 'Уведомления',
+        'sunrise': 'Рассвет',
+        'sunset': 'Закат',
+        'timeformat': 'Формат времени',
+        '12': '12-часовой',
+        '24': '24-часовой',
+        'cloudcover': 'Облачный покров',
+        'uvIndex': 'УФ-индекс',
+        'materialColor': 'Динамические цвета',
+        'uvLow': 'Низкий',
+        'uvAverage': 'Умеренный',
+        'uvHigh': 'Высокий',
+        'uvVeryHigh': 'Очень высокий',
+        'uvExtreme': 'Экстремальный',
+        'weatherMore': 'Прогноз погоды на 12 дней',
+        'windgusts': 'Шквал',
+        'north': 'Север',
+        'northeast': 'Северо-восток',
+        'east': 'Восток',
+        'southeast': 'Юго-восток',
+        'south': 'Юг',
+        'southwest': 'Юго-запад',
+        'west': 'Запад',
+        'northwest': 'Северо-запад',
+        'project': 'Проект на',
+        'version': 'Версия приложения',
+        'precipitationProbability': 'Вероятность выпадения осадков',
+        'apparentTemperatureMin': 'Минимальная ощущаемая температура',
+        'apparentTemperatureMax': 'Максимальная ощущаемая температура',
+        'amoledTheme': 'AMOLED-тема',
+        'appearance': 'Внешний вид',
+        'functions': 'Функции',
+        'data': 'Данные',
+        'language': 'Язык',
+        'timeRange': 'Периодичность (в часах)',
+        'timeStart': 'Время начала',
+        'timeEnd': 'Время окончания',
+        'support': 'Поддержка',
+        'system': 'Системная',
+        'dark': 'Тёмная',
+        'light': 'Светлая',
+        'license': 'Лицензии',
+        'widget': 'Виджет',
+        'widgetBackground': 'Фон виджета',
+        'widgetText': 'Текст виджета',
+        'dewpoint': 'Точка росы',
+        'shortwaveRadiation': 'Коротковолновое излучение',
+        'W/m2': 'Вт/м2',
+        'roundDegree': 'Округлить градусы',
+      };
 }
diff --git a/lib/translation/sk_sk.dart b/lib/translation/sk_sk.dart
old mode 100755
new mode 100644
index a4cd7d9..cf45037
--- a/lib/translation/sk_sk.dart
+++ b/lib/translation/sk_sk.dart
@@ -1,142 +1,124 @@
 class SkSk {
   Map<String, String> get messages => {
-    'start': 'Začať',
-    'description':
-        'Aplikácia počasia s aktuálnym predpoveďou pre každú hodinu, deň a týždeň pre akékoľvek miesto.',
-    'name': 'Počasie',
-    'name2': 'Pohodlný dizajn',
-    'name3': 'Kontaktujte nás',
-    'description2':
-        'Celá navigácia je navrhnutá tak, aby sa s aplikáciou dalo interagovať čo najpohodlnejšie a najrýchlejšie.',
-    'description3':
-        'Ak sa vyskytnú nejaké problémy, kontaktujte nás prosím e-mailom alebo v recenziách aplikácie.',
-    'next': 'Ďalej',
-    'search': 'Hľadať...',
-    'loading': 'Načítava sa...',
-    'searchCity': 'Nájdite svoje miesto',
-    'humidity': 'Vlhkosť',
-    'wind': 'Vietor',
-    'visibility': 'Viditeľnosť',
-    'feels': 'Pocitová teplota',
-    'evaporation': 'Evapotranspirácia',
-    'precipitation': 'Zrážky',
-    'direction': 'Smer',
-    'pressure': 'Tlak',
-    'rain': 'Dážď',
-    'clear_sky': 'Jasno',
-    'cloudy': 'Oblačno',
-    'overcast': 'Zamračené',
-    'fog': 'Hmla',
-    'drizzle': 'Mrholenie',
-    'drizzling_rain': 'Mrznúce mrholenie',
-    'freezing_rain': 'Mrazivý dážď',
-    'heavy_rains': 'Prehánky',
-    'snow': 'Sneh',
-    'thunderstorm': 'Búrka',
-    'kph': 'km/h',
-    'mph': 'mph',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'mi': 'mi',
-    'km': 'km',
-    'inch': 'inch',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'Nast.',
-    'no_inter': 'Žiadny internet',
-    'on_inter': 'Pripojte sa na internet a získajte meteorologické údaje.',
-    'location': 'Poloha',
-    'no_location':
-        'Ak chcete získať údaje o počasí pre aktuálnu polohu, povoľte službu určovania polohy.',
-    'theme': 'Téma',
-    'low': 'Nízky',
-    'high': 'Vysoký',
-    'normal': 'Normálny',
-    'lat': 'Zemepisná šírka',
-    'lon': 'Zemepisná dĺžka',
-    'create': 'Vytvoriť',
-    'city': 'Miesto',
-    'district': 'Okres',
-    'noWeatherCard': 'Pridať mesto',
-    'deletedCardWeather': 'Vymazať mesto',
-    'deletedCardWeatherQuery': 'Naozaj chcete odstrániť mesto?',
-    'delete': 'Odstrániť',
-    'cancel': 'Zrušiť',
-    'time': 'Čas v meste',
-    'validateName': 'Prosím zadajte názov',
-    'measurements': 'Jednotky merania',
-    'degrees': 'Stupňe',
-    'celsius': 'Celzius',
-    'fahrenheit': 'Fahrenheit',
-    'imperial': 'Imperiálne',
-    'metric': 'Metrické',
-    'validateValue': 'Zadajte hodnotu',
-    'validateNumber': 'Zadajte platné číslo',
-    'validate90': 'Hodnota musí byť medzi -90 a 90',
-    'validate180': 'Hodnota musí byť medzi -180 a 180',
-    'notifications': 'Notifikácie',
-    'sunrise': 'Východ slnka',
-    'sunset': 'Západ slnka',
-    'timeformat': 'Formát času',
-    '12': '12-hodinový',
-    '24': '24-hodinový',
-    'cloudcover': 'Oblačnosť',
-    'uvIndex': 'UV-index',
-    'materialColor': 'Dynamické Farby',
-    'uvLow': 'Nízky',
-    'uvAverage': 'Mierny',
-    'uvHigh': 'Vysoký',
-    'uvVeryHigh': 'Veľmi vysoký',
-    'uvExtreme': 'Extrémny',
-    'weatherMore': 'Predpoveď počasia na 12 dní',
-    'windgusts': 'Nárazy vetra',
-    'north': 'Sever',
-    'northeast': 'Severo-Východ',
-    'east': 'Východ',
-    'southeast': 'Juhovýchod',
-    'south': 'Juž',
-    'southwest': 'Juhozápad',
-    'west': 'Západ',
-    'northwest': 'Severo-Západ',
-    'project': 'Projekt na',
-    'version': 'Verzia aplikácie',
-    'precipitationProbability': 'Pravdepodobnosť zrážok',
-    'apparentTemperatureMin': 'Minimálna pocitová teplota',
-    'apparentTemperatureMax': 'Maximálna pocitová teplota',
-    'amoledTheme': 'AMOLED-téma',
-    'appearance': 'Vzhľad',
-    'functions': 'Funkcie',
-    'data': 'Dáta',
-    'language': 'Jazyk',
-    'timeRange': 'Frekvencia (v hodinách)',
-    'timeStart': 'Čas začiatku',
-    'timeEnd': 'Čas ukončenia',
-    'support': 'Podpora',
-    'system': 'Systém',
-    'dark': 'Tmavá',
-    'light': 'Svetlá',
-    'license': 'Licencie',
-    'widget': 'Widget',
-    'widgetBackground': 'Pozadie widgetu',
-    'widgetText': 'Text widgetu',
-    'dewpoint': 'Rosný bod',
-    'shortwaveRadiation': 'Krátka vlnová radiácia',
-    'roundDegree': 'Zaokrúhliť stupne',
-    'settings_full': 'Nastavenia',
-    'cities': 'Mestá',
-    'searchMethod': 'Použite vyhľadávanie alebo geolokáciu',
-    'done': 'Hotovo',
-    'groups': 'Naše skupiny',
-    'openMeteo': 'Údaje od Open-Meteo (CC-BY 4.0)',
-    'hourlyVariables': 'Hodinové meteorologické premenné',
-    'dailyVariables': 'Denné meteorologické premenné',
-    'largeElement': 'Veľké zobrazenie počasia',
-    'map': 'Mapa',
-    'clearCacheStore': 'Vymazať vyrovnávaciu pamäť',
-    'deletedCacheStore': 'Vymazávanie vyrovnávacej pamäte',
-    'deletedCacheStoreQuery':
-        'Ste si istí, že chcete vymazať vyrovnávaciu pamäť?',
-    'addWidget': 'Pridať widget',
-    'hideMap': 'Skryť mapu',
-  };
+        'start': 'Začať',
+        'description':
+            'Aplikácia počasia s aktuálnym predpoveďou pre každú hodinu, deň a týždeň pre akékoľvek miesto.',
+        'name': 'Počasie',
+        'name2': 'Pohodlný dizajn',
+        'name3': 'Kontaktujte nás',
+        'description2':
+            'Celá navigácia je navrhnutá tak, aby sa s aplikáciou dalo interagovať čo najpohodlnejšie a najrýchlejšie.',
+        'description3':
+            'Ak sa vyskytnú nejaké problémy, kontaktujte nás prosím e-mailom alebo v recenziách aplikácie.',
+        'next': 'Ďalej',
+        'search': 'Hľadať...',
+        'loading': 'Načítava sa...',
+        'searchCity': 'Nájdite svoje miesto',
+        'humidity': 'Vlhkosť',
+        'wind': 'Vietor',
+        'visibility': 'Viditeľnosť',
+        'feels': 'Pocitová teplota',
+        'evaporation': 'Evapotranspirácia',
+        'precipitation': 'Zrážky',
+        'direction': 'Smer',
+        'pressure': 'Tlak',
+        'rain': 'Dážď',
+        'clear_sky': 'Jasno',
+        'cloudy': 'Oblačno',
+        'overcast': 'Zamračené',
+        'fog': 'Hmla',
+        'drizzle': 'Mrholenie',
+        'drizzling_rain': 'Mrznúce mrholenie',
+        'freezing_rain': 'Mrazivý dážď',
+        'heavy_rains': 'Prehánky',
+        'snow': 'Sneh',
+        'thunderstorm': 'Búrka',
+        'kph': 'km/h',
+        'mph': 'mph',
+        'mi': 'mi',
+        'km': 'km',
+        'inch': 'inch',
+        'mm': 'mm',
+        'hPa': 'hPa',
+        'settings': 'Nast.',
+        'no_inter': 'Žiadny internet',
+        'on_inter': 'Pripojte sa na internet a získajte meteorologické údaje.',
+        'location': 'Poloha',
+        'no_location':
+            'Ak chcete získať údaje o počasí pre aktuálnu polohu, povoľte službu určovania polohy.',
+        'theme': 'Téma',
+        'low': 'Nízky',
+        'high': 'Vysoký',
+        'normal': 'Normálny',
+        'lat': 'Zemepisná šírka',
+        'lon': 'Zemepisná dĺžka',
+        'create': 'Vytvoriť',
+        'city': 'Miesto',
+        'district': 'Okres',
+        'noWeatherCard': 'Pridať mesto',
+        'deletedCardWeather': 'Vymazať mesto',
+        'deletedCardWeatherQuery': 'Naozaj chcete odstrániť mesto?',
+        'delete': 'Odstrániť',
+        'cancel': 'Zrušiť',
+        'time': 'Čas v meste',
+        'validateName': 'Prosím zadajte názov',
+        'measurements': 'Jednotky merania',
+        'degrees': 'Stupňe',
+        'celsius': 'Celzius',
+        'fahrenheit': 'Fahrenheit',
+        'imperial': 'Imperiálne',
+        'metric': 'Metrické',
+        'validateValue': 'Zadajte hodnotu',
+        'validateNumber': 'Zadajte platné číslo',
+        'validate90': 'Hodnota musí byť medzi -90 a 90',
+        'validate180': 'Hodnota musí byť medzi -180 a 180',
+        'notifications': 'Notifikácie',
+        'sunrise': 'Východ slnka',
+        'sunset': 'Západ slnka',
+        'timeformat': 'Formát času',
+        '12': '12-hodinový',
+        '24': '24-hodinový',
+        'cloudcover': 'Oblačnosť',
+        'uvIndex': 'UV-index',
+        'materialColor': 'Dynamické Farby',
+        'uvLow': 'Nízky',
+        'uvAverage': 'Mierny',
+        'uvHigh': 'Vysoký',
+        'uvVeryHigh': 'Veľmi vysoký',
+        'uvExtreme': 'Extrémny',
+        'weatherMore': 'Predpoveď počasia na 12 dní',
+        'windgusts': 'Nárazy vetra',
+        'north': 'Sever',
+        'northeast': 'Severo-Východ',
+        'east': 'Východ',
+        'southeast': 'Juhovýchod',
+        'south': 'Juž',
+        'southwest': 'Juhozápad',
+        'west': 'Západ',
+        'northwest': 'Severo-Západ',
+        'project': 'Projekt na',
+        'version': 'Verzia aplikácie',
+        'precipitationProbability': 'Pravdepodobnosť zrážok',
+        'apparentTemperatureMin': 'Minimálna pocitová teplota',
+        'apparentTemperatureMax': 'Maximálna pocitová teplota',
+        'amoledTheme': 'AMOLED-téma',
+        'appearance': 'Vzhľad',
+        'functions': 'Funkcie',
+        'data': 'Dáta',
+        'language': 'Jazyk',
+        'timeRange': 'Frekvencia (v hodinách)',
+        'timeStart': 'Čas začiatku',
+        'timeEnd': 'Čas ukončenia',
+        'support': 'Podpora',
+        'system': 'Systém',
+        'dark': 'Tmavá',
+        'light': 'Svetlá',
+        'license': 'Licencie',
+        'widget': 'Widget',
+        'widgetBackground': 'Pozadie widgetu',
+        'widgetText': 'Text widgetu',
+        'dewpoint': 'Rosný bod',
+        'shortwaveRadiation': 'Krátka vlnová radiácia',
+        'roundDegree': 'Zaokrúhliť stupne',
+      };
 }
diff --git a/lib/translation/tr_tr.dart b/lib/translation/tr_tr.dart
old mode 100755
new mode 100644
index 11628f6..505299f
--- a/lib/translation/tr_tr.dart
+++ b/lib/translation/tr_tr.dart
@@ -1,142 +1,124 @@
 class TrTr {
   Map<String, String> get messages => {
-    'start': 'Başlat',
-    'description':
-        'Herhangi bir yer için her saat, gün ve hafta için güncel hava durumu tahmini sunan hava durumu uygulaması.',
-    'name': 'Hava Durumu',
-    'name2': 'Pratik Tasarım',
-    'name3': 'Bizimle İletişime Geçin',
-    'description2':
-        'Tüm gezinme, uygulama ile mümkün olduğunca rahat ve hızlı etkileşim kurmak için tasarlanmıştır.',
-    'description3':
-        'Herhangi bir sorunla karşılaşırsanız, lütfen bize e-posta veya uygulama yorumları aracılığıyla ulaşın.',
-    'next': 'Devam',
-    'search': 'Arayış...',
-    'loading': 'Yükleniyor...',
-    'searchCity': 'Şehrinizi bulun',
-    'humidity': 'Nem',
-    'wind': 'Rüzgar',
-    'visibility': 'Görüş',
-    'feels': 'Hissedilen',
-    'evaporation': 'Buharlaşma',
-    'precipitation': 'Yağış',
-    'direction': 'Yön',
-    'pressure': 'Basınç',
-    'rain': 'Yağmur',
-    'clear_sky': 'Açık gökyüzü',
-    'cloudy': 'Bulutlu',
-    'overcast': 'Kapalı',
-    'fog': 'Sis',
-    'drizzle': 'Çiseleme',
-    'drizzling_rain': 'Çiseleyen Yağmur',
-    'freezing_rain': 'Dondurucu Yağmur',
-    'heavy_rains': 'Aşırı Yağmurlar',
-    'snow': 'Kar',
-    'thunderstorm': 'Gök Gürültülü Fırtına',
-    'kph': 'km/sa',
-    'mph': 'mil/sa',
-    'm/s': 'm/s',
-    'mmHg': 'mmHg',
-    'mi': 'mil',
-    'km': 'km',
-    'inch': 'inç',
-    'mm': 'mm',
-    'hPa': 'hPa',
-    'settings': 'Ayarlar',
-    'no_inter': 'İnternet yok',
-    'on_inter': 'Hava durumu verilerini almak için interneti açın.',
-    'location': 'Konum',
-    'no_location':
-        'Mevcut konumun hava durumu verilerini almak için konum servisini açın.',
-    'theme': 'Tema',
-    'low': 'Düşük',
-    'high': 'Yüksek',
-    'normal': 'Normal',
-    'lat': 'Enlem',
-    'lon': 'Boylam',
-    'create': 'Oluştur',
-    'city': 'Şehir',
-    'district': 'İlçe',
-    'noWeatherCard': 'Şehri ekle',
-    'deletedCardWeather': 'Şehir silme',
-    'deletedCardWeatherQuery': 'Şehri silmek istediğinizden emin misiniz?',
-    'delete': 'Sil',
-    'cancel': 'İptal',
-    'time': 'Şehirde Saat',
-    'validateName': 'Lütfen bir isim girin',
-    'measurements': 'Ölçüm sistemi',
-    'degrees': 'Dereceler',
-    'celsius': 'Celsius',
-    'fahrenheit': 'Fahrenheit',
-    'imperial': 'İmparatorluk',
-    'metric': 'Metrik',
-    'validateValue': 'Lütfen bir değer girin',
-    'validateNumber': 'Lütfen bir sayı girin',
-    'validate90': 'Değer -90 ile 90 arasında olmalıdır',
-    'validate180': 'Değer -180 ile 180 arasında olmalıdır',
-    'notifications': 'Bildirme',
-    'sunrise': 'Güneş doğuşu',
-    'sunset': 'Güneş batışı',
-    'timeformat': 'Saat biçimi',
-    '12': '12 saat',
-    '24': '24 saat',
-    'cloudcover': 'Bulut örtüsü',
-    'uvIndex': 'UV-indeksi',
-    'materialColor': 'Dinamik Renkler',
-    'uvLow': 'Düşük',
-    'uvAverage': 'Orta',
-    'uvHigh': 'Yüksek',
-    'uvVeryHigh': 'Çok yüksek',
-    'uvExtreme': 'Aşırı',
-    'weatherMore': '12 günlük hava tahmini',
-    'windgusts': 'Bir telaş',
-    'north': 'Kuzey',
-    'northeast': 'Kuzeydoğu',
-    'east': 'Doğu',
-    'southeast': 'Güneydoğu',
-    'south': 'Güney',
-    'southwest': 'Güneybatı',
-    'west': 'Batı',
-    'northwest': 'Kuzeybatı',
-    'project': 'Proje üzerinde',
-    'version': 'Uygulama sürümü',
-    'precipitationProbability': 'Yağış olasılığı',
-    'apparentTemperatureMin': 'Minimum hissedilen sıcaklık',
-    'apparentTemperatureMax': 'Maksimum hissedilen sıcaklık',
-    'amoledTheme': 'AMOLED-teması',
-    'appearance': 'Görünüm',
-    'functions': 'Fonksiyonlar',
-    'data': 'Veri',
-    'language': 'Dil',
-    'timeRange': 'Sıklık (saat cinsinden)',
-    'timeStart': 'Başlangıç zamanı',
-    'timeEnd': 'Bitiş zamanı',
-    'support': 'Destek',
-    'system': 'Sistem',
-    'dark': 'Karanlık',
-    'light': 'Aydınlık',
-    'license': 'Lisanslar',
-    'widget': 'Araç',
-    'widgetBackground': 'Araç Arka Planı',
-    'widgetText': 'Araç metni',
-    'dewpoint': 'Çiğ noktası',
-    'shortwaveRadiation': 'Kısa dalga radyasyonu',
-    'roundDegree': 'Dereceleri yuvarla',
-    'settings_full': 'Ayarlar',
-    'cities': 'Şehirler',
-    'searchMethod': 'Arama veya konum belirleme kullanın',
-    'done': 'Tamam',
-    'groups': 'Gruplarımız',
-    'openMeteo': 'Open-Meteo\'dan veriler (CC-BY 4.0)',
-    'hourlyVariables': 'Saatlik hava değişkenleri',
-    'dailyVariables': 'Günlük hava değişkenleri',
-    'largeElement': 'Büyük hava durumu gösterimi',
-    'map': 'Harita',
-    'clearCacheStore': 'Önbelleği temizle',
-    'deletedCacheStore': 'Önbellek temizleniyor',
-    'deletedCacheStoreQuery':
-        'Önbelleği temizlemek istediğinizden emin misiniz?',
-    'addWidget': 'Widget ekle',
-    'hideMap': 'Haritayı gizle',
-  };
+        'start': 'Başlat',
+        'description':
+            'Herhangi bir yer için her saat, gün ve hafta için güncel hava durumu tahmini sunan hava durumu uygulaması.',
+        'name': 'Hava Durumu',
+        'name2': 'Pratik Tasarım',
+        'name3': 'Bizimle İletişime Geçin',
+        'description2':
+            'Tüm gezinme, uygulama ile mümkün olduğunca rahat ve hızlı etkileşim kurmak için tasarlanmıştır.',
+        'description3':
+            'Herhangi bir sorunla karşılaşırsanız, lütfen bize e-posta veya uygulama yorumları aracılığıyla ulaşın.',
+        'next': 'Devam',
+        'search': 'Arayış...',
+        'loading': 'Yükleniyor...',
+        'searchCity': 'Şehrinizi bulun',
+        'humidity': 'Nem',
+        'wind': 'Rüzgar',
+        'visibility': 'Görüş',
+        'feels': 'Hissedilen',
+        'evaporation': 'Buharlaşma',
+        'precipitation': 'Yağış',
+        'direction': 'Yön',
+        'pressure': 'Basınç',
+        'rain': 'Yağmur',
+        'clear_sky': 'Açık gökyüzü',
+        'cloudy': 'Bulutlu',
+        'overcast': 'Kapalı',
+        'fog': 'Sis',
+        'drizzle': 'Çiseleme',
+        'drizzling_rain': 'Çiseleyen Yağmur',
+        'freezing_rain': 'Dondurucu Yağmur',
+        'heavy_rains': 'Aşırı Yağmurlar',
+        'snow': 'Kar',
+        'thunderstorm': 'Gök Gürültülü Fırtına',
+        'kph': 'km/sa',
+        'mph': 'mil/sa',
+        'mi': 'mil',
+        'km': 'km',
+        'inch': 'inç',
+        'mm': 'mm',
+        'hPa': 'hPa',
+        'settings': 'Ayarlar',
+        'no_inter': 'İnternet yok',
+        'on_inter': 'Hava durumu verilerini almak için interneti açın.',
+        'location': 'Konum',
+        'no_location':
+            'Mevcut konumun hava durumu verilerini almak için konum servisini açın.',
+        'theme': 'Tema',
+        'low': 'Düşük',
+        'high': 'Yüksek',
+        'normal': 'Normal',
+        'lat': 'Enlem',
+        'lon': 'Boylam',
+        'create': 'Oluştur',
+        'city': 'Şehir',
+        'district': 'İlçe',
+        'noWeatherCard': 'Şehri ekle',
+        'deletedCardWeather': 'Şehir silme',
+        'deletedCardWeatherQuery': 'Şehri silmek istediğinizden emin misiniz?',
+        'delete': 'Sil',
+        'cancel': 'İptal',
+        'time': 'Şehirde Saat',
+        'validateName': 'Lütfen bir isim girin',
+        'measurements': 'Ölçüm sistemi',
+        'degrees': 'Dereceler',
+        'celsius': 'Celsius',
+        'fahrenheit': 'Fahrenheit',
+        'imperial': 'İmparatorluk',
+        'metric': 'Metrik',
+        'validateValue': 'Lütfen bir değer girin',
+        'validateNumber': 'Lütfen bir sayı girin',
+        'validate90': 'Değer -90 ile 90 arasında olmalıdır',
+        'validate180': 'Değer -180 ile 180 arasında olmalıdır',
+        'notifications': 'Bildirme',
+        'sunrise': 'Güneş doğuşu',
+        'sunset': 'Güneş batışı',
+        'timeformat': 'Saat biçimi',
+        '12': '12 saat',
+        '24': '24 saat',
+        'cloudcover': 'Bulut örtüsü',
+        'uvIndex': 'UV-indeksi',
+        'materialColor': 'Dinamik Renkler',
+        'uvLow': 'Düşük',
+        'uvAverage': 'Orta',
+        'uvHigh': 'Yüksek',
+        'uvVeryHigh': 'Çok yüksek',
+        'uvExtreme': 'Aşırı',
+        'weatherMore': '12 günlük hava tahmini',
+        'windgusts': 'Bir telaş',
+        'north': 'Kuzey',
+        'northeast': 'Kuzeydoğu',
+        'east': 'Doğu',
+        'southeast': 'Güneydoğu',
+        'south': 'Güney',
+        'southwest': 'Güneybatı',
+        'west': 'Batı',
+        'northwest': 'Kuzeybatı',
+        'project': 'Proje üzerinde',
+        'version': 'Uygulama sürümü',
+        'precipitationProbability': 'Yağış olasılığı',
+        'apparentTemperatureMin': 'Minimum hissedilen sıcaklık',
+        'apparentTemperatureMax': 'Maksimum hissedilen sıcaklık',
+        'amoledTheme': 'AMOLED-teması',
+        'appearance': 'Görünüm',
+        'functions': 'Fonksiyonlar',
+        'data': 'Veri',
+        'language': 'Dil',
+        'timeRange': 'Sıklık (saat cinsinden)',
+        'timeStart': 'Başlangıç zamanı',
+        'timeEnd': 'Bitiş zamanı',
+        'support': 'Destek',
+        'system': 'Sistem',
+        'dark': 'Karanlık',
+        'light': 'Aydınlık',
+        'license': 'Lisanslar',
+        'widget': 'Araç',
+        'widgetBackground': 'Araç Arka Planı',
+        'widgetText': 'Araç metni',
+        'dewpoint': 'Çiğ noktası',
+        'shortwaveRadiation': 'Kısa dalga radyasyonu',
+        'roundDegree': 'Dereceleri yuvarla',
+      };
 }
diff --git a/lib/translation/translation.dart b/lib/translation/translation.dart
old mode 100755
new mode 100644
index e7db376..0072fb8
--- a/lib/translation/translation.dart
+++ b/lib/translation/translation.dart
@@ -1,18 +1,15 @@
 import 'package:get/get.dart';
 import 'package:rain/translation/bn_in.dart';
 import 'package:rain/translation/cs_cz.dart';
-import 'package:rain/translation/da_dk.dart';
 import 'package:rain/translation/de_de.dart';
 import 'package:rain/translation/en_us.dart';
 import 'package:rain/translation/es_es.dart';
-import 'package:rain/translation/fa_ir.dart';
 import 'package:rain/translation/fr_fr.dart';
 import 'package:rain/translation/ga_ie.dart';
 import 'package:rain/translation/hi_in.dart';
 import 'package:rain/translation/hu_hu.dart';
 import 'package:rain/translation/it_it.dart';
 import 'package:rain/translation/ka_ge.dart';
-import 'package:rain/translation/ko_kr.dart';
 import 'package:rain/translation/nl_nl.dart';
 import 'package:rain/translation/pl_pl.dart';
 import 'package:rain/translation/pt_br.dart';
@@ -22,34 +19,29 @@ import 'package:rain/translation/sk_sk.dart';
 import 'package:rain/translation/tr_tr.dart';
 import 'package:rain/translation/ur_pk.dart';
 import 'package:rain/translation/zh_ch.dart';
-import 'package:rain/translation/zh_tw.dart';
 
 class Translation extends Translations {
   @override
   Map<String, Map<String, String>> get keys => {
-    'ru_RU': RuRu().messages,
-    'en_US': EnUs().messages,
-    'fr_FR': FrFr().messages,
-    'fa_IR': FaIr().messages,
-    'it_IT': ItIt().messages,
-    'de_DE': DeDe().messages,
-    'tr_TR': TrTr().messages,
-    'pt_BR': PtBr().messages,
-    'es_ES': EsEs().messages,
-    'sk_SK': SkSk().messages,
-    'nl_NL': NlNl().messages,
-    'hi_IN': HiIn().messages,
-    'ro_RO': RoRo().messages,
-    'zh_CN': ZhCh().messages,
-    'zh_TW': ZhTw().messages,
-    'pl_PL': PlPl().messages,
-    'ur_PK': UrPk().messages,
-    'cs_CZ': CsCz().messages,
-    'ka_GE': KaGe().messages,
-    'bn_IN': BnIn().messages,
-    'ga_IE': GaIe().messages,
-    'hu_HU': HuHu().messages,
-    'da_DK': DaDk().messages,
-    'ko_KR': KoKr().messages,
-  };
+        'ru_RU': RuRu().messages,
+        'en_US': EnUs().messages,
+        'fr_FR': FrFr().messages,
+        'it_IT': ItIt().messages,
+        'de_DE': DeDe().messages,
+        'tr_TR': TrTr().messages,
+        'pt_BR': PtBr().messages,
+        'es_ES': EsEs().messages,
+        'sk_SK': SkSk().messages,
+        'nl_NL': NlNl().messages,
+        'hi_IN': HiIn().messages,
+        'ro_RO': RoRo().messages,
+        'zh_CN': ZhCh().messages,
+        'pl_PL': PlPl().messages,
+        'ur_PK': UrPk().messages,
+        'cs_CZ': CsCz().messages,
+        'ka_GE': KaGe().messages,
+        'bn_IN': BnIn().messages,
+        'ga_IE': GaIe().messages,
+        'hu_HU': HuHu().messages,
+      };
 }
diff --git a/lib/translation/ur_pk.dart b/lib/translation/ur_pk.dart
old mode 100755
new mode 100644
index 5425898..bcdd660
--- a/lib/translation/ur_pk.dart
+++ b/lib/translation/ur_pk.dart
@@ -1,142 +1,125 @@
 class UrPk {
   Map<String, String> get messages => {
-    'start': 'شروع',
-    'description':
-        'ہر جگہ کے لیے ہر گھنٹے، ہر دن اور ہر ہفتے کے لیے مواقع پر تازہ پیشگوئیوں کے ساتھ موسم کا ایپلیکیشن۔',
-    'name': 'موسم',
-    'name2': 'آسان ڈیزائن',
-    'name3': 'ہم سے رابطہ کریں',
-    'description2':
-        'تمام نیویگیشن کو ایسا ترتیب دیا گیا ہے کہ آپ ایپلیکیشن کے ساتھ سب سے زیادہ آسان اور تیزی سے تعامل کر سکیں۔',
-    'description3':
-        'اگر آپ کسی بھی مسائل کا سامنا کریں، براہ کرم ای میل یا ایپلیکیشن کے جوابات میں ہم سے رابطہ کریں۔',
-    'next': 'اگلا',
-    'search': 'تلاش کریں...',
-    'loading': 'لوڈ ہو رہا ہے...',
-    'searchCity': 'اپنا شہر تلاش کریں',
-    'humidity': 'نمائش',
-    'wind': 'باد',
-    'visibility': 'دیکھنے کی صلاحیت',
-    'feels': 'محسوس ہوتا ہے',
-    'evaporation': 'بخاری',
-    'precipitation': 'برسات',
-    'direction': 'سمت',
-    'pressure': 'دباؤ',
-    'rain': 'بارش',
-    'clear_sky': 'صاف آسمان',
-    'cloudy': 'بادلوں سے بھرپور',
-    'overcast': 'دھندلے',
-    'fog': 'کھسک',
-    'drizzle': 'بوند بوند بارش',
-    'drizzling_rain': 'چھچھوندار بارش',
-    'freezing_rain': 'ٹھنڈی بارش',
-    'heavy_rains': 'زوردار بارشیں',
-    'snow': 'برف',
-    'thunderstorm': 'طوفانی بارش',
-    'kph': 'کلومیٹر فی گھنٹہ',
-    'mph': 'میل فی گھنٹہ',
-    'm/s': 'میٹر/سیکنڈ',
-    'mmHg': 'ملی میٹر مرکری',
-    'mi': 'میل',
-    'km': 'کلومیٹر',
-    'inch': 'انچ',
-    'mm': 'ملی میٹر',
-    'hPa': 'ہیکٹو پاسکل',
-    'settings': 'ترتیبات',
-    'no_inter': 'انٹرنیٹ نہیں ہے',
-    'on_inter': 'موسمی معلومات حاصل کرنے کے لئے انٹرنیٹ کو چالنے دیں۔',
-    'location': 'مقام',
-    'no_location':
-        'موسمی معلومات حاصل کرنے کے لئے مقام کی تشخیص کی خدمات کو چالنے دیں۔',
-    'theme': 'تھیم',
-    'low': 'کم',
-    'high': 'زیادہ',
-    'normal': 'عام',
-    'lat': 'عرض',
-    'lon': 'طول',
-    'create': 'تخلیق کریں',
-    'city': 'شہر',
-    'district': 'ضلع',
-    'noWeatherCard': 'شہر شامل کریں',
-    'deletedCardWeather': 'شہر کو حذف کر رہا ہے',
-    'deletedCardWeatherQuery': 'کیا آپ واقعی شہر کو حذف کرنا چاہتے ہیں؟',
-    'delete': 'حذف کریں',
-    'cancel': 'منسوخ کریں',
-    'time': 'شہر میں وقت',
-    'validateName': 'براہ کرم نام درج کریں',
-    'measurements': 'پیمائش کی نظام',
-    'degrees': 'درجہ',
-    'celsius': 'سینٹی گریڈ',
-    'fahrenheit': 'فارن ہائٹ',
-    'imperial': 'امپیریل',
-    'metric': 'میٹرک',
-    'validateValue': 'براہ کرم قدر درج کریں',
-    'validateNumber': 'براہ کرم ایک عدد درج کریں',
-    'validate90': 'قدر -90 سے 90 کے اندر ہونی چاہئے',
-    'validate180': 'قدر -180 سے 180 کے اندر ہونی چاہئے',
-    'notifications': 'خبریں',
-    'sunrise': 'طلوع آفتاب',
-    'sunset': 'غروب آفتاب',
-    'timeformat': 'وقت کی شکل',
-    '12': '12-گھنٹے',
-    '24': '24-گھنٹے',
-    'cloudcover': 'ابری پردہ',
-    'uvIndex': 'یووی-انڈیکس',
-    'materialColor': 'موادی رنگیں',
-    'uvLow': 'کم',
-    'uvAverage': 'معتدل',
-    'uvHigh': 'زیادہ',
-    'uvVeryHigh': 'بہت زیادہ',
-    'uvExtreme': 'بہتی کٹھن',
-    'weatherMore': '12 دنوں کی موسمی توقعات',
-    'windgusts': 'گرج',
-    'north': 'شمال',
-    'northeast': 'شمال مشرق',
-    'east': 'مشرق',
-    'southeast': 'جنوب مشرق',
-    'south': 'جنوب',
-    'southwest': 'جنوب مغرب',
-    'west': 'مغرب',
-    'northwest': 'شمال مغرب',
-    'project': 'پروجیکٹ',
-    'version': 'ایپ کی ورژن',
-    'precipitationProbability': 'برسات کی ممکنیت',
-    'apparentTemperatureMin': 'کم درج حرارت محسوس',
-    'apparentTemperatureMax': 'زیادہ درج حرارت محسوس',
-    'amoledTheme': 'AMOLED تھیم',
-    'appearance': 'ظاہریت',
-    'functions': 'فنکشنز',
-    'data': 'ڈیٹا',
-    'language': 'زبان',
-    'timeRange': 'وقت کی مدت (گھنٹوں میں)',
-    'timeStart': 'شروع کا وقت',
-    'timeEnd': 'مختتم کا وقت',
-    'support': 'حمایت',
-    'system': 'سسٹم',
-    'dark': 'اندھیری',
-    'light': 'روشن',
-    'license': 'لائسنس',
-    'widget': 'ویجٹ',
-    'widgetBackground': 'ویجٹ کا پس منظر',
-    'widgetText': 'ویجٹ کا مواد',
-    'dewpoint': 'دھوا پوائنٹ',
-    'shortwaveRadiation': 'چھوٹی موجی شعاع',
-    'W/m2': 'واٹ/میٹر مربع',
-    'roundDegree': 'ڈگری گھیریں',
-    'settings_full': 'ترتیبات',
-    'cities': 'شہر',
-    'searchMethod': 'تلاش یا جغرافیائی مقام استعمال کریں',
-    'done': 'ہوگیا',
-    'groups': 'ہماری گروپس',
-    'openMeteo': 'Open-Meteo سے ڈیٹا (CC-BY 4.0)',
-    'hourlyVariables': 'ہر گھنٹے کے موسمی متغیرات',
-    'dailyVariables': 'روزانہ کے موسمی متغیرات',
-    'largeElement': 'بڑے موسم کا ڈسپلے',
-    'map': 'نقشہ',
-    'clearCacheStore': 'کیچ صاف کریں',
-    'deletedCacheStore': 'کیچ صاف کی جارہی ہے',
-    'deletedCacheStoreQuery': 'کیا آپ واقعی کیچ صاف کرنا چاہتے ہیں؟',
-    'addWidget': 'ویجٹ شامل کریں',
-    'hideMap': 'نقشہ چھپائیں',
-  };
+        'start': 'شروع',
+        'description':
+            'ہر جگہ کے لیے ہر گھنٹے، ہر دن اور ہر ہفتے کے لیے مواقع پر تازہ پیشگوئیوں کے ساتھ موسم کا ایپلیکیشن۔',
+        'name': 'موسم',
+        'name2': 'آسان ڈیزائن',
+        'name3': 'ہم سے رابطہ کریں',
+        'description2':
+            'تمام نیویگیشن کو ایسا ترتیب دیا گیا ہے کہ آپ ایپلیکیشن کے ساتھ سب سے زیادہ آسان اور تیزی سے تعامل کر سکیں۔',
+        'description3':
+            'اگر آپ کسی بھی مسائل کا سامنا کریں، براہ کرم ای میل یا ایپلیکیشن کے جوابات میں ہم سے رابطہ کریں۔',
+        'next': 'اگلا',
+        'search': 'تلاش کریں...',
+        'loading': 'لوڈ ہو رہا ہے...',
+        'searchCity': 'اپنا شہر تلاش کریں',
+        'humidity': 'نمائش',
+        'wind': 'باد',
+        'visibility': 'دیکھنے کی صلاحیت',
+        'feels': 'محسوس ہوتا ہے',
+        'evaporation': 'بخاری',
+        'precipitation': 'برسات',
+        'direction': 'سمت',
+        'pressure': 'دباؤ',
+        'rain': 'بارش',
+        'clear_sky': 'صاف آسمان',
+        'cloudy': 'بادلوں سے بھرپور',
+        'overcast': 'دھندلے',
+        'fog': 'کھسک',
+        'drizzle': 'بوند بوند بارش',
+        'drizzling_rain': 'چھچھوندار بارش',
+        'freezing_rain': 'ٹھنڈی بارش',
+        'heavy_rains': 'زوردار بارشیں',
+        'snow': 'برف',
+        'thunderstorm': 'طوفانی بارش',
+        'kph': 'کلومیٹر فی گھنٹہ',
+        'mph': 'میل فی گھنٹہ',
+        'mi': 'میل',
+        'km': 'کلومیٹر',
+        'inch': 'انچ',
+        'mm': 'ملی میٹر',
+        'hPa': 'ہیکٹو پاسکل',
+        'settings': 'ترتیبات',
+        'no_inter': 'انٹرنیٹ نہیں ہے',
+        'on_inter': 'موسمی معلومات حاصل کرنے کے لئے انٹرنیٹ کو چالنے دیں۔',
+        'location': 'مقام',
+        'no_location':
+            'موسمی معلومات حاصل کرنے کے لئے مقام کی تشخیص کی خدمات کو چالنے دیں۔',
+        'theme': 'تھیم',
+        'low': 'کم',
+        'high': 'زیادہ',
+        'normal': 'عام',
+        'lat': 'عرض',
+        'lon': 'طول',
+        'create': 'تخلیق کریں',
+        'city': 'شہر',
+        'district': 'ضلع',
+        'noWeatherCard': 'شہر شامل کریں',
+        'deletedCardWeather': 'شہر کو حذف کر رہا ہے',
+        'deletedCardWeatherQuery': 'کیا آپ واقعی شہر کو حذف کرنا چاہتے ہیں؟',
+        'delete': 'حذف کریں',
+        'cancel': 'منسوخ کریں',
+        'time': 'شہر میں وقت',
+        'validateName': 'براہ کرم نام درج کریں',
+        'measurements': 'پیمائش کی نظام',
+        'degrees': 'درجہ',
+        'celsius': 'سینٹی گریڈ',
+        'fahrenheit': 'فارن ہائٹ',
+        'imperial': 'امپیریل',
+        'metric': 'میٹرک',
+        'validateValue': 'براہ کرم قدر درج کریں',
+        'validateNumber': 'براہ کرم ایک عدد درج کریں',
+        'validate90': 'قدر -90 سے 90 کے اندر ہونی چاہئے',
+        'validate180': 'قدر -180 سے 180 کے اندر ہونی چاہئے',
+        'notifications': 'خبریں',
+        'sunrise': 'طلوع آفتاب',
+        'sunset': 'غروب آفتاب',
+        'timeformat': 'وقت کی شکل',
+        '12': '12-گھنٹے',
+        '24': '24-گھنٹے',
+        'cloudcover': 'ابری پردہ',
+        'uvIndex': 'یووی-انڈیکس',
+        'materialColor': 'موادی رنگیں',
+        'uvLow': 'کم',
+        'uvAverage': 'معتدل',
+        'uvHigh': 'زیادہ',
+        'uvVeryHigh': 'بہت زیادہ',
+        'uvExtreme': 'بہتی کٹھن',
+        'weatherMore': '12 دنوں کی موسمی توقعات',
+        'windgusts': 'گرج',
+        'north': 'شمال',
+        'northeast': 'شمال مشرق',
+        'east': 'مشرق',
+        'southeast': 'جنوب مشرق',
+        'south': 'جنوب',
+        'southwest': 'جنوب مغرب',
+        'west': 'مغرب',
+        'northwest': 'شمال مغرب',
+        'project': 'پروجیکٹ',
+        'version': 'ایپ کی ورژن',
+        'precipitationProbability': 'برسات کی ممکنیت',
+        'apparentTemperatureMin': 'کم درج حرارت محسوس',
+        'apparentTemperatureMax': 'زیادہ درج حرارت محسوس',
+        'amoledTheme': 'AMOLED تھیم',
+        'appearance': 'ظاہریت',
+        'functions': 'فنکشنز',
+        'data': 'ڈیٹا',
+        'language': 'زبان',
+        'timeRange': 'وقت کی مدت (گھنٹوں میں)',
+        'timeStart': 'شروع کا وقت',
+        'timeEnd': 'مختتم کا وقت',
+        'support': 'حمایت',
+        'system': 'سسٹم',
+        'dark': 'اندھیری',
+        'light': 'روشن',
+        'license': 'لائسنس',
+        'widget': 'ویجٹ',
+        'widgetBackground': 'ویجٹ کا پس منظر',
+        'widgetText': 'ویجٹ کا مواد',
+        'dewpoint': 'دھوا پوائنٹ',
+        'shortwaveRadiation': 'چھوٹی موجی شعاع',
+        'W/m2': 'واٹ/میٹر مربع',
+        'roundDegree': 'ڈگری گھیریں',
+      };
 }
diff --git a/lib/translation/zh_ch.dart b/lib/translation/zh_ch.dart
old mode 100755
new mode 100644
index cf67e67..043624b
--- a/lib/translation/zh_ch.dart
+++ b/lib/translation/zh_ch.dart
@@ -1,137 +1,120 @@
 class ZhCh {
   Map<String, String> get messages => {
-    'start': '开始',
-    'description': '天气应用，提供每小时、每天和每周的实时预报，适用于任何地点。',
-    'name': '天气',
-    'name2': '方便的设计',
-    'name3': '联系我们',
-    'description2': '所有导航均设计成能够尽可能方便快捷地与应用程序交互。',
-    'description3': '如果您遇到任何问题，请通过电子邮件或应用评论与我们联系。',
-    'next': '下一步',
-    'search': '搜索...',
-    'loading': '加载中...',
-    'searchCity': '查找城市',
-    'humidity': '湿度',
-    'wind': '风速',
-    'visibility': '能见度',
-    'feels': '体感温度',
-    'evaporation': '蒸发量',
-    'precipitation': '降水量',
-    'direction': '风向',
-    'pressure': '气压',
-    'rain': '雨',
-    'clear_sky': '晴朗',
-    'cloudy': '多云',
-    'overcast': '阴天',
-    'fog': '雾',
-    'drizzle': '毛毛雨',
-    'drizzling_rain': '冻毛毛雨',
-    'freezing_rain': '冻雨',
-    'heavy_rains': '阵雨',
-    'snow': '雪',
-    'thunderstorm': '雷暴',
-    'kph': '千米/小时',
-    'mph': '英里/小时',
-    'm/s': '米/秒',
-    'mmHg': '毫米汞柱',
-    'mi': '英里',
-    'km': '千米',
-    'inch': '英寸',
-    'mm': '毫米',
-    'hPa': '百帕',
-    'settings': '设置',
-    'no_inter': '无网络连接',
-    'on_inter': '打开网络连接以获取气象数据。',
-    'location': '位置',
-    'no_location': '启用定位服务以获取当前位置的天气数据。',
-    'theme': '主题',
-    'low': '最低',
-    'high': '最高',
-    'normal': '正常',
-    'lat': '纬度',
-    'lon': '经度',
-    'create': '创建',
-    'city': '城市',
-    'district': '区域',
-    'noWeatherCard': '添加城市',
-    'deletedCardWeather': '删除城市',
-    'deletedCardWeatherQuery': '确定要删除该城市吗？',
-    'delete': '删除',
-    'cancel': '取消',
-    'time': '城市时间',
-    'validateName': '请输入名称',
-    'measurements': '度量系统',
-    'degrees': '度',
-    'celsius': '摄氏度',
-    'fahrenheit': '华氏度',
-    'imperial': '英制',
-    'metric': '公制',
-    'validateValue': '请输入值',
-    'validateNumber': '请输入有效数字',
-    'validate90': '值必须介于-90和90之间',
-    'validate180': '值必须介于-180和180之间',
-    'notifications': '通知',
-    'sunrise': '日出',
-    'sunset': '日落',
-    'timeformat': '时间格式',
-    '12': '12小时制',
-    '24': '24小时制',
-    'cloudcover': '云量',
-    'uvIndex': '紫外线指数',
-    'materialColor': '动态颜色',
-    'uvLow': '低',
-    'uvAverage': '中等',
-    'uvHigh': '高',
-    'uvVeryHigh': '很高',
-    'uvExtreme': '极高',
-    'weatherMore': '12天天气预报',
-    'windgusts': '阵风',
-    'north': '北',
-    'northeast': '东北',
-    'east': '东',
-    'southeast': '东南',
-    'south': '南',
-    'southwest': '西南',
-    'west': '西',
-    'northwest': '西北',
-    'project': '项目使用',
-    'version': '应用程序版本',
-    'precipitationProbability': '降水概率',
-    'apparentTemperatureMin': '最低体感温度',
-    'apparentTemperatureMax': '最高体感温度',
-    'amoledTheme': 'AMOLED主题',
-    'appearance': '外观',
-    'functions': '功能',
-    'data': '数据',
-    'language': '语言',
-    'timeRange': '频率（小时）',
-    'timeStart': '开始时间',
-    'timeEnd': '结束时间',
-    'support': '支持',
-    'system': '系统',
-    'dark': '暗',
-    'light': '亮',
-    'license': '许可证',
-    'widget': '小部件',
-    'widgetBackground': '小部件背景',
-    'widgetText': '小部件文本',
-    'dewpoint': '露点',
-    'shortwaveRadiation': '短波辐射',
-    'roundDegree': '四舍五入度数',
-    'settings_full': '设置',
-    'cities': '城市',
-    'searchMethod': '使用搜索或地理定位',
-    'done': '完成',
-    'groups': '我们的组',
-    'openMeteo': '来自Open-Meteo的数据 (CC-BY 4.0)',
-    'hourlyVariables': '每小时天气变量',
-    'dailyVariables': '每日天气变量',
-    'largeElement': '大天气显示',
-    'map': '地图',
-    'clearCacheStore': '清除缓存',
-    'deletedCacheStore': '正在清除缓存',
-    'deletedCacheStoreQuery': '您确定要清除缓存吗？',
-    'addWidget': '添加小部件',
-    'hideMap': '隐藏地图',
-  };
+        'start': '开始',
+        'description': '天气应用，提供每小时、每天和每周的实时预报，适用于任何地点。',
+        'name': '天气',
+        'name2': '方便的设计',
+        'name3': '联系我们',
+        'description2': '所有导航均设计成能够尽可能方便快捷地与应用程序交互。',
+        'description3': '如果您遇到任何问题，请通过电子邮件或应用评论与我们联系。',
+        'next': '下一步',
+        'search': '搜索...',
+        'loading': '加载中...',
+        'searchCity': '查找城市',
+        'humidity': '湿度',
+        'wind': '风速',
+        'visibility': '能见度',
+        'feels': '体感温度',
+        'evaporation': '蒸发量',
+        'precipitation': '降水量',
+        'direction': '风向',
+        'pressure': '气压',
+        'rain': '雨',
+        'clear_sky': '晴朗',
+        'cloudy': '多云',
+        'overcast': '阴天',
+        'fog': '雾',
+        'drizzle': '毛毛雨',
+        'drizzling_rain': '冻毛毛雨',
+        'freezing_rain': '冻雨',
+        'heavy_rains': '阵雨',
+        'snow': '雪',
+        'thunderstorm': '雷暴',
+        'kph': '千米/小时',
+        'mph': '英里/小时',
+        'mi': '英里',
+        'km': '千米',
+        'inch': '英寸',
+        'mm': '毫米',
+        'hPa': '百帕',
+        'settings': '设置',
+        'no_inter': '无网络连接',
+        'on_inter': '打开网络连接以获取气象数据。',
+        'location': '位置',
+        'no_location': '启用定位服务以获取当前位置的天气数据。',
+        'theme': '主题',
+        'low': '最低',
+        'high': '最高',
+        'normal': '正常',
+        'lat': '纬度',
+        'lon': '经度',
+        'create': '创建',
+        'city': '城市',
+        'district': '区域',
+        'noWeatherCard': '添加城市',
+        'deletedCardWeather': '删除城市',
+        'deletedCardWeatherQuery': '确定要删除该城市吗？',
+        'delete': '删除',
+        'cancel': '取消',
+        'time': '城市时间',
+        'validateName': '请输入名称',
+        'measurements': '度量系统',
+        'degrees': '度',
+        'celsius': '摄氏度',
+        'fahrenheit': '华氏度',
+        'imperial': '英制',
+        'metric': '公制',
+        'validateValue': '请输入值',
+        'validateNumber': '请输入有效数字',
+        'validate90': '值必须介于-90和90之间',
+        'validate180': '值必须介于-180和180之间',
+        'notifications': '通知',
+        'sunrise': '日出',
+        'sunset': '日落',
+        'timeformat': '时间格式',
+        '12': '12小时制',
+        '24': '24小时制',
+        'cloudcover': '云量',
+        'uvIndex': '紫外线指数',
+        'materialColor': '动态颜色',
+        'uvLow': '低',
+        'uvAverage': '中等',
+        'uvHigh': '高',
+        'uvVeryHigh': '很高',
+        'uvExtreme': '极高',
+        'weatherMore': '12天天气预报',
+        'windgusts': '阵风',
+        'north': '北',
+        'northeast': '东北',
+        'east': '东',
+        'southeast': '东南',
+        'south': '南',
+        'southwest': '西南',
+        'west': '西',
+        'northwest': '西北',
+        'project': '项目使用',
+        'version': '应用程序版本',
+        'precipitationProbability': '降水概率',
+        'apparentTemperatureMin': '最低体感温度',
+        'apparentTemperatureMax': '最高体感温度',
+        'amoledTheme': 'AMOLED主题',
+        'appearance': '外观',
+        'functions': '功能',
+        'data': '数据',
+        'language': '语言',
+        'timeRange': '频率（小时）',
+        'timeStart': '开始时间',
+        'timeEnd': '结束时间',
+        'support': '支持',
+        'system': '系统',
+        'dark': '暗',
+        'light': '亮',
+        'license': '许可证',
+        'widget': '小部件',
+        'widgetBackground': '小部件背景',
+        'widgetText': '小部件文本',
+        'dewpoint': '露点',
+        'shortwaveRadiation': '短波辐射',
+        'roundDegree': '四舍五入度数',
+      };
 }
diff --git a/lib/translation/zh_tw.dart b/lib/translation/zh_tw.dart
deleted file mode 100755
index 4a5d4e3..0000000
--- a/lib/translation/zh_tw.dart
+++ /dev/null
@@ -1,138 +0,0 @@
-class ZhTw {
-  Map<String, String> get messages => {
-    'start': '開始使用',
-    'description': '一個提供實時天氣資訊的天氣軟體。',
-    'name': '天氣',
-    'name2': '方便優雅的設計',
-    'name3': '聯絡我們',
-    'description2': '所有導覽均設計得盡可能方便交互',
-    'description3': '如遇到問題請透過電郵或軟體評論與我們聯絡',
-    'next': '下一步',
-    'search': '搜尋……',
-    'loading': '載入中……',
-    'searchCity': '查找你的所在地',
-    'humidity': '濕度',
-    'wind': '風速',
-    'visibility': '可見度',
-    'feels': '體感',
-    'evaporation': '蒸發量',
-    'precipitation': '降水量',
-    'direction': '風向',
-    'pressure': '氣壓',
-    'rain': '雨',
-    'clear_sky': '晴朗',
-    'cloudy': '多雲',
-    'overcast': '陰天',
-    'fog': '霧',
-    'drizzle': '毛毛雨',
-    'drizzling_rain': '冻雾雨',
-    'freezing_rain': '凍雨',
-    'heavy_rains': '大雨',
-    'snow': '雪',
-    'thunderstorm': '雷暴',
-    'kph': '公里/時',
-    'mph': '英里/時',
-    'm/s': '米/秒',
-    'mmHg': '毫米汞柱',
-    'mi': '英里',
-    'km': '公里',
-    'inch': '英呎',
-    'mm': '毫米',
-    'hPa': '百帕',
-    'settings': '設定',
-    'no_inter': '沒有網路連線',
-    'on_inter': '啟用網路以獲取氣象資料。',
-    'location': '位置',
-    'no_location': '啟用位置服務以獲取當前位置的天氣資訊。',
-    'theme': '主題',
-    'low': '低',
-    'high': '高',
-    'normal': '正常',
-    'lat': '維度',
-    'lon': '精度',
-    'create': '建立',
-    'city': '城市',
-    'district': '區',
-    'noWeatherCard': '新增城市',
-    'deletedCardWeather': '刪除城市',
-    'deletedCardWeatherQuery': '你確定要刪除這個城市嗎？',
-    'delete': '刪除',
-    'cancel': '取消',
-    'time': '城市時間',
-    'validateName': '請輸入名稱',
-    'measurements': '度量單位',
-    'degrees': '度',
-    'celsius': '攝氏度',
-    'fahrenheit': '華氏度',
-    'imperial': '英制',
-    'metric': '公制',
-    'validateValue': '請輸入一個值',
-    'validateNumber': '請輸入一個有效數字',
-    'validate90': '數值必須在-90和90之間',
-    'validate180': '數值必須在-180和180之間',
-    'notifications': '通知',
-    'sunrise': '日出',
-    'sunset': '日落',
-    'timeformat': '時間格式',
-    '12': '12小時',
-    '24': '24小時',
-    'cloudcover': '雲量',
-    'uvIndex': 'UV值',
-    'materialColor': '動態取色',
-    'uvLow': '低',
-    'uvAverage': '中等',
-    'uvHigh': '高',
-    'uvVeryHigh': '很高',
-    'uvExtreme': '超高',
-    'weatherMore': '12天天氣預報',
-    'windgusts': '陣風',
-    'north': '北',
-    'northeast': '東北',
-    'east': '東',
-    'southeast': '東南',
-    'south': '南',
-    'southwest': '西南',
-    'west': '西',
-    'northwest': '西北',
-    'project': '造訪我們的',
-    'version': '應用版本',
-    'precipitationProbability': '降水概率',
-    'apparentTemperatureMin': '最低體感溫度',
-    'apparentTemperatureMax': '最高體感溫度',
-    'amoledTheme': 'AMOLED主題',
-    'appearance': '外觀',
-    'functions': '功能',
-    'data': '資料',
-    'language': '語言',
-    'timeRange': '頻率(小時)',
-    'timeStart': '起始時間',
-    'timeEnd': '終止時間',
-    'support': '支援',
-    'system': '系統',
-    'dark': '黑暗',
-    'light': '明亮',
-    'license': '許可證',
-    'widget': '小組件',
-    'widgetBackground': '小組件背景',
-    'widgetText': '小組件文字',
-    'dewpoint': '露點',
-    'shortwaveRadiation': '短波輻射',
-    'W/m2': '瓦/平方米',
-    'roundDegree': '四捨五入度數',
-    'settings_full': '設定',
-    'cities': '城市',
-    'searchMethod': '使用搜尋或地理位置',
-    'done': '完成',
-    'groups': '我們的小組',
-    'openMeteo': '來自Open-Meteo的數據 (CC-BY 4.0)',
-    'hourlyVariables': '每小時天氣變量',
-    'dailyVariables': '每日天氣變量',
-    'largeElement': '大型天氣顯示',
-    'map': '地圖',
-    'clearCacheStore': '清除快取',
-    'deletedCacheStore': '正在清除快取',
-    'deletedCacheStoreQuery': '您確定要清除快取嗎？',
-    'addWidget': '新增小工具',
-    'hideMap': '隱藏地圖',
-  };
-}
diff --git a/lib/utils/color_converter.dart b/lib/utils/color_converter.dart
new file mode 100644
index 0000000..8f4c614
--- /dev/null
+++ b/lib/utils/color_converter.dart
@@ -0,0 +1,18 @@
+import 'dart:ui';
+
+extension HexColor on Color {
+  /// String is in the format "aabbcc" or "ffaabbcc" with an optional leading "#".
+  static Color fromHex(String hexString) {
+    final buffer = StringBuffer();
+    if (hexString.length == 6 || hexString.length == 7) buffer.write('ff');
+    buffer.write(hexString.replaceFirst('#', ''));
+    return Color(int.parse(buffer.toString(), radix: 16));
+  }
+
+  /// Prefixes a hash sign if [leadingHashSign] is set to `true` (default is `true`).
+  String toHex({bool leadingHashSign = true}) => '${leadingHashSign ? '#' : ''}'
+      '${alpha.toRadixString(16).padLeft(2, '0')}'
+      '${red.toRadixString(16).padLeft(2, '0')}'
+      '${green.toRadixString(16).padLeft(2, '0')}'
+      '${blue.toRadixString(16).padLeft(2, '0')}';
+}
diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc
index 597a91d..c54dc17 100644
--- a/linux/flutter/generated_plugin_registrant.cc
+++ b/linux/flutter/generated_plugin_registrant.cc
@@ -7,7 +7,6 @@
 #include "generated_plugin_registrant.h"
 
 #include <dynamic_color/dynamic_color_plugin.h>
-#include <flutter_timezone/flutter_timezone_plugin.h>
 #include <isar_flutter_libs/isar_flutter_libs_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 
@@ -15,9 +14,6 @@ void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) dynamic_color_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "DynamicColorPlugin");
   dynamic_color_plugin_register_with_registrar(dynamic_color_registrar);
-  g_autoptr(FlPluginRegistrar) flutter_timezone_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterTimezonePlugin");
-  flutter_timezone_plugin_register_with_registrar(flutter_timezone_registrar);
   g_autoptr(FlPluginRegistrar) isar_flutter_libs_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "IsarFlutterLibsPlugin");
   isar_flutter_libs_plugin_register_with_registrar(isar_flutter_libs_registrar);
diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake
index 0349e00..13157ca 100644
--- a/linux/flutter/generated_plugins.cmake
+++ b/linux/flutter/generated_plugins.cmake
@@ -4,7 +4,6 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   dynamic_color
-  flutter_timezone
   isar_flutter_libs
   url_launcher_linux
 )
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index 7c9d1ec..206b4ae 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -6,7 +6,6 @@ import FlutterMacOS
 import Foundation
 
 import connectivity_plus
-import device_info_plus
 import dynamic_color
 import flutter_local_notifications
 import flutter_timezone
@@ -17,8 +16,7 @@ import path_provider_foundation
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
-  DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
+  ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
   DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
   FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
   FlutterTimezonePlugin.register(with: registry.registrar(forPlugin: "FlutterTimezonePlugin"))
diff --git a/macos/RunnerTests/RunnerTests.swift b/macos/RunnerTests/RunnerTests.swift
deleted file mode 100644
index 61f3bd1..0000000
--- a/macos/RunnerTests/RunnerTests.swift
+++ /dev/null
@@ -1,12 +0,0 @@
-import Cocoa
-import FlutterMacOS
-import XCTest
-
-class RunnerTests: XCTestCase {
-
-  func testExample() {
-    // If you add code to the Runner application, consider adding tests here.
-    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
-  }
-
-}
diff --git a/pubspec.lock b/pubspec.lock
index 11afdad..394a457 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,111 +5,106 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab"
+      sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a
       url: "https://pub.dev"
     source: hosted
-    version: "76.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.3"
+    version: "61.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e"
+      sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562
       url: "https://pub.dev"
     source: hosted
-    version: "6.11.0"
+    version: "5.13.0"
   ansicolor:
     dependency: transitive
     description:
       name: ansicolor
-      sha256: "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f"
+      sha256: "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.2"
   archive:
     dependency: transitive
     description:
       name: archive
-      sha256: "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd"
+      sha256: "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.7"
+    version: "3.4.10"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
+      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
       url: "https://pub.dev"
     source: hosted
-    version: "2.7.0"
+    version: "2.4.2"
   async:
     dependency: transitive
     description:
       name: async
-      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.13.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.1"
   build:
     dependency: transitive
     description:
       name: build
-      sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.4.1"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33"
+      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.1"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa"
+      sha256: "0343061a33da9c5810b2d6cee51945127d8f4c060b7fbdd9d54917f0a3feaaa1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.4"
+    version: "4.0.1"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0
+      sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.4"
+    version: "2.4.2"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99"
+      sha256: "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.15"
+    version: "2.4.8"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021"
+      sha256: c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "7.2.11"
   built_collection:
     dependency: transitive
     description:
@@ -122,18 +117,18 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27"
+      sha256: a3ec2e0f967bc47f69f95009bb93db936288d61d5343b9436e378b28a2f830c6
       url: "https://pub.dev"
     source: hosted
-    version: "8.10.1"
+    version: "8.9.0"
   characters:
     dependency: transitive
     description:
       name: characters
-      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.3.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -146,90 +141,82 @@ packages:
     dependency: transitive
     description:
       name: cli_util
-      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
+      sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.2"
+    version: "0.4.1"
   clock:
     dependency: transitive
     description:
       name: clock
-      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
+    version: "1.1.1"
   code_builder:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
+      sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
       url: "https://pub.dev"
     source: hosted
-    version: "4.10.1"
+    version: "4.10.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.19.1"
+    version: "1.18.0"
   connectivity_plus:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99"
+      sha256: "224a77051d52a11fbad53dd57827594d3bd24f945af28bd70bab376d68d437f0"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.4"
+    version: "5.0.2"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
       name: connectivity_plus_platform_interface
-      sha256: "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204"
+      sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "1.2.4"
   convert:
     dependency: transitive
     description:
       name: convert
-      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
+      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "3.1.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
+      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.6"
+    version: "3.0.3"
   csslib:
     dependency: transitive
     description:
       name: csslib
-      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
+      sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
-  dart_earcut:
-    dependency: transitive
-    description:
-      name: dart_earcut
-      sha256: e485001bfc05dcbc437d7bfb666316182e3522d4c3f9668048e004d0eb2ce43b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
+    version: "1.0.0"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820"
+      sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.8"
+    version: "2.3.2"
   dartx:
     dependency: transitive
     description:
@@ -242,95 +229,71 @@ packages:
     dependency: transitive
     description:
       name: dbus
-      sha256: "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c"
+      sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.11"
-  device_info_plus:
-    dependency: "direct main"
-    description:
-      name: device_info_plus
-      sha256: "0c6396126421b590089447154c5f98a5de423b70cfb15b1578fd018843ee6f53"
-      url: "https://pub.dev"
-    source: hosted
-    version: "11.4.0"
-  device_info_plus_platform_interface:
-    dependency: transitive
-    description:
-      name: device_info_plus_platform_interface
-      sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.2"
+    version: "0.7.10"
   dio:
     dependency: "direct main"
     description:
       name: dio
-      sha256: "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9"
+      sha256: "797e1e341c3dd2f69f2dad42564a6feff3bfb87187d05abb93b9609e6f1645c3"
       url: "https://pub.dev"
     source: hosted
-    version: "5.8.0+1"
-  dio_cache_interceptor:
-    dependency: "direct main"
-    description:
-      name: dio_cache_interceptor
-      sha256: c1cbf8be886b3e077165dda50a1b3bb299b8a72694af94d065b4d2ac0fee67d7
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.3"
-  dio_web_adapter:
-    dependency: transitive
-    description:
-      name: dio_web_adapter
-      sha256: "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
+    version: "5.4.0"
   dynamic_color:
     dependency: "direct main"
     description:
       name: dynamic_color
-      sha256: eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d
+      sha256: a866f1f8947bfdaf674d7928e769eac7230388a2e7a2542824fad4bb5b87be3b
       url: "https://pub.dev"
     source: hosted
-    version: "1.7.0"
+    version: "1.6.9"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.3"
+    version: "1.3.1"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      sha256: "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418"
+      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.0"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.1"
+    version: "7.0.0"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
+      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.0"
   flutter:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_colorpicker:
+    dependency: "direct main"
+    description:
+      name: flutter_colorpicker
+      sha256: "458a6ed8ea480eb16ff892aedb4b7092b2804affd7e046591fb03127e8d8ef8b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.3"
   flutter_displaymode:
     dependency: "direct main"
     description:
@@ -339,107 +302,67 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.6.0"
-  flutter_expandable_fab:
+  flutter_glow:
     dependency: "direct main"
     description:
-      name: flutter_expandable_fab
-      sha256: c2936d398169166064d025df91a3bb417109a859e725d9b80c6ef7f04e01b6ab
+      name: flutter_glow
+      sha256: "158f041ddbc18f199dcfd9375d40b983a2bf887752598cdf7b41ac6ff36362bf"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.1"
-  flutter_hsvcolor_picker:
-    dependency: "direct main"
-    description:
-      name: flutter_hsvcolor_picker
-      sha256: f3480d7beaf4d3a3b76512a0c149a3b698076c8cf721bc515cded30de37ded6a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.5.1"
+    version: "0.3.0"
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
       name: flutter_launcher_icons
-      sha256: bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c
+      sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea"
       url: "https://pub.dev"
     source: hosted
-    version: "0.14.3"
+    version: "0.13.1"
   flutter_lints:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1"
+      sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.0"
+    version: "3.0.1"
   flutter_local_notifications:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: b94a50aabbe56ef254f95f3be75640f99120429f0a153b2dc30143cffc9bfdf3
+      sha256: c18f1de98fe0bb9dd5ba91e1330d4febc8b6a7de6aae3ffe475ef423723e72f3
       url: "https://pub.dev"
     source: hosted
-    version: "19.2.1"
+    version: "16.3.2"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
       name: flutter_local_notifications_linux
-      sha256: e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5
+      sha256: "33f741ef47b5f63cc7f78fe75eeeac7e19f171ff3c3df054d84c1e38bedb6a03"
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.0"
+    version: "4.0.0+1"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      sha256: "2569b973fc9d1f63a37410a9f7c1c552081226c597190cb359ef5d5762d1631c"
+      sha256: "7cf643d6d5022f3baed0be777b0662cce5919c0a7b86e700299f22dc4ae660ef"
       url: "https://pub.dev"
     source: hosted
-    version: "9.0.0"
-  flutter_local_notifications_windows:
-    dependency: transitive
-    description:
-      name: flutter_local_notifications_windows
-      sha256: f8fc0652a601f83419d623c85723a3e82ad81f92b33eaa9bcc21ea1b94773e6e
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
+    version: "7.0.0+1"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_map:
-    dependency: "direct main"
-    description:
-      name: flutter_map
-      sha256: f7d0379477274f323c3f3bc12d369a2b42eb86d1e7bd2970ae1ea3cff782449a
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.1.1"
-  flutter_map_animations:
-    dependency: "direct main"
-    description:
-      name: flutter_map_animations
-      sha256: bf583863561861aaaf4854ae7ed8940d79bea7d32918bf7a85d309b25235a09e
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.0"
-  flutter_map_cache:
-    dependency: "direct main"
-    description:
-      name: flutter_map_cache
-      sha256: fc9697760dc95b6adf75110a23a800ace5d95a735a58ec43f05183bc675c7246
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0+1"
   flutter_native_splash:
     dependency: "direct dev"
     description:
       name: flutter_native_splash
-      sha256: "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc"
+      sha256: "9cdb5d9665dab5d098dc50feab74301c2c228cd02ca25c9b546ab572cebcd6af"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.6"
+    version: "2.3.9"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -449,10 +372,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_timezone
-      sha256: "13b2109ad75651faced4831bf262e32559e44aa549426eab8a597610d385d934"
+      sha256: "06b35132c98fa188db3c4b654b7e1af7ccd01dfe12a004d58be423357605fb24"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.1"
+    version: "1.0.8"
   flutter_web_plugins:
     dependency: transitive
     description: flutter
@@ -462,290 +385,258 @@ packages:
     dependency: "direct dev"
     description:
       name: freezed
-      sha256: "62b248b2dfb06ded10c84b713215b25aea020a5b08c32e801a974361557ebc3f"
+      sha256: "6c5031daae12c7072b3a87eff98983076434b4889ef2a44384d0cae3f82372ba"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0-0.0.dev"
+    version: "2.4.6"
   freezed_annotation:
     dependency: "direct main"
     description:
       name: freezed_annotation
-      sha256: c87ff004c8aa6af2d531668b46a4ea379f7191dc6dfa066acd53d506da6e044b
+      sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "2.4.1"
   frontend_server_client:
     dependency: transitive
     description:
       name: frontend_server_client
-      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
+      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
-  gap:
-    dependency: "direct main"
-    description:
-      name: gap
-      sha256: f19387d4e32f849394758b91377f9153a1b41d79513ef7668c088c77dbc6955d
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
+    version: "3.2.0"
   geocoding:
     dependency: "direct main"
     description:
       name: geocoding
-      sha256: "606be036287842d779d7ec4e2f6c9435fc29bbbd3c6da6589710f981d8852895"
+      sha256: e1dc0ac56666d9ed1d5a9ae5543ce9eb5986db6209cc7600103487d09192059c
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "2.1.1"
   geocoding_android:
     dependency: transitive
     description:
       name: geocoding_android
-      sha256: fe7df2e35dc49a5176af634ff9c7b0312d9a2adc94320b936a56241f8028bbbc
+      sha256: "609db1d71bc364dd9d0616f72a41c01e0c74f3a3807efb85e0d5a67e57baf50f"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "2.1.2"
   geocoding_ios:
     dependency: transitive
     description:
       name: geocoding_ios
-      sha256: "43bde988312feb1a3cb6c3d514e9f4b04b564d1884fa56bd8241030bbb3bde36"
+      sha256: "8f79e380abb640ef4d88baee8bb65390058c802601158d0813dc990b36b189d2"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "2.1.1"
   geocoding_platform_interface:
     dependency: transitive
     description:
       name: geocoding_platform_interface
-      sha256: "8c2c8226e5c276594c2e18bfe88b19110ed770aeb7c1ab50ede570be8b92229b"
+      sha256: "8848605d307d844d89937cdb4b8ad7dfa880552078f310fa24d8a460f6dddab4"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "2.0.1"
   geolocator:
     dependency: "direct main"
     description:
       name: geolocator
-      sha256: ee2212a3df8292ec4c90b91183b8001d3f5a800823c974b570c5f9344ca320dc
+      sha256: e946395fc608842bb2f6c914807e9183f86f3cb787f6b8f832753e5251036f02
       url: "https://pub.dev"
     source: hosted
-    version: "14.0.1"
+    version: "10.1.0"
   geolocator_android:
     dependency: transitive
     description:
       name: geolocator_android
-      sha256: "114072db5d1dce0ec0b36af2697f55c133bc89a2c8dd513e137c0afe59696ed4"
+      sha256: "30ff8fa384ab6d35965aecc15dfc980e5ebc5f823352c1adfc87dc3d000e8e24"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.1+1"
+    version: "4.5.0"
   geolocator_apple:
     dependency: transitive
     description:
       name: geolocator_apple
-      sha256: dbdd8789d5aaf14cf69f74d4925ad1336b4433a6efdf2fce91e8955dc921bf22
+      sha256: "79babf44b692ec5e789d322dc736ef71586056e8e6828f747c9e005456b248bf"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.13"
+    version: "2.3.5"
   geolocator_platform_interface:
     dependency: transitive
     description:
       name: geolocator_platform_interface
-      sha256: "30cb64f0b9adcc0fb36f628b4ebf4f731a2961a0ebd849f4b56200205056fe67"
+      sha256: "6c8d494d6948757c56720b778af742f6973f31fca1f702a7539b8917e4a2468a"
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.6"
+    version: "4.2.0"
   geolocator_web:
     dependency: transitive
     description:
       name: geolocator_web
-      sha256: b1ae9bdfd90f861fde8fd4f209c37b953d65e92823cb73c7dee1fa021b06f172
+      sha256: "59083f7e0871b78299918d92bf930a14377f711d2d1156c558cd5ebae6c20d58"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.3"
+    version: "2.2.0"
   geolocator_windows:
     dependency: transitive
     description:
       name: geolocator_windows
-      sha256: "175435404d20278ffd220de83c2ca293b73db95eafbdc8131fe8609be1421eb6"
+      sha256: a92fae29779d5c6dc60e8411302f5221ade464968fe80a36d330e80a71f087af
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.5"
+    version: "0.2.2"
   get:
     dependency: "direct main"
     description:
       name: get
-      sha256: c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425
+      sha256: e4e7335ede17452b391ed3b2ede016545706c01a02292a6c97619705e7d2a85e
       url: "https://pub.dev"
     source: hosted
-    version: "4.7.2"
+    version: "4.6.6"
   glob:
     dependency: transitive
     description:
       name: glob
-      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
+      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.2"
   google_fonts:
     dependency: "direct main"
     description:
       name: google_fonts
-      sha256: b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82
+      sha256: f0b8d115a13ecf827013ec9fc883390ccc0e87a96ed5347a3114cac177ef18e8
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.1"
+    version: "6.1.0"
   graphs:
     dependency: transitive
     description:
       name: graphs
-      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
+      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.1"
   home_widget:
     dependency: "direct main"
     description:
       name: home_widget
-      sha256: ad9634ef5894f3bac73f04d59e2e5151a39798f49985399fd928dadc828d974a
+      sha256: c58a9e6d3b94490f1a8d5ddcbeeeeebc79abd0befe5889c26b0713fb09be6857
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.4.1"
   html:
     dependency: transitive
     description:
       name: html
-      sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602"
+      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.15.6"
+    version: "0.15.4"
   http:
     dependency: transitive
     description:
       name: http
-      sha256: "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b"
+      sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
-  http_cache_core:
-    dependency: transitive
-    description:
-      name: http_cache_core
-      sha256: b0accfa821e73085b5252dd42a6908d19ea0c29badd46db3668af6f8e510cfe1
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  http_cache_file_store:
-    dependency: "direct main"
-    description:
-      name: http_cache_file_store
-      sha256: b7d2d67ad262a4b5c6ccde4378228100ab0e58371d40cb2f0443177922638c01
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
+    version: "1.2.0"
   http_multi_server:
     dependency: transitive
     description:
       name: http_multi_server
-      sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
+      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.2"
+    version: "3.2.1"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.2"
-  iconsax_plus:
+    version: "4.0.2"
+  iconsax:
     dependency: "direct main"
     description:
-      name: iconsax_plus
-      sha256: e9e51b0652a1d3ceea5fedbfc2c1bb4ad432c2ceb7be7de2e30caf085678933c
+      name: iconsax
+      sha256: fb0144c61f41f3f8a385fadc27783ea9f5359670be885ed7f35cef32565d5228
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "0.0.8"
   image:
     dependency: transitive
     description:
       name: image
-      sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928"
+      sha256: "004a2e90ce080f8627b5a04aecb4cdfac87d2c3f3b520aa291260be5a32c033d"
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.4"
-  internet_connection_checker_plus:
-    dependency: "direct main"
-    description:
-      name: internet_connection_checker_plus
-      sha256: "5aea4a1ee0fcca736980a7d04d96fe8c0b53dea330690053305a5c5392230112"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.7.2"
+    version: "4.1.4"
   intl:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5"
+      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.20.2"
+    version: "0.18.1"
   io:
     dependency: transitive
     description:
       name: io
-      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
+      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.5"
+    version: "1.0.4"
   isar:
     dependency: "direct main"
     description:
       name: isar
-      sha256: e17a9555bc7f22ff26568b8c64d019b4ffa2dc6bd4cb1c8d9b269aefd32e53ad
-      url: "https://pub.isar-community.dev"
+      sha256: "99165dadb2cf2329d3140198363a7e7bff9bbd441871898a87e26914d25cf1ea"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.1.8"
+    version: "3.1.0+1"
   isar_flutter_libs:
     dependency: "direct main"
     description:
       name: isar_flutter_libs
-      sha256: "78710781e658ce4bff59b3f38c5b2735e899e627f4e926e1221934e77b95231a"
-      url: "https://pub.isar-community.dev"
+      sha256: bc6768cc4b9c61aabff77152e7f33b4b17d2fc93134f7af1c3dd51500fe8d5e8
+      url: "https://pub.dev"
     source: hosted
-    version: "3.1.8"
+    version: "3.1.0+1"
   isar_generator:
     dependency: "direct dev"
     description:
       name: isar_generator
-      sha256: "484e73d3b7e81dbd816852fe0b9497333118a9aeb646fd2d349a62cc8980ffe1"
-      url: "https://pub.isar-community.dev"
+      sha256: "76c121e1295a30423604f2f819bc255bc79f852f3bc8743a24017df6068ad133"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.1.8"
+    version: "3.1.0+1"
   js:
     dependency: transitive
     description:
       name: js
-      sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2"
+    version: "0.6.7"
   json_annotation:
     dependency: "direct main"
     description:
       name: json_annotation
-      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
+      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
       url: "https://pub.dev"
     source: hosted
-    version: "4.9.0"
+    version: "4.8.1"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c
+      sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969
       url: "https://pub.dev"
     source: hosted
-    version: "6.9.0"
+    version: "6.7.1"
   lat_lng_to_timezone:
     dependency: "direct main"
     description:
@@ -754,126 +645,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.2.0"
-  latlong2:
-    dependency: "direct main"
-    description:
-      name: latlong2
-      sha256: "98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.1"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.9"
-  leak_tracker_flutter_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_flutter_testing
-      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.9"
-  leak_tracker_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
-  line_awesome_flutter:
-    dependency: "direct main"
-    description:
-      name: line_awesome_flutter
-      sha256: "24cef0a34816ffed9846f1793172333be50dc29678d499893b3cb38d3c53db24"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0
+      sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.0"
-  lists:
-    dependency: transitive
-    description:
-      name: lists
-      sha256: "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  logger:
-    dependency: transitive
-    description:
-      name: logger
-      sha256: be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.5.0"
+    version: "3.0.0"
   logging:
     dependency: transitive
     description:
       name: logging
-      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
+      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.3-main.0"
+    version: "1.2.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.17"
+    version: "0.12.16"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
       url: "https://pub.dev"
     source: hosted
-    version: "0.11.1"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
       url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
-  mgrs_dart:
-    dependency: transitive
-    description:
-      name: mgrs_dart
-      sha256: fb89ae62f05fa0bb90f70c31fc870bcbcfd516c843fb554452ab3396f78586f7
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
+    version: "1.10.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
+      sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "1.0.5"
   nm:
     dependency: transitive
     description:
@@ -886,58 +705,58 @@ packages:
     dependency: transitive
     description:
       name: package_config
-      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
+      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.1.0"
   package_info_plus:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191"
+      sha256: "88bc797f44a94814f2213db1c9bd5badebafdfb8290ca9f78d4b9ee2a3db4d79"
       url: "https://pub.dev"
     source: hosted
-    version: "8.3.0"
+    version: "5.0.1"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c"
+      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "2.0.1"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.8.3"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
+      sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.2"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
+      sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.17"
+    version: "2.2.2"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
+      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.3.2"
   path_provider_linux:
     dependency: transitive
     description:
@@ -958,26 +777,26 @@ packages:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
+      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.2.1"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646"
+      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.0"
+    version: "6.0.2"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
+      sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.6"
+    version: "3.1.4"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -986,14 +805,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
-  polylabel:
+  pointycastle:
     dependency: transitive
     description:
-      name: polylabel
-      sha256: "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b"
+      name: pointycastle
+      sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "3.7.4"
   pool:
     dependency: transitive
     description:
@@ -1002,46 +821,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
-  posix:
-    dependency: transitive
-    description:
-      name: posix
-      sha256: f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.2"
-  proj4dart:
-    dependency: transitive
-    description:
-      name: proj4dart
-      sha256: c8a659ac9b6864aa47c171e78d41bbe6f5e1d7bd790a5814249e6b68bc44324e
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
+      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.1.4"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082"
+      sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
-  restart_app:
-    dependency: "direct main"
-    description:
-      name: restart_app
-      sha256: "00d5ec3e9de871cedbe552fc41e615b042b5ec654385e090e0983f6d02f655ed"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.2"
+    version: "1.2.3"
   scrollable_positioned_list:
     dependency: "direct main"
     description:
@@ -1054,18 +849,18 @@ packages:
     dependency: transitive
     description:
       name: shelf
-      sha256: e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12
+      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.2"
+    version: "1.4.1"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925"
+      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "1.0.4"
   shimmer:
     dependency: "direct main"
     description:
@@ -1078,7 +873,7 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.0"
+    version: "0.0.99"
   source_gen:
     dependency: transitive
     description:
@@ -1091,18 +886,18 @@ packages:
     dependency: transitive
     description:
       name: source_helper
-      sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c"
+      sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.5"
+    version: "1.3.4"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.1"
+    version: "1.10.0"
   sprintf:
     dependency: transitive
     description:
@@ -1115,98 +910,90 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.1"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.2"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
-      sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
+      sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.1"
-  synchronized:
-    dependency: transitive
-    description:
-      name: synchronized
-      sha256: "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.3.1"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.4"
+    version: "0.6.1"
   time:
     dependency: transitive
     description:
       name: time
-      sha256: "370572cf5d1e58adcb3e354c47515da3f7469dac3a95b447117e728e7be6f461"
+      sha256: ad8e018a6c9db36cb917a031853a1aae49467a93e0d464683e029537d848c221
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.4"
+  time_machine:
+    dependency: "direct main"
+    description:
+      name: time_machine
+      sha256: b39511bf66cc8553d86c1242c43dbf67a17c594d5d7124727c1fdbf331e3989d
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.17"
   timezone:
     dependency: "direct main"
     description:
       name: timezone
-      sha256: dd14a3b83cfd7cb19e7888f1cbc20f258b8d71b54c06f79ac585f14093a287d1
+      sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0"
       url: "https://pub.dev"
     source: hosted
-    version: "0.10.1"
+    version: "0.9.2"
   timing:
     dependency: transitive
     description:
       name: timing
-      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
+      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.1"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
+      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
-  unicode:
-    dependency: transitive
-    description:
-      name: unicode
-      sha256: "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.1"
+    version: "1.3.2"
   universal_io:
     dependency: transitive
     description:
@@ -1219,74 +1006,74 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
+      sha256: c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.2.4"
   url_launcher_android:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79"
+      sha256: "507dc655b1d9cb5ebc756032eb785f114e415f91557b73bf60b7e201dfedeb2f"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.16"
+    version: "6.2.2"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb"
+      sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.3"
+    version: "6.2.4"
   url_launcher_linux:
     dependency: transitive
     description:
       name: url_launcher_linux
-      sha256: "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935"
+      sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.1"
+    version: "3.1.1"
   url_launcher_macos:
     dependency: transitive
     description:
       name: url_launcher_macos
-      sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
+      sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.2"
+    version: "3.1.0"
   url_launcher_platform_interface:
     dependency: transitive
     description:
       name: url_launcher_platform_interface
-      sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029"
+      sha256: a932c3a8082e118f80a475ce692fde89dc20fddb24c57360b96bc56f7035de1f
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.1"
   url_launcher_web:
     dependency: transitive
     description:
       name: url_launcher_web
-      sha256: "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2"
+      sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.1"
+    version: "2.2.3"
   url_launcher_windows:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77"
+      sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.4"
+    version: "3.1.1"
   uuid:
     dependency: transitive
     description:
       name: uuid
-      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
+      sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.1"
+    version: "4.3.3"
   vector_math:
     dependency: transitive
     description:
@@ -1295,87 +1082,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
-      url: "https://pub.dev"
-    source: hosted
-    version: "15.0.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
+      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.0"
   web:
     dependency: transitive
     description:
       name: web
-      sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
-  web_socket:
-    dependency: transitive
-    description:
-      name: web_socket
-      sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
+    version: "0.3.0"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
+      sha256: cc1f6c632a248278a091fd7d9a68f624906830f7c1c5aa66503fae0804633e1c
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "2.4.2"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba"
+      sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8"
       url: "https://pub.dev"
     source: hosted
-    version: "5.13.0"
-  win32_registry:
-    dependency: transitive
-    description:
-      name: win32_registry
-      sha256: "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
-  wkt_parser:
-    dependency: transitive
-    description:
-      name: wkt_parser
-      sha256: "8a555fc60de3116c00aad67891bcab20f81a958e4219cc106e3c037aa3937f13"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
+    version: "5.2.0"
   workmanager:
     dependency: "direct main"
     description:
-      path: workmanager
-      ref: main
-      resolved-ref: "387d30698678dbf40585fa4732be60a74f9e07ef"
-      url: "https://github.com/fluttercommunity/flutter_workmanager.git"
-    source: git
+      name: workmanager
+      sha256: ed13530cccd28c5c9959ad42d657cd0666274ca74c56dea0ca183ddd527d3a00
+      url: "https://pub.dev"
+    source: hosted
     version: "0.5.2"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
+      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.0.4"
   xml:
     dependency: transitive
     description:
@@ -1388,18 +1142,18 @@ packages:
     dependency: transitive
     description:
       name: xxh3
-      sha256: "399a0438f5d426785723c99da6b16e136f4953fb1e9db0bf270bd41dd4619916"
+      sha256: a92b30944a9aeb4e3d4f3c3d4ddb3c7816ca73475cd603682c4f8149690f56d7
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.0.1"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
+      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.3"
+    version: "3.1.2"
 sdks:
-  dart: ">=3.8.0 <4.0.0"
-  flutter: ">=3.27.0"
+  dart: ">=3.2.6 <4.0.0"
+  flutter: ">=3.16.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index ed79c01..4baa5b8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,63 +3,44 @@ description: Weather application
 
 publish_to: "none"
 
-version: 1.3.8+41
+version: 1.2.9+32
 
 environment:
-  sdk: ">=3.8.0 <4.0.0"
+  sdk: ">=3.2.6 <4.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
   flutter_localizations:
     sdk: flutter
-  get: ^4.7.2
-  gap: ^3.0.1
-  dio: ^5.8.0+1
-  intl: ^0.20.2
+  get: ^4.6.6
+  dio: ^5.4.0
+  intl: ^0.18.1
+  isar: ^3.1.0+1
   shimmer: ^3.0.0
-  latlong2: ^0.9.1
-  timezone: ^0.10.1
-  geocoding: ^4.0.0
-  geolocator: ^14.0.1
-  home_widget: ^0.8.0
-  restart_app: ^1.3.2
-  flutter_map: ^8.1.1
-  google_fonts: ^6.2.1
-  url_launcher: ^6.3.1
-  iconsax_plus: ^1.0.0
-  dynamic_color: ^1.7.0
-  path_provider: ^2.1.5
-  # quick_settings: ^1.0.1
-  json_annotation: ^4.9.0
-  flutter_timezone: ^4.1.1
-  device_info_plus: ^11.4.0
-  package_info_plus: ^8.3.0
-  connectivity_plus: ^6.1.4
-  freezed_annotation: ^3.0.0
-  flutter_map_cache: ^2.0.0+1
+  iconsax: ^0.0.8
+  timezone: ^0.9.2
+  geocoding: ^2.1.1
+  geolocator: ^10.1.0
+  home_widget: ^0.4.1
+  workmanager: ^0.5.2
+  google_fonts: ^6.1.0
+  flutter_glow: ^0.3.0
+  url_launcher: ^6.2.4
+  time_machine: ^0.9.17
+  dynamic_color: ^1.6.9
+  path_provider: ^2.1.2
+  json_annotation: ^4.8.1
+  flutter_timezone: ^1.0.8
+  package_info_plus: ^5.0.1
+  connectivity_plus: ^5.0.2
+  freezed_annotation: ^2.4.1
+  isar_flutter_libs: ^3.1.0+1
   flutter_displaymode: ^0.6.0
   lat_lng_to_timezone: ^0.2.0
-  line_awesome_flutter: ^3.0.1
-  dio_cache_interceptor: ^4.0.3
-  http_cache_file_store: ^2.0.1
-  flutter_map_animations: ^0.9.0
-  flutter_expandable_fab: ^2.5.1
-  flutter_hsvcolor_picker: ^1.5.1
+  flutter_colorpicker: ^1.0.3
   scrollable_positioned_list: ^0.3.8
-  flutter_local_notifications: ^19.2.1
-  internet_connection_checker_plus: ^2.7.2
-  isar:
-    version: ^3.1.8
-    hosted: https://pub.isar-community.dev/
-  isar_flutter_libs:
-    version: ^3.1.8
-    hosted: https://pub.isar-community.dev/
-  workmanager:
-    git:
-      url: https://github.com/fluttercommunity/flutter_workmanager.git
-      path: workmanager
-      ref: main
+  flutter_local_notifications: ^16.3.2
 
 # Uncomment this for publishing FLOSS variant
 # dependency_overrides:
@@ -72,17 +53,15 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  freezed: ^3.0.0-0.0.dev
-  build_runner: ^2.4.15
-  flutter_lints: ^6.0.0
-  json_serializable: ^6.9.0
-  flutter_native_splash: ^2.4.6
-  flutter_launcher_icons: ^0.14.3
-  isar_generator:
-    version: ^3.1.8
-    hosted: https://pub.isar-community.dev/
+  freezed: ^2.4.6
+  build_runner: ^2.4.8
+  flutter_lints: ^3.0.1
+  isar_generator: ^3.1.0+1
+  json_serializable: ^6.7.1
+  flutter_native_splash: ^2.3.9
+  flutter_launcher_icons: ^0.13.1
 
-flutter_launcher_icons:
+flutter_icons:
   android: true
   image_path: "assets/icons/icon.png"
   adaptive_icon_background: "#181818"
@@ -99,6 +78,5 @@ flutter:
   uses-material-design: true
 
   assets:
-    - assets/
     - assets/images/
     - assets/icons/
diff --git a/readme/1.png b/readme/1.png
index 7c84165..2185ee0 100644
Binary files a/readme/1.png and b/readme/1.png differ
diff --git a/readme/2.png b/readme/2.png
index 1dc58ba..0c78ec6 100644
Binary files a/readme/2.png and b/readme/2.png differ
diff --git a/readme/3.png b/readme/3.png
index 9621145..15b131c 100644
Binary files a/readme/3.png and b/readme/3.png differ
diff --git a/readme/4.png b/readme/4.png
index 2ee842a..6185971 100644
Binary files a/readme/4.png and b/readme/4.png differ
diff --git a/readme/5.png b/readme/5.png
deleted file mode 100644
index 805cb04..0000000
Binary files a/readme/5.png and /dev/null differ
diff --git a/readme/6.png b/readme/6.png
deleted file mode 100644
index 7cbf07e..0000000
Binary files a/readme/6.png and /dev/null differ
diff --git a/readme/7.png b/readme/7.png
deleted file mode 100644
index 26ad1cc..0000000
Binary files a/readme/7.png and /dev/null differ
diff --git a/readme/8.png b/readme/8.png
deleted file mode 100644
index 96e8e8f..0000000
Binary files a/readme/8.png and /dev/null differ
diff --git a/readme/icon.png b/readme/icon.png
deleted file mode 100644
index c47fd3a..0000000
Binary files a/readme/icon.png and /dev/null differ
diff --git a/test/widget_test.dart b/test/widget_test.dart
deleted file mode 100644
index 411d91f..0000000
--- a/test/widget_test.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility in the flutter_test package. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:rain/main.dart';
-
-void main() {
-  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(const MyApp());
-
-    // Verify that our counter starts at 0.
-    expect(find.text('0'), findsOneWidget);
-    expect(find.text('1'), findsNothing);
-
-    // Tap the '+' icon and trigger a frame.
-    await tester.tap(find.byIcon(Icons.add));
-    await tester.pump();
-
-    // Verify that our counter has incremented.
-    expect(find.text('0'), findsNothing);
-    expect(find.text('1'), findsOneWidget);
-  });
-}
diff --git a/web/index.html b/web/index.html
index 010cbf1..6c6800f 100644
--- a/web/index.html
+++ b/web/index.html
@@ -45,8 +45,6 @@
   
   
   
-  
-  
   <style id="splash-screen-style">
     html {
       height: 100%
@@ -121,7 +119,6 @@
   </picture>
   
   
-  
                 
   <script>
     window.addEventListener('load', function(ev) {
diff --git a/web/splash/img/dark-1x.png b/web/splash/img/dark-1x.png
index a8261e2..e59ff2b 100644
Binary files a/web/splash/img/dark-1x.png and b/web/splash/img/dark-1x.png differ
diff --git a/web/splash/img/dark-2x.png b/web/splash/img/dark-2x.png
index fd4fbdf..87f38b3 100644
Binary files a/web/splash/img/dark-2x.png and b/web/splash/img/dark-2x.png differ
diff --git a/web/splash/img/dark-3x.png b/web/splash/img/dark-3x.png
index 1b38ebd..3d3e41f 100644
Binary files a/web/splash/img/dark-3x.png and b/web/splash/img/dark-3x.png differ
diff --git a/web/splash/img/light-1x.png b/web/splash/img/light-1x.png
index a8261e2..e59ff2b 100644
Binary files a/web/splash/img/light-1x.png and b/web/splash/img/light-1x.png differ
diff --git a/web/splash/img/light-2x.png b/web/splash/img/light-2x.png
index fd4fbdf..87f38b3 100644
Binary files a/web/splash/img/light-2x.png and b/web/splash/img/light-2x.png differ
diff --git a/web/splash/img/light-3x.png b/web/splash/img/light-3x.png
index 1b38ebd..3d3e41f 100644
Binary files a/web/splash/img/light-3x.png and b/web/splash/img/light-3x.png differ
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
index 5bedd61..f8a9621 100644
--- a/windows/flutter/generated_plugin_registrant.cc
+++ b/windows/flutter/generated_plugin_registrant.cc
@@ -8,7 +8,6 @@
 
 #include <connectivity_plus/connectivity_plus_windows_plugin.h>
 #include <dynamic_color/dynamic_color_plugin_c_api.h>
-#include <flutter_timezone/flutter_timezone_plugin_c_api.h>
 #include <geolocator_windows/geolocator_windows.h>
 #include <isar_flutter_libs/isar_flutter_libs_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
@@ -18,8 +17,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("ConnectivityPlusWindowsPlugin"));
   DynamicColorPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
-  FlutterTimezonePluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("FlutterTimezonePluginCApi"));
   GeolocatorWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("GeolocatorWindows"));
   IsarFlutterLibsPluginRegisterWithRegistrar(
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake
index af26974..ca34188 100644
--- a/windows/flutter/generated_plugins.cmake
+++ b/windows/flutter/generated_plugins.cmake
@@ -5,14 +5,12 @@
 list(APPEND FLUTTER_PLUGIN_LIST
   connectivity_plus
   dynamic_color
-  flutter_timezone
   geolocator_windows
   isar_flutter_libs
   url_launcher_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST
-  flutter_local_notifications_windows
 )
 
 set(PLUGIN_BUNDLED_LIBRARIES)