From fb68f1f49277598aa4fa618538df036080dbc16e Mon Sep 17 00:00:00 2001
From: Shinokuni <shinokuni@openserver.fr>
Date: Mon, 23 Sep 2024 14:18:22 +0200
Subject: [PATCH] Fix merge issues

---
 app/src/main/java/com/readrops/app/timelime/TimelineTab.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/readrops/app/timelime/TimelineTab.kt b/app/src/main/java/com/readrops/app/timelime/TimelineTab.kt
index 4a111a6b..6ef29ffb 100644
--- a/app/src/main/java/com/readrops/app/timelime/TimelineTab.kt
+++ b/app/src/main/java/com/readrops/app/timelime/TimelineTab.kt
@@ -303,21 +303,21 @@ object TimelineTab : Tab {
                                     MarkItemsRead(
                                         lazyListState = lazyListState,
                                         items = items,
-                                        markReadOnScroll = state.markReadOnScroll,
+                                        markReadOnScroll = preferences.markReadOnScroll,
                                         screenModel = screenModel
                                     )
 
                                     LazyColumn(
                                         state = lazyListState,
                                         contentPadding = PaddingValues(
-                                            vertical = if (state.itemSize == TimelineItemSize.COMPACT) {
+                                            vertical = if (preferences.itemSize == TimelineItemSize.COMPACT) {
                                                 0.dp
                                             } else {
                                                 MaterialTheme.spacing.shortSpacing
                                             }
                                         ),
                                         verticalArrangement = Arrangement.spacedBy(
-                                            if (state.itemSize == TimelineItemSize.COMPACT) {
+                                            if (preferences.itemSize == TimelineItemSize.COMPACT) {
                                                 0.dp
                                             } else
                                                 MaterialTheme.spacing.shortSpacing