feat: Activity filter header

app/src/main/java/to/bitkit/ext/Activities.kt

@@ -1,8 +1,28 @@
 package to.bitkit.ext
 
 import uniffi.bitkitcore.Activity
+import uniffi.bitkitcore.PaymentType
 
 fun Activity.rawId(): String = when (this) {
     is Activity.Lightning -> v1.id
     is Activity.Onchain -> v1.id
 }
+
+/**
+ * Calculates the total value of an activity based on its type.
+ *
+ * For `Lightning` activity, the total value = `value + fee`.
+ *
+ * For `Onchain` activity:
+ * - If it is a send, the total value = `value + fee`.
+ * - Otherwise it's equal to `value`.
+ *
+ * @return The total value as an `ULong`.
+ */
+fun Activity.totalValue() = when(this) {
+    is Activity.Lightning -> v1.value + (v1.fee ?: 0u)
+    is Activity.Onchain -> when (v1.txType) {
+        PaymentType.SENT -> v1.value + v1.fee
+        else -> v1.value
+    }
+}

app/src/main/java/to/bitkit/services/CoreService.kt

@@ -252,11 +252,11 @@ class ActivityService(
                                 txType = payment.direction.toPaymentType(),
                                 status = state,
                                 value = payment.amountSats ?: 0u,
-                                fee = null, // TODO
-                                invoice = "lnbc123", // TODO
+                                fee = (payment.feePaidMsat ?: 0u) / 1000u,
+                                invoice = "lnbc123_todo", // TODO
                                 message = "",
                                 timestamp = payment.latestUpdateTimestamp,
-                                preimage = null,
+                                preimage = kind.preimage,
                                 createdAt = payment.latestUpdateTimestamp,
                                 updatedAt = payment.latestUpdateTimestamp,
                             )
