Skip to content

Commit db60dd4

Browse files
committed
Simplify code
2 parents 1195773 + 7904803 commit db60dd4

5 files changed

Lines changed: 7 additions & 17 deletions

File tree

JetLagged/app/src/main/java/com/example/jetlagged/HomeScreenCards.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ fun AverageTimeInBedCard(modifier: Modifier = Modifier) {
181181
secondLineText = "8h42min",
182182
icon = Icons.Default.Watch,
183183
modifier = modifier
184-
.wrapContentWidth()
185-
.heightIn(min = 156.dp)
184+
.wrapContentWidth()
185+
.heightIn(min = 156.dp)
186186
)
187187
}
188188

@@ -197,8 +197,8 @@ fun AverageTimeAsleepCard(modifier: Modifier = Modifier) {
197197
secondLineText = "7h42min",
198198
icon = Icons.Default.SingleBed,
199199
modifier = modifier
200-
.wrapContentWidth()
201-
.heightIn(min = 156.dp)
200+
.wrapContentWidth()
201+
.heightIn(min = 156.dp)
202202
)
203203
}
204204

@@ -211,8 +211,8 @@ fun WellnessCard(
211211
BasicInformationalCard(
212212
borderColor = LightBlue,
213213
modifier = modifier
214-
.widthIn(max = 400.dp)
215-
.heightIn(min = 200.dp)
214+
.widthIn(max = 400.dp)
215+
.heightIn(min = 200.dp)
216216
) {
217217
FadingCircleBackground(36.dp, LightBlue.copy(0.25f))
218218
Column(

JetLagged/app/src/main/java/com/example/jetlagged/JetLaggedScreen.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
@file:OptIn(ExperimentalComposeUiApi::class)
18-
1917
package com.example.jetlagged
2018

2119
import androidx.compose.foundation.background
@@ -32,12 +30,8 @@ import androidx.compose.foundation.rememberScrollState
3230
import androidx.compose.foundation.verticalScroll
3331
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
3432
import androidx.compose.runtime.Composable
35-
import androidx.compose.runtime.movableContentOf
36-
import androidx.compose.runtime.remember
37-
import androidx.compose.ui.ExperimentalComposeUiApi
3833
import androidx.compose.ui.Modifier
3934
import androidx.compose.ui.graphics.Color
40-
import androidx.compose.ui.layout.LookaheadScope
4135
import androidx.compose.ui.unit.dp
4236
import androidx.lifecycle.compose.collectAsStateWithLifecycle
4337
import androidx.lifecycle.viewmodel.compose.viewModel
@@ -107,6 +101,5 @@ fun JetLaggedScreen(
107101
}
108102
}
109103
}
110-
111104
}
112105
}

JetLagged/app/src/main/java/com/example/jetlagged/MainActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import androidx.activity.compose.setContent
2222
import androidx.activity.enableEdgeToEdge
2323
import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
2424
import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
25-
import androidx.core.view.WindowCompat
2625
import com.example.jetlagged.ui.theme.JetLaggedTheme
2726

2827
class MainActivity : ComponentActivity() {

JetLagged/app/src/main/java/com/example/jetlagged/backgrounds/ShaderBackground.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import androidx.compose.ui.Modifier
2626
import androidx.compose.ui.draw.drawWithCache
2727
import androidx.compose.ui.graphics.Brush
2828
import androidx.compose.ui.graphics.ShaderBrush
29-
import androidx.compose.ui.graphics.drawscope.scale
3029
import androidx.compose.ui.graphics.drawscope.ContentDrawScope
3130
import androidx.compose.ui.node.DrawModifierNode
3231
import androidx.compose.ui.node.ModifierNodeElement

JetLagged/app/src/main/java/com/example/jetlagged/heartrate/HeartRateCard.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ fun HeartRateCard(
4949
BasicInformationalCard(
5050
borderColor = Coral,
5151
modifier = modifier
52-
.height(260.dp)
53-
52+
.height(260.dp)
5453
) {
5554
Column(
5655
modifier = Modifier

0 commit comments

Comments
 (0)