From 4ce4e445664b31c106be5c96f3e8f9ffe4e1d12d Mon Sep 17 00:00:00 2001 From: ashnohe Date: Fri, 26 Jun 2026 11:46:07 -0700 Subject: [PATCH 1/2] refactor snap scrolling code --- .../compose/snippets/glance/GlanceSnippets.kt | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/glance/GlanceSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/glance/GlanceSnippets.kt index d812d8641..331ece806 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/glance/GlanceSnippets.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/glance/GlanceSnippets.kt @@ -949,19 +949,17 @@ private object SnapScrollingSnippet { ColorItem(Color.Blue, "Blue") ) - if (Build.VERSION.SDK_INT >= 36 && isSnapScrollSupported) { - LazyColumn( - verticalScrollMode = VerticalScrollMode.SnapScrollMatchHeight(height) - ) { - items(items) { item -> - ColorCard(item, height) - } - } + val scrollMode = if (isSnapScrollSupported) { + VerticalScrollMode.SnapScrollMatchHeight(height) } else { - LazyColumn { - items(items) { item -> - ColorCard(item, height) - } + VerticalScrollMode.Normal + } + + LazyColumn( + verticalScrollMode = scrollMode + ) { + items(items) { item -> + ColorCard(item, height) } } } From 0158e47c0ae82292f24f4e0c59d63f594328c716 Mon Sep 17 00:00:00 2001 From: ashnohe Date: Fri, 26 Jun 2026 12:16:15 -0700 Subject: [PATCH 2/2] change supported version to SDK 37 --- .../com/example/compose/snippets/glance/GlanceSnippets.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/compose/snippets/src/main/java/com/example/compose/snippets/glance/GlanceSnippets.kt b/compose/snippets/src/main/java/com/example/compose/snippets/glance/GlanceSnippets.kt index 331ece806..56bd11806 100644 --- a/compose/snippets/src/main/java/com/example/compose/snippets/glance/GlanceSnippets.kt +++ b/compose/snippets/src/main/java/com/example/compose/snippets/glance/GlanceSnippets.kt @@ -949,7 +949,7 @@ private object SnapScrollingSnippet { ColorItem(Color.Blue, "Blue") ) - val scrollMode = if (isSnapScrollSupported) { + val scrollMode = if (Build.VERSION.SDK_INT >= 37) { VerticalScrollMode.SnapScrollMatchHeight(height) } else { VerticalScrollMode.Normal @@ -979,11 +979,6 @@ private object SnapScrollingSnippet { ) } } - - val isSnapScrollSupported: Boolean - get() = Build.VERSION.SDK_INT >= 36 && - Build.VERSION.SDK_INT_FULL >= Build.VERSION_CODES_FULL.BAKLAVA_1 - // [END android_compose_glance_snap_scrolling] }