FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge issues

This commit is contained in:
Shinokuni 2024-09-23 14:18:22 +02:00
parent 379c560236
commit fb68f1f492
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/readrops/app/timelime/TimelineTab.kt
View File

@ -303,21 +303,21 @@ object TimelineTab : Tab {
MarkItemsRead( MarkItemsRead(
lazyListState = lazyListState, lazyListState = lazyListState,
items = items, items = items,
markReadOnScroll = state.markReadOnScroll, markReadOnScroll = preferences.markReadOnScroll,
screenModel = screenModel screenModel = screenModel
) )
LazyColumn( LazyColumn(
state = lazyListState, state = lazyListState,
contentPadding = PaddingValues( contentPadding = PaddingValues(
vertical = if (state.itemSize == TimelineItemSize.COMPACT) { vertical = if (preferences.itemSize == TimelineItemSize.COMPACT) {
0.dp 0.dp
} else { } else {
MaterialTheme.spacing.shortSpacing MaterialTheme.spacing.shortSpacing
} }
), ),
verticalArrangement = Arrangement.spacedBy( verticalArrangement = Arrangement.spacedBy(
if (state.itemSize == TimelineItemSize.COMPACT) { if (preferences.itemSize == TimelineItemSize.COMPACT) {
0.dp 0.dp
} else } else
MaterialTheme.spacing.shortSpacing MaterialTheme.spacing.shortSpacing