Skip to content

Commit b8ef5a9

Browse files
committed
fix: enforce max-4 block fields in wide layouts
1 parent 497272f commit b8ef5a9

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

app/src/main/java/to/bitkit/appwidget/ui/blocks/BlocksGlanceContent.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ fun BlocksGlanceContent(
7171
return@GlanceWidgetScaffold
7272
}
7373

74-
val fields = entry.blocksPreferences.enabledFields().filter { it.value(block).isNotEmpty() }
74+
val fields = entry.blocksPreferences.enabledFields()
75+
.filter { it.value(block).isNotEmpty() }
76+
.take(MAX_BLOCKS_FIELDS)
7577
if (fields.isEmpty()) {
7678
CaptionB(text = context.getString(R.string.appwidget__loading))
7779
return@GlanceWidgetScaffold
@@ -80,7 +82,7 @@ fun BlocksGlanceContent(
8082
if (LocalSize.current.width >= GlanceLayoutDimens.WIDE_LAYOUT_MIN_WIDTH) {
8183
WideContent(fields = fields.toImmutableList(), block = block, context = context)
8284
} else {
83-
CompactContent(fields = fields.take(MAX_BLOCKS_FIELDS).toImmutableList(), block = block)
85+
CompactContent(fields = fields.toImmutableList(), block = block)
8486
}
8587
}
8688
}

app/src/main/java/to/bitkit/ui/screens/widgets/blocks/BlockCard.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ fun BlockCard(
3838
preferences: BlocksPreferences,
3939
block: BlockModel,
4040
) {
41-
val fields = preferences.enabledFields().filter { it.value(block).isNotEmpty() }
41+
val fields = preferences.enabledFields()
42+
.filter { it.value(block).isNotEmpty() }
43+
.take(MAX_BLOCKS_FIELDS)
4244

4345
Box(
4446
modifier = modifier

0 commit comments

Comments
 (0)