Skip to content

Commit a59c400

Browse files
yschimkeyschimke
committed
Cleanup
1 parent 172d9e9 commit a59c400

File tree

7 files changed

+55
-46
lines changed

7 files changed

+55
-46
lines changed

‎wearApp/src/main/java/dev/johnoreilly/confetti/wear/bookmarks/BookmarksScreen.kt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,19 @@ fun BookmarksScreen(
3131
sessionSelected: (String) -> Unit,
3232
addBookmark: (sessionId: String) -> Unit,
3333
removeBookmark: (sessionId: String) -> Unit,
34+
modifier: Modifier = Modifier,
3435
) {
3536
val columnState = rememberTransformingLazyColumnState()
3637

37-
ScreenScaffold(scrollState = columnState) {
38+
val columnPadding = rememberResponsiveColumnPadding(
39+
first = ColumnItemType.ListHeader,
40+
last = ColumnItemType.Card
41+
)
42+
ScreenScaffold(modifier = modifier, scrollState = columnState, contentPadding = columnPadding) { contentPadding ->
3843
TransformingLazyColumn(
3944
modifier = Modifier.fillMaxSize(),
4045
state = columnState,
41-
contentPadding = rememberResponsiveColumnPadding(
42-
first = ColumnItemType.ListHeader,
43-
last = ColumnItemType.Card
44-
),
46+
contentPadding = contentPadding,
4547
) {
4648
when (uiState) {
4749
is QueryResult.Success -> {

‎wearApp/src/main/java/dev/johnoreilly/confetti/wear/conferences/ConferencesView.kt‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import androidx.wear.compose.ui.tooling.preview.WearPreviewDevices
1818
import androidx.wear.compose.ui.tooling.preview.WearPreviewFontScales
1919
import com.arkivanov.decompose.extensions.compose.subscribeAsState
2020
import com.google.android.horologist.compose.layout.ColumnItemType
21-
import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults.ItemType
2221
import com.google.android.horologist.compose.layout.rememberResponsiveColumnPadding
2322
import dev.johnoreilly.confetti.BuildConfig
2423
import dev.johnoreilly.confetti.GetConferencesQuery
@@ -56,16 +55,19 @@ fun ConferencesView(
5655
modifier: Modifier = Modifier,
5756
columnState: TransformingLazyColumnState = rememberTransformingLazyColumnState(),
5857
) {
59-
ScreenScaffold(scrollState = columnState) {
58+
val columnPadding = rememberResponsiveColumnPadding(
59+
first = ColumnItemType.ListHeader,
60+
last = ColumnItemType.Button
61+
)
62+
ScreenScaffold(modifier = modifier, scrollState = columnState, contentPadding = columnPadding) { contentPadding ->
6063
TransformingLazyColumn(
61-
modifier = modifier.fillMaxSize(), state = columnState,
62-
contentPadding = rememberResponsiveColumnPadding(
63-
first = ColumnItemType.ListHeader,
64-
last = ItemType.Chip
65-
),
64+
modifier = Modifier.fillMaxSize(),
65+
state = columnState,
66+
contentPadding = contentPadding,
6667
) {
6768
item {
68-
ScreenHeader(text = "Conferences"
69+
ScreenHeader(
70+
text = "Conferences"
6971
)
7072
}
7173

‎wearApp/src/main/java/dev/johnoreilly/confetti/wear/home/HomeScreen.kt‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,21 @@ fun HomeScreen(
5151
addBookmark: ((sessionId: String) -> Unit)?,
5252
removeBookmark: ((sessionId: String) -> Unit)?,
5353
onBookmarksClick: () -> Unit,
54+
modifier: Modifier = Modifier,
5455
) {
5556
val dayFormatter = remember { DateTimeFormatter.ofPattern("cccc") }
5657

5758
val columnState = rememberTransformingLazyColumnState()
5859

59-
ScreenScaffold(scrollState = columnState) {
60+
val columnPadding = rememberResponsiveColumnPadding(
61+
first = ColumnItemType.ListHeader,
62+
last = ColumnItemType.IconButton
63+
)
64+
ScreenScaffold(modifier = modifier, scrollState = columnState, contentPadding = columnPadding) { contentPadding ->
6065
TransformingLazyColumn(
6166
modifier = Modifier.fillMaxSize(),
6267
state = columnState,
63-
contentPadding = rememberResponsiveColumnPadding(
64-
first = ColumnItemType.ListHeader,
65-
last = ColumnItemType.IconButton,
66-
),
68+
contentPadding = contentPadding,
6769
) {
6870
titleSection(uiState = uiState)
6971

@@ -87,7 +89,8 @@ private fun TransformingLazyColumnScope.titleSection(uiState: QueryResult<HomeUi
8789
when (uiState) {
8890
is QueryResult.Success -> {
8991
item {
90-
ScreenHeader(text = uiState.result.conferenceName
92+
ScreenHeader(
93+
text = uiState.result.conferenceName
9194
)
9295
}
9396
}

‎wearApp/src/main/java/dev/johnoreilly/confetti/wear/sessiondetails/SessionDetailsView.kt‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,19 @@ import java.time.format.DateTimeFormatter
2424
fun SessionDetailView(
2525
uiState: SessionDetailsUiState,
2626
columnState: TransformingLazyColumnState = rememberTransformingLazyColumnState(),
27-
navigateToSpeaker: (String) -> Unit
27+
navigateToSpeaker: (String) -> Unit,
28+
modifier: Modifier = Modifier,
2829
) {
2930
val timeFormatter = remember { DateTimeFormatter.ofPattern("eeee HH:mm") }
30-
31-
ScreenScaffold(scrollState = columnState) {
31+
val columnPadding = rememberResponsiveColumnPadding(
32+
first = ColumnItemType.ListHeader,
33+
last = ColumnItemType.Button
34+
)
35+
ScreenScaffold(modifier = modifier, scrollState = columnState, contentPadding = columnPadding) { contentPadding ->
3236
TransformingLazyColumn(
3337
modifier = Modifier.fillMaxSize(),
3438
state = columnState,
35-
contentPadding = rememberResponsiveColumnPadding(
36-
first = ColumnItemType.ListHeader,
37-
last = ColumnItemType.Button
38-
),
39+
contentPadding = contentPadding,
3940
) {
4041
when (uiState) {
4142
is SessionDetailsUiState.Success -> {

‎wearApp/src/main/java/dev/johnoreilly/confetti/wear/sessions/SessionsScreen.kt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,17 @@ fun SessionsScreen(
2828
addBookmark: ((sessionId: String) -> Unit)?,
2929
removeBookmark: ((sessionId: String) -> Unit)?,
3030
columnState: TransformingLazyColumnState = rememberTransformingLazyColumnState(),
31+
modifier: Modifier = Modifier,
3132
) {
32-
ScreenScaffold(scrollState = columnState) {
33+
val columnPadding = rememberResponsiveColumnPadding(
34+
first = ColumnItemType.ListHeader,
35+
last = ColumnItemType.Card
36+
)
37+
ScreenScaffold(modifier = modifier, scrollState = columnState, contentPadding = columnPadding) { contentPadding ->
3338
TransformingLazyColumn(
3439
modifier = Modifier.fillMaxSize(),
3540
state = columnState,
36-
contentPadding = rememberResponsiveColumnPadding(
37-
first = ColumnItemType.ListHeader,
38-
last = ColumnItemType.Card
39-
),
41+
contentPadding = contentPadding,
4042
) {
4143
when (uiState) {
4244
is SessionsUiState.Success -> {

‎wearApp/src/main/java/dev/johnoreilly/confetti/wear/settings/SettingsListView.kt‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import dev.johnoreilly.confetti.wear.components.ScreenHeader
3939
import dev.johnoreilly.confetti.wear.proto.NetworkDetail
4040
import dev.johnoreilly.confetti.wear.proto.NetworkPreferences
4141
import dev.johnoreilly.confetti.wear.proto.WearPreferences
42-
import kotlinx.coroutines.launch
4342
import java.time.Instant
4443
import java.time.LocalDateTime
4544
import java.time.ZoneId
@@ -54,15 +53,17 @@ fun SettingsListView(
5453
onEnableDeveloperMode: () -> Unit,
5554
updatePreferences: (WearPreferences) -> Unit,
5655
columnState: TransformingLazyColumnState = rememberTransformingLazyColumnState(),
56+
modifier: Modifier = Modifier,
5757
) {
58-
ScreenScaffold(scrollState = columnState) {
58+
val columnPadding = rememberResponsiveColumnPadding(
59+
first = ColumnItemType.ListHeader,
60+
last = ColumnItemType.Button
61+
)
62+
ScreenScaffold(modifier = modifier, scrollState = columnState, contentPadding = columnPadding) { contentPadding ->
5963
TransformingLazyColumn(
6064
modifier = Modifier.fillMaxSize(),
6165
state = columnState,
62-
contentPadding = rememberResponsiveColumnPadding(
63-
first = ColumnItemType.ListHeader,
64-
last = ColumnItemType.Button
65-
),
66+
contentPadding = contentPadding,
6667
) {
6768
item {
6869
ScreenHeader(
@@ -251,10 +252,6 @@ private fun TransformingLazyColumnScope.developerModeOptions(
251252
}
252253
}
253254

254-
@Composable
255-
private fun Long.localTime(): LocalDateTime =
256-
Instant.ofEpochSecond(this).atZone(ZoneId.systemDefault()).toLocalDateTime()
257-
258255
@WearPreviewDevices
259256
@WearPreviewFontScales
260257
@Composable

‎wearApp/src/main/java/dev/johnoreilly/confetti/wear/speakerdetails/SpeakerDetailsView.kt‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,20 @@ fun SpeakerDetailsRoute(
4141
@Composable
4242
fun SpeakerDetailsView(
4343
uiState: SpeakerDetailsUiState,
44+
modifier: Modifier = Modifier,
4445
columnState: TransformingLazyColumnState = rememberTransformingLazyColumnState(),
4546
) {
4647
val placeholderState = rememberPlaceholderState { uiState !is SpeakerDetailsUiState.Loading }
4748

48-
ScreenScaffold(scrollState = columnState) {
49+
val columnPadding = rememberResponsiveColumnPadding(
50+
first = ColumnItemType.IconButton,
51+
last = ColumnItemType.BodyText
52+
)
53+
ScreenScaffold(modifier = modifier, scrollState = columnState, contentPadding = columnPadding) { contentPadding ->
4954
TransformingLazyColumn(
5055
modifier = Modifier.fillMaxSize(),
5156
state = columnState,
52-
contentPadding = rememberResponsiveColumnPadding(
53-
first = ColumnItemType.IconButton,
54-
last = ColumnItemType.BodyText
55-
),
57+
contentPadding = contentPadding,
5658
) {
5759
if (uiState is SpeakerDetailsUiState.Loading) {
5860
item {

0 commit comments

Comments
 (0)