Skip to content

add back in snap scrolling #425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashnohe merged 1 commit into from
Jul 10, 2026
+21 −35
Merged

add back in snap scrolling #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ camerax = "1.6.1"
material3Android = "1.4.0"
media3 = "1.10.1"
glide-compose = "1.0.0-beta09"
glance = "1.3.0-SNAPSHOT"
glance = "1.3.0-alpha02"
tensorflowLite = "2.16.1"
tensorflowLiteGpuDelegatePlugin = "0.4.4"
tensorflowLiteSupport = "0.4.4"
Expand Down
54 changes: 20 additions & 34 deletions ...java/com/example/platform/ui/appwidgets/glance/layout/text/layout/FullBleedImageLayout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import androidx.glance.LocalContext
import androidx.glance.LocalSize
import androidx.glance.appwidget.cornerRadius
import androidx.glance.appwidget.lazy.LazyColumn
// import androidx.glance.appwidget.lazy.VerticalScrollMode
import androidx.glance.appwidget.lazy.VerticalScrollMode
import androidx.glance.appwidget.lazy.items
import androidx.glance.background
import androidx.glance.layout.Alignment
Expand All @@ -38,10 +38,8 @@ import androidx.glance.layout.Column
import androidx.glance.layout.ContentScale
import androidx.glance.layout.fillMaxSize
import androidx.glance.layout.fillMaxWidth
import androidx.glance.layout.height
import androidx.glance.layout.padding
import androidx.glance.layout.size
import androidx.glance.layout.width
import androidx.glance.text.FontWeight
import androidx.glance.text.Text
import androidx.glance.text.TextStyle
Expand All @@ -67,6 +65,12 @@ fun FullBleedImageLayout(
val isSmall = size.height <= 110.dp
val appName = LocalContext.current.getString(R.string.sample_full_bleed_image_app_widget_name)

val scrollMode = if (Build.VERSION.SDK_INT >= 37) {
VerticalScrollMode.SnapScrollMatchHeight(size.height)
} else {
VerticalScrollMode.Normal
}
Comment on lines +68 to +72

@gemini-code-assist gemini-code-assist Bot Jul 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

Using Build.VERSION.SDK_INT >= 37 might prevent snap scrolling from working on Baklava (Android 16 / API 36) devices. It is safer and more consistent with the previous implementation to use Build.VERSION.SDK_INT_FULL >= Build.VERSION_CODES_FULL.BAKLAVA_1.

Suggested change
val scrollMode = if (Build.VERSION.SDK_INT >= 37) {
VerticalScrollMode.SnapScrollMatchHeight(size.height)
} else {
VerticalScrollMode.Normal
}
val scrollMode = if (Build.VERSION.SDK_INT_FULL >= Build.VERSION_CODES_FULL.BAKLAVA_1) {
VerticalScrollMode.SnapScrollMatchHeight(size.height)
} else {
VerticalScrollMode.Normal
}


Box(
modifier = GlanceModifier
.fillMaxSize()
Expand All @@ -81,20 +85,13 @@ fun FullBleedImageLayout(
actionButtonIcon = R.drawable.sample_info_icon,
actionButtonOnClick = actionStartDemoActivity("on-click of info button in no data view")
)
} else if (Build.VERSION.SDK_INT_FULL >= Build.VERSION_CODES_FULL.BAKLAVA_1) {
SnapScrollingGallery(
data = data,
isSmall = isSmall,
appName = appName,
size = size
)
} else {
// Show a standard scrolling list of items without Snap Scrolling
GalleryList(
SnapScrollingGallery(
data = data,
isSmall = isSmall,
appName = appName,
size = size
size = size,
scrollMode = scrollMode
)
}
}
Expand All @@ -103,47 +100,36 @@ fun FullBleedImageLayout(
@RequiresApi(Build.VERSION_CODES_FULL.BAKLAVA_1)
@Composable
private fun SnapScrollingGallery(
data: List<ImageGridItemData>,
data: List<ImageGridItemData>?,
isSmall: Boolean,
appName: String,
size: DpSize,
scrollMode: VerticalScrollMode,
) {
GalleryList(
data = data,
isSmall = isSmall,
appName = appName,
size = size
)
}
val galleryData = data ?: return
if (galleryData.isEmpty()) return

@Composable
private fun GalleryList(
data: List<ImageGridItemData>,
isSmall: Boolean,
appName: String,
size: DpSize
) {
if (data.size == 1) {
if (galleryData.size == 1) {
// If there's only 1 item (like in the widget preview), render with fillMaxSize to
// bypass LazyColumn measurement issues where the generated widget preview item doesn't
// fill the widget bounds.
GalleryItemCard(
item = data[0],
item = galleryData[0],
isSmall = isSmall,
appName = appName,
modifier = GlanceModifier.fillMaxSize()
)
} else {
val limitedData = data.take(5)
LazyColumn(
modifier = GlanceModifier.fillMaxSize()
modifier = GlanceModifier.fillMaxSize(),
verticalScrollMode = scrollMode
) {
items(limitedData, itemId = { item -> item.key.hashCode().toLong() }) { item ->
items(galleryData.take(5), itemId = { it.key.hashCode().toLong() }) { item ->
GalleryItemCard(
item = item,
isSmall = isSmall,
appName = appName,
modifier = GlanceModifier.width(size.width).height(size.height)
modifier = GlanceModifier.size(size.width, size.height)
)
}
}
Expand Down
Loading