Skip to content

Commit 9ceb220

Browse files
mlykotommlykotom
authored
🤖 Update Dependencies (#1161)
Updated depedencies
2 parents 7d488d7 + 928cf29 commit 9ceb220

14 files changed

Lines changed: 148 additions & 112 deletions

File tree

‎Crane/app/src/main/java/androidx/compose/samples/crane/home/CraneHome.kt‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ fun CraneHome(
9696
}
9797

9898
@OptIn(
99-
ExperimentalMaterialApi::class, ExperimentalAnimationApi::class,
99+
ExperimentalMaterialApi::class,
100100
ExperimentalFoundationApi::class
101101
)
102102
@Composable
@@ -111,9 +111,11 @@ fun CraneHomeContent(
111111
val suggestedDestinations by viewModel.suggestedDestinations.observeAsState()
112112

113113
val onPeopleChanged: (Int) -> Unit = { viewModel.updatePeople(it) }
114-
val pagerState = rememberPagerState(initialPage = CraneScreen.Fly.ordinal)
115-
val coroutineScope = rememberCoroutineScope()
116114
val craneScreenValues = CraneScreen.values()
115+
val pagerState =
116+
rememberPagerState(initialPage = CraneScreen.Fly.ordinal) { craneScreenValues.size }
117+
118+
val coroutineScope = rememberCoroutineScope()
117119
BackdropScaffold(
118120
modifier = modifier,
119121
scaffoldState = rememberBackdropScaffoldState(BackdropValue.Revealed),
@@ -133,19 +135,16 @@ fun CraneHomeContent(
133135
},
134136
backLayerContent = {
135137
SearchContent(
136-
widthSize,
137-
craneScreenValues[pagerState.currentPage],
138-
viewModel,
139-
onPeopleChanged,
140-
onDateSelectionClicked,
141-
onExploreItemClicked
138+
widthSize = widthSize,
139+
tabSelected = craneScreenValues[pagerState.currentPage],
140+
viewModel = viewModel,
141+
onPeopleChanged = onPeopleChanged,
142+
onDateSelectionClicked = onDateSelectionClicked,
143+
onExploreItemClicked = onExploreItemClicked
142144
)
143145
},
144146
frontLayerContent = {
145-
HorizontalPager(
146-
pageCount = craneScreenValues.size,
147-
state = pagerState
148-
) { page ->
147+
HorizontalPager(state = pagerState) { page ->
149148
when (craneScreenValues[page]) {
150149
CraneScreen.Fly -> {
151150
suggestedDestinations?.let { destinations ->
@@ -157,6 +156,7 @@ fun CraneHomeContent(
157156
)
158157
}
159158
}
159+
160160
CraneScreen.Sleep -> {
161161
ExploreSection(
162162
widthSize = widthSize,
@@ -165,6 +165,7 @@ fun CraneHomeContent(
165165
onItemClicked = onExploreItemClicked
166166
)
167167
}
168+
168169
CraneScreen.Eat -> {
169170
ExploreSection(
170171
widthSize = widthSize,
@@ -202,6 +203,7 @@ private fun HomeTabBar(
202203
}
203204

204205
private const val TAB_SWITCH_ANIM_DURATION = 300
206+
205207
@OptIn(ExperimentalAnimationApi::class)
206208
@Composable
207209
private fun SearchContent(
@@ -244,6 +246,7 @@ private fun SearchContent(
244246
onExploreItemClicked = onExploreItemClicked
245247
)
246248
)
249+
247250
CraneScreen.Sleep -> SleepSearchContent(
248251
widthSize = widthSize,
249252
datesSelected = selectedDates,
@@ -253,6 +256,7 @@ private fun SearchContent(
253256
onExploreItemClicked = onExploreItemClicked
254257
)
255258
)
259+
256260
CraneScreen.Eat -> EatSearchContent(
257261
widthSize = widthSize,
258262
datesSelected = selectedDates,

‎Crane/gradle/libs.versions.toml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,33 @@
44
#####
55
[versions]
66
accompanist = "0.30.1"
7-
androidGradlePlugin = "8.0.1"
8-
androidx-activity-compose = "1.7.1"
7+
androidGradlePlugin = "8.0.2"
8+
androidx-activity-compose = "1.7.2"
99
androidx-appcompat = "1.6.1"
1010
androidx-benchmark = "1.1.0"
1111
androidx-benchmark-junit4 = "1.1.1"
12-
androidx-compose-bom = "2023.05.01"
12+
androidx-compose-bom = "2023.06.01"
1313
androidx-constraintlayout = "1.0.1"
1414
androidx-corektx = "1.9.0"
15+
androidx-glance = "1.0.0-beta01"
1516
androidx-lifecycle-compose = "2.6.1"
1617
androidx-lifecycle-runtime-compose = "2.6.1"
17-
androidx-navigation = "2.6.0-rc01"
18+
androidx-navigation = "2.7.0-beta02"
1819
androidx-palette = "1.0.0"
1920
androidx-test = "1.5.0"
2021
androidx-test-espresso = "3.5.1"
2122
androidx-test-ext-junit = "1.1.5"
2223
androidx-test-ext-truth = "1.5.0"
23-
androidx-window = "1.1.0-rc01"
24+
androidx-window = "1.2.0-alpha03"
2425
androidxHiltNavigationCompose = "1.0.0"
2526
androix-test-uiautomator = "2.2.0"
2627
coil = "2.2.2"
2728
# @keep
28-
compileSdk = "33"
29+
compileSdk = "34"
2930
compose-compiler = "1.4.0"
30-
coroutines = "1.6.4"
31+
coroutines = "1.7.2"
3132
google-maps = "18.1.0"
32-
gradle-versions = "0.46.0"
33+
gradle-versions = "0.47.0"
3334
hilt = "2.43.2"
3435
hiltExt = "1.0.0"
3536
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
@@ -85,6 +86,9 @@ androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" }
8586
androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" }
8687
androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout" }
8788
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" }
89+
androidx-glance = { module = "androidx.glance:glance", version.ref = "androidx-glance" }
90+
androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance" }
91+
androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" }
8892
androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" }
8993
androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" }
9094
androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04"

‎JetLagged/gradle/libs.versions.toml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,33 @@
44
#####
55
[versions]
66
accompanist = "0.30.1"
7-
androidGradlePlugin = "8.0.1"
8-
androidx-activity-compose = "1.7.1"
7+
androidGradlePlugin = "8.0.2"
8+
androidx-activity-compose = "1.7.2"
99
androidx-appcompat = "1.6.1"
1010
androidx-benchmark = "1.1.0"
1111
androidx-benchmark-junit4 = "1.1.1"
12-
androidx-compose-bom = "2023.05.01"
12+
androidx-compose-bom = "2023.06.01"
1313
androidx-constraintlayout = "1.0.1"
1414
androidx-corektx = "1.9.0"
15+
androidx-glance = "1.0.0-beta01"
1516
androidx-lifecycle-compose = "2.6.1"
1617
androidx-lifecycle-runtime-compose = "2.6.1"
17-
androidx-navigation = "2.6.0-rc01"
18+
androidx-navigation = "2.7.0-beta02"
1819
androidx-palette = "1.0.0"
1920
androidx-test = "1.5.0"
2021
androidx-test-espresso = "3.5.1"
2122
androidx-test-ext-junit = "1.1.5"
2223
androidx-test-ext-truth = "1.5.0"
23-
androidx-window = "1.1.0-rc01"
24+
androidx-window = "1.2.0-alpha03"
2425
androidxHiltNavigationCompose = "1.0.0"
2526
androix-test-uiautomator = "2.2.0"
2627
coil = "2.2.2"
2728
# @keep
28-
compileSdk = "33"
29+
compileSdk = "34"
2930
compose-compiler = "1.4.0"
30-
coroutines = "1.6.4"
31+
coroutines = "1.7.2"
3132
google-maps = "18.1.0"
32-
gradle-versions = "0.46.0"
33+
gradle-versions = "0.47.0"
3334
hilt = "2.43.2"
3435
hiltExt = "1.0.0"
3536
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
@@ -85,6 +86,9 @@ androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" }
8586
androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" }
8687
androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout" }
8788
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" }
89+
androidx-glance = { module = "androidx.glance:glance", version.ref = "androidx-glance" }
90+
androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance" }
91+
androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" }
8892
androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" }
8993
androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" }
9094
androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04"

‎JetNews/gradle/libs.versions.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,33 @@
44
#####
55
[versions]
66
accompanist = "0.30.1"
7-
androidGradlePlugin = "8.0.1"
8-
androidx-activity-compose = "1.7.1"
7+
androidGradlePlugin = "8.0.2"
8+
androidx-activity-compose = "1.7.2"
99
androidx-appcompat = "1.6.1"
1010
androidx-benchmark = "1.1.0"
1111
androidx-benchmark-junit4 = "1.1.1"
12-
androidx-compose-bom = "2023.05.01"
12+
androidx-compose-bom = "2023.06.01"
1313
androidx-constraintlayout = "1.0.1"
1414
androidx-corektx = "1.9.0"
1515
androidx-glance = "1.0.0-beta01"
1616
androidx-lifecycle-compose = "2.6.1"
1717
androidx-lifecycle-runtime-compose = "2.6.1"
18-
androidx-navigation = "2.6.0-rc01"
18+
androidx-navigation = "2.7.0-beta02"
1919
androidx-palette = "1.0.0"
2020
androidx-test = "1.5.0"
2121
androidx-test-espresso = "3.5.1"
2222
androidx-test-ext-junit = "1.1.5"
2323
androidx-test-ext-truth = "1.5.0"
24-
androidx-window = "1.1.0-rc01"
24+
androidx-window = "1.2.0-alpha03"
2525
androidxHiltNavigationCompose = "1.0.0"
2626
androix-test-uiautomator = "2.2.0"
2727
coil = "2.2.2"
2828
# @keep
29-
compileSdk = "33"
29+
compileSdk = "34"
3030
compose-compiler = "1.4.0"
31-
coroutines = "1.6.4"
31+
coroutines = "1.7.2"
3232
google-maps = "18.1.0"
33-
gradle-versions = "0.46.0"
33+
gradle-versions = "0.47.0"
3434
hilt = "2.43.2"
3535
hiltExt = "1.0.0"
3636
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions

‎Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ fun HomeContent(
185185
}
186186

187187
DynamicThemePrimaryColorsFromImage(dominantColorState) {
188-
val pagerState = rememberPagerState()
188+
val pagerState = rememberPagerState { featuredPodcasts.size }
189189

190190
val selectedImageUrl = featuredPodcasts.getOrNull(pagerState.currentPage)
191191
?.podcast?.imageUrl
@@ -255,6 +255,7 @@ fun HomeContent(
255255
HomeCategory.Library -> {
256256
// TODO
257257
}
258+
258259
HomeCategory.Discover -> {
259260
Discover(
260261
navigateToPlayer = navigateToPlayer,
@@ -326,7 +327,6 @@ fun FollowedPodcasts(
326327
onPodcastUnfollowed: (String) -> Unit,
327328
) {
328329
HorizontalPager(
329-
pageCount = items.size,
330330
state = pagerState,
331331
modifier = modifier
332332
) { page ->
@@ -405,6 +405,7 @@ private fun lastUpdated(updated: OffsetDateTime): String {
405405
val weeks = days / 7
406406
quantityStringResource(R.plurals.updated_weeks_ago, weeks, weeks)
407407
}
408+
408409
days > 0 -> quantityStringResource(R.plurals.updated_days_ago, days, days)
409410
else -> stringResource(R.string.updated_today)
410411
}

‎Jetcaster/app/src/main/java/com/example/jetcaster/util/GradientScrim.kt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@
1717
package com.example.jetcaster.util
1818

1919
import androidx.annotation.FloatRange
20-
import androidx.compose.runtime.getValue
21-
import androidx.compose.runtime.setValue
2220
import androidx.compose.ui.ExperimentalComposeUiApi
2321
import androidx.compose.ui.Modifier
24-
import androidx.compose.ui.draw.alpha
2522
import androidx.compose.ui.geometry.Offset
2623
import androidx.compose.ui.geometry.Rect
2724
import androidx.compose.ui.graphics.Brush
@@ -56,7 +53,6 @@ fun Modifier.verticalGradientScrim(
5653
numStops: Int = 16
5754
) = this then VerticalGradientElement(color, startYPercentage, endYPercentage, decay, numStops)
5855

59-
@OptIn(ExperimentalComposeUiApi::class)
6056
private data class VerticalGradientElement(
6157
var color: Color,
6258
var startYPercentage: Float = 0f,
@@ -100,7 +96,7 @@ private data class VerticalGradientElement(
10096

10197
override fun create() = VerticalGradientModifier(createOnDraw())
10298

103-
override fun update(node: VerticalGradientModifier) = node.apply {
99+
override fun update(node: VerticalGradientModifier) {
104100
node.onDraw = createOnDraw()
105101
}
106102

‎Jetcaster/gradle/libs.versions.toml‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,33 @@
44
#####
55
[versions]
66
accompanist = "0.30.1"
7-
androidGradlePlugin = "8.0.1"
8-
androidx-activity-compose = "1.7.1"
7+
androidGradlePlugin = "8.0.2"
8+
androidx-activity-compose = "1.7.2"
99
androidx-appcompat = "1.6.1"
1010
androidx-benchmark = "1.1.0"
1111
androidx-benchmark-junit4 = "1.1.1"
12-
androidx-compose-bom = "2023.05.01"
12+
androidx-compose-bom = "2023.06.01"
1313
androidx-constraintlayout = "1.0.1"
1414
androidx-corektx = "1.9.0"
15+
androidx-glance = "1.0.0-beta01"
1516
androidx-lifecycle-compose = "2.6.1"
1617
androidx-lifecycle-runtime-compose = "2.6.1"
17-
androidx-navigation = "2.6.0-rc01"
18+
androidx-navigation = "2.7.0-beta02"
1819
androidx-palette = "1.0.0"
1920
androidx-test = "1.5.0"
2021
androidx-test-espresso = "3.5.1"
2122
androidx-test-ext-junit = "1.1.5"
2223
androidx-test-ext-truth = "1.5.0"
23-
androidx-window = "1.1.0-rc01"
24+
androidx-window = "1.2.0-alpha03"
2425
androidxHiltNavigationCompose = "1.0.0"
2526
androix-test-uiautomator = "2.2.0"
2627
coil = "2.2.2"
2728
# @keep
28-
compileSdk = "33"
29+
compileSdk = "34"
2930
compose-compiler = "1.4.0"
30-
coroutines = "1.6.4"
31+
coroutines = "1.7.2"
3132
google-maps = "18.1.0"
32-
gradle-versions = "0.46.0"
33+
gradle-versions = "0.47.0"
3334
hilt = "2.43.2"
3435
hiltExt = "1.0.0"
3536
# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
@@ -85,6 +86,9 @@ androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" }
8586
androidx-compose-ui-viewbinding = { module = "androidx.compose.ui:ui-viewbinding" }
8687
androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout" }
8788
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidx-corektx" }
89+
androidx-glance = { module = "androidx.glance:glance", version.ref = "androidx-glance" }
90+
androidx-glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "androidx-glance" }
91+
androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "androidx-glance" }
8892
androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" }
8993
androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle-compose" }
9094
androidx-lifecycle-runtime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.0-alpha04"

0 commit comments

Comments
 (0)