Skip to content

Commit f54357a

Browse files
committed
PR Comments.
1 parent e41304d commit f54357a

File tree

5 files changed

+1
-76
lines changed

5 files changed

+1
-76
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ import com.example.jetlagged.ui.util.MultiDevicePreview
4646
@MultiDevicePreview
4747
@Composable
4848
fun JetLaggedScreen(
49+
modifier: Modifier = Modifier,
4950
windowSizeClass: WindowWidthSizeClass = WindowWidthSizeClass.Compact,
5051
viewModel: JetLaggedHomeScreenViewModel = viewModel(),
51-
modifier: Modifier = Modifier,
5252
onDrawerClicked: () -> Unit = {}
5353
) {
5454
Column(

JetLagged/app/src/main/java/com/example/jetlagged/data/FakeHeartRateData.kt

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -63,30 +63,6 @@ internal val heartRateGraphData = listOf(
6363
HeartRateData(LocalTime.of(6, 28), 117),
6464
HeartRateData(LocalTime.of(6, 22), 153),
6565
HeartRateData(LocalTime.of(6, 38), 103),
66-
// HeartRateData(LocalTime.of(6, 9), 65),
67-
// HeartRateData(LocalTime.of(6, 31), 172),
68-
// HeartRateData(LocalTime.of(6, 19), 135),
69-
// HeartRateData(LocalTime.of(6, 14), 103),
70-
// HeartRateData(LocalTime.of(6, 23), 106),
71-
// HeartRateData(LocalTime.of(7, 56), 70),
72-
// HeartRateData(LocalTime.of(7, 50), 140),
73-
// HeartRateData(LocalTime.of(7, 13), 124),
74-
// HeartRateData(LocalTime.of(7, 42), 86),
75-
// HeartRateData(LocalTime.of(7, 51), 163),
76-
// HeartRateData(LocalTime.of(7, 15), 138),
77-
// HeartRateData(LocalTime.of(7, 14), 77),
78-
// HeartRateData(LocalTime.of(7, 52), 140),
79-
// HeartRateData(LocalTime.of(8, 57), 173),
80-
// HeartRateData(LocalTime.of(8, 9), 153),
81-
// HeartRateData(LocalTime.of(8, 26), 102),
82-
// HeartRateData(LocalTime.of(8, 30), 54),
83-
// HeartRateData(LocalTime.of(8, 3), 155),
84-
// HeartRateData(LocalTime.of(8, 43), 164),
85-
// HeartRateData(LocalTime.of(8, 49), 98),
86-
// HeartRateData(LocalTime.of(9, 26), 171),
87-
// HeartRateData(LocalTime.of(9, 7), 142),
88-
// HeartRateData(LocalTime.of(9, 45), 135),
89-
// HeartRateData(LocalTime.of(9, 42), 68),
9066
HeartRateData(LocalTime.of(9, 6), 92),
9167
HeartRateData(LocalTime.of(9, 15), 141),
9268
HeartRateData(LocalTime.of(9, 22), 120),

JetLagged/app/src/main/java/com/example/jetlagged/data/JetLaggedHomeScreenState.kt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,6 @@ package com.example.jetlagged.data
1818

1919
import com.example.jetlagged.sleep.SleepGraphData
2020

21-
/*
22-
* Copyright 2022 The Android Open Source Project
23-
*
24-
* Licensed under the Apache License, Version 2.0 (the "License");
25-
* you may not use this file except in compliance with the License.
26-
* You may obtain a copy of the License at
27-
*
28-
* http://www.apache.org/licenses/LICENSE-2.0
29-
*
30-
* Unless required by applicable law or agreed to in writing, software
31-
* distributed under the License is distributed on an "AS IS" BASIS,
32-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
33-
* See the License for the specific language governing permissions and
34-
* limitations under the License.
35-
*/
3621
data class JetLaggedHomeScreenState(
3722
val sleepGraphData: SleepGraphData = sleepData,
3823
val wellnessData: WellnessData = WellnessData(10, 4, 5),

JetLagged/app/src/main/java/com/example/jetlagged/data/JetLaggedHomeScreenViewModel.kt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,6 @@ import androidx.lifecycle.ViewModel
2020
import kotlinx.coroutines.flow.MutableStateFlow
2121
import kotlinx.coroutines.flow.StateFlow
2222

23-
/*
24-
* Copyright 2022 The Android Open Source Project
25-
*
26-
* Licensed under the Apache License, Version 2.0 (the "License");
27-
* you may not use this file except in compliance with the License.
28-
* You may obtain a copy of the License at
29-
*
30-
* http://www.apache.org/licenses/LICENSE-2.0
31-
*
32-
* Unless required by applicable law or agreed to in writing, software
33-
* distributed under the License is distributed on an "AS IS" BASIS,
34-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
35-
* See the License for the specific language governing permissions and
36-
* limitations under the License.
37-
*/
3823
class JetLaggedHomeScreenViewModel : ViewModel() {
3924

4025
val uiState: StateFlow<JetLaggedHomeScreenState> = MutableStateFlow(JetLaggedHomeScreenState())

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -51,30 +51,13 @@ import com.example.jetlagged.ui.theme.Pink
5151
import com.example.jetlagged.ui.theme.Purple
5252
import kotlin.math.roundToInt
5353

54-
/*
55-
* Copyright 2023 The Android Open Source Project
56-
*
57-
* Licensed under the Apache License, Version 2.0 (the "License");
58-
* you may not use this file except in compliance with the License.
59-
* You may obtain a copy of the License at
60-
*
61-
* http://www.apache.org/licenses/LICENSE-2.0
62-
*
63-
* Unless required by applicable law or agreed to in writing, software
64-
* distributed under the License is distributed on an "AS IS" BASIS,
65-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
66-
* See the License for the specific language governing permissions and
67-
* limitations under the License.
68-
*/
69-
7054
@Composable
7155
fun HeartRateGraph(listData: List<HeartRateData>) {
7256
Box(Modifier.size(width = 400.dp, height = 100.dp)) {
7357
Graph(
7458
listData = listData,
7559
modifier = Modifier.padding(16.dp)
7660
)
77-
Highlight()
7861
}
7962
}
8063

@@ -105,10 +88,6 @@ private fun Graph(
10588
)
10689
}
10790

108-
@Composable
109-
private fun Highlight() {
110-
}
111-
11291
sealed class DataPoint {
11392
object NoMeasurement : DataPoint()
11493
data class Measurement(

0 commit comments

Comments
 (0)