Merge pull request #862 from synonymdev/refactor/immutable-collections-cleanup

ovitrif · web-flow · commit 7c65722e5500 · 2026-03-25T10:39:29.000+01:00
refactor: simplify ui stability changes
diff --git a/app/src/main/java/to/bitkit/ui/NodeInfoScreen.kt b/app/src/main/java/to/bitkit/ui/NodeInfoScreen.kt
@@ -20,7 +20,6 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -35,7 +34,6 @@ import androidx.navigation.NavController
 import com.synonym.bitkitcore.ILspNode
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-
 import org.lightningdevkit.ldknode.BalanceDetails
 import org.lightningdevkit.ldknode.BalanceSource
 import org.lightningdevkit.ldknode.BestBlock
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/SavingsWalletScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/SavingsWalletScreen.kt
@@ -28,7 +28,6 @@ import androidx.compose.ui.unit.dp
 import com.synonym.bitkitcore.Activity
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
 import to.bitkit.R
 import to.bitkit.models.BalanceState
 import to.bitkit.ui.LocalBalances
@@ -159,7 +158,7 @@ private fun Preview() {
         Box {
             SavingsWalletScreen(
                 isGeoBlocked = false,
-                onchainActivities = previewOnchainActivityItems().toImmutableList(),
+                onchainActivities = previewOnchainActivityItems(),
                 onAllActivityButtonClick = {},
                 onActivityItemClick = {},
                 onEmptyActivityRowClick = {},
@@ -179,7 +178,7 @@ private fun PreviewTransfer() {
         Box {
             SavingsWalletScreen(
                 isGeoBlocked = false,
-                onchainActivities = previewOnchainActivityItems().toImmutableList(),
+                onchainActivities = previewOnchainActivityItems(),
                 onAllActivityButtonClick = {},
                 onActivityItemClick = {},
                 onEmptyActivityRowClick = {},
@@ -222,7 +221,7 @@ private fun PreviewGeoBlocked() {
         Box {
             SavingsWalletScreen(
                 isGeoBlocked = true,
-                onchainActivities = previewOnchainActivityItems().toImmutableList(),
+                onchainActivities = previewOnchainActivityItems(),
                 onAllActivityButtonClick = {},
                 onActivityItemClick = {},
                 onEmptyActivityRowClick = {},
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt
@@ -28,7 +28,6 @@ import androidx.compose.ui.unit.dp
 import com.synonym.bitkitcore.Activity
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
 import org.lightningdevkit.ldknode.ChannelDetails
 import to.bitkit.R
 import to.bitkit.ext.createChannelDetails
@@ -159,7 +158,7 @@ private fun Preview() {
         Box {
             SpendingWalletScreen(
                 channels = persistentListOf(createChannelDetails()),
-                lightningActivities = previewLightningActivityItems().toImmutableList(),
+                lightningActivities = previewLightningActivityItems(),
                 onAllActivityButtonClick = {},
                 onActivityItemClick = {},
                 onEmptyActivityRowClick = {},
@@ -179,7 +178,7 @@ private fun PreviewTransfer() {
         Box {
             SpendingWalletScreen(
                 channels = persistentListOf(createChannelDetails()),
-                lightningActivities = previewLightningActivityItems().toImmutableList(),
+                lightningActivities = previewLightningActivityItems(),
                 onAllActivityButtonClick = {},
                 onActivityItemClick = {},
                 onEmptyActivityRowClick = {},
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityDetailScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityDetailScreen.kt
@@ -52,7 +52,6 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
-import kotlinx.collections.immutable.toImmutableList
 import to.bitkit.R
 import to.bitkit.ext.create
 import to.bitkit.ext.ellipsisMiddle
@@ -227,7 +226,7 @@ fun ActivityDetailScreen(
                     )
                     ActivityDetailContent(
                         item = item,
-                        tags = tags.toImmutableList(),
+                        tags = tags,
                         onRemoveTag = { detailViewModel.removeTag(it) },
                         onAddTagClick = { showAddTagSheet = true },
                         onAssignClick = { showAssignSheet = true },
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/AllActivityScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/AllActivityScreen.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
@@ -24,7 +23,6 @@ import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.collections.immutable.toImmutableList
-import kotlinx.collections.immutable.toImmutableSet
 import to.bitkit.R
 import to.bitkit.ui.appViewModel
 import to.bitkit.ui.components.Sheet
@@ -54,15 +52,15 @@ fun AllActivityScreen(
     val startDate by viewModel.startDate.collectAsStateWithLifecycle()
 
     val selectedTab by viewModel.selectedTab.collectAsStateWithLifecycle()
-    val tabs = remember { ActivityTab.entries.toImmutableList() }
+    val tabs = activityTabs
     val currentTabIndex = tabs.indexOf(selectedTab)
 
     AllActivityScreenContent(
         filteredActivities = filteredActivities,
         searchText = searchText,
         onSearchTextChange = { viewModel.setSearchText(it) },
         hasTagFilter = selectedTags.isNotEmpty(),
-        selectedTags = selectedTags.toImmutableSet(),
+        selectedTags = selectedTags,
         hasDateRangeFilter = startDate != null,
         tabs = tabs,
         currentTabIndex = currentTabIndex,
@@ -146,18 +144,20 @@ private fun AllActivityScreenContent(
     }
 }
 
+private val activityTabs = ActivityTab.entries.toImmutableList()
+
 @Preview(showSystemUi = true)
 @Composable
 private fun Preview() {
     AppThemeSurface {
         AllActivityScreenContent(
-            filteredActivities = previewActivityItems.toImmutableList(),
+            filteredActivities = previewActivityItems,
             searchText = "",
             onSearchTextChange = {},
             hasTagFilter = false,
             selectedTags = persistentSetOf(),
             hasDateRangeFilter = false,
-            tabs = ActivityTab.entries.toImmutableList(),
+            tabs = activityTabs,
             currentTabIndex = 0,
             onTabChange = {},
             onBackClick = {},
@@ -181,7 +181,7 @@ private fun PreviewEmpty() {
             hasTagFilter = false,
             selectedTags = persistentSetOf("tag1", "tag2"),
             hasDateRangeFilter = false,
-            tabs = ActivityTab.entries.toImmutableList(),
+            tabs = activityTabs,
             currentTabIndex = 0,
             onTabChange = {},
             onBackClick = {},
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/TagSelectorSheet.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/TagSelectorSheet.kt
@@ -22,7 +22,6 @@ import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.ImmutableSet
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentSetOf
-import kotlinx.collections.immutable.toImmutableSet
 import to.bitkit.R
 import to.bitkit.ui.activityListViewModel
 import to.bitkit.ui.appViewModel
@@ -49,7 +48,7 @@ fun TagSelectorSheet() {
 
     Content(
         availableTags = availableTags,
-        selectedTags = selectedTags.toImmutableSet(),
+        selectedTags = selectedTags,
         onTagClick = {
             activity.toggleTag(it)
             app.hideSheet()
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityListFilter.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityListFilter.kt
@@ -117,6 +117,8 @@ enum class ActivityTab : TabItem {
         }
 }
 
+private val previewTabs = ActivityTab.entries.toImmutableList()
+
 @Preview
 @Composable
 private fun Preview() {
@@ -128,7 +130,7 @@ private fun Preview() {
             onTagClick = {},
             hasDateRangeFilter = false,
             onDateRangeClick = {},
-            tabs = ActivityTab.entries.toImmutableList(),
+            tabs = previewTabs,
             currentTabIndex = 0,
             onTabChange = {},
             modifier = Modifier.padding(16.dp)
@@ -147,7 +149,7 @@ private fun PreviewWithTags() {
             onTagClick = {},
             hasDateRangeFilter = false,
             onDateRangeClick = {},
-            tabs = ActivityTab.entries.toImmutableList(),
+            tabs = previewTabs,
             currentTabIndex = 0,
             onTabChange = {},
             selectedTags = persistentSetOf("Tag1", "Tag2"),
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityListGrouped.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityListGrouped.kt
@@ -20,7 +20,6 @@ import androidx.compose.ui.unit.dp
 import com.synonym.bitkitcore.Activity
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
 import to.bitkit.R
 import to.bitkit.ext.rawId
 import to.bitkit.ui.components.BodyM
@@ -68,6 +67,7 @@ fun ActivityListGrouped(
                                 is Activity.Lightning -> "lightning_${item.rawId()}"
                                 is Activity.Onchain -> "onchain_${item.rawId()}"
                             }
+
                             else -> "item_$index"
                         }
                     }
@@ -207,7 +207,7 @@ private fun Preview() {
     AppThemeSurface {
         Column(modifier = Modifier.padding(horizontal = 16.dp)) {
             ActivityListGrouped(
-                items = previewActivityItems.toImmutableList(),
+                items = previewActivityItems,
                 onActivityItemClick = {},
                 onEmptyActivityRowClick = {},
             )
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityListSimple.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/components/ActivityListSimple.kt
@@ -14,7 +14,6 @@ import androidx.compose.ui.unit.dp
 import com.synonym.bitkitcore.Activity
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
 import to.bitkit.R
 import to.bitkit.ui.components.TertiaryButton
 import to.bitkit.ui.components.VerticalSpacer
@@ -54,7 +53,7 @@ fun ActivityListSimple(
 private fun Preview() {
     AppThemeSurface {
         ActivityListSimple(
-            items = previewActivityItems.toImmutableList(),
+            items = previewActivityItems,
             onAllActivityClick = {},
             onActivityItemClick = {},
         )
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/activity/utils/PreviewItems.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/activity/utils/PreviewItems.kt
@@ -5,10 +5,12 @@ import com.synonym.bitkitcore.LightningActivity
 import com.synonym.bitkitcore.OnchainActivity
 import com.synonym.bitkitcore.PaymentState
 import com.synonym.bitkitcore.PaymentType
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 import to.bitkit.ext.create
 import java.util.Calendar
 
-val previewActivityItems = buildList {
+val previewActivityItems: ImmutableList<Activity> = buildList {
     val today: Calendar = Calendar.getInstance()
     val yesterday: Calendar = Calendar.getInstance().apply { add(Calendar.DATE, -1) }
     val thisWeek: Calendar = Calendar.getInstance().apply { add(Calendar.DATE, -3) }
@@ -107,7 +109,7 @@ val previewActivityItems = buildList {
             )
         )
     )
-}
+}.toImmutableList()
 
-fun previewOnchainActivityItems() = previewActivityItems.filter { it is Activity.Onchain }
-fun previewLightningActivityItems() = previewActivityItems.filter { it is Activity.Lightning }
+fun previewOnchainActivityItems() = previewActivityItems.filterIsInstance<Activity.Onchain>().toImmutableList()
+fun previewLightningActivityItems() = previewActivityItems.filterIsInstance<Activity.Lightning>().toImmutableList()
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveQrScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveQrScreen.kt
@@ -731,7 +731,7 @@ private fun PreviewAutoMode() {
                 ),
                 lightningState = LightningState(
                     nodeLifecycleState = NodeLifecycleState.Running,
-                    channels = listOf(mockChannel).toImmutableList(),
+                    channels = persistentListOf(mockChannel),
                 ),
                 onClickEditInvoice = {},
                 modifier = Modifier.sheetHeight(),
@@ -798,7 +798,7 @@ private fun PreviewSpendingMode() {
                 ),
                 lightningState = LightningState(
                     nodeLifecycleState = NodeLifecycleState.Running,
-                    channels = listOf(mockChannel).toImmutableList(),
+                    channels = persistentListOf(mockChannel),
                 ),
                 onClickEditInvoice = {},
                 modifier = Modifier.sheetHeight(),
diff --git a/app/src/main/java/to/bitkit/ui/screens/wallets/send/AddTagScreen.kt b/app/src/main/java/to/bitkit/ui/screens/wallets/send/AddTagScreen.kt
@@ -24,7 +24,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import kotlinx.collections.immutable.toImmutableList
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.coroutines.delay
 import to.bitkit.R
 import to.bitkit.ui.components.BottomSheetPreview
@@ -157,7 +157,7 @@ private fun Preview() {
         BottomSheetPreview {
             AddTagContent(
                 uiState = AddTagUiState(
-                    tagsSuggestions = listOf("Lunch", "Mom", "Dad", "Dinner", "Tip", "Gift").toImmutableList()
+                    tagsSuggestions = persistentListOf("Lunch", "Mom", "Dad", "Dinner", "Tip", "Gift")
                 ),
                 onTagSelected = {},
                 onInputUpdated = {},
diff --git a/app/src/main/java/to/bitkit/ui/settings/general/TagsSettingsScreen.kt b/app/src/main/java/to/bitkit/ui/settings/general/TagsSettingsScreen.kt
@@ -16,7 +16,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
 import to.bitkit.R
 import to.bitkit.ui.components.TagButton
 import to.bitkit.ui.components.settings.SectionHeader
@@ -35,7 +34,7 @@ fun TagsSettingsScreen(
     val tags by settings.lastUsedTags.collectAsStateWithLifecycle()
 
     TagsSettingsContent(
-        tags = tags.toImmutableList(),
+        tags = tags,
         onClickTag = { tag ->
             settings.deleteLastUsedTag(tag)
             if (tags.size == 1) {
diff --git a/app/src/main/java/to/bitkit/ui/settings/lightning/ChannelDetailViewModel.kt b/app/src/main/java/to/bitkit/ui/settings/lightning/ChannelDetailViewModel.kt
@@ -14,7 +14,6 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -75,8 +74,8 @@ class ChannelDetailViewModel @Inject constructor(
         _uiState.update {
             it.copy(
                 channelLoadState = ChannelLoadState.Success(channelUi),
-                paidOrders = blocktankRepo.blocktankState.value.paidOrders.toImmutableList(),
-                cjitEntries = blocktankRepo.blocktankState.value.cjitEntries.toImmutableList(),
+                paidOrders = blocktankRepo.blocktankState.value.paidOrders,
+                cjitEntries = blocktankRepo.blocktankState.value.cjitEntries,
                 isClosedChannel = isClosedChannel,
                 nodeId = lightningRepo.getNodeId().orEmpty(),
             )
@@ -175,8 +174,8 @@ class ChannelDetailViewModel @Inject constructor(
                     _uiState.update {
                         it.copy(
                             channelLoadState = ChannelLoadState.Success(updatedChannel),
-                            paidOrders = blocktankState.paidOrders.toImmutableList(),
-                            cjitEntries = blocktankState.cjitEntries.toImmutableList(),
+                            paidOrders = blocktankState.paidOrders,
+                            cjitEntries = blocktankState.cjitEntries,
                             nodeId = lightningRepo.getNodeId().orEmpty(),
                         )
                     }
@@ -190,8 +189,8 @@ class ChannelDetailViewModel @Inject constructor(
                             it.copy(
                                 channelLoadState = ChannelLoadState.Success(closedChannel),
                                 isClosedChannel = true,
-                                paidOrders = blocktankState.paidOrders.toImmutableList(),
-                                cjitEntries = blocktankState.cjitEntries.toImmutableList(),
+                                paidOrders = blocktankState.paidOrders,
+                                cjitEntries = blocktankState.cjitEntries,
                                 nodeId = lightningRepo.getNodeId().orEmpty(),
                             )
                         }
diff --git a/app/src/main/java/to/bitkit/ui/settings/lightning/LightningConnectionsScreen.kt b/app/src/main/java/to/bitkit/ui/settings/lightning/LightningConnectionsScreen.kt
@@ -162,7 +162,7 @@ private fun Content(
                     Caption13Up(stringResource(R.string.lightning__conn_pending), color = Colors.White64)
                     ChannelList(
                         status = ChannelStatusUi.PENDING,
-                        channels = uiState.pendingConnections.reversed().toImmutableList(),
+                        channels = uiState.pendingConnections,
                         onClickChannel = onClickChannel,
                     )
                 }
@@ -173,7 +173,7 @@ private fun Content(
                     Caption13Up(stringResource(R.string.lightning__conn_open), color = Colors.White64)
                     ChannelList(
                         status = ChannelStatusUi.OPEN,
-                        channels = uiState.openChannels.reversed().toImmutableList(),
+                        channels = uiState.openChannels,
                         onClickChannel = onClickChannel,
                     )
                 }
@@ -185,7 +185,7 @@ private fun Content(
                         Caption13Up(stringResource(R.string.lightning__conn_failed), color = Colors.White64)
                         ChannelList(
                             status = ChannelStatusUi.CLOSED,
-                            channels = uiState.failedOrders.reversed().toImmutableList(),
+                            channels = uiState.failedOrders,
                             onClickChannel = onClickChannel,
                         )
                     }
diff --git a/app/src/main/java/to/bitkit/ui/settings/lightning/LightningConnectionsViewModel.kt b/app/src/main/java/to/bitkit/ui/settings/lightning/LightningConnectionsViewModel.kt
diff --git a/app/src/main/java/to/bitkit/ui/shared/toast/ToastQueueManager.kt b/app/src/main/java/to/bitkit/ui/shared/toast/ToastQueueManager.kt
diff --git a/app/src/main/java/to/bitkit/viewmodels/ActivityDetailViewModel.kt b/app/src/main/java/to/bitkit/viewmodels/ActivityDetailViewModel.kt
diff --git a/app/src/main/java/to/bitkit/viewmodels/ActivityListViewModel.kt b/app/src/main/java/to/bitkit/viewmodels/ActivityListViewModel.kt
diff --git a/app/src/main/java/to/bitkit/viewmodels/SettingsViewModel.kt b/app/src/main/java/to/bitkit/viewmodels/SettingsViewModel.kt

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ import androidx.compose.ui.unit.dp`
`20`	`20`	`import com.synonym.bitkitcore.Activity`
`21`	`21`	`import kotlinx.collections.immutable.ImmutableList`
`22`	`22`	`import kotlinx.collections.immutable.persistentListOf`
`23`		`-import kotlinx.collections.immutable.toImmutableList`
`24`	`23`	`import to.bitkit.R`
`25`	`24`	`import to.bitkit.ext.rawId`
`26`	`25`	`import to.bitkit.ui.components.BodyM`
`@@ -68,6 +67,7 @@ fun ActivityListGrouped(`
`68`	`67`	`is Activity.Lightning -> "lightning_${item.rawId()}"`
`69`	`68`	`is Activity.Onchain -> "onchain_${item.rawId()}"`
`70`	`69`	`}`
	`70`	`+`
`71`	`71`	`else -> "item_$index"`
`72`	`72`	`}`
`73`	`73`	`}`
`@@ -207,7 +207,7 @@ private fun Preview() {`
`207`	`207`	`AppThemeSurface {`
`208`	`208`	`Column(modifier = Modifier.padding(horizontal = 16.dp)) {`
`209`	`209`	`ActivityListGrouped(`
`210`		`- items = previewActivityItems.toImmutableList(),`
	`210`	`+ items = previewActivityItems,`
`211`	`211`	`onActivityItemClick = {},`
`212`	`212`	`onEmptyActivityRowClick = {},`
`213`	`213`	`)`