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

Always expand tabs

Browse source
This commit is contained in:
Henry Hiles 2023-12-25 12:00:39 -05:00
parent 43b7b42495
commit e75c7f770d
2 changed files with 30 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,6 @@
package com.henryhiles.qweather.presentation.components.weather package com.henryhiles.qweather.presentation.components.weather
import androidx.compose.foundation.Image import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Water import androidx.compose.material.icons.outlined.Water
@ -22,7 +21,7 @@ import com.henryhiles.qweather.domain.weather.DailyWeatherData
import java.time.format.DateTimeFormatter import java.time.format.DateTimeFormatter
@Composable @Composable
fun WeatherDay(dailyWeatherData: DailyWeatherData, expanded: Boolean, onExpand: () -> Unit) { fun WeatherDay(dailyWeatherData: DailyWeatherData) {
val formattedDate by remember { val formattedDate by remember {
derivedStateOf { derivedStateOf {
dailyWeatherData.date.format( dailyWeatherData.date.format(
@ -37,7 +36,6 @@ fun WeatherDay(dailyWeatherData: DailyWeatherData, expanded: Boolean, onExpand:
horizontal = 16.dp, horizontal = 16.dp,
vertical = 8.dp vertical = 8.dp
) )
.clickable(onClick = onExpand)
) { ) {
Row( Row(
modifier = Modifier modifier = Modifier
@ -65,34 +63,32 @@ fun WeatherDay(dailyWeatherData: DailyWeatherData, expanded: Boolean, onExpand:
style = MaterialTheme.typography.titleLarge, style = MaterialTheme.typography.titleLarge,
) )
} }
if (expanded) { Row(
Row( modifier = Modifier
modifier = Modifier .fillMaxWidth()
.fillMaxWidth() .padding(start = 16.dp, end = 16.dp, bottom = 16.dp),
.padding(start = 16.dp, end = 16.dp, bottom = 16.dp), horizontalArrangement = Arrangement.Center
horizontalArrangement = Arrangement.Center ) {
) { WeatherDataDisplay(
WeatherDataDisplay( value = dailyWeatherData.precipitationProbabilityMax,
value = dailyWeatherData.precipitationProbabilityMax, unit = "%",
unit = "%", icon = Icons.Outlined.WaterDrop,
icon = Icons.Outlined.WaterDrop, description = "Chance of rain"
description = "Chance of rain" )
) Spacer(modifier = Modifier.width(16.dp))
Spacer(modifier = Modifier.width(16.dp)) WeatherDataDisplay(
WeatherDataDisplay( value = dailyWeatherData.windSpeedMax,
value = dailyWeatherData.windSpeedMax, unit = "mm",
unit = "mm", icon = Icons.Outlined.Water,
icon = Icons.Outlined.Water, description = "Precipitation Amount"
description = "Precipitation Amount" )
) Spacer(modifier = Modifier.width(16.dp))
Spacer(modifier = Modifier.width(16.dp)) WeatherDataDisplay(
WeatherDataDisplay( value = dailyWeatherData.windSpeedMax,
value = dailyWeatherData.windSpeedMax, unit = "km/h",
unit = "km/h", icon = Icons.Outlined.WindPower,
icon = Icons.Outlined.WindPower, description = "Wind Speed"
description = "Wind Speed" )
)
}
} }
} }
} }

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

@ -3,7 +3,7 @@ package com.henryhiles.qweather.presentation.tabs
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.text.selection.SelectionContainer import androidx.compose.foundation.text.selection.SelectionContainer
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.DateRange import androidx.compose.material.icons.filled.DateRange
@ -75,13 +75,8 @@ object WeekTab : NavigationTab {
modifier = Modifier.fillMaxSize() modifier = Modifier.fillMaxSize()
) { ) {
weatherViewModel.state.dailyWeatherData?.let { data -> weatherViewModel.state.dailyWeatherData?.let { data ->
itemsIndexed(data) { index, dailyData -> items(data) {
val expanded = weatherViewModel.state.expanded == index WeatherDay(dailyWeatherData = it)
WeatherDay(
dailyWeatherData = dailyData,
expanded = expanded,
onExpand = { weatherViewModel.setExpanded(if (expanded) null else index) }
)
} }
} }
} }