From 868af8a9ca5774c215561453b2899737d5b85f27 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Thu, 6 Apr 2023 15:16:01 -0400
Subject: [PATCH] refactor code

---
 .../components/weather/WeatherDay.kt          | 60 +++++++++++++++++++
 .../qweather/presentation/tabs/WeekTab.kt     | 41 +------------
 2 files changed, 62 insertions(+), 39 deletions(-)
 create mode 100644 app/src/main/java/com/henryhiles/qweather/presentation/components/weather/WeatherDay.kt

diff --git a/app/src/main/java/com/henryhiles/qweather/presentation/components/weather/WeatherDay.kt b/app/src/main/java/com/henryhiles/qweather/presentation/components/weather/WeatherDay.kt
new file mode 100644
index 0000000..cc61483
--- /dev/null
+++ b/app/src/main/java/com/henryhiles/qweather/presentation/components/weather/WeatherDay.kt
@@ -0,0 +1,60 @@
+package com.henryhiles.qweather.presentation.components.weather
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.*
+import androidx.compose.material3.Card
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import com.henryhiles.qweather.domain.weather.DailyWeatherData
+import java.time.format.DateTimeFormatter
+
+@Composable
+fun WeatherDay(dailyWeatherData: DailyWeatherData) {
+    val formattedDate = remember {
+        derivedStateOf {
+            dailyWeatherData.date.format(
+                DateTimeFormatter.ofPattern("E d")
+            )
+        }
+    }
+
+    Card(
+        modifier = Modifier.padding(
+            horizontal = 16.dp,
+            vertical = 8.dp
+        )
+    ) {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(16.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Image(
+                painter = painterResource(id = dailyWeatherData.weatherType.iconRes),
+                contentDescription = "Image of ${dailyWeatherData.weatherType}",
+                modifier = Modifier.width(48.dp)
+            )
+            Spacer(modifier = Modifier.width(16.dp))
+            Column {
+                Text(
+                    text = formattedDate.value
+                )
+                Text(text = "Feels like ${dailyWeatherData.apparentTemperatureMax}°C")
+            }
+
+            Spacer(modifier = Modifier.weight(1f))
+            Text(
+                text = "${dailyWeatherData.temperatureMax}°C",
+                style = MaterialTheme.typography.titleLarge,
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/henryhiles/qweather/presentation/tabs/WeekTab.kt b/app/src/main/java/com/henryhiles/qweather/presentation/tabs/WeekTab.kt
index 9fc4d58..3a93a68 100644
--- a/app/src/main/java/com/henryhiles/qweather/presentation/tabs/WeekTab.kt
+++ b/app/src/main/java/com/henryhiles/qweather/presentation/tabs/WeekTab.kt
@@ -1,7 +1,6 @@
 package com.henryhiles.qweather.presentation.tabs
 
 import android.Manifest
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -15,17 +14,15 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import cafe.adriel.voyager.koin.getScreenModel
 import cafe.adriel.voyager.navigator.tab.Tab
 import cafe.adriel.voyager.navigator.tab.TabOptions
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.rememberPermissionState
 import com.henryhiles.qweather.R
+import com.henryhiles.qweather.presentation.components.weather.WeatherDay
 import com.henryhiles.qweather.presentation.screenmodel.DailyWeatherScreenModel
-import java.time.format.DateTimeFormatter
 
 object WeekTab : Tab {
     override val options: TabOptions
@@ -87,41 +84,7 @@ object WeekTab : Tab {
                     ) {
                         weatherViewModel.state.dailyWeatherData?.let { data ->
                             items(data) {
-                                val formattedDate = it.date.format(
-                                    DateTimeFormatter.ofPattern("E d")
-                                )
-                                Card(
-                                    modifier = Modifier.padding(
-                                        horizontal = 16.dp,
-                                        vertical = 8.dp
-                                    )
-                                ) {
-                                    Row(
-                                        modifier = Modifier
-                                            .fillMaxWidth()
-                                            .padding(16.dp),
-                                        verticalAlignment = Alignment.CenterVertically
-                                    ) {
-                                        Image(
-                                            painter = painterResource(id = it.weatherType.iconRes),
-                                            contentDescription = "Image of ${it.weatherType}",
-                                            modifier = Modifier.width(48.dp)
-                                        )
-                                        Spacer(modifier = Modifier.width(16.dp))
-                                        Column {
-                                            Text(
-                                                text = formattedDate
-                                            )
-                                            Text(text = "Feels like ${it.apparentTemperatureMax}°C")
-                                        }
-
-                                        Spacer(modifier = Modifier.weight(1f))
-                                        Text(
-                                            text = "${it.temperatureMax}°C",
-                                            style = MaterialTheme.typography.titleLarge,
-                                        )
-                                    }
-                                }
+                                WeatherDay(dailyWeatherData = it)
                             }
                         }
                     }