Skip to content

Commit a13f661

Browse files
authored
Fix pager APIs (#2544)
* Fix pager APIs * more dependency bumps * 🤖 Updates screenshots --------- Co-authored-by: yschimke <[email protected]>
1 parent 9dac1b0 commit a13f661

File tree

52 files changed

+103
-108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+103
-108
lines changed

composables/api/current.api

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ package com.google.android.horologist.composables {
161161
}
162162

163163
public final class UnboundedRippleButtonKt {
164-
method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void UnboundedRippleButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional float rippleRadius, optional boolean enabled, optional androidx.wear.compose.material.ButtonColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.wear.compose.material.ButtonBorder border, optional kotlin.jvm.functions.Function0<kotlin.Unit> onLongClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
164+
method @androidx.compose.runtime.Composable @com.google.android.horologist.annotations.ExperimentalHorologistApi public static void UnboundedRippleButton(kotlin.jvm.functions.Function0<kotlin.Unit> onClick, optional androidx.compose.ui.Modifier modifier, optional float rippleRadius, optional boolean enabled, optional androidx.wear.compose.material.ButtonColors colors, optional androidx.compose.foundation.interaction.MutableInteractionSource interactionSource, optional androidx.compose.ui.graphics.Shape shape, optional androidx.wear.compose.material.ButtonBorder border, optional kotlin.jvm.functions.Function0<kotlin.Unit>? onLongClick, kotlin.jvm.functions.Function1<? super androidx.compose.foundation.layout.BoxScope,kotlin.Unit> content);
165165
}
166166

167167
}

compose-layout/src/main/java/com/google/android/horologist/compose/pager/PagerScreen.kt

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public fun PagerScreen(
6464
userScrollEnabled = userScrollEnabled,
6565
reverseLayout = reverseLayout,
6666
key = key,
67-
flingBehavior = HorizontalPagerDefaults.flingParams(state),
6867
) { page ->
6968
ClippedBox(state) {
7069
HierarchicalFocusCoordinator(requiresFocus = { page == state.currentPage }) {

compose-layout/src/main/java/com/google/android/horologist/compose/pager/VerticalPagerScreen.kt

+1-5
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@ import androidx.compose.ui.Modifier
2323
import androidx.compose.ui.unit.dp
2424
import androidx.wear.compose.foundation.pager.PagerState
2525
import androidx.wear.compose.foundation.pager.VerticalPager
26-
import androidx.wear.compose.foundation.rememberActiveFocusRequester
2726
import com.google.android.horologist.annotations.ExperimentalHorologistApi
2827
import com.google.android.horologist.compose.layout.ScreenScaffold
29-
import com.google.android.horologist.compose.rotaryinput.rotaryWithPager
3028

3129
/**
3230
* A Wear Material Compliant Vertical Pager screen.
@@ -55,14 +53,12 @@ public fun VerticalPagerScreen(
5553
) {
5654
VerticalPager(
5755
modifier = Modifier
58-
.fillMaxSize()
59-
.rotaryWithPager(state, rememberActiveFocusRequester()),
56+
.fillMaxSize(),
6057
state = state,
6158
beyondViewportPageCount = beyondViewportPageCount,
6259
userScrollEnabled = userScrollEnabled,
6360
reverseLayout = reverseLayout,
6461
key = key,
65-
flingBehavior = HorizontalPagerDefaults.flingParams(state),
6662
) { page ->
6763
ClippedBox(state) {
6864
content(page)

gradle/libs.versions.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ androidx-test-ext = "1.2.1"
1414
androidx-test-runner = "1.6.2"
1515
androidx-wear-watchface = "1.2.1"
1616
androidxActivity = "1.10.1"
17-
androidxComposeBom = "2025.02.00"
17+
androidxComposeBom = "2025.03.00"
1818
androidxCore = "1.15.0"
1919
androidxLifecycle = "2.8.7"
20-
androidxNavigation = "2.8.8"
20+
androidxNavigation = "2.8.9"
2121
androidxPhoneInteractions = "1.1.0"
2222
androidxRemoteInteractions = "1.1.0"
2323
androidxStartup = "1.2.0"
@@ -35,7 +35,7 @@ compose-material3 = "1.3.1"
3535
ossLicensesPlugin = "0.10.6"
3636
osslicenses = "0.7.1"
3737
playServicesOssLicenses = "17.1.0"
38-
wearComposeMaterial3 = "1.0.0-alpha33"
38+
wearComposeMaterial3 = "1.0.0-alpha34"
3939
composesnapshot = "-"
4040
dependencyAnalysis = "2.11.0"
4141
dokka = "2.0.0"
@@ -67,7 +67,7 @@ tiles-tooling-preview = "1.4.1"
6767
truth = "1.4.4"
6868
wearInput = "1.2.0-alpha02"
6969
wearToolingPreview = "1.0.0"
70-
wearcompose = "1.5.0-alpha10"
70+
wearcompose = "1.5.0-alpha11"
7171

7272
[libraries]
7373
accessibility-test-framework = { module = "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework", version.ref = "accessibilityTestFramework" }
@@ -114,7 +114,7 @@ androidx-media3-testutils = { module = "androidx.media3:media3-test-utils", vers
114114
androidx-media3-testutils-robolectric = { module = "androidx.media3:media3-test-utils-robolectric", version.ref = "androidx-media3" }
115115
androidx-media3-ui = { module = "androidx.media3:media3-ui", version.ref = "androidx-media3" }
116116
androidx-mediarouter = "androidx.mediarouter:mediarouter:1.7.0"
117-
androidx-metrics-performance = "androidx.metrics:metrics-performance:1.0.0-beta01"
117+
androidx-metrics-performance = "androidx.metrics:metrics-performance:1.0.0-beta02"
118118
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" }
119119
androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime", version.ref = "androidxNavigation" }
120120
androidx-navigation-testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidxNavigation" }

0 commit comments

Comments
 (0)