@@ -68,20 +68,16 @@ import com.example.jetlagged.ui.theme.JetLaggedTheme
68
68
import com.example.jetlagged.ui.theme.SmallHeadingStyle
69
69
70
70
@Composable
71
- fun BasicInformationalCard (
72
- modifier : Modifier = Modifier ,
73
- borderColor : Color ,
74
- content : @Composable () -> Unit
75
- ) {
71
+ fun BasicInformationalCard (modifier : Modifier = Modifier , borderColor : Color , content : @Composable () -> Unit ) {
76
72
val shape = RoundedCornerShape (24 .dp)
77
73
Card (
78
74
shape = shape,
79
75
colors = CardDefaults .cardColors(
80
- containerColor = JetLaggedTheme .extraColors.cardBackground
76
+ containerColor = JetLaggedTheme .extraColors.cardBackground,
81
77
),
82
78
modifier = modifier
83
79
.padding(8 .dp),
84
- border = BorderStroke (2 .dp, borderColor)
80
+ border = BorderStroke (2 .dp, borderColor),
85
81
) {
86
82
Box {
87
83
content()
@@ -90,20 +86,14 @@ fun BasicInformationalCard(
90
86
}
91
87
92
88
@Composable
93
- fun TwoLineInfoCard (
94
- borderColor : Color ,
95
- firstLineText : String ,
96
- secondLineText : String ,
97
- icon : ImageVector ,
98
- modifier : Modifier = Modifier
99
- ) {
89
+ fun TwoLineInfoCard (borderColor : Color , firstLineText : String , secondLineText : String , icon : ImageVector , modifier : Modifier = Modifier ) {
100
90
BasicInformationalCard (
101
91
borderColor = borderColor,
102
- modifier = modifier.size(200 .dp)
92
+ modifier = modifier.size(200 .dp),
103
93
) {
104
94
BubbleBackground (
105
95
modifier = Modifier .fillMaxSize(),
106
- numberBubbles = 3 , bubbleColor = borderColor.copy(0.25f )
96
+ numberBubbles = 3 , bubbleColor = borderColor.copy(0.25f ),
107
97
)
108
98
BoxWithConstraints (
109
99
modifier = Modifier
@@ -114,23 +104,23 @@ fun TwoLineInfoCard(
114
104
Row (
115
105
modifier = Modifier
116
106
.wrapContentSize()
117
- .align(CenterStart )
107
+ .align(CenterStart ),
118
108
) {
119
109
Icon (
120
110
icon, contentDescription = null ,
121
111
modifier = Modifier
122
112
.size(50 .dp)
123
- .align(CenterVertically )
113
+ .align(CenterVertically ),
124
114
)
125
115
Spacer (modifier = Modifier .width(16 .dp))
126
116
Column (
127
117
modifier = Modifier
128
118
.align(CenterVertically )
129
- .wrapContentSize()
119
+ .wrapContentSize(),
130
120
) {
131
121
Text (
132
122
firstLineText,
133
- style = SmallHeadingStyle
123
+ style = SmallHeadingStyle ,
134
124
)
135
125
Text (
136
126
secondLineText,
@@ -142,25 +132,25 @@ fun TwoLineInfoCard(
142
132
Column (
143
133
modifier = Modifier
144
134
.wrapContentSize()
145
- .align(Center )
135
+ .align(Center ),
146
136
) {
147
137
Icon (
148
138
icon, contentDescription = null ,
149
139
modifier = Modifier
150
140
.size(50 .dp)
151
- .align(CenterHorizontally )
141
+ .align(CenterHorizontally ),
152
142
)
153
143
Spacer (modifier = Modifier .height(16 .dp))
154
144
Column (modifier = Modifier .align(CenterHorizontally )) {
155
145
Text (
156
146
firstLineText,
157
147
style = SmallHeadingStyle ,
158
- modifier = Modifier .align(CenterHorizontally )
148
+ modifier = Modifier .align(CenterHorizontally ),
159
149
)
160
150
Text (
161
151
secondLineText,
162
152
style = HeadingStyle ,
163
- modifier = Modifier .align(CenterHorizontally )
153
+ modifier = Modifier .align(CenterHorizontally ),
164
154
)
165
155
}
166
156
}
@@ -180,7 +170,7 @@ fun AverageTimeInBedCard(modifier: Modifier = Modifier) {
180
170
icon = Icons .Default .Watch ,
181
171
modifier = modifier
182
172
.wrapContentWidth()
183
- .heightIn(min = 156 .dp)
173
+ .heightIn(min = 156 .dp),
184
174
)
185
175
}
186
176
@@ -195,49 +185,46 @@ fun AverageTimeAsleepCard(modifier: Modifier = Modifier) {
195
185
icon = Icons .Default .SingleBed ,
196
186
modifier = modifier
197
187
.wrapContentWidth()
198
- .heightIn(min = 156 .dp)
188
+ .heightIn(min = 156 .dp),
199
189
)
200
190
}
201
191
202
192
@OptIn(ExperimentalLayoutApi ::class )
203
193
@Preview
204
194
@Composable
205
- fun WellnessCard (
206
- modifier : Modifier = Modifier ,
207
- wellnessData : WellnessData = WellnessData (0, 0, 0)
208
- ) {
195
+ fun WellnessCard (modifier : Modifier = Modifier , wellnessData : WellnessData = WellnessData (0, 0, 0)) {
209
196
BasicInformationalCard (
210
197
borderColor = JetLaggedTheme .extraColors.wellness,
211
198
modifier = modifier
212
199
.widthIn(max = 400 .dp)
213
- .heightIn(min = 200 .dp)
200
+ .heightIn(min = 200 .dp),
214
201
) {
215
202
FadingCircleBackground (36 .dp, JetLaggedTheme .extraColors.wellness.copy(0.25f ))
216
203
Column (
217
204
horizontalAlignment = CenterHorizontally ,
218
205
modifier = Modifier
219
- .fillMaxWidth()
206
+ .fillMaxWidth(),
220
207
) {
221
208
HomeScreenCardHeading (text = stringResource(R .string.wellness_heading))
222
209
FlowRow (
223
210
horizontalArrangement = Arrangement .Center ,
224
211
verticalArrangement = Arrangement .Center ,
225
- modifier = Modifier .fillMaxHeight()
212
+ modifier = Modifier .fillMaxHeight(),
226
213
) {
227
214
WellnessBubble (
228
215
titleText = stringResource(R .string.snoring_heading),
229
216
countText = wellnessData.snoring.toString(),
230
- metric = " min"
217
+ metric = " min" ,
231
218
)
232
219
WellnessBubble (
233
220
titleText = stringResource(R .string.coughing_heading),
234
221
countText = wellnessData.coughing.toString(),
235
- metric = " times"
222
+ metric = " times" ,
236
223
)
237
224
WellnessBubble (
238
225
titleText = stringResource(R .string.respiration_heading),
239
226
countText = wellnessData.respiration.toString(),
240
- metric = " rpm"
227
+ metric = " rpm" ,
241
228
)
242
229
}
243
230
}
@@ -250,7 +237,7 @@ fun WellnessBubble(
250
237
countText : String ,
251
238
metric : String ,
252
239
modifier : Modifier = Modifier ,
253
- bubbleColor : Color = JetLaggedTheme .extraColors.wellness
240
+ bubbleColor : Color = JetLaggedTheme .extraColors.wellness,
254
241
) {
255
242
Column (
256
243
modifier = modifier
@@ -261,7 +248,7 @@ fun WellnessBubble(
261
248
drawCircle(bubbleColor)
262
249
},
263
250
verticalArrangement = Arrangement .Center ,
264
- horizontalAlignment = CenterHorizontally
251
+ horizontalAlignment = CenterHorizontally ,
265
252
) {
266
253
Text (titleText, fontSize = 12 .sp)
267
254
Text (countText, fontSize = 36 .sp)
@@ -277,6 +264,6 @@ fun HomeScreenCardHeading(text: String) {
277
264
.fillMaxWidth()
278
265
.padding(top = 8 .dp),
279
266
textAlign = TextAlign .Center ,
280
- style = HeadingStyle
267
+ style = HeadingStyle ,
281
268
)
282
269
}
0 commit comments