From 3c9e1b45574d940ad32588eb23c66c91b33c44dc Mon Sep 17 00:00:00 2001
From: Henry Hiles <henry@henryhiles.com>
Date: Mon, 25 Dec 2023 10:45:58 -0500
Subject: [PATCH] Fix icons

---
 .../qweather/domain/weather/HourlyWeatherData.kt           | 2 ++
 .../presentation/components/weather/WeatherCard.kt         | 7 ++++---
 .../presentation/components/weather/WeatherHour.kt         | 2 +-
 app/src/main/res/drawable/ic_clear_night.xml               | 3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/henryhiles/qweather/domain/weather/HourlyWeatherData.kt b/app/src/main/java/com/henryhiles/qweather/domain/weather/HourlyWeatherData.kt
index 6dd9617..1f652d3 100644
--- a/app/src/main/java/com/henryhiles/qweather/domain/weather/HourlyWeatherData.kt
+++ b/app/src/main/java/com/henryhiles/qweather/domain/weather/HourlyWeatherData.kt
@@ -1,5 +1,6 @@
 package com.henryhiles.qweather.domain.weather
 
+import androidx.annotation.DrawableRes
 import java.time.LocalDateTime
 
 data class HourlyWeatherData(
@@ -9,4 +10,5 @@ data class HourlyWeatherData(
     val weatherType: WeatherType,
     val precipitationProbability: Int?,
     val windSpeed: Int,
+    @DrawableRes val icon: Int = if(time.hour < 8 || time.hour >= 19) weatherType.nightIconRes else weatherType.iconRes
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/henryhiles/qweather/presentation/components/weather/WeatherCard.kt b/app/src/main/java/com/henryhiles/qweather/presentation/components/weather/WeatherCard.kt
index 6abfb2d..b6ead84 100644
--- a/app/src/main/java/com/henryhiles/qweather/presentation/components/weather/WeatherCard.kt
+++ b/app/src/main/java/com/henryhiles/qweather/presentation/components/weather/WeatherCard.kt
@@ -13,6 +13,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -36,7 +37,6 @@ fun WeatherCard(hour: HourlyWeatherData?, modifier: Modifier = Modifier) {
                 horizontalAlignment = Alignment.CenterHorizontally
             ) {
                 Row(
-                    horizontalArrangement = Arrangement.SpaceBetween,
                     modifier = Modifier.fillMaxWidth()
                 ) {
                     Text(
@@ -45,9 +45,10 @@ fun WeatherCard(hour: HourlyWeatherData?, modifier: Modifier = Modifier) {
                 }
                 Spacer(modifier = Modifier.height(16.dp))
                 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}",
-                    modifier = Modifier.height(152.dp)
+                    modifier = Modifier.height(140.dp),
+                    contentScale = ContentScale.FillHeight
                 )
                 Spacer(modifier = Modifier.height(16.dp))
                 Text(text = "${it.temperature}°C", fontSize = 50.sp)
diff --git a/app/src/main/java/com/henryhiles/qweather/presentation/components/weather/WeatherHour.kt b/app/src/main/java/com/henryhiles/qweather/presentation/components/weather/WeatherHour.kt
index 21e598d..941e50e 100644
--- a/app/src/main/java/com/henryhiles/qweather/presentation/components/weather/WeatherHour.kt
+++ b/app/src/main/java/com/henryhiles/qweather/presentation/components/weather/WeatherHour.kt
@@ -38,7 +38,7 @@ fun WeatherHour(
             ) {
                 Text(text = formattedTime)
                 Image(
-                    painter = painterResource(id = it.weatherType.iconRes),
+                    painter = painterResource(id = it.icon),
                     contentDescription = "Image of ${it.weatherType.weatherDesc}",
                     modifier = Modifier.width(40.dp)
                 )
diff --git a/app/src/main/res/drawable/ic_clear_night.xml b/app/src/main/res/drawable/ic_clear_night.xml
index 49455c9..0445d4c 100644
--- a/app/src/main/res/drawable/ic_clear_night.xml
+++ b/app/src/main/res/drawable/ic_clear_night.xml
@@ -4,6 +4,7 @@
     android:viewportWidth="64"
     android:viewportHeight="64">
   <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"/>
 </vector>