mirror of
https://github.com/PranshulGG/WeatherMaster.git
synced 2026-10-22 02:52:37 -05:00
add sleet, hail, mixed precip
This commit is contained in:
PranshulGG committed
1 parent
f4cec63a20
commit
ce94ca03a9
4 files changed
+135
-1
No files matched your search
+13
-1
@@ -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)
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:aapt="http://schemas.android.com/aapt"
|
||||
android:width="48dp"
|
||||
android:height="48dp"
|
||||
android:viewportWidth="48"
|
||||
android:viewportHeight="48">
|
||||
<path
|
||||
android:pathData="M47,16.5c0,8.358 -6.662,15.171 -15,15.488V32H11v-0.002h-0.143C5.413,31.999 1,27.617 1,22.21c0,-5.407 4.413,-9.79 9.857,-9.79 1.89,0 3.654,0.528 5.154,1.444C17.271,6.559 23.679,1 31.393,1 40.013,1 47,7.94 47,16.5Z"
|
||||
android:fillType="evenOdd">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient
|
||||
android:centerX="39.332"
|
||||
android:centerY="29.363"
|
||||
android:gradientRadius="36.073"
|
||||
android:type="radial">
|
||||
<item android:offset="0" android:color="#FFB4B4B4"/>
|
||||
<item android:offset="0.298" android:color="#FFB4B4B4"/>
|
||||
<item android:offset="1" android:color="#FFE3E3E3"/>
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
<group>
|
||||
<clip-path
|
||||
android:pathData="M47,16.5c0,8.358 -6.662,15.171 -15,15.488V32H11v-0.002h-0.143C5.413,31.999 1,27.617 1,22.21c0,-5.407 4.413,-9.79 9.857,-9.79 1.89,0 3.654,0.528 5.154,1.444C17.271,6.559 23.679,1 31.393,1 40.013,1 47,7.94 47,16.5Z"
|
||||
android:fillType="evenOdd"/>
|
||||
<path
|
||||
android:pathData="m32,31.988 l-0.038,-1 -0.962,0.037v0.963h1ZM32,32v1h1v-1h-1ZM11,32h-1v1h1v-1ZM11,31.998h1v-1.014l-1.014,0.014 0.014,1ZM16.011,13.864 L15.49,14.717 16.746,15.484 16.996,14.034 16.011,13.864ZM32.038,32.987C40.905,32.651 48,25.404 48,16.5h-2c0,7.813 -6.229,14.192 -14.038,14.489l0.076,1.998ZM33,32v-0.012h-2L31,32h2ZM11,33h21v-2L11,31v2ZM10,31.998L10,32h2v-0.002h-2ZM10.986,30.998h-0.13v2h0.158l-0.028,-2ZM10.856,30.998C5.96,30.999 2,27.059 2,22.21L0,22.21c0,5.965 4.867,10.789 10.857,10.789v-2ZM2,22.21c0,-4.848 3.959,-8.79 8.857,-8.79v-2C4.867,11.42 0,16.244 0,22.21h2ZM10.857,13.42c1.7,0 3.286,0.475 4.633,1.297l1.042,-1.707a10.862,10.862 0,0 0,-5.675 -1.59v2ZM31.393,0C23.19,0 16.368,5.913 15.025,13.694l1.971,0.34C18.174,7.205 24.168,2 31.393,2L31.393,0ZM48,16.5C48,7.38 40.558,0 31.393,0v2C39.467,2 46,8.498 46,16.5h2Z">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient
|
||||
android:startX="30"
|
||||
android:startY="15.5"
|
||||
android:endX="37"
|
||||
android:endY="30.5"
|
||||
android:type="linear">
|
||||
<item android:offset="0" android:color="#0080868B"/>
|
||||
<item android:offset="1" android:color="#FF80868B"/>
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
</group>
|
||||
<group>
|
||||
<clip-path
|
||||
android:pathData="M47,16.5c0,8.358 -6.662,15.171 -15,15.488V32H11v-0.002h-0.143C5.413,31.999 1,27.617 1,22.21c0,-5.407 4.413,-9.79 9.857,-9.79 1.89,0 3.654,0.528 5.154,1.444C17.271,6.559 23.679,1 31.393,1 40.013,1 47,7.94 47,16.5Z"
|
||||
android:fillType="evenOdd"/>
|
||||
<path
|
||||
android:pathData="m32,31.988 l-0.038,-1 -0.962,0.037v0.963h1ZM32,32v1h1v-1h-1ZM11,32h-1v1h1v-1ZM11,31.998h1v-1.014l-1.014,0.014 0.014,1ZM16.011,13.864 L15.49,14.717 16.746,15.484 16.996,14.034 16.011,13.864ZM32.038,32.987C40.905,32.651 48,25.404 48,16.5h-2c0,7.813 -6.229,14.192 -14.038,14.489l0.076,1.998ZM33,32v-0.012h-2L31,32h2ZM11,33h21v-2L11,31v2ZM10,31.998L10,32h2v-0.002h-2ZM10.986,30.998h-0.13v2h0.158l-0.028,-2ZM10.856,30.998C5.96,30.999 2,27.059 2,22.21L0,22.21c0,5.965 4.867,10.789 10.857,10.789v-2ZM2,22.21c0,-4.848 3.959,-8.79 8.857,-8.79v-2C4.867,11.42 0,16.244 0,22.21h2ZM10.857,13.42c1.7,0 3.286,0.475 4.633,1.297l1.042,-1.707a10.862,10.862 0,0 0,-5.675 -1.59v2ZM31.393,0C23.19,0 16.368,5.913 15.025,13.694l1.971,0.34C18.174,7.205 24.168,2 31.393,2L31.393,0ZM48,16.5C48,7.38 40.558,0 31.393,0v2C39.467,2 46,8.498 46,16.5h2Z">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient
|
||||
android:startX="41.5"
|
||||
android:startY="1"
|
||||
android:endX="5"
|
||||
android:endY="15"
|
||||
android:type="linear">
|
||||
<item android:offset="0" android:color="#FF81878C"/>
|
||||
<item android:offset="1" android:color="#00C3C5C6"/>
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
</group>
|
||||
<path
|
||||
android:pathData="m32,33 l-4.243,4.1a5.663,5.663 0,0 0,0 8.202c2.343,2.264 6.142,2.264 8.485,0a5.663,5.663 0,0 0,-0.037 -8.237L32,33Z"
|
||||
android:fillColor="#0B57D0"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,31 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:aapt="http://schemas.android.com/aapt"
|
||||
android:width="48dp"
|
||||
android:height="48dp"
|
||||
android:viewportWidth="48"
|
||||
android:viewportHeight="48">
|
||||
<path
|
||||
android:pathData="M47,16.5c0,8.358 -6.662,15.171 -15,15.488V32H11v-0.002h-0.143C5.413,31.999 1,27.617 1,22.21c0,-5.406 4.413,-9.789 9.857,-9.789 1.89,0 3.654,0.528 5.154,1.444C17.271,6.559 23.679,1 31.393,1 40.013,1 47,7.94 47,16.5Z"
|
||||
android:fillAlpha="0.95"
|
||||
android:fillType="evenOdd">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient
|
||||
android:centerX="39.333"
|
||||
android:centerY="29.362"
|
||||
android:gradientRadius="36.073"
|
||||
android:type="radial">
|
||||
<item android:offset="0.298" android:color="#FFB4B4B4"/>
|
||||
<item android:offset="1" android:color="#FFE3E3E3"/>
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
<path
|
||||
android:pathData="m9.44,23.735 l5.44,5.439 -5.44,5.44L4,29.173z"
|
||||
android:fillColor="#474747"/>
|
||||
<path
|
||||
android:pathData="m23.5,37 l-3.182,2.929c-1.757,1.617 -1.757,4.24 0,5.858 1.758,1.617 4.607,1.617 6.364,0 1.757,-1.618 1.757,-4.24 0,-5.858l-0.028,-0.026L23.5,37Z"
|
||||
android:fillColor="#0B57D0"/>
|
||||
<path
|
||||
android:pathData="m28.48,21.015 l2.72,2.72 -16.32,16.318 -2.72,-2.72zM35.28,27.814 L38,30.533l-8.16,8.159 -2.72,-2.72z"
|
||||
android:fillColor="#5E5E5E"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,28 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:aapt="http://schemas.android.com/aapt"
|
||||
android:width="48dp"
|
||||
android:height="48dp"
|
||||
android:viewportWidth="48"
|
||||
android:viewportHeight="48">
|
||||
<path
|
||||
android:pathData="M47,16.5c0,8.358 -6.662,15.172 -15,15.488V32H11v-0.002h-0.143C5.413,31.999 1,27.617 1,22.21c0,-5.407 4.413,-9.79 9.857,-9.79 1.89,0 3.654,0.528 5.154,1.444C17.271,6.559 23.68,1 31.393,1 40.013,1 47,7.94 47,16.5Z"
|
||||
android:fillAlpha="0.95"
|
||||
android:fillType="evenOdd">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient
|
||||
android:centerX="39.333"
|
||||
android:centerY="29.362"
|
||||
android:gradientRadius="36.073"
|
||||
android:type="radial">
|
||||
<item android:offset="0.298" android:color="#FFB4B4B4"/>
|
||||
<item android:offset="1" android:color="#FFE3E3E3"/>
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
<path
|
||||
android:pathData="m9.44,21.72 l5.44,5.439 -5.44,5.44L4,27.158zM23.04,35.316l5.44,5.44 -5.44,5.44 -5.44,-5.44z"
|
||||
android:fillColor="#474747"/>
|
||||
<path
|
||||
android:pathData="m28.48,19 l2.72,2.72 -16.32,16.318 -2.72,-2.72zM35.28,25.799 L38,28.518l-8.16,8.159 -2.72,-2.72z"
|
||||
android:fillColor="#5E5E5E"/>
|
||||
</vector>
|
||||
Reference in new issue
Block a user