Remove StableList

fibelatti · Jan 27, 2024 · aba1be1 · aba1be1
1 parent 53dde1e
commit aba1be1
Show file tree

Hide file tree

Showing 23 changed files with 86 additions and 172 deletions.
diff --git a/app/src/main/kotlin/com/fibelatti/pinboard/core/android/SelectionDialog.kt b/app/src/main/kotlin/com/fibelatti/pinboard/core/android/SelectionDialog.kt
@@ -18,14 +18,13 @@ import androidx.compose.ui.platform.rememberNestedScrollInteropConnection
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import com.fibelatti.ui.foundation.StableList
 
 object SelectionDialog {
 
     fun <T> show(
         context: Context,
         title: String,
-        options: StableList<T>,
+        options: List<T>,
         optionName: (T) -> String,
         optionIcon: (T) -> Int? = { null },
         onOptionSelected: (T) -> Unit,
@@ -48,7 +47,7 @@ object SelectionDialog {
 @Composable
 private fun <T> SelectionDialogContent(
     title: String,
-    options: StableList<T>,
+    options: List<T>,
     optionName: (T) -> String,
     optionIcon: (T) -> Int? = { null },
     onOptionSelected: (T) -> Unit,

diff --git a/app/src/main/kotlin/com/fibelatti/pinboard/features/MainScreen.kt b/app/src/main/kotlin/com/fibelatti/pinboard/features/MainScreen.kt
@@ -58,10 +58,8 @@ import com.fibelatti.pinboard.features.appstate.PostListContent
 import com.fibelatti.pinboard.features.appstate.Refresh
 import com.fibelatti.pinboard.features.appstate.RefreshPopular
 import com.fibelatti.pinboard.features.navigation.NavigationMenu
-import com.fibelatti.ui.foundation.StableList
 import com.fibelatti.ui.foundation.navigationBarsPaddingCompat
 import com.fibelatti.ui.foundation.pxToDp
-import com.fibelatti.ui.foundation.stableListOf
 import com.fibelatti.ui.preview.ThemePreviews
 import com.fibelatti.ui.theme.ExtendedTheme
 
@@ -288,7 +286,7 @@ private fun MainBottomAppBar(
 @Composable
 @OptIn(ExperimentalAnimationApi::class)
 private fun MenuItemsContent(
-    menuItems: StableList<MainState.MenuItemComponent>,
+    menuItems: List<MainState.MenuItemComponent>,
     data: Any?,
     onMenuItemClick: (MainState.MenuItemComponent, data: Any?) -> Unit,
 ) {
@@ -382,7 +380,7 @@ private fun MainTopAppBarPreview() {
                     actionButton = MainState.ActionButtonComponent.Visible(id = "", label = "Action"),
                     bottomAppBar = MainState.BottomAppBarComponent.Visible(
                         id = "",
-                        menuItems = stableListOf(MainState.MenuItemComponent.SearchBookmarks),
+                        menuItems = listOf(MainState.MenuItemComponent.SearchBookmarks),
                         navigationIcon = R.drawable.ic_menu,
                     ),
                     floatingActionButton = MainState.FabComponent.Visible(id = "", icon = R.drawable.ic_pin),
@@ -414,7 +412,7 @@ private fun MainBottomAppBarPreview() {
                         actionButton = MainState.ActionButtonComponent.Visible(id = "", label = "Action"),
                         bottomAppBar = MainState.BottomAppBarComponent.Visible(
                             id = "",
-                            menuItems = stableListOf(MainState.MenuItemComponent.SearchBookmarks),
+                            menuItems = listOf(MainState.MenuItemComponent.SearchBookmarks),
                             navigationIcon = R.drawable.ic_menu,
                         ),
                         floatingActionButton = MainState.FabComponent.Visible(id = "", icon = R.drawable.ic_pin),

diff --git a/app/src/main/kotlin/com/fibelatti/pinboard/features/MainState.kt b/app/src/main/kotlin/com/fibelatti/pinboard/features/MainState.kt
@@ -3,7 +3,6 @@ package com.fibelatti.pinboard.features
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import com.fibelatti.pinboard.R
-import com.fibelatti.ui.foundation.StableList
 import java.util.UUID
 
 data class MainState(
@@ -66,7 +65,7 @@ data class MainState(
 
         data class Visible(
             override val id: String,
-            val menuItems: StableList<MenuItemComponent>,
+            val menuItems: List<MenuItemComponent>,
             @DrawableRes val navigationIcon: Int? = null,
             val data: Any? = null,
         ) : BottomAppBarComponent()
@@ -160,7 +159,7 @@ data class MainState(
 
         data class Visible(
             override val id: String,
-            val menuItems: StableList<MenuItemComponent>,
+            val menuItems: List<MenuItemComponent>,
             val data: Any? = null,
         ) : SidePanelAppBarComponent()
     }

diff --git a/.../main/kotlin/com/fibelatti/pinboard/features/filters/presentation/SavedFiltersFragment.kt b/.../main/kotlin/com/fibelatti/pinboard/features/filters/presentation/SavedFiltersFragment.kt
@@ -15,7 +15,6 @@ import com.fibelatti.pinboard.core.extension.showBanner
 import com.fibelatti.pinboard.features.MainViewModel
 import com.fibelatti.pinboard.features.appstate.AppStateViewModel
 import com.fibelatti.pinboard.features.filters.domain.model.SavedFilter
-import com.fibelatti.ui.foundation.toStableList
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -45,7 +44,7 @@ class SavedFiltersFragment @Inject constructor() : BaseFragment() {
         SelectionDialog.show(
             context = requireContext(),
             title = getString(R.string.quick_actions_title),
-            options = SavedFiltersQuickActions.allOptions(savedFilter).toStableList(),
+            options = SavedFiltersQuickActions.allOptions(savedFilter),
             optionName = { getString(it.title) },
             optionIcon = SavedFiltersQuickActions::icon,
             onOptionSelected = { option ->

diff --git a/...rc/main/kotlin/com/fibelatti/pinboard/features/filters/presentation/SavedFiltersScreen.kt b/...rc/main/kotlin/com/fibelatti/pinboard/features/filters/presentation/SavedFiltersScreen.kt
@@ -40,10 +40,7 @@ import com.fibelatti.pinboard.features.appstate.ViewSavedFilter
 import com.fibelatti.pinboard.features.filters.domain.model.SavedFilter
 import com.fibelatti.ui.components.ChipGroup
 import com.fibelatti.ui.components.MultilineChipGroup
-import com.fibelatti.ui.foundation.StableList
 import com.fibelatti.ui.foundation.navigationBarsCompat
-import com.fibelatti.ui.foundation.stableListOf
-import com.fibelatti.ui.foundation.toStableList
 import com.fibelatti.ui.preview.ThemePreviews
 import com.fibelatti.ui.theme.ExtendedTheme
 import kotlinx.coroutines.flow.onEach
@@ -92,7 +89,7 @@ fun SavedFiltersScreen(
         }
 
         SavedFiltersScreen(
-            savedFilters = savedFilters.toStableList(),
+            savedFilters = savedFilters,
             onSavedFilterClicked = { savedFilter ->
                 appStateViewModel.runAction(ViewSavedFilter(savedFilter = savedFilter))
             },
@@ -103,7 +100,7 @@ fun SavedFiltersScreen(
 
 @Composable
 private fun SavedFiltersScreen(
-    savedFilters: StableList<SavedFilter>,
+    savedFilters: List<SavedFilter>,
     onSavedFilterClicked: (SavedFilter) -> Unit,
     onSavedFilterLongClicked: (SavedFilter) -> Unit,
 ) {
@@ -185,7 +182,7 @@ private fun SavedFilterItem(
                 )
 
                 val tags = remember(savedFilter.tags) {
-                    savedFilter.tags.map { tag -> ChipGroup.Item(text = tag.name) }.toStableList()
+                    savedFilter.tags.map { tag -> ChipGroup.Item(text = tag.name) }
                 }
 
                 MultilineChipGroup(
@@ -207,7 +204,7 @@ private fun SavedFilterScreenPreview(
 ) {
     ExtendedTheme {
         SavedFiltersScreen(
-            savedFilters = remember { savedFilters.toStableList() },
+            savedFilters = remember { savedFilters },
             onSavedFilterClicked = {},
             onSavedFilterLongClicked = {},
         )
@@ -219,7 +216,7 @@ private fun SavedFilterScreenPreview(
 private fun SavedFilterScreenEmptyPreview() {
     ExtendedTheme {
         SavedFiltersScreen(
-            savedFilters = stableListOf(),
+            savedFilters = emptyList(),
             onSavedFilterClicked = {},
             onSavedFilterLongClicked = {},
         )

diff --git a/app/src/main/kotlin/com/fibelatti/pinboard/features/notes/presentation/NoteDetailsScreen.kt b/app/src/main/kotlin/com/fibelatti/pinboard/features/notes/presentation/NoteDetailsScreen.kt
@@ -30,7 +30,6 @@ import com.fibelatti.pinboard.features.MainState
 import com.fibelatti.pinboard.features.MainViewModel
 import com.fibelatti.pinboard.features.appstate.AppStateViewModel
 import com.fibelatti.pinboard.features.notes.domain.model.Note
-import com.fibelatti.ui.foundation.stableListOf
 import com.fibelatti.ui.preview.ThemePreviews
 import com.fibelatti.ui.theme.ExtendedTheme
 import kotlinx.coroutines.flow.onEach
@@ -60,7 +59,7 @@ fun NoteDetailsScreen(
                     currentState.copy(
                         sidePanelAppBar = MainState.SidePanelAppBarComponent.Visible(
                             id = actionId,
-                            menuItems = stableListOf(MainState.MenuItemComponent.CloseSidePanel),
+                            menuItems = listOf(MainState.MenuItemComponent.CloseSidePanel),
                         ),
                     )
                 } else {

diff --git a/app/src/main/kotlin/com/fibelatti/pinboard/features/notes/presentation/NoteListScreen.kt b/app/src/main/kotlin/com/fibelatti/pinboard/features/notes/presentation/NoteListScreen.kt
@@ -48,11 +48,8 @@ import com.fibelatti.pinboard.features.notes.domain.model.Note
 import com.fibelatti.pinboard.features.notes.domain.model.NoteSorting
 import com.fibelatti.ui.components.RowToggleButtonGroup
 import com.fibelatti.ui.components.ToggleButtonGroup
-import com.fibelatti.ui.foundation.StableList
 import com.fibelatti.ui.foundation.asHorizontalPaddingDp
 import com.fibelatti.ui.foundation.navigationBarsCompat
-import com.fibelatti.ui.foundation.stableListOf
-import com.fibelatti.ui.foundation.toStableList
 import com.fibelatti.ui.preview.ThemePreviews
 import com.fibelatti.ui.theme.ExtendedTheme
 import kotlinx.coroutines.flow.onEach
@@ -129,7 +126,7 @@ fun NoteListScreen(
             LoadingContent()
         } else {
             NoteListContent(
-                notes = noteListContent.notes.toStableList(),
+                notes = noteListContent.notes,
                 onSortOptionClicked = { noteListSorting ->
                     val sorting = when (noteListSorting) {
                         NoteList.Sorting.ByDateUpdatedDesc -> NoteSorting.ByDateUpdatedDesc
@@ -149,7 +146,7 @@ fun NoteListScreen(
 
 @Composable
 private fun NoteListContent(
-    notes: StableList<Note>,
+    notes: List<Note>,
     onSortOptionClicked: (NoteList.Sorting) -> Unit = {},
     onPullToRefresh: () -> Unit = {},
     onNoteClicked: (Note) -> Unit = {},
@@ -174,14 +171,12 @@ private fun NoteListContent(
                 .asHorizontalPaddingDp(addStart = 16.dp, addEnd = 16.dp)
 
             RowToggleButtonGroup(
-                items = NoteList.Sorting.entries
-                    .map { sorting ->
-                        ToggleButtonGroup.Item(
-                            id = sorting.id,
-                            text = stringResource(id = sorting.label),
-                        )
-                    }
-                    .toStableList(),
+                items = NoteList.Sorting.entries.map { sorting ->
+                    ToggleButtonGroup.Item(
+                        id = sorting.id,
+                        text = stringResource(id = sorting.label),
+                    )
+                },
                 onButtonClick = {
                     val (index, sorting) = requireNotNull(NoteList.Sorting.findByIdWithIndex(it.id))
                     selectedSortingIndex = index
@@ -283,7 +278,7 @@ object NoteList {
 private fun EmptyNoteListScreenPreview() {
     ExtendedTheme {
         NoteListContent(
-            notes = stableListOf(),
+            notes = emptyList(),
         )
     }
 }
@@ -300,7 +295,7 @@ private fun NoteListContentPreview() {
                 updatedAt = "${if (it % 2 == 0) it else it + 1}",
                 text = "Note text $it",
             )
-        }.toStableList()
+        }
 
         NoteListContent(
             notes = notes,

diff --git a/app/src/main/kotlin/com/fibelatti/pinboard/features/posts/presentation/BookmarkListScreen.kt b/app/src/main/kotlin/com/fibelatti/pinboard/features/posts/presentation/BookmarkListScreen.kt
@@ -81,7 +81,6 @@ import com.fibelatti.ui.components.ChipGroup
 import com.fibelatti.ui.components.MultilineChipGroup
 import com.fibelatti.ui.foundation.asHorizontalPaddingDp
 import com.fibelatti.ui.foundation.navigationBarsCompat
-import com.fibelatti.ui.foundation.toStableList
 import com.fibelatti.ui.preview.ThemePreviews
 import com.fibelatti.ui.theme.ExtendedTheme
 import kotlinx.coroutines.delay
@@ -429,7 +428,7 @@ private fun BookmarkItem(
 
             if (!post.tags.isNullOrEmpty()) {
                 val tags = remember(post.tags) {
-                    post.tags.map { tag -> ChipGroup.Item(text = tag.name) }.toStableList()
+                    post.tags.map { tag -> ChipGroup.Item(text = tag.name) }
                 }
 
                 MultilineChipGroup(

diff --git a/app/src/main/kotlin/com/fibelatti/pinboard/features/posts/presentation/EditBookmarkScreen.kt b/app/src/main/kotlin/com/fibelatti/pinboard/features/posts/presentation/EditBookmarkScreen.kt
@@ -52,11 +52,8 @@ import com.fibelatti.pinboard.features.posts.domain.model.Post
 import com.fibelatti.pinboard.features.tags.domain.model.Tag
 import com.fibelatti.pinboard.features.tags.presentation.TagManager
 import com.fibelatti.pinboard.features.tags.presentation.TagManagerViewModel
-import com.fibelatti.ui.foundation.StableList
 import com.fibelatti.ui.foundation.imePaddingCompat
 import com.fibelatti.ui.foundation.navigationBarsPaddingCompat
-import com.fibelatti.ui.foundation.stableListOf
-import com.fibelatti.ui.foundation.toStableList
 import com.fibelatti.ui.preview.ThemePreviews
 import com.fibelatti.ui.theme.ExtendedTheme
 
@@ -130,10 +127,10 @@ fun EditBookmarkScreen(
         searchTagInput = tagManagerState.currentQuery,
         onSearchTagInputChanged = tagManagerViewModel::setQuery,
         onAddTagClicked = tagManagerViewModel::addTag,
-        suggestedTags = tagManagerState.suggestedTags.toStableList(),
+        suggestedTags = tagManagerState.suggestedTags,
         onSuggestedTagClicked = tagManagerViewModel::addTag,
         currentTagsTitle = stringResource(id = tagManagerState.displayTitle),
-        currentTags = tagManagerState.tags.toStableList(),
+        currentTags = tagManagerState.tags,
         onRemoveCurrentTagClicked = tagManagerViewModel::removeTag,
         appMode = appMode,
     )
@@ -153,10 +150,10 @@ private fun EditBookmarkScreen(
     searchTagInput: String,
     onSearchTagInputChanged: (String) -> Unit,
     onAddTagClicked: (String) -> Unit,
-    suggestedTags: StableList<String>,
+    suggestedTags: List<String>,
     onSuggestedTagClicked: (String) -> Unit,
     currentTagsTitle: String,
-    currentTags: StableList<Tag>,
+    currentTags: List<Tag>,
     onRemoveCurrentTagClicked: (Tag) -> Unit,
     appMode: AppMode,
 ) {
@@ -214,10 +211,10 @@ private fun BookmarkContent(
     searchTagInput: String,
     onSearchTagInputChanged: (String) -> Unit,
     onAddTagClicked: (String) -> Unit,
-    suggestedTags: StableList<String>,
+    suggestedTags: List<String>,
     onSuggestedTagClicked: (String) -> Unit,
     currentTagsTitle: String,
-    currentTags: StableList<Tag>,
+    currentTags: List<Tag>,
     onRemoveCurrentTagClicked: (Tag) -> Unit,
     appMode: AppMode,
 ) {
@@ -431,10 +428,10 @@ private fun EditBookmarkScreenPreview(
             searchTagInput = "",
             onSearchTagInputChanged = {},
             onAddTagClicked = {},
-            suggestedTags = stableListOf(),
+            suggestedTags = emptyList(),
             onSuggestedTagClicked = {},
             currentTagsTitle = stringResource(id = R.string.tags_added_title),
-            currentTags = post.tags.orEmpty().toStableList(),
+            currentTags = post.tags.orEmpty(),
             onRemoveCurrentTagClicked = {},
             appMode = AppMode.PINBOARD,
         )

diff --git a/app/src/main/kotlin/com/fibelatti/pinboard/features/posts/presentation/EditPostFragment.kt b/app/src/main/kotlin/com/fibelatti/pinboard/features/posts/presentation/EditPostFragment.kt
@@ -23,7 +23,6 @@ import com.fibelatti.pinboard.features.appstate.AppStateViewModel
 import com.fibelatti.pinboard.features.appstate.NavigateBack
 import com.fibelatti.pinboard.features.posts.domain.model.Post
 import com.fibelatti.pinboard.features.tags.presentation.TagManagerViewModel
-import com.fibelatti.ui.foundation.toStableList
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.onEach
@@ -206,7 +205,7 @@ class EditPostFragment @Inject constructor() : BaseFragment() {
                                     add(MainState.MenuItemComponent.DeleteBookmark)
                                     add(MainState.MenuItemComponent.OpenInBrowser)
                                 }
-                            }.toStableList(),
+                            },
                             navigationIcon = null,
                             data = post,
                         ),

diff --git a/.../main/kotlin/com/fibelatti/pinboard/features/posts/presentation/PopularBookmarksScreen.kt b/.../main/kotlin/com/fibelatti/pinboard/features/posts/presentation/PopularBookmarksScreen.kt
@@ -49,10 +49,8 @@ import com.fibelatti.pinboard.features.appstate.ViewPost
 import com.fibelatti.pinboard.features.posts.domain.model.Post
 import com.fibelatti.ui.components.ChipGroup
 import com.fibelatti.ui.components.MultilineChipGroup
-import com.fibelatti.ui.foundation.StableList
 import com.fibelatti.ui.foundation.asHorizontalPaddingDp
 import com.fibelatti.ui.foundation.navigationBarsCompat
-import com.fibelatti.ui.foundation.toStableList
 import com.fibelatti.ui.preview.ThemePreviews
 import com.fibelatti.ui.theme.ExtendedTheme
 import kotlinx.coroutines.flow.onEach
@@ -130,8 +128,7 @@ fun PopularBookmarksScreen(
 
         CrossfadeLoadingLayout(
             data = popularPostsContent.posts
-                .takeUnless { popularPostsContent.shouldLoad || popularPostsScreenState.isLoading }
-                ?.toStableList(),
+                .takeUnless { popularPostsContent.shouldLoad || popularPostsScreenState.isLoading },
             modifier = Modifier.fillMaxSize(),
         ) { posts ->
             PopularBookmarksContent(
@@ -147,7 +144,7 @@ fun PopularBookmarksScreen(
 
 @Composable
 fun PopularBookmarksContent(
-    posts: StableList<Post>,
+    posts: List<Post>,
     onPullToRefresh: () -> Unit = {},
     onBookmarkClicked: (Post) -> Unit = {},
     onBookmarkLongClicked: (Post) -> Unit = {},
@@ -216,7 +213,7 @@ private fun PopularBookmarkItem(
 
             if (post.tags != null) {
                 val items = remember(post.tags) {
-                    post.tags.map { tag -> ChipGroup.Item(text = tag.name) }.toStableList()
+                    post.tags.map { tag -> ChipGroup.Item(text = tag.name) }
                 }
                 MultilineChipGroup(
                     items = items,
@@ -236,7 +233,7 @@ private fun PopularBookmarksContentPreview(
 ) {
     ExtendedTheme {
         PopularBookmarksContent(
-            posts = posts.toStableList(),
+            posts = posts,
         )
     }
 }