@@ -370,7 +370,8 @@ class ActivityService(
                 "Gift for mom",
                 "Split dinner bill",
                 "Monthly rent",
-                "Gym membership"
+                "Gym membership",
+                "Very long invoice message to test truncation in list",
             )
 
             repeat(count) { i ->

app/src/main/java/to/bitkit/ui/components/Text.kt

@@ -350,6 +350,8 @@ fun CaptionB(
     modifier: Modifier = Modifier,
     color: Color = MaterialTheme.colorScheme.primary,
     textAlign: TextAlign = TextAlign.Start,
+    maxLines: Int = Int.MAX_VALUE,
+    overflow: TextOverflow = if (maxLines == 1) TextOverflow.Ellipsis else TextOverflow.Clip,
 ) {
     Text(
         text = text,
@@ -363,6 +365,8 @@ fun CaptionB(
             textAlign = textAlign,
         ),
         modifier = modifier,
+        maxLines = maxLines,
+        overflow = overflow,
     )
 }
 

app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt

@@ -60,7 +60,7 @@ import to.bitkit.ui.navigateToTransferSavingsIntro
 import to.bitkit.ui.navigateToTransferSpendingAmount
 import to.bitkit.ui.navigateToTransferSpendingIntro
 import to.bitkit.ui.scaffold.AppScaffold
-import to.bitkit.ui.screens.wallets.activity.HomeActivityList
+import to.bitkit.ui.screens.wallets.activity.components.ActivityListSimple
 import to.bitkit.ui.screens.wallets.activity.AllActivityScreen
 import to.bitkit.ui.screens.wallets.activity.DateRangeSelectorSheet
 import to.bitkit.ui.screens.wallets.activity.TagSelectorSheet
@@ -272,7 +272,7 @@ private fun HomeContentView(
                     Spacer(modifier = Modifier.height(16.dp))
                     val activity = activityListViewModel ?: return@Column
                     val latestActivities by activity.latestActivities.collectAsStateWithLifecycle()
-                    HomeActivityList(
+                    ActivityListSimple(
                         items = latestActivities,
                         onAllActivityClick = { walletNavController.navigate(HomeRoutes.AllActivity) },
                         onActivityItemClick = { rootNavController.navigateToActivityItem(it) },

app/src/main/java/to/bitkit/ui/screens/wallets/SavingsWalletScreen.kt

@@ -33,7 +33,7 @@ import to.bitkit.ui.components.EmptyStateView
 import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.ScreenColumn
-import to.bitkit.ui.screens.wallets.activity.ActivityListWithHeaders
+import to.bitkit.ui.screens.wallets.activity.components.ActivityListGrouped
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.utils.withAccent
@@ -88,10 +88,10 @@ fun SavingsWalletScreen(
                             )
                         }
                     )
-                    Spacer(modifier = Modifier.height(16.dp))
+
                     val activity = activityListViewModel ?: return@Column
                     val onchainActivities by activity.onchainActivities.collectAsState()
-                    ActivityListWithHeaders(
+                    ActivityListGrouped(
                         items = onchainActivities,
                         showFooter = true,
                         onAllActivityButtonClick = onAllActivityButtonClick,

app/src/main/java/to/bitkit/ui/screens/wallets/SpendingWalletScreen.kt

@@ -33,7 +33,7 @@ import to.bitkit.ui.components.EmptyStateView
 import to.bitkit.ui.components.SecondaryButton
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.ScreenColumn
-import to.bitkit.ui.screens.wallets.activity.ActivityListWithHeaders
+import to.bitkit.ui.screens.wallets.activity.components.ActivityListGrouped
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
 import to.bitkit.ui.utils.withAccent
@@ -100,12 +100,11 @@ fun SpendingWalletScreen(
                                 )
                             }
                         )
-                        Spacer(modifier = Modifier.height(16.dp))
                     }
 
                     val activity = activityListViewModel ?: return@Column
                     val lightningActivities by activity.lightningActivities.collectAsState()
-                    ActivityListWithHeaders(
+                    ActivityListGrouped(
                         items = lightningActivities,
                         showFooter = true,
                         onAllActivityButtonClick = onAllActivityButtonClick,

app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityDetailScreen.kt

@@ -38,6 +38,7 @@ import to.bitkit.ext.ellipsisMiddle
 import to.bitkit.ext.rawId
 import to.bitkit.ext.toActivityItemDate
 import to.bitkit.ext.toActivityItemTime
+import to.bitkit.ext.totalValue
 import to.bitkit.models.Toast
 import to.bitkit.ui.Routes
 import to.bitkit.ui.appViewModel
@@ -50,7 +51,6 @@ import to.bitkit.ui.components.TagButton
 import to.bitkit.ui.components.Title
 import to.bitkit.ui.scaffold.AppTopBar
 import to.bitkit.ui.scaffold.CloseNavIcon
-import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.screens.wallets.activity.components.ActivityAddTagSheet
 import to.bitkit.ui.screens.wallets.activity.components.ActivityIcon
 import to.bitkit.ui.shared.util.clickableAlpha
@@ -89,7 +89,9 @@ fun ActivityDetailScreen(
         detailViewModel.setActivity(item)
     }
 
-    ScreenColumn {
+    Column(
+        modifier = Modifier.background(Colors.Black)
+    ) {
         AppTopBar(
             titleText = stringResource(item.getScreenTitleRes()),
             onBackClick = onBackClick,
@@ -111,6 +113,7 @@ fun ActivityDetailScreen(
         )
         if (showAddTagSheet) {
             ActivityAddTagSheet(
+                listViewModel = listViewModel,
                 activityViewModel = detailViewModel,
                 onDismiss = { showAddTagSheet = false },
             )
@@ -142,13 +145,6 @@ private fun ActivityDetailContent(
             else -> item.v1.timestamp
         }
     }
-    val value = when (item) {
-        is Activity.Lightning -> item.v1.value
-        is Activity.Onchain -> when {
-            isSent -> item.v1.value + item.v1.fee
-            else -> item.v1.value
-        }
-    }
     val paymentValue = when (item) {
         is Activity.Lightning -> item.v1.value
         is Activity.Onchain -> item.v1.value
@@ -171,7 +167,7 @@ private fun ActivityDetailContent(
                 .padding(vertical = 16.dp)
         ) {
             BalanceHeaderView(
-                sats = value.toLong(),
+                sats = item.totalValue().toLong(),
                 prefix = amountPrefix,
                 showBitcoinSymbol = false,
                 modifier = Modifier.weight(1f)

app/src/main/java/to/bitkit/ui/screens/wallets/activity/ActivityExploreScreen.kt

@@ -34,6 +34,7 @@ import to.bitkit.R
 import to.bitkit.env.Env
 import to.bitkit.ext.ellipsisMiddle
 import to.bitkit.ext.rawId
+import to.bitkit.ext.totalValue
 import to.bitkit.models.Toast
 import to.bitkit.ui.Routes
 import to.bitkit.ui.appViewModel
@@ -129,17 +130,13 @@ private fun ActivityExploreContent(
                 .fillMaxWidth()
                 .padding(vertical = 16.dp)
         ) {
-            val value = when (item) {
-                is Activity.Lightning -> item.v1.value
-                is Activity.Onchain -> item.v1.value
-            }
             val isSent = when (item) {
                 is Activity.Lightning -> item.v1.txType == PaymentType.SENT
                 is Activity.Onchain -> item.v1.txType == PaymentType.SENT
             }
             val amountPrefix = if (isSent) "-" else "+"
             BalanceHeaderView(
-                sats = value.toLong(),
+                sats = item.totalValue().toLong(),
                 prefix = amountPrefix,
                 showBitcoinSymbol = false,
                 modifier = Modifier.weight(1f),