Merge pull request #139 from synonymdev/feat/activity-explore

feat: Activity explore

Author: ovitrif

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

@@ -0,0 +1,9 @@
+package to.bitkit.ext
+
+import uniffi.bitkitcore.Activity
+
+val Activity.idValue: String
+    get() = when (this) {
+        is Activity.Lightning -> v1.id
+        is Activity.Onchain -> v1.txId
+    }

app/src/main/java/to/bitkit/repositories/WalletRepo.kt

@@ -21,6 +21,7 @@ import to.bitkit.data.entities.InvoiceTagEntity
 import to.bitkit.data.keychain.Keychain
 import to.bitkit.di.BgDispatcher
 import to.bitkit.env.Env
+import to.bitkit.ext.idValue
 import to.bitkit.ext.toHex
 import to.bitkit.models.BalanceState
 import to.bitkit.models.NodeLifecycleState
@@ -529,12 +530,6 @@ class WalletRepo @Inject constructor(
         is Activity.Onchain -> paymentHashOrTxId == v1.txId
     }
 
-    private val Activity.idValue: String
-        get() = when (this) {
-            is Activity.Lightning -> v1.id
-            is Activity.Onchain -> v1.txId
-        }
-
     private suspend fun Scanner.OnChain.extractLightningHashOrAddress(): String {
         val address = this.invoice.address
         val lightningInvoice: String = this.invoice.params?.get("lightning") ?: address

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -59,6 +59,7 @@ import to.bitkit.ui.screens.transfer.external.ExternalFeeCustomScreen
 import to.bitkit.ui.screens.transfer.external.ExternalSuccessScreen
 import to.bitkit.ui.screens.wallets.HomeScreen
 import to.bitkit.ui.screens.wallets.activity.ActivityItemScreen
+import to.bitkit.ui.screens.wallets.activity.ActivityExploreScreen
 import to.bitkit.ui.settings.BackupSettingsScreen
 import to.bitkit.ui.settings.BlocktankRegtestScreen
 import to.bitkit.ui.settings.BlocktankRegtestViewModel
@@ -642,7 +643,17 @@ private fun NavGraphBuilder.activityItem(
         ActivityItemScreen(
             viewModel = activityListViewModel,
             activityItem = navBackEntry.toRoute(),
+            onExploreClick = { id -> navController.navigateToActivityExplore(id) },
             onBackClick = { navController.popBackStack() },
+            onCloseClick = { navController.navigateToHome() },
+        )
+    }
+    composableWithDefaultTransitions<Routes.ActivityExplore> { navBackEntry ->
+        ActivityExploreScreen(
+            viewModel = activityListViewModel,
+            route = navBackEntry.toRoute(),
+            onBackClick = { navController.popBackStack() },
+            onCloseClick = { navController.navigateToHome() },
         )
     }
 }
@@ -819,6 +830,10 @@ fun NavController.navigateToActivityItem(id: String) = navigate(
     route = Routes.ActivityItem(id),
 )
 
+fun NavController.navigateToActivityExplore(id: String) = navigate(
+    route = Routes.ActivityExplore(id),
+)
+
 fun NavController.navigateToQrScanner() = navigate(
     route = Routes.QrScanner,
 )
@@ -990,6 +1005,9 @@ object Routes {
     @Serializable
     data class ActivityItem(val id: String)
 
+    @Serializable
+    data class ActivityExplore(val id: String)
+
     @Serializable
     data object QrScanner
 }

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

@@ -9,6 +9,7 @@ import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.text.toUpperCase
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.sp
@@ -240,11 +241,16 @@ fun BodySSB(
     text: String,
     modifier: Modifier = Modifier,
     color: Color = MaterialTheme.colorScheme.primary,
+    maxLines: Int = Int.MAX_VALUE,
+    overflow: TextOverflow = TextOverflow.Clip,
+
 ) {
     BodySSB(
         text = AnnotatedString(text),
         color = color,
         modifier = modifier,
+        maxLines = maxLines,
+        overflow = overflow,
     )
 }
 
@@ -253,6 +259,8 @@ fun BodySSB(
     text: AnnotatedString,
     modifier: Modifier = Modifier,
     color: Color = MaterialTheme.colorScheme.primary,
+    maxLines: Int = Int.MAX_VALUE,
+    overflow: TextOverflow = TextOverflow.Clip,
 ) {
     Text(
         text = text,
@@ -266,6 +274,8 @@ fun BodySSB(
             textAlign = TextAlign.Start,
         ),
         modifier = modifier,
+        maxLines = maxLines,
+        overflow = overflow,
     )
 }
 

app/src/main/java/to/bitkit/ui/screens/DevSettingsScreen.kt

@@ -57,7 +57,7 @@ fun DevSettingsScreen(
             NodeDetails(uiState)
             InfoField(
                 value = uiState.onchainAddress,
-                label = stringResource(R.string.address),
+                label = stringResource(R.string.wallet__activity_address),
                 maxLength = 36,
                 trailingIcon = {
                     Row {

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

@@ -59,7 +59,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.ActivityList
+import to.bitkit.ui.screens.wallets.activity.HomeActivityList
 import to.bitkit.ui.screens.wallets.activity.AllActivityScreen
 import to.bitkit.ui.screens.wallets.activity.DateRangeSelectorSheet
 import to.bitkit.ui.screens.wallets.activity.TagSelectorSheet
@@ -266,7 +266,7 @@ private fun HomeContentView(
                     Spacer(modifier = Modifier.height(16.dp))
                     val activity = activityListViewModel ?: return@Column
                     val latestActivities by activity.latestActivities.collectAsStateWithLifecycle()
-                    ActivityList(
+                    HomeActivityList(
                         items = latestActivities,
                         onAllActivityClick = { walletNavController.navigate(HomeRoutes.AllActivity) },
                         onActivityItemClick = { rootNavController.navigateToActivityItem(it) },