fix: change timeline type in homepage (#782)

* fix visual bug introduced by #781 in post detail * fix: ignore loading state when changing timeline type
LiveFastEatTrashRaccoon · Feb 1, 2025 · 06f9cbb · 06f9cbb
1 parent de7184e
commit 06f9cbb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/...kotlin/com/livefast/eattrash/raccoonforfriendica/feature/entrydetail/EntryDetailScreen.kt b/...kotlin/com/livefast/eattrash/raccoonforfriendica/feature/entrydetail/EntryDetailScreen.kt
@@ -282,6 +282,7 @@ class EntryDetailScreen(
                     },
                 ) {
                     LazyColumn(
+                        modifier = Modifier.fillMaxSize(),
                         state = lazyListState,
                     ) {
                         itemsIndexed(

diff --git a/...nMain/kotlin/com/livefast/eattrash/raccoonforfriendica/feature/timeline/TimelineScreen.kt b/...nMain/kotlin/com/livefast/eattrash/raccoonforfriendica/feature/timeline/TimelineScreen.kt
@@ -564,10 +564,11 @@ class TimelineScreen : Screen {
         }
 
         if (timelineTypeSelectorOpen) {
+            val items = uiState.availableTimelineTypes
             CustomModalBottomSheet(
                 title = LocalStrings.current.feedTypeTitle,
                 items =
-                    uiState.availableTimelineTypes.map {
+                    items.map {
                         CustomModalBottomSheetItem(
                             label = it.toReadableName(),
                             trailingContent = {
@@ -583,7 +584,7 @@ class TimelineScreen : Screen {
                 onSelected = { index ->
                     timelineTypeSelectorOpen = false
                     if (index != null) {
-                        val type = uiState.availableTimelineTypes[index]
+                        val type = items[index]
                         model.reduce(TimelineMviModel.Intent.ChangeType(type))
                     }
                 },

diff --git a/...in/kotlin/com/livefast/eattrash/raccoonforfriendica/feature/timeline/TimelineViewModel.kt b/...in/kotlin/com/livefast/eattrash/raccoonforfriendica/feature/timeline/TimelineViewModel.kt
@@ -13,7 +13,6 @@ import com.livefast.eattrash.raccoonforfriendica.core.utils.vibrate.HapticFeedba
 import com.livefast.eattrash.raccoonforfriendica.domain.content.data.TimelineEntryModel
 import com.livefast.eattrash.raccoonforfriendica.domain.content.data.TimelineType
 import com.livefast.eattrash.raccoonforfriendica.domain.content.data.blurHashParamsForPreload
-import com.livefast.eattrash.raccoonforfriendica.domain.content.data.nodeName
 import com.livefast.eattrash.raccoonforfriendica.domain.content.data.original
 import com.livefast.eattrash.raccoonforfriendica.domain.content.data.toTimelineType
 import com.livefast.eattrash.raccoonforfriendica.domain.content.data.urlsForPreload
@@ -208,10 +207,6 @@ class TimelineViewModel(
     }
 
     private suspend fun changeTimelineType(type: TimelineType) {
-        if (uiState.value.loading) {
-            return
-        }
-
         updateState {
             it.copy(
                 initial = true,