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

refactor code

Browse source
This commit is contained in:
Henry Hiles 2023-04-06 15:16:01 -04:00
parent b1b71cee5e
commit 868af8a9ca
2 changed files with 62 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
app/src/main/java/com/henryhiles/qweather/presentation/components/weather/WeatherDay.kt Normal file
View file

@ -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,
)
}
}
}

41
app/src/main/java/com/henryhiles/qweather/presentation/tabs/WeekTab.kt
View file

@ -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)
}
}
}