Henry-Hiles/QWeather
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix icons

Browse source
This commit is contained in:
Henry Hiles 2023-12-25 10:45:58 -05:00
parent b36145a373
commit 3c9e1b4557
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/henryhiles/qweather/domain/weather/HourlyWeatherData.kt
View file

@ -1,5 +1,6 @@
package com.henryhiles.qweather.domain.weather package com.henryhiles.qweather.domain.weather
import androidx.annotation.DrawableRes
import java.time.LocalDateTime import java.time.LocalDateTime
data class HourlyWeatherData( data class HourlyWeatherData(
@ -9,4 +10,5 @@ data class HourlyWeatherData(
val weatherType: WeatherType, val weatherType: WeatherType,
val precipitationProbability: Int?, val precipitationProbability: Int?,
val windSpeed: Int, val windSpeed: Int,
@DrawableRes val icon: Int = if(time.hour < 8 || time.hour >= 19) weatherType.nightIconRes else weatherType.iconRes
) )

7
app/src/main/java/com/henryhiles/qweather/presentation/components/weather/WeatherCard.kt
View file

@ -13,6 +13,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
@ -36,7 +37,6 @@ fun WeatherCard(hour: HourlyWeatherData?, modifier: Modifier = Modifier) {
horizontalAlignment = Alignment.CenterHorizontally horizontalAlignment = Alignment.CenterHorizontally
) { ) {
Row( Row(
horizontalArrangement = Arrangement.SpaceBetween,
modifier = Modifier.fillMaxWidth() modifier = Modifier.fillMaxWidth()
) { ) {
Text( Text(
@ -45,9 +45,10 @@ fun WeatherCard(hour: HourlyWeatherData?, modifier: Modifier = Modifier) {
} }
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(16.dp))
Image( Image(
painter = painterResource(id = if(it.time.hour > 6 || it.time.hour < 8) it.weatherType.nightIconRes else it.weatherType.iconRes), painter = painterResource(id = it.icon),
contentDescription = "Image of ${it.weatherType.weatherDesc}", contentDescription = "Image of ${it.weatherType.weatherDesc}",
modifier = Modifier.height(152.dp) modifier = Modifier.height(140.dp),
contentScale = ContentScale.FillHeight
) )
Spacer(modifier = Modifier.height(16.dp)) Spacer(modifier = Modifier.height(16.dp))
Text(text = "${it.temperature}°C", fontSize = 50.sp) Text(text = "${it.temperature}°C", fontSize = 50.sp)

2
app/src/main/java/com/henryhiles/qweather/presentation/components/weather/WeatherHour.kt
View file

@ -38,7 +38,7 @@ fun WeatherHour(
) { ) {
Text(text = formattedTime) Text(text = formattedTime)
Image( Image(
painter = painterResource(id = it.weatherType.iconRes), painter = painterResource(id = it.icon),
contentDescription = "Image of ${it.weatherType.weatherDesc}", contentDescription = "Image of ${it.weatherType.weatherDesc}",
modifier = Modifier.width(40.dp) modifier = Modifier.width(40.dp)
) )

3
app/src/main/res/drawable/ic_clear_night.xml
View file

@ -4,6 +4,7 @@
android:viewportWidth="64" android:viewportWidth="64"
android:viewportHeight="64"> android:viewportHeight="64">
<path <path
android:pathData="M44.54,41.47A23,23 0,0 1,24.49 11.73,1 1,0 0,0 23,10.59 23,23 0,1 0,54.41 42a1,1 0,0 0,-1.14 -1.47A23.06,23.06 0,0 1,44.54 41.47Z" android:pathData="M48.171,45.314A32.271,32.26 0,0 1,20.039 3.6,1.403 1.403,0 0,0 17.948,2.001 32.271,32.26 0,1 0,62.02 46.057,1.403 1.403,0 0,0 60.42,43.996 32.356,32.344 0,0 1,48.171 45.314Z"
android:strokeWidth="1.40286"
android:fillColor="#efcc00"/> android:fillColor="#efcc00"/>
</vector> </vector>