mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-10-31 22:37:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Glance widget fixes (#7706)

Browse Source 
* Fix glance failing when there's too much children

* Adjust cover error placeholder
This commit is contained in:
Ivan Iskandar
2022-08-08 20:20:45 +07:00
committed by GitHub
parent 3bc6b1e202
commit 16abfeeff0
3 changed files with 30 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/kanade/tachiyomi/glance/UpdatesGridGlanceWidget.kt
View File

@@ -164,8 +164,7 @@ class UpdatesGridGlanceWidget : GlanceAppWidget() {
Box(
modifier = modifier
.size(width = CoverWidth, height = CoverHeight)
.appWidgetInnerRadius()
.background(ColorProvider(R.color.appwidget_surface_variant)),
.appWidgetInnerRadius(),
) {
if (cover != null) {
Image(
@@ -179,11 +178,9 @@ class UpdatesGridGlanceWidget : GlanceAppWidget() {
} else {
// Enjoy placeholder
Image(
provider = ImageProvider(R.drawable.appwidget_cover_placeholder),
provider = ImageProvider(R.drawable.appwidget_cover_error),
contentDescription = null,
modifier = GlanceModifier
.fillMaxSize()
.padding(4.dp),
modifier = GlanceModifier.fillMaxSize(),
contentScale = ContentScale.Crop,
)
}
@@ -281,7 +278,8 @@ private val ContainerModifier = GlanceModifier
*/
private fun DpSize.calculateRowAndColumnCount(): Pair<Int, Int> {
// Hack: Size provided by Glance manager is not reliable so take at least 1 row and 1 column
val rowCount = (height.value / 95).toInt().coerceAtLeast(1)
val columnCount = (width.value / 64).toInt().coerceAtLeast(1)
// Set max to 10 children each direction because of Glance limitation
val rowCount = (height.value / 95).toInt().coerceIn(1, 10)
val columnCount = (width.value / 64).toInt().coerceIn(1, 10)
return Pair(rowCount, columnCount)
}