File tree Expand file tree Collapse file tree 4 files changed +19
-12
lines changed
JetLagged/app/src/main/java/com/example/jetlagged Expand file tree Collapse file tree 4 files changed +19
-12
lines changed Original file line number Diff line number Diff line change @@ -206,8 +206,9 @@ fun AverageTimeAsleepCard(modifier: Modifier = Modifier) {
206206@Preview
207207@Composable
208208fun WellnessCard (
209- modifier : Modifier = Modifier ,
210- wellnessData : WellnessData = WellnessData (0, 0, 0)) {
209+ modifier : Modifier = Modifier ,
210+ wellnessData : WellnessData = WellnessData (0, 0, 0)
211+ ) {
211212 BasicInformationalCard (
212213 borderColor = LightBlue ,
213214 modifier = modifier
Original file line number Diff line number Diff line change @@ -85,19 +85,26 @@ fun JetLaggedScreen(
8585 }
8686 }
8787 if (windowSizeClass == WindowWidthSizeClass .Compact ) {
88- WellnessCard (wellnessData = uiState.value.wellnessData,
88+ WellnessCard (
89+ wellnessData = uiState.value.wellnessData,
8990 modifier = Modifier .widthIn(max = 400 .dp)
90- .heightIn(min = 200 .dp))
91- HeartRateCard (modifier = Modifier .widthIn(max = 400 .dp, min = 200 .dp),
92- uiState.value.heartRateData)
91+ .heightIn(min = 200 .dp)
92+ )
93+ HeartRateCard (
94+ modifier = Modifier .widthIn(max = 400 .dp, min = 200 .dp),
95+ uiState.value.heartRateData
96+ )
9397 } else {
9498 FlowColumn {
95- WellnessCard (wellnessData = uiState.value.wellnessData,
99+ WellnessCard (
100+ wellnessData = uiState.value.wellnessData,
96101 modifier = Modifier .widthIn(max = 400 .dp)
97- .heightIn(min = 200 .dp))
102+ .heightIn(min = 200 .dp)
103+ )
98104 HeartRateCard (
99105 modifier = Modifier .widthIn(max = 400 .dp, min = 200 .dp),
100- uiState.value.heartRateData)
106+ uiState.value.heartRateData
107+ )
101108 }
102109 }
103110 }
Original file line number Diff line number Diff line change @@ -23,7 +23,6 @@ import androidx.compose.foundation.layout.fillMaxSize
2323import androidx.compose.foundation.layout.fillMaxWidth
2424import androidx.compose.foundation.layout.height
2525import androidx.compose.foundation.layout.padding
26- import androidx.compose.foundation.layout.widthIn
2726import androidx.compose.material3.Text
2827import androidx.compose.runtime.Composable
2928import androidx.compose.ui.ExperimentalComposeUiApi
@@ -45,7 +44,8 @@ import com.example.jetlagged.ui.theme.TitleStyle
4544@Composable
4645fun HeartRateCard (
4746 modifier : Modifier = Modifier ,
48- heartRateData : HeartRateOverallData = HeartRateOverallData ()) {
47+ heartRateData : HeartRateOverallData = HeartRateOverallData ()
48+ ) {
4949 BasicInformationalCard (
5050 borderColor = Coral ,
5151 modifier = modifier
Original file line number Diff line number Diff line change @@ -23,7 +23,6 @@ import androidx.compose.foundation.layout.Spacer
2323import androidx.compose.foundation.layout.height
2424import androidx.compose.foundation.layout.padding
2525import androidx.compose.foundation.layout.width
26- import androidx.compose.foundation.layout.widthIn
2726import androidx.compose.foundation.layout.wrapContentSize
2827import androidx.compose.foundation.rememberScrollState
2928import androidx.compose.material3.Text
You can’t perform that action at this time.
0 commit comments