From ce4d6ad54067dde66711edeef39adafc43c90296 Mon Sep 17 00:00:00 2001
From: woheller69 <wolfgang.heller@web.de>
Date: Fri, 3 Mar 2023 13:43:21 +0100
Subject: [PATCH] Improvements from omWeather development: Add wind icons Use
 Rainviewer clouds layer in rain radar Fix white lines in rain radar Use
 violet for max uv level Layout improvements

---
 README.md                                     |  2 +
 app/src/main/assets/leaflet.css               |  4 ++
 app/src/main/assets/rainviewer.html           | 48 ++++++++++++-------
 .../activities/RainViewerActivity.java        |  5 +-
 .../weather/database/PFASQLiteHelper.java     | 18 +++----
 .../dialogs/AddLocationDialogPhotonAPI.java   |  2 +
 .../weather/services/UpdateDataService.java   | 12 ++---
 .../weather/ui/Help/StringFormatUtils.java    | 14 +++---
 .../ui/RecycleList/CityWeatherAdapter.java    |  8 +++-
 .../ui/RecycleList/CourseOfDayAdapter.java    |  3 ++
 .../ui/RecycleList/WeekWeatherAdapter.java    |  3 ++
 app/src/main/res/drawable/ic_wind_empty.xml   | 20 ++++++++
 .../main/res/drawable/rounded_highlight.xml   |  2 +-
 app/src/main/res/drawable/rounded_violet.xml  | 14 ++++++
 app/src/main/res/layout/card_overview.xml     | 22 ++++++---
 .../res/layout/list_item_course_of_day.xml    | 33 ++++++++-----
 .../res/layout/list_item_week_forecast.xml    | 33 ++++++++-----
 app/src/main/res/values-da/strings.xml        | 16 +++----
 app/src/main/res/values-de/strings.xml        |  2 +-
 app/src/main/res/values-es/strings.xml        |  2 +-
 app/src/main/res/values-fr/strings.xml        |  2 +-
 app/src/main/res/values-hu/strings.xml        | 16 +++----
 app/src/main/res/values-it/strings.xml        | 16 +++----
 app/src/main/res/values-night/colors.xml      |  1 +
 app/src/main/res/values-nl/strings.xml        | 16 +++----
 app/src/main/res/values-pt/strings.xml        | 16 +++----
 app/src/main/res/values-ru/strings.xml        |  2 +-
 app/src/main/res/values-sv/strings.xml        | 16 +++----
 app/src/main/res/values/colors.xml            |  1 +
 app/src/main/res/values/strings.xml           |  2 +-
 app/src/main/res/xml/pref_general.xml         |  2 +-
 31 files changed, 224 insertions(+), 129 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_wind_empty.xml
 create mode 100644 app/src/main/res/drawable/rounded_violet.xml

diff --git a/README.md b/README.md
index cb5aec2..dbe979f 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,8 @@ For subscriptions later than Aug 15, 2022 you need a free subscription and OneCa
 
 Please register for free account at: https://home.openweathermap.org/users/sign_up
 
+Use [omWeather](https://github.com/woheller69/omweather) instead if you do not yet have an API key.
+
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" height="75">](https://f-droid.org/de/packages/org.woheller69.weather/)
 
 
diff --git a/app/src/main/assets/leaflet.css b/app/src/main/assets/leaflet.css
index 609a662..16d172b 100644
--- a/app/src/main/assets/leaflet.css
+++ b/app/src/main/assets/leaflet.css
@@ -638,3 +638,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	margin-left: -12px;
 	border-right-color: #fff;
 	}
+.leaflet-tile-container img {
+  width: 257px !important;
+  height: 257px !important;
+}
\ No newline at end of file
diff --git a/app/src/main/assets/rainviewer.html b/app/src/main/assets/rainviewer.html
index 35cd979..3e09592 100644
--- a/app/src/main/assets/rainviewer.html
+++ b/app/src/main/assets/rainviewer.html
@@ -35,7 +35,7 @@
 <div id="mapid" style="position: absolute; top: 45px; left: 0; bottom: 0; right: 0;"></div>
 
 <script>
-//call: rainviewer.html?lat={latitude}&lon={longitude}&appid={API_KEY}&nightmode={mode} Takes latitude/longitude and OWM API_Key from request and shows rainviewer rain radar and OWM clouds layer on openstreetmap for requested position and zoom
+//call: rainviewer.html?lat={latitude}&lon={longitude}&nightmode={mode} Takes latitude/longitude and nightmode from request and shows rainviewer rain radar and clouds on openstreetmap for requested position and zoom
 
 
 var getUrlParameter = function getUrlParameter(sParam) {
@@ -60,18 +60,18 @@
         }).setView([getUrlParameter('lat'), getUrlParameter('lon')], 8);  //zoom factor 8
 
 let myFilterClouds = [
-    'contrast:1000%',
+    'contrast:200%',
     'invert:100%',
-    'opacity:60%'
+    'opacity:40%'
 ];
 
 let myFilterCloudsNight = [
-    'contrast:1000%',
+    'contrast:200%',
     'opacity:60%'
 ];
 
 let myFilterMap = [
-    'saturate:200%'
+    'saturate:300%'
 ];
 
 let myFilterMapNight = [
@@ -83,18 +83,12 @@
 if (getUrlParameter('nightmode')==0){
         L.tileLayer.colorFilter('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
             filter: myFilterMap,
-            attribution: 'Map data ©<a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors <br> Weather data <a href="https://www.rainviewer.com/api.html"> RainViewer </a>& <a href="https://openweathermap.org/api"> OpenWeatherMap </a>'
-        }).addTo(map);
-            L.tileLayer.colorFilter('https://tile.openweathermap.org/map/clouds_new/{z}/{x}/{y}.png?appid=' + getUrlParameter('appid'),{
-            filter: myFilterClouds
+            attribution: 'Map data ©<a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors <br> Weather data <a href="https://www.rainviewer.com/api.html"> RainViewer </a>'
         }).addTo(map);
     }else{
         L.tileLayer.colorFilter('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
             filter: myFilterMapNight,
-            attribution: 'Map data ©<a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors <br> Weather data <a href="https://www.rainviewer.com/api.html"> RainViewer </a>& <a href="https://openweathermap.org/api"> OpenWeatherMap </a>'
-        }).addTo(map);
-            L.tileLayer.colorFilter('https://tile.openweathermap.org/map/clouds_new/{z}/{x}/{y}.png?appid=' + getUrlParameter('appid'),{
-            filter: myFilterCloudsNight
+            attribution: 'Map data ©<a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors <br> Weather data <a href="https://www.rainviewer.com/api.html"> RainViewer </a>'
         }).addTo(map);
     }
 
@@ -108,6 +102,7 @@
     var mapFrames = [];
     var lastPastFramePosition = -1;
     var radarLayers = [];
+    var infraredLayer;
 
     var animationPosition = 0;
     var animationTimer = false;
@@ -121,15 +116,22 @@
 
         // Save the API response
         apiData = JSON.parse(apiRequest.response);
-
-        // Rebuild frames to show
+        
+        //add current infrared frame
+        if (apiData.satellite && apiData.satellite.infrared) {
+            mapFrames = apiData.satellite.infrared;
+            lastPastFramePosition = apiData.satellite.infrared.length - 1;
+            addInfraredLayer(mapFrames[lastPastFramePosition]);
+        }
+        
+        //Rebuild frames to show
         if (apiData && apiData.radar && apiData.radar.past) {
             mapFrames = apiData.radar.past;
             if (apiData.radar.nowcast) {
                 mapFrames = mapFrames.concat(apiData.radar.nowcast);
             }
 
-            // show the last "past" frame
+              //show the last "past" frame
             lastPastFramePosition = apiData.radar.past.length - 1;
             showFrame(lastPastFramePosition);
         }
@@ -152,6 +154,20 @@
             map.addLayer(radarLayers[frame.path]);
         }
     }
+    
+    function addInfraredLayer(frame) {
+    
+    if (getUrlParameter('nightmode')==0){
+            L.tileLayer.colorFilter(apiData.host + frame.path + '/256/{z}/{x}/{y}/0/0_0.png', {
+            filter: myFilterClouds
+        }).addTo(map);
+        } else {
+            L.tileLayer.colorFilter(apiData.host + frame.path + '/256/{z}/{x}/{y}/0/0_0.png', {
+            filter: myFilterCloudsNight
+        }).addTo(map);
+        }
+        console.log(apiData.host + frame.path + '/256/{z}/{x}/{y}/0/0_0.png');
+    }
 
     /**
      * Display particular frame of animation for the @position
diff --git a/app/src/main/java/org/woheller69/weather/activities/RainViewerActivity.java b/app/src/main/java/org/woheller69/weather/activities/RainViewerActivity.java
index 1f33684..cef3784 100644
--- a/app/src/main/java/org/woheller69/weather/activities/RainViewerActivity.java
+++ b/app/src/main/java/org/woheller69/weather/activities/RainViewerActivity.java
@@ -39,9 +39,6 @@ protected void onPause() {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_rain_viewer);
-        AppPreferencesManager prefManager =
-                new AppPreferencesManager(PreferenceManager.getDefaultSharedPreferences(getApplicationContext()));
-        String API_KEY = prefManager.getOWMApiKey(getApplicationContext());
         float latitude = getIntent().getFloatExtra("latitude", -1);
         float longitude = getIntent().getFloatExtra("longitude", -1);
         int timezoneseconds = getIntent().getIntExtra("timezoneseconds",0);
@@ -61,7 +58,7 @@ protected void onCreate(Bundle savedInstanceState) {
         webView = findViewById(R.id.webView);
         webView.getSettings().setJavaScriptEnabled(true);
         webView.getSettings().setUserAgentString(BuildConfig.APPLICATION_ID+"/"+BuildConfig.VERSION_NAME);
-        webView.loadUrl("file:///android_asset/rainviewer.html?lat=" + latitude + "&lon=" + longitude + "&appid=" + API_KEY + "&nightmode=" + nightmode + "&hour12=" + hour12 + "&tz="+timezoneseconds);
+        webView.loadUrl("file:///android_asset/rainviewer.html?lat=" + latitude + "&lon=" + longitude + "&nightmode=" + nightmode + "&hour12=" + hour12 + "&tz="+timezoneseconds);
 
         webView.setWebViewClient(new WebViewClient() {
             @Override
diff --git a/app/src/main/java/org/woheller69/weather/database/PFASQLiteHelper.java b/app/src/main/java/org/woheller69/weather/database/PFASQLiteHelper.java
index dcb645e..526fcd5 100644
--- a/app/src/main/java/org/woheller69/weather/database/PFASQLiteHelper.java
+++ b/app/src/main/java/org/woheller69/weather/database/PFASQLiteHelper.java
@@ -126,7 +126,7 @@ public class PFASQLiteHelper extends SQLiteAssetHelper {
             COLUMN_TIME_SUNRISE + "  VARCHAR(50) NOT NULL," +
             COLUMN_TIME_SUNSET + "  VARCHAR(50) NOT NULL," +
             COLUMN_TIMEZONE_SECONDS + " INTEGER," +
-            COLUMN_RAIN60MIN + " VARCHAR(25 NOT NULL)," +
+            COLUMN_RAIN60MIN + " VARCHAR(25) NOT NULL," +
             " FOREIGN KEY (" + CURRENT_WEATHER_CITY_ID + ") REFERENCES " + TABLE_CITIES + "(" + CITIES_ID + "));";
 
     private static final String CREATE_TABLE_CITIES = "CREATE TABLE " + TABLE_CITIES +
@@ -487,10 +487,10 @@ public synchronized CityToWatch getCityToWatch(int id) {
         Cursor cursor = database.rawQuery(
                 "SELECT " + CITIES_TO_WATCH_ID +
                         ", " + CITIES_TO_WATCH_CITY_ID +
-                        ", " + CITIES_NAME +
-                        ", " + CITIES_COUNTRY_CODE +
-                        ", " + CITIES_LONGITUDE +
-                        ", " + CITIES_LATITUDE +
+                        ", " + CITIES_TO_WATCH_NAME +
+                        ", " + CITIES_TO_WATCH_COUNTRY_CODE +
+                        ", " + CITIES_TO_WATCH_LONGITUDE +
+                        ", " + CITIES_TO_WATCH_LATITUDE +
                         ", " + CITIES_TO_WATCH_COLUMN_RANK +
                         " FROM " + TABLE_CITIES_TO_WATCH +
                         " WHERE " + CITIES_TO_WATCH_CITY_ID + " = ?", arguments);
@@ -522,10 +522,10 @@ public synchronized List<CityToWatch> getAllCitiesToWatch() {
         Cursor cursor = database.rawQuery(
                 "SELECT " + CITIES_TO_WATCH_ID +
                         ", " + CITIES_TO_WATCH_CITY_ID +
-                        ", " + CITIES_NAME +
-                        ", " + CITIES_COUNTRY_CODE +
-                        ", " + CITIES_LONGITUDE +
-                        ", " + CITIES_LATITUDE +
+                        ", " + CITIES_TO_WATCH_NAME +
+                        ", " + CITIES_TO_WATCH_COUNTRY_CODE +
+                        ", " + CITIES_TO_WATCH_LONGITUDE +
+                        ", " + CITIES_TO_WATCH_LATITUDE +
                         ", " + CITIES_TO_WATCH_COLUMN_RANK +
                         " FROM " + TABLE_CITIES_TO_WATCH
                 , new String[]{});
diff --git a/app/src/main/java/org/woheller69/weather/dialogs/AddLocationDialogPhotonAPI.java b/app/src/main/java/org/woheller69/weather/dialogs/AddLocationDialogPhotonAPI.java
index 7b7b303..851ab95 100644
--- a/app/src/main/java/org/woheller69/weather/dialogs/AddLocationDialogPhotonAPI.java
+++ b/app/src/main/java/org/woheller69/weather/dialogs/AddLocationDialogPhotonAPI.java
@@ -12,6 +12,7 @@
 import android.os.Looper;
 import android.os.Message;
 import android.text.Editable;
+import android.text.InputType;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
@@ -114,6 +115,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         autoSuggestAdapter = new AutoSuggestAdapter(requireContext(),
                 R.layout.list_item_autocomplete);
         autoCompleteTextView.setThreshold(2);
+        autoCompleteTextView.setInputType(InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
         autoCompleteTextView.setAdapter(autoSuggestAdapter);
 
         autoCompleteTextView.setOnItemClickListener(
diff --git a/app/src/main/java/org/woheller69/weather/services/UpdateDataService.java b/app/src/main/java/org/woheller69/weather/services/UpdateDataService.java
index 77dd0e8..2c25114 100644
--- a/app/src/main/java/org/woheller69/weather/services/UpdateDataService.java
+++ b/app/src/main/java/org/woheller69/weather/services/UpdateDataService.java
@@ -113,12 +113,12 @@ private void handleUpdateForecastAction(Intent intent, int cityId, float lat, fl
 
         // Update if update forced or if a certain time has passed
         if (skipUpdateInterval || timestamp + updateInterval - systemTime <= 0) {
-             //if forecastChoice = 1 (3h) perform both else only one call API
-            int choice = Integer.parseInt(prefManager.getString("forecastChoice","1"));
-            if (choice==1) {
-                IHttpRequestForForecast forecastRequest = new OwmHttpRequestForForecast(getApplicationContext());
-                forecastRequest.perform(lat, lon, cityId);
-            }
+           //if forecastChoice = 1 (3h) perform both else only one call API
+           // int choice = Integer.parseInt(prefManager.getString("forecastChoice","1"));
+           // if (choice==1) {
+           //     IHttpRequestForForecast forecastRequest = new OwmHttpRequestForForecast(getApplicationContext());
+           //     forecastRequest.perform(lat, lon, cityId);
+           // }
             IHttpRequestForOneCallAPI forecastOneCallRequest = new OwmHttpRequestForOneCallAPI(getApplicationContext());
             forecastOneCallRequest.perform(lat,lon, cityId);
         }
diff --git a/app/src/main/java/org/woheller69/weather/ui/Help/StringFormatUtils.java b/app/src/main/java/org/woheller69/weather/ui/Help/StringFormatUtils.java
index 3da8c80..8b48f61 100644
--- a/app/src/main/java/org/woheller69/weather/ui/Help/StringFormatUtils.java
+++ b/app/src/main/java/org/woheller69/weather/ui/Help/StringFormatUtils.java
@@ -137,15 +137,15 @@ public static Drawable colorWindSpeed(Context context, float wind_speed) {
 
     public static int colorWindSpeedWidget(float wind_speed) {
         if (wind_speed < 0.3) {
-            return R.drawable.transparent_no_margin;
+            return R.drawable.ic_wind_empty;
         } else if (wind_speed < 1.5) {
-            return R.drawable.transparent_no_margin;
+            return R.drawable.ic_wind_empty;
         } else if (wind_speed < 3.3) {
-            return R.drawable.transparent_no_margin;
+            return R.drawable.ic_wind_empty;
         } else if (wind_speed < 5.5) {
-            return R.drawable.transparent_no_margin;
+            return R.drawable.ic_wind_empty;
         } else if (wind_speed < 7.9) {
-            return R.drawable.transparent_no_margin;
+            return R.drawable.ic_wind_empty;
         } else if (wind_speed < 10.7) {
             return R.drawable.ic_wind_yellow;
         } else if (wind_speed < 13.8) {
@@ -175,7 +175,7 @@ public static Drawable colorUVindex(Context context, int uvindex) {
         } else if (uvindex <= 10) {
             return ResourcesCompat.getDrawable(context.getResources(),R.drawable.rounded_lightred,null);
         } else  {
-            return ResourcesCompat.getDrawable(context.getResources(),R.drawable.rounded_red,null);
+            return ResourcesCompat.getDrawable(context.getResources(),R.drawable.rounded_violet,null);
         }
     }
 
@@ -219,7 +219,7 @@ public static Integer widgetColorUVindex(Context context, int uvindex) {
         } else if (uvindex <= 10) {
             return R.drawable.rounded_lightred;
         } else  {
-            return R.drawable.rounded_red;
+            return R.drawable.rounded_violet;
         }
     }
 
diff --git a/app/src/main/java/org/woheller69/weather/ui/RecycleList/CityWeatherAdapter.java b/app/src/main/java/org/woheller69/weather/ui/RecycleList/CityWeatherAdapter.java
index 490aad7..d4551fc 100644
--- a/app/src/main/java/org/woheller69/weather/ui/RecycleList/CityWeatherAdapter.java
+++ b/app/src/main/java/org/woheller69/weather/ui/RecycleList/CityWeatherAdapter.java
@@ -6,6 +6,8 @@
 import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
+import android.media.Image;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -162,12 +164,14 @@ public class OverViewHolder extends ViewHolder {
         TextView temperature;
         ImageView weather;
         TextView sun;
+        ImageView windicon;
 
         OverViewHolder(View v) {
             super(v);
             this.temperature = v.findViewById(R.id.card_overview_temperature);
             this.weather = v.findViewById(R.id.card_overview_weather_image);
-            this.sun=v.findViewById(R.id.card_overview_sunrise_sunset);
+            this.sun = v.findViewById(R.id.card_overview_sunrise_sunset);
+            this.windicon = v.findViewById(R.id.card_overview_windicon);
         }
     }
 
@@ -289,7 +293,7 @@ public void onBindViewHolder(ViewHolder viewHolder, final int position) {
             }
 
             setImage(currentWeatherDataList.getWeatherID(), holder.weather, isDay);
-
+            holder.windicon.setImageResource(StringFormatUtils.colorWindSpeedWidget(currentWeatherDataList.getWindSpeed()));
             holder.temperature.setText(StringFormatUtils.formatTemperature(context, currentWeatherDataList.getTemperatureCurrent()));
 
         } else if (viewHolder.getItemViewType() == DETAILS) {
diff --git a/app/src/main/java/org/woheller69/weather/ui/RecycleList/CourseOfDayAdapter.java b/app/src/main/java/org/woheller69/weather/ui/RecycleList/CourseOfDayAdapter.java
index 03311fb..6024e69 100644
--- a/app/src/main/java/org/woheller69/weather/ui/RecycleList/CourseOfDayAdapter.java
+++ b/app/src/main/java/org/woheller69/weather/ui/RecycleList/CourseOfDayAdapter.java
@@ -96,6 +96,7 @@ public void onBindViewHolder(CourseOfDayViewHolder holder, int position) {
 
         updateRecyclerViewHeader();  //update header according to date in first visible item on the left
 
+        holder.windicon.setImageResource(StringFormatUtils.colorWindSpeedWidget(courseOfDayList.get(position).getWindSpeed()));
         setIcon(courseOfDayList.get(position).getWeatherID(), holder.weather, isDay);
         holder.humidity.setText(StringFormatUtils.formatInt(courseOfDayList.get(position).getHumidity(), context.getString(R.string.units_rh)));
 
@@ -153,6 +154,7 @@ class CourseOfDayViewHolder extends RecyclerView.ViewHolder {
         TextView precipitation;
         TextView wind_speed;
         ImageView wind_direction;
+        ImageView windicon;
 
         CourseOfDayViewHolder(View itemView) {
             super(itemView);
@@ -165,6 +167,7 @@ class CourseOfDayViewHolder extends RecyclerView.ViewHolder {
             precipitation = itemView.findViewById(R.id.course_of_day_precipitation);
             wind_speed = itemView.findViewById(R.id.course_of_day_wind_speed);
             wind_direction = itemView.findViewById(R.id.course_of_day_wind_direction);
+            windicon = itemView.findViewById(R.id.course_of_day_wind_icon);
 
         }
     }
diff --git a/app/src/main/java/org/woheller69/weather/ui/RecycleList/WeekWeatherAdapter.java b/app/src/main/java/org/woheller69/weather/ui/RecycleList/WeekWeatherAdapter.java
index 70fb1c6..f6b5e3e 100644
--- a/app/src/main/java/org/woheller69/weather/ui/RecycleList/WeekWeatherAdapter.java
+++ b/app/src/main/java/org/woheller69/weather/ui/RecycleList/WeekWeatherAdapter.java
@@ -89,6 +89,7 @@ public void onBindViewHolder(WeekForecastViewHolder holder, int position) {
         }
 
         setIcon((int) dayValues[9], holder.weather, isDay);
+        holder.windicon.setImageResource(StringFormatUtils.colorWindSpeedWidget(dayValues[5]));
         holder.humidity.setText(StringFormatUtils.formatInt(dayValues[2],context.getString(R.string.units_rh)));
 
         SharedPreferences prefManager = PreferenceManager.getDefaultSharedPreferences(context);
@@ -146,6 +147,7 @@ class WeekForecastViewHolder extends RecyclerView.ViewHolder {
         TextView wind_speed;
         TextView precipitation;
         TextView uv_index;
+        ImageView windicon;
 
         WeekForecastViewHolder(View itemView) {
             super(itemView);
@@ -161,6 +163,7 @@ class WeekForecastViewHolder extends RecyclerView.ViewHolder {
             wind_speed = itemView.findViewById(R.id.week_forecast_wind_speed);
             precipitation = itemView.findViewById(R.id.week_forecast_precipitation);
             uv_index = itemView.findViewById(R.id.week_forecast_uv_index);
+            windicon = itemView.findViewById(R.id.week_forecast_wind_icon);
         }
     }
 
diff --git a/app/src/main/res/drawable/ic_wind_empty.xml b/app/src/main/res/drawable/ic_wind_empty.xml
new file mode 100644
index 0000000..6c23f97
--- /dev/null
+++ b/app/src/main/res/drawable/ic_wind_empty.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12.01dp"
+    android:height="17.51dp"
+    android:viewportWidth="1201"
+    android:viewportHeight="1751">
+    <path
+        android:pathData="M125,1750L0,1750 0,0 250,0 250,1750 125,1750Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="28.222"
+        android:fillColor="#00000000"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M1200,575L249,1001 249,150 1200,575Z"
+        android:strokeLineJoin="round"
+        android:strokeWidth="28.222"
+        android:fillColor="#00000000"
+        android:strokeColor="#00000000"
+        android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/rounded_highlight.xml b/app/src/main/res/drawable/rounded_highlight.xml
index 8d51905..fd056da 100644
--- a/app/src/main/res/drawable/rounded_highlight.xml
+++ b/app/src/main/res/drawable/rounded_highlight.xml
@@ -5,7 +5,7 @@
         android:color="@color/backgroundHighlight"
         />
     <padding
-        android:bottom="-3dp"
+        android:bottom="3dp"
         android:top="-3dp"
         android:left="5dp"
         android:right="5dp" />
diff --git a/app/src/main/res/drawable/rounded_violet.xml b/app/src/main/res/drawable/rounded_violet.xml
new file mode 100644
index 0000000..cb09679
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_violet.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/violet" />
+    <stroke android:width="0dp"
+        android:color="@color/violet"
+        />
+    <padding
+        android:bottom="-3dp"
+        android:top="-3dp"
+        android:left="5dp"
+        android:right="5dp" />
+
+    <corners android:radius="7dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_overview.xml b/app/src/main/res/layout/card_overview.xml
index ae6b09a..ecd70ed 100644
--- a/app/src/main/res/layout/card_overview.xml
+++ b/app/src/main/res/layout/card_overview.xml
@@ -15,21 +15,31 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_gravity="center_vertical">
 
+        <ImageView
+            android:id="@+id/card_overview_windicon"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_centerInParent="true"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="5dp"
+            android:src="@drawable/ic_wind_orange"
+            android:translationY="-20dp" />
+
         <TextView
             android:id="@+id/card_overview_temperature"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="50dp"
-            android:textColor="@color/colorPrimaryDark"
-            android:background="@drawable/rounded_corner"
-            android:layout_alignParentTop="true"
             android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
             android:layout_marginEnd="10dp"
+            android:background="@drawable/rounded_corner"
+            android:paddingLeft="7dp"
             android:paddingRight="7dp"
-            android:paddingLeft="7dp" />
+            android:textColor="@color/colorPrimaryDark"
+            android:textSize="45dp" />
 
     </RelativeLayout>
     <TextView
diff --git a/app/src/main/res/layout/list_item_course_of_day.xml b/app/src/main/res/layout/list_item_course_of_day.xml
index cfceeee..96206c5 100644
--- a/app/src/main/res/layout/list_item_course_of_day.xml
+++ b/app/src/main/res/layout/list_item_course_of_day.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/activity_city_weather_details_holder"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
     android:orientation="vertical"
     android:padding="10dp">
 
@@ -10,18 +10,33 @@
         android:id="@+id/course_of_day_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_marginBottom="5dp"
         android:text="14:42"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="@color/colorPrimaryDark" />
 
-    <ImageView
-        android:id="@+id/course_of_day_weather"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center" />
-
+        android:orientation="horizontal">
+        <androidx.legacy.widget.Space
+            android:layout_width="20dp"
+            android:layout_height="1dp"
+            android:layout_marginStart="-15dp"/>
+        <ImageView
+            android:id="@+id/course_of_day_weather"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/weather_icon_10d" />
+        <ImageView
+            android:id="@+id/course_of_day_wind_icon"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:translationX="-15dp"
+            android:layout_marginEnd="-15dp"
+            android:src="@drawable/ic_wind_orange"
+            />
+    </LinearLayout>
     <androidx.legacy.widget.Space
         android:layout_width="match_parent"
         android:layout_height="10dp" />
@@ -30,7 +45,6 @@
         android:id="@+id/course_of_day_temperature"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_marginBottom="3dp"
         android:text="xy°C"
         android:textAppearance="?android:attr/textAppearanceMedium"
@@ -40,7 +54,6 @@
         android:id="@+id/course_of_day_humidity"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_marginBottom="3dp"
         android:text="xy %"
         android:textAppearance="?android:attr/textAppearanceMedium"
@@ -50,7 +63,6 @@
         android:id="@+id/course_of_day_pressure"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_marginBottom="3dp"
         android:text="xy hpa"
         android:textAppearance="?android:attr/textAppearanceMedium"
@@ -60,7 +72,6 @@
         android:id="@+id/course_of_day_precipitation"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_marginBottom="3dp"
         android:text="xy mm"
         android:textAppearance="?android:attr/textAppearanceMedium"
@@ -70,7 +81,6 @@
         android:id="@+id/course_of_day_wind_speed"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_marginBottom="3dp"
         android:text="xy Bft"
         android:textAppearance="?android:attr/textAppearanceMedium"
@@ -80,7 +90,6 @@
         android:id="@+id/course_of_day_wind_direction"
         android:layout_width="20sp"
         android:layout_height="20sp"
-        android:layout_gravity="center"
         android:layout_marginBottom="3dp"
         android:src="@drawable/ic_south_24px" />
 
diff --git a/app/src/main/res/layout/list_item_week_forecast.xml b/app/src/main/res/layout/list_item_week_forecast.xml
index f5af3dd..90e5911 100644
--- a/app/src/main/res/layout/list_item_week_forecast.xml
+++ b/app/src/main/res/layout/list_item_week_forecast.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/activity_city_weather_details_holder"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="vertical"
+    android:gravity="center_horizontal"
     android:padding="10dp">
 
     <TextView
@@ -11,16 +11,32 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="5dp"
-        android:layout_gravity="center"
         android:text="Monday:"
         android:textColor="@color/colorPrimaryDark"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <ImageView
-        android:id="@+id/week_forecast_weather"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center" />
+        android:orientation="horizontal">
+        <androidx.legacy.widget.Space
+            android:layout_width="20dp"
+            android:layout_height="1dp"
+            android:layout_marginStart="-15dp"/>
+        <ImageView
+            android:id="@+id/week_forecast_weather"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@mipmap/weather_icon_10d" />
+        <ImageView
+            android:id="@+id/week_forecast_wind_icon"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:translationX="-15dp"
+            android:layout_marginEnd="-15dp"
+            android:src="@drawable/ic_wind_orange"
+            />
+    </LinearLayout>
 
     <androidx.legacy.widget.Space
         android:layout_width="match_parent"
@@ -30,7 +46,6 @@
         android:id="@+id/week_forecast_temperature_max"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_marginBottom="0dp"
         android:text="xy°C"
         android:textColor="@color/colorPrimaryDark"
@@ -40,7 +55,6 @@
         android:id="@+id/week_forecast_temperature_min"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_marginBottom="3dp"
         android:text="xy°C"
         android:textColor="@color/colorPrimaryDark"
@@ -49,7 +63,6 @@
         android:id="@+id/week_forecast_humidity"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_marginBottom="3dp"
         android:text="xy %rh"
         android:textColor="@color/colorPrimaryDark"
@@ -58,7 +71,6 @@
         android:id="@+id/week_forecast_pressure"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_marginBottom="3dp"
         android:text="xy hPa"
         android:textColor="@color/colorPrimaryDark"
@@ -67,7 +79,6 @@
         android:id="@+id/week_forecast_precipitation"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_marginBottom="3dp"
         android:text="xy mm"
         android:textColor="@color/colorPrimaryDark"
@@ -77,7 +88,6 @@
         android:id="@+id/week_forecast_wind_speed"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_marginBottom="3dp"
         android:text="10 Bft"
         android:textColor="@color/colorPrimaryDark"
@@ -87,7 +97,6 @@
         android:id="@+id/week_forecast_uv_index"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:layout_marginBottom="3dp"
         android:text="uv xy"
         android:textColor="@color/colorPrimaryDark"
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 685fdc4..2a6c1eb 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -86,13 +86,13 @@
     <string name="error_no_city_selected">Der er ikke valgt nogen by. For at vælge en by skal du gå til \"Administrer lokationer\".</string>
     <string name="error_dialog_add_city_too_close">By for tæt på en anden overvåget by</string>
     <string name="error_no_radius_search_result">Ingen by fundet. Forøg søgeradius</string>
-    <string name="settings_interval_quarter" translatable="false">15 min</string>
-    <string name="settings_interval_half" translatable="false">30 min</string>
-    <string name="settings_interval_one" translatable="false">1 h</string>
-    <string name="settings_interval_two" translatable="false">2 h</string>
-    <string name="settings_interval_six" translatable="false">6 h</string>
-    <string name="settings_interval_twelve" translatable="false">12 h</string>
-    <string name="settings_interval_twentyfour" translatable="false">24 h</string>
+    <string name="settings_interval_quarter">15 min</string>
+    <string name="settings_interval_half">30 min</string>
+    <string name="settings_interval_one">1 h</string>
+    <string name="settings_interval_two">2 h</string>
+    <string name="settings_interval_six">6 h</string>
+    <string name="settings_interval_twelve">12 h</string>
+    <string name="settings_interval_twentyfour">24 h</string>
     <string name="settings_intervals">Intervaller</string>
     <string name="settings_update_interval">Opdateringsinterval</string>
     <string name="settings_interval_summary">Indstil intervallet for automatiske opdateringer</string>
@@ -103,7 +103,7 @@
     <string name="RainViewer">Regn radar</string>
     <string name="long_press_text">Hold og træk for at sortere.</string>
     <string name="swipe_to_delete">Stryg for at slette</string>
-    <string name="settings_title_forecastChoice">Visningsmuligheder</string>
+    <string name="settings_title_display_options">Visningsmuligheder</string>
     <string name="settings_summary_forecastChoice">Vælg mellem 5 dage /3 timer og 2 dage /1 timer 3 dage /3 timer prognoser</string>
     <string name="settings_forecast_option_1">5 dage /3 timer</string>
     <string name="settings_forecast_option_2">2 dage /1 t 3 dag /3 timer</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7491dad..56bb47f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -75,7 +75,7 @@
     <string name="settings_title_API">API Key</string>
     <string name="settings_title_API_key">API Key eingeben</string>
     <string name="settings_update_interval">Update Intervall</string>
-    <string name="settings_title_forecastChoice">Anzeigeoptionen</string>
+    <string name="settings_title_display_options">Anzeigeoptionen</string>
     <string name="settings_summary_forecastChoice">Wählen Sie zwischen 5 Tage / 3h und 2 Tage / 1h + 3 Tage / 3h Vorhersage</string>
     <string name="settings_forecast_option_1">5 Tage / 3h</string>
     <string name="settings_forecast_option_2">2 Tage / 1h + 3 Tage / 3h</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 62bcd00..5bdeaa3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -96,7 +96,7 @@
     <string name="RainViewer">Radar de lluvia</string>
     <string name="long_press_text">Mantenga presionado y arrastre para ordenar.</string>
     <string name="swipe_to_delete">Deslizar para eliminar</string>
-    <string name="settings_title_forecastChoice">opciones de pantalla</string>
+    <string name="settings_title_display_options">opciones de pantalla</string>
     <string name="settings_summary_forecastChoice">Seleccione entre pronósticos de 5 días /3h y 2 días /1h + 3 días /3h</string>
     <string name="settings_forecast_option_1">5 días /3h</string>
     <string name="settings_forecast_option_2">2 días /1h + 3 días /3h</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6255fe4..7ea7925 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -77,7 +77,7 @@
     <string name="settings_title_API">Clé API</string>
     <string name="settings_title_API_key">Entrez la clé API</string>
     <string name="settings_update_interval">Intervalle de mise à jour</string>
-    <string name="settings_title_forecastChoice">Option d\'affichage</string>
+    <string name="settings_title_display_options">Option d\'affichage</string>
     <string name="settings_summary_forecastChoice">Choisissez entre 5 jours /3h et 2 jours /1h + 3 jours /3h de prévision</string>
     <string name="settings_forecast_option_1">5 jours /3h</string>
     <string name="settings_forecast_option_2">2 jours /1h + 3 jours /3h</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index d987a77..d507c66 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -86,13 +86,13 @@
     <string name="error_no_city_selected">Nincs kiválasztott város. A város kiválasztásához lépjen a \"Helyek kezelése\" oldalra.</string>
     <string name="error_dialog_add_city_too_close">A város túl közel van a többi megfigyelt városhoz</string>
     <string name="error_no_radius_search_result">Nem található város. Növelje a keresési sugarat</string>
-    <string name="settings_interval_quarter" translatable="false">15 min</string>
-    <string name="settings_interval_half" translatable="false">30 min</string>
-    <string name="settings_interval_one" translatable="false">1 h</string>
-    <string name="settings_interval_two" translatable="false">2 h</string>
-    <string name="settings_interval_six" translatable="false">6 h</string>
-    <string name="settings_interval_twelve" translatable="false">12 h</string>
-    <string name="settings_interval_twentyfour" translatable="false">24 h</string>
+    <string name="settings_interval_quarter">15 min</string>
+    <string name="settings_interval_half">30 min</string>
+    <string name="settings_interval_one">1 h</string>
+    <string name="settings_interval_two">2 h</string>
+    <string name="settings_interval_six">6 h</string>
+    <string name="settings_interval_twelve">12 h</string>
+    <string name="settings_interval_twentyfour">24 h</string>
     <string name="settings_intervals">Intervallumok</string>
     <string name="settings_update_interval">Frissítési időköz</string>
     <string name="settings_interval_summary">Állítsa be az automatikus frissítések időközét</string>
@@ -103,7 +103,7 @@
     <string name="RainViewer">Eső Radar</string>
     <string name="long_press_text">Tartsa lenyomva és húzza a rendezéshez.</string>
     <string name="swipe_to_delete">Csúsztassa az ujját a törléshez</string>
-    <string name="settings_title_forecastChoice">megjelenítési lehetőségek</string>
+    <string name="settings_title_display_options">megjelenítési lehetőségek</string>
     <string name="settings_summary_forecastChoice">Válasszon az 5 napos /3 órás és a 2 napos /1 óra 3 napos /3 órás előrejelzések közül</string>
     <string name="settings_forecast_option_1">5 nap /3 óra</string>
     <string name="settings_forecast_option_2">2 nap /1 óra 3 nap /3 óra</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 701d6fd..20cc7a3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -84,13 +84,13 @@
     <string name="error_no_city_selected">Nessuna città selezionata. Per selezionare una città vai a \"Gestisci località\".</string>
     <string name="error_dialog_add_city_too_close">Città troppo vicina ad altre città osservate</string>
     <string name="error_no_radius_search_result">Nessuna città trovata. Aumenta il raggio di ricerca</string>
-    <string name="settings_interval_quarter" translatable="false">15 min</string>
-    <string name="settings_interval_half" translatable="false">30 min</string>
-    <string name="settings_interval_one" translatable="false">1 h</string>
-    <string name="settings_interval_two" translatable="false">2 h</string>
-    <string name="settings_interval_six" translatable="false">6 h</string>
-    <string name="settings_interval_twelve" translatable="false">12 h</string>
-    <string name="settings_interval_twentyfour" translatable="false">24 h</string>
+    <string name="settings_interval_quarter">15 min</string>
+    <string name="settings_interval_half">30 min</string>
+    <string name="settings_interval_one">1 h</string>
+    <string name="settings_interval_two">2 h</string>
+    <string name="settings_interval_six">6 h</string>
+    <string name="settings_interval_twelve">12 h</string>
+    <string name="settings_interval_twentyfour">24 h</string>
     <string name="settings_intervals">Intervalli</string>
     <string name="settings_update_interval">Intervallo di aggiornamento</string>
     <string name="settings_interval_summary">Imposta l\'intervallo degli aggiornamenti automatici</string>
@@ -101,7 +101,7 @@
     <string name="RainViewer">Radar Pioggia</string>
     <string name="long_press_text">Tieni premuto e trascina per ordinare.</string>
     <string name="swipe_to_delete">Scorri per eliminare</string>
-    <string name="settings_title_forecastChoice">Opzioni di visualizzazione</string>
+    <string name="settings_title_display_options">Opzioni di visualizzazione</string>
     <string name="settings_summary_forecastChoice">Selezionare tra previsioni di 5 giorni / 3 ore e 2 giorni / 1 ora + 3 giorni / 3 ore</string>
     <string name="settings_forecast_option_1">5 giorni / 3h</string>
     <string name="settings_forecast_option_2">2 giorni / 1h + 3 giorni / 3h</string>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index fe98662..f08427c 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -10,6 +10,7 @@
     <color name="white">#303030</color>
     <color name="red">#d01530</color>
     <color name="lightred">#fa7972</color>
+    <color name="violet">#779461c9</color>
     <color name="yellow">#f8f49f</color>
     <color name="orange">#fec58e</color>
     <color name="green">#c3f5b2</color>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 719b267..1431778 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -86,13 +86,13 @@
     <string name="error_no_city_selected">Er is geen stad geselecteerd. Ga naar \"Locaties beheren\" om een ​​stad te selecteren.</string>
     <string name="error_dialog_add_city_too_close">Stad te dicht bij andere bekeken stad</string>
     <string name="error_no_radius_search_result">Geen stad gevonden. Zoekradius vergroten</string>
-    <string name="settings_interval_quarter" translatable="false">15 min</string>
-    <string name="settings_interval_half" translatable="false">30 min</string>
-    <string name="settings_interval_one" translatable="false">1 h</string>
-    <string name="settings_interval_two" translatable="false">2 h</string>
-    <string name="settings_interval_six" translatable="false">6 h</string>
-    <string name="settings_interval_twelve" translatable="false">12 h</string>
-    <string name="settings_interval_twentyfour" translatable="false">24 h</string>
+    <string name="settings_interval_quarter">15 min</string>
+    <string name="settings_interval_half">30 min</string>
+    <string name="settings_interval_one">1 h</string>
+    <string name="settings_interval_two">2 h</string>
+    <string name="settings_interval_six">6 h</string>
+    <string name="settings_interval_twelve">12 h</string>
+    <string name="settings_interval_twentyfour">24 h</string>
     <string name="settings_intervals">Intervallen</string>
     <string name="settings_update_interval">Bijwerkingsonderbreking</string>
     <string name="settings_interval_summary">Stel het interval van automatische updates in</string>
@@ -103,7 +103,7 @@
     <string name="RainViewer">Regenradar</string>
     <string name="long_press_text">Houd ingedrukt en sleep om te sorteren.</string>
     <string name="swipe_to_delete">Veeg om te verwijderen</string>
-    <string name="settings_title_forecastChoice">weergaveopties</string>
+    <string name="settings_title_display_options">weergaveopties</string>
     <string name="settings_summary_forecastChoice">Kies tussen 5 dagen /3 uur en 2 dagen /1 uur 3 dagen /3 uur voorspellingen</string>
     <string name="settings_forecast_option_1">5 dagen /3u</string>
     <string name="settings_forecast_option_2">2 dagen /1 uur 3 dagen /3 uur</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 2ee9418..47e013b 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -84,13 +84,13 @@
     <string name="error_no_city_selected">Nenhuma cidade selecionada. Para selecionar uma cidade, vá para \"Gerenciar Locais\".</string>
     <string name="error_dialog_add_city_too_close">Cidade muito perto de outra cidade sendo visualizada</string>
     <string name="error_no_radius_search_result">Nenhuma cidade encontrada. Aumente o raio de pesquisa.</string>
-    <string name="settings_interval_quarter" translatable="false">15 min</string>
-    <string name="settings_interval_half" translatable="false">30 min</string>
-    <string name="settings_interval_one" translatable="false">1 h</string>
-    <string name="settings_interval_two" translatable="false">2 h</string>
-    <string name="settings_interval_six" translatable="false">6 h</string>
-    <string name="settings_interval_twelve" translatable="false">12 h</string>
-    <string name="settings_interval_twentyfour" translatable="false">24 h</string>
+    <string name="settings_interval_quarter">15 min</string>
+    <string name="settings_interval_half">30 min</string>
+    <string name="settings_interval_one">1 h</string>
+    <string name="settings_interval_two">2 h</string>
+    <string name="settings_interval_six">6 h</string>
+    <string name="settings_interval_twelve">12 h</string>
+    <string name="settings_interval_twentyfour">24 h</string>
     <string name="settings_intervals">Intervalos</string>
     <string name="settings_update_interval">Intervalos de atualização</string>
     <string name="settings_interval_summary">Defina o intervalo para atualizações automáticas</string>
@@ -101,7 +101,7 @@
     <string name="RainViewer">Radar de Chuvas</string>
     <string name="long_press_text">Segure e arraste para ordenar.</string>
     <string name="swipe_to_delete">Deslize para remover</string>
-    <string name="settings_title_forecastChoice">Opções de Visualização</string>
+    <string name="settings_title_display_options">Opções de Visualização</string>
     <string name="settings_summary_forecastChoice">Selecione entre previsões de 5 dias / 3h e 2 dias / 1h + 3 dias / 3h</string>
     <string name="settings_forecast_option_1">5 day / 3h</string>
     <string name="settings_forecast_option_2">2 day / 1h + 3 day / 3h</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9f62203..4cb545f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -95,7 +95,7 @@
     <string name="RainViewer">Карта осадков</string>
     <string name="long_press_text">Удерживайте и тащите для сортировки.</string>
     <string name="swipe_to_delete">Проведите, чтобы удалить</string>
-    <string name="settings_title_forecastChoice">Предпочтения отображения</string>
+    <string name="settings_title_display_options">Предпочтения отображения</string>
     <string name="settings_summary_forecastChoice">Выбор форматов отображения прогноза погоды: 5 дней / 3 часа + 2 дня / 1 час + 3 дня / 3 часа</string>
     <string name="settings_forecast_option_1">5 дней / 3 часа</string>
     <string name="settings_forecast_option_2">2 дня / 1 час + 3 дня / 3 часа</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index b23047a..445c7a1 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -86,13 +86,13 @@
     <string name="error_no_city_selected">Ingen stad har valts. För att välja en stad gå till \"Hantera platser\".</string>
     <string name="error_dialog_add_city_too_close">Staden är för nära annan bevakad stad</string>
     <string name="error_no_radius_search_result">Ingen stad hittades. Öka sökradien</string>
-    <string name="settings_interval_quarter" translatable="false">15 min</string>
-    <string name="settings_interval_half" translatable="false">30 min</string>
-    <string name="settings_interval_one" translatable="false">1 h</string>
-    <string name="settings_interval_two" translatable="false">2 h</string>
-    <string name="settings_interval_six" translatable="false">6 h</string>
-    <string name="settings_interval_twelve" translatable="false">12 h</string>
-    <string name="settings_interval_twentyfour" translatable="false">24 h</string>
+    <string name="settings_interval_quarter">15 min</string>
+    <string name="settings_interval_half">30 min</string>
+    <string name="settings_interval_one">1 h</string>
+    <string name="settings_interval_two">2 h</string>
+    <string name="settings_interval_six">6 h</string>
+    <string name="settings_interval_twelve">12 h</string>
+    <string name="settings_interval_twentyfour">24 h</string>
     <string name="settings_intervals">Intervaller</string>
     <string name="settings_update_interval">Uppdateringsintervall</string>
     <string name="settings_interval_summary">Ställ in intervallet för automatiska uppdateringar</string>
@@ -103,7 +103,7 @@
     <string name="RainViewer">Regnradar</string>
     <string name="long_press_text">Håll och dra för att sortera.</string>
     <string name="swipe_to_delete">Svep för att radera</string>
-    <string name="settings_title_forecastChoice">Skärmalternativ</string>
+    <string name="settings_title_display_options">Skärmalternativ</string>
     <string name="settings_summary_forecastChoice">Välj mellan 5 dagar /3 timmar och 2 dagar /1 timmar 3 dagar /3 timmar prognoser</string>
     <string name="settings_forecast_option_1">5 dagar /3h</string>
     <string name="settings_forecast_option_2">2 dagar /1h 3 dagar /3h</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 23ff730..550d93c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,6 +10,7 @@
     <color name="white">#fafafa</color>
     <color name="red">#d01530</color>
     <color name="lightred">#fa7972</color>
+    <color name="violet">#779461c9</color>
     <color name="yellow">#f8f49f</color>
     <color name="orange">#fec58e</color>
     <color name="green">#c3f5b2</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 140e011..999f0d8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -106,7 +106,7 @@
     <string name="RainViewer">Rain Radar</string>
     <string name="long_press_text">Hold and drag to sort.</string>
     <string name="swipe_to_delete">Swipe to delete</string>
-    <string name="settings_title_forecastChoice">Display options</string>
+    <string name="settings_title_display_options">Display options</string>
     <string name="settings_summary_forecastChoice">Select between 5 day / 3h and 2 day / 1h + 3 day / 3h forecasts</string>
     <string name="settings_forecast_option_1">5 day / 3h</string>
     <string name="settings_forecast_option_2">2 day / 1h + 3 day / 3h</string>
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index 1867b56..1d5e536 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -43,7 +43,7 @@
             />
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/settings_title_forecastChoice">
+    <PreferenceCategory android:title="@string/settings_title_display_options">
         <ListPreference
             app:useSimpleSummaryProvider="true"
             android:defaultValue="2"