diff --git a/app/src/main/java/com/pranshulgg/weather_master_app/core/model/weather/WeatherCondition.kt b/app/src/main/java/com/pranshulgg/weather_master_app/core/model/weather/WeatherCondition.kt index db0d3c906..1da1fd242 100644 --- a/app/src/main/java/com/pranshulgg/weather_master_app/core/model/weather/WeatherCondition.kt +++ b/app/src/main/java/com/pranshulgg/weather_master_app/core/model/weather/WeatherCondition.kt @@ -23,6 +23,10 @@ enum class WeatherCondition { RAIN, + SLEET, + HAIL, + MIXED_PRECIPITATION, + NO_CONDITION_FOUND, // USED FOR DAILY @@ -78,7 +82,7 @@ fun WeatherCondition.toIcon(daily: WeatherDaily? = null, targetTimeMilli: Long): WeatherCondition.PARTLY_CLOUDY -> if (isDay) R.drawable.weather_partly_cloudy_day else R.drawable.weather_partly_cloudy_night WeatherCondition.HEAVY_RAIN -> R.drawable.weather_heavy_rain - WeatherCondition.LIGHT_RAIN -> if (isDay) R.drawable.weather_light_rain_day else R.drawable.weather_light_rain_night + WeatherCondition.LIGHT_RAIN -> R.drawable.weather_light_rain WeatherCondition.LIGHT_SNOW -> if (isDay) R.drawable.weather_light_snow_day else R.drawable.weather_light_snow_night WeatherCondition.SNOW -> R.drawable.weather_snow @@ -97,6 +101,10 @@ fun WeatherCondition.toIcon(daily: WeatherDaily? = null, targetTimeMilli: Long): WeatherCondition.RAIN -> R.drawable.weather_rain + WeatherCondition.SLEET, WeatherCondition.HAIL -> R.drawable.weather_sleet_hail + + WeatherCondition.MIXED_PRECIPITATION -> R.drawable.weather_mixed_precipitation + WeatherCondition.CLEAR_WITH_CLOUDY -> R.drawable.clear_with_cloudy WeatherCondition.CLEAR_WITH_RAIN -> R.drawable.clear_with_rain WeatherCondition.CLEAR_WITH_SNOW -> R.drawable.clear_with_snow @@ -169,6 +177,10 @@ fun WeatherCondition.toLabel(context: Context): String { WeatherCondition.RAIN -> context.getString(R.string.weather_rain) + WeatherCondition.SLEET -> context.getString(R.string.weather_sleet) + WeatherCondition.HAIL -> context.getString(R.string.weather_hail) + WeatherCondition.MIXED_PRECIPITATION -> context.getString(R.string.weather_mixed_precipitation) + WeatherCondition.CLEAR_WITH_CLOUDY -> context.getString(R.string.weather_clear_with_cloudy) WeatherCondition.CLEAR_WITH_RAIN -> context.getString(R.string.weather_clear_with_rain) WeatherCondition.CLEAR_WITH_SNOW -> context.getString(R.string.weather_clear_with_snow) diff --git a/app/src/main/res/drawable/weather_light_rain.xml b/app/src/main/res/drawable/weather_light_rain.xml new file mode 100644 index 000000000..98d2d8690 --- /dev/null +++ b/app/src/main/res/drawable/weather_light_rain.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/weather_mixed_precipitation.xml b/app/src/main/res/drawable/weather_mixed_precipitation.xml new file mode 100644 index 000000000..103030984 --- /dev/null +++ b/app/src/main/res/drawable/weather_mixed_precipitation.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/weather_sleet_hail.xml b/app/src/main/res/drawable/weather_sleet_hail.xml new file mode 100644 index 000000000..145468b59 --- /dev/null +++ b/app/src/main/res/drawable/weather_sleet_hail.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + +