Merge pull request #143 from synonymdev/feat/activity-tags

feat: Activity add tags sheet

Author: ovitrif

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

@@ -2,8 +2,7 @@ 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
-    }
+fun Activity.rawId(): String = when (this) {
+    is Activity.Lightning -> v1.id
+    is Activity.Onchain -> v1.id
+}

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

@@ -21,7 +21,6 @@ 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
@@ -530,6 +529,12 @@ 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

@@ -58,7 +58,7 @@ import to.bitkit.ui.screens.transfer.external.ExternalConnectionScreen
 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.ActivityDetailScreen
 import to.bitkit.ui.screens.wallets.activity.ActivityExploreScreen
 import to.bitkit.ui.settings.BackupSettingsScreen
 import to.bitkit.ui.settings.BlocktankRegtestScreen
@@ -148,7 +148,7 @@ fun ContentView(
     LaunchedEffect(appViewModel) {
         appViewModel.mainScreenEffect.collect {
             when (it) {
-                is MainScreenEffect.NavigateActivityDetail -> navController.navigate(Routes.ActivityItem(it.activityId))
+                is MainScreenEffect.NavigateActivityDetail -> navController.navigate(Routes.ActivityDetail(it.activityId))
                 else -> Unit
             }
         }
@@ -639,18 +639,18 @@ private fun NavGraphBuilder.activityItem(
     activityListViewModel: ActivityListViewModel,
     navController: NavHostController,
 ) {
-    composableWithDefaultTransitions<Routes.ActivityItem> { navBackEntry ->
-        ActivityItemScreen(
-            viewModel = activityListViewModel,
-            activityItem = navBackEntry.toRoute(),
+    composableWithDefaultTransitions<Routes.ActivityDetail> { navBackEntry ->
+        ActivityDetailScreen(
+            listViewModel = activityListViewModel,
+            route = navBackEntry.toRoute(),
             onExploreClick = { id -> navController.navigateToActivityExplore(id) },
             onBackClick = { navController.popBackStack() },
             onCloseClick = { navController.navigateToHome() },
         )
     }
     composableWithDefaultTransitions<Routes.ActivityExplore> { navBackEntry ->
         ActivityExploreScreen(
-            viewModel = activityListViewModel,
+            listViewModel = activityListViewModel,
             route = navBackEntry.toRoute(),
             onBackClick = { navController.popBackStack() },
             onCloseClick = { navController.navigateToHome() },
@@ -827,7 +827,7 @@ fun NavController.navigateToTransferFunding() = navigate(
 )
 
 fun NavController.navigateToActivityItem(id: String) = navigate(
-    route = Routes.ActivityItem(id),
+    route = Routes.ActivityDetail(id),
 )
 
 fun NavController.navigateToActivityExplore(id: String) = navigate(
@@ -1003,7 +1003,7 @@ object Routes {
     data object ExternalFeeCustom
 
     @Serializable
-    data class ActivityItem(val id: String)
+    data class ActivityDetail(val id: String)
 
     @Serializable
     data class ActivityExplore(val id: String)

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

@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredHeight
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.icons.Icons
@@ -65,7 +66,7 @@ fun PrimaryButton(
         contentPadding = PaddingValues(horizontal = size.horizontalPadding),
         modifier = Modifier
             .then(if (fullWidth) Modifier.fillMaxWidth() else Modifier)
-            .height(size.height)
+            .requiredHeight(size.height)
             .then(modifier)
     ) {
         if (isLoading) {

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

@@ -1,16 +1,13 @@
 package to.bitkit.ui.components
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
-import androidx.compose.material3.BottomSheetDefaults
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.rememberModalBottomSheetState
@@ -42,16 +39,7 @@ fun ForgotPinSheet(
         sheetState = sheetState,
         shape = AppShapes.sheet,
         containerColor = Colors.Black,
-        dragHandle = {
-            Box(
-                contentAlignment = Alignment.Center,
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .background(color = Colors.Gray6)
-            ) {
-                BottomSheetDefaults.DragHandle()
-            }
-        },
+        dragHandle = { ModalBottomSheetHandle() },
         modifier = Modifier
             .fillMaxSize()
             .padding(top = ModalSheetTopPadding)

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

@@ -0,0 +1,26 @@
+package to.bitkit.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.material3.BottomSheetDefaults
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import to.bitkit.ui.theme.Colors
+
+@Composable
+@OptIn(ExperimentalMaterial3Api::class)
+fun ModalBottomSheetHandle(
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        contentAlignment = Alignment.Center,
+        modifier = modifier
+            .fillMaxWidth()
+            .background(color = Colors.Gray6)
+    ) {
+        BottomSheetDefaults.DragHandle()
+    }
+}