Merge branch 'feat/nav3' into fix/skip-autorefresh-for-disabled-widgets

# Conflicts:
#	app/src/main/java/to/bitkit/ui/components/DrawerMenu.kt
#	app/src/main/java/to/bitkit/ui/components/SheetHost.kt
#	app/src/main/java/to/bitkit/ui/nav/DeepLinks.kt
#	app/src/main/java/to/bitkit/ui/nav/Routes.kt
#	app/src/main/java/to/bitkit/ui/nav/entries/HomeEntries.kt
#	app/src/main/java/to/bitkit/ui/nav/entries/OnboardingEntries.kt
#	app/src/main/java/to/bitkit/ui/nav/entries/SettingsEntries.kt
#	app/src/main/java/to/bitkit/ui/nav/entries/TransferEntries.kt
#	app/src/main/java/to/bitkit/ui/nav/entries/WidgetEntries.kt
#	app/src/main/java/to/bitkit/ui/settings/SecuritySettingsScreen.kt
#	app/src/main/java/to/bitkit/ui/settings/pin/ChangePinConfirmScreen.kt
#	app/src/main/java/to/bitkit/ui/settings/pin/ChangePinNewScreen.kt
#	app/src/main/java/to/bitkit/ui/settings/pin/ChangePinScreen.kt

Author: jvsena42

AGENTS.md

@@ -192,6 +192,7 @@ suspend fun getData(): Result<Data> = withContext(Dispatchers.IO) {
 - ALWAYS be mindful of thread safety when working with mutable lists & state
 - ALWAYS split screen composables into parent accepting viewmodel + inner private child accepting state and callbacks `Content()`
 - ALWAYS name lambda parameters in a composable function using present tense, NEVER use past tense
+- ALWAYS use a single root layout node in composables that emit UI
 - ALWAYS list 3 suggested commit messages after implementation work for the entire set of uncommitted changes
 - NEVER use `wheneverBlocking` in unit test expression body functions wrapped in a `= test {}` lambda
 - ALWAYS wrap unit tests `setUp` methods mocking suspending calls with `runBlocking`, e.g `setUp() = runBlocking { }`

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

@@ -63,69 +63,70 @@ fun DrawerMenu(
 ) {
     val scope = rememberCoroutineScope()
 
-    Scrim(
-        visible = drawerState.currentValue == DrawerValue.Open,
-        onClick = {
-            scope.launch {
-                drawerState.close()
-            }
-        },
-        modifier = Modifier
-            .fillMaxSize()
-            .zIndex(zIndexScrim)
-    )
+    Box(modifier = modifier.fillMaxSize()) {
+        Scrim(
+            visible = drawerState.currentValue == DrawerValue.Open,
+            onClick = {
+                scope.launch {
+                    drawerState.close()
+                }
+            },
+            modifier = Modifier
+                .fillMaxSize()
+                .zIndex(zIndexScrim)
+        )
 
-    AnimatedVisibility(
-        visible = drawerState.currentValue == DrawerValue.Open,
-        enter = slideInHorizontally(
-            initialOffsetX = { it }
-        ),
-        exit = slideOutHorizontally(
-            targetOffsetX = { it }
-        ),
-        modifier = modifier.then(
-            Modifier
+        AnimatedVisibility(
+            visible = drawerState.currentValue == DrawerValue.Open,
+            enter = slideInHorizontally(
+                initialOffsetX = { it }
+            ),
+            exit = slideOutHorizontally(
+                targetOffsetX = { it }
+            ),
+            modifier = Modifier
+                .align(Alignment.TopEnd)
                 .fillMaxHeight()
                 .zIndex(zIndexMenu)
                 .blockPointerInputPassthrough()
-        )
-    ) {
-        MenuContent(
-            onWalletClick = {
-                if (!navigator.isAtHome()) navigator.navigateToHome()
-                scope.launch { drawerState.close() }
-            },
-            onActivityClick = {
-                navigator.navigate(Routes.Activity.All)
-                scope.launch { drawerState.close() }
-            },
-            onContactsClick = null, // TODO IMPLEMENT CONTACTS
-            onProfileClick = null, // TODO IMPLEMENT PROFILE
-            onWidgetsClick = {
-                if (!hasSeenWidgetsIntro) {
-                    navigator.navigate(Routes.Widgets.Intro)
-                } else {
-                    navigator.navigate(Routes.Widgets.Add)
-                }
-                scope.launch { drawerState.close() }
-            },
-            onShopClick = {
-                if (!hasSeenShopIntro) {
-                    navigator.navigate(Routes.Shop.Intro)
-                } else {
-                    navigator.navigate(Routes.Shop.Discover)
-                }
-                scope.launch { drawerState.close() }
-            },
-            onSettingsClick = {
-                navigator.navigate(Routes.Settings.Main)
-                scope.launch { drawerState.close() }
-            },
-            onAppStatusClick = {
-                navigator.navigate(Routes.AppStatus)
-                scope.launch { drawerState.close() }
-            },
-        )
+        ) {
+            MenuContent(
+                onWalletClick = {
+                    if (!navigator.isAtHome()) navigator.navigateToHome()
+                    scope.launch { drawerState.close() }
+                },
+                onActivityClick = {
+                    navigator.navigate(Routes.Activity.All)
+                    scope.launch { drawerState.close() }
+                },
+                onContactsClick = null, // TODO IMPLEMENT CONTACTS
+                onProfileClick = null, // TODO IMPLEMENT PROFILE
+                onWidgetsClick = {
+                    if (!hasSeenWidgetsIntro) {
+                        navigator.navigate(Routes.Widgets.Intro)
+                    } else {
+                        navigator.navigate(Routes.Widgets.Add)
+                    }
+                    scope.launch { drawerState.close() }
+                },
+                onShopClick = {
+                    if (!hasSeenShopIntro) {
+                        navigator.navigate(Routes.Shop.Intro)
+                    } else {
+                        navigator.navigate(Routes.Shop.Discover)
+                    }
+                    scope.launch { drawerState.close() }
+                },
+                onSettingsClick = {
+                    navigator.navigate(Routes.Settings.Main)
+                    scope.launch { drawerState.close() }
+                },
+                onAppStatusClick = {
+                    navigator.navigate(Routes.AppStatus)
+                    scope.launch { drawerState.close() }
+                },
+            )
+        }
     }
 }
 
@@ -294,17 +295,19 @@ private fun DrawerItem(
 @Composable
 private fun Preview() {
     AppThemeSurface {
-        Box {
-            MenuContent(
-                onWalletClick = {},
-                onActivityClick = {},
-                onContactsClick = null,
-                onProfileClick = null,
-                onWidgetsClick = {},
-                onShopClick = {},
-                onSettingsClick = {},
-                onAppStatusClick = {},
-            )
+        Box(modifier = Modifier.fillMaxSize()) {
+            Box(modifier = Modifier.align(Alignment.TopEnd)) {
+                MenuContent(
+                    onWalletClick = {},
+                    onActivityClick = {},
+                    onContactsClick = null,
+                    onProfileClick = null,
+                    onWidgetsClick = {},
+                    onShopClick = {},
+                    onSettingsClick = {},
+                    onAppStatusClick = {},
+                )
+            }
         }
     }
 }

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

@@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.offset
 import androidx.compose.runtime.Composable
@@ -29,18 +30,23 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.input.pointer.util.VelocityTracker
 import androidx.compose.ui.layout.onSizeChanged
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.IntOffset
 import kotlinx.coroutines.launch
 import to.bitkit.ui.shared.modifiers.sheetHeight
 import to.bitkit.ui.theme.AppShapes
 import to.bitkit.ui.theme.Colors
+import kotlin.math.abs
 import kotlin.math.roundToInt
 
 private const val MS_DURATION_ANIM = 300
-private const val THRESHOLD_DISMISS = 0.45f
+private const val THRESHOLD_DISMISS = 0.33f
+private const val VELOCITY_DISMISS = 2500f
 private const val OFFSET_MIN_DRAG = -0.1f
 private val sheetContainerColor = Color.Black
 
@@ -65,6 +71,7 @@ fun SheetHost(
     var sheetHeightPx by remember { mutableFloatStateOf(0f) }
     val offsetY = remember { Animatable(1f) }
     var sheetVisible by remember { mutableStateOf(false) }
+    val velocityTracker = remember { VelocityTracker() }
 
     LaunchedEffect(Unit) {
         sheetVisible = true
@@ -90,6 +97,18 @@ fun SheetHost(
             onClick = { dismiss() },
         )
 
+        // Fixed background extension - covers gap when sheet drags up
+        val density = LocalDensity.current
+        if (sheetVisible && sheetHeightPx > 0f) {
+            Box(
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .fillMaxWidth()
+                    .height(with(density) { (sheetHeightPx * abs(OFFSET_MIN_DRAG)).toDp() })
+                    .background(sheetContainerColor)
+            )
+        }
+
         AnimatedVisibility(
             visible = sheetVisible,
             enter = slideInVertically { it } + fadeIn(),
@@ -105,10 +124,18 @@ fun SheetHost(
                     .background(sheetContainerColor)
                     .fillMaxWidth()
                     .pointerInput(Unit) {
+                        var dragPosition = 0f
                         detectVerticalDragGestures(
+                            onDragStart = {
+                                velocityTracker.resetTracking()
+                                dragPosition = 0f
+                            },
                             onDragEnd = {
+                                val velocity = velocityTracker.calculateVelocity().y
+                                val shouldDismiss = velocity > VELOCITY_DISMISS ||
+                                    offsetY.value > THRESHOLD_DISMISS
                                 scope.launch {
-                                    if (offsetY.value > THRESHOLD_DISMISS) {
+                                    if (shouldDismiss) {
                                         offsetY.animateTo(
                                             1f,
                                             animationSpec = tween(MS_DURATION_ANIM)
@@ -123,7 +150,12 @@ fun SheetHost(
                                     }
                                 }
                             },
-                            onVerticalDrag = { _, dragAmount ->
+                            onVerticalDrag = { change, dragAmount ->
+                                dragPosition += dragAmount
+                                velocityTracker.addPosition(
+                                    change.uptimeMillis,
+                                    Offset(0f, dragPosition)
+                                )
                                 val newOffset = offsetY.value + (dragAmount / sheetHeightPx)
                                 scope.launch {
                                     offsetY.snapTo(newOffset.coerceIn(OFFSET_MIN_DRAG, 1f))

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

@@ -56,6 +56,7 @@ import to.bitkit.models.Toast
 import to.bitkit.ui.scaffold.ScreenColumn
 import to.bitkit.ui.theme.AppThemeSurface
 import to.bitkit.ui.theme.Colors
+import kotlin.math.abs
 import kotlin.math.roundToInt
 
 private const val DISMISS_THRESHOLD_DP = 40
@@ -120,8 +121,8 @@ fun ToastView(
                             }
 
                             coroutineScope.launch {
-                                val horizontalSwipeDistance = kotlin.math.abs(dragOffsetX.value)
-                                val verticalSwipeDistance = kotlin.math.abs(dragOffsetY.value)
+                                val horizontalSwipeDistance = abs(dragOffsetX.value)
+                                val verticalSwipeDistance = abs(dragOffsetY.value)
 
                                 // Determine if this is primarily horizontal or vertical swipe
                                 val isHorizontalSwipe = horizontalSwipeDistance > verticalSwipeDistance

app/src/main/java/to/bitkit/ui/nav/DeepLinks.kt

@@ -38,8 +38,7 @@ data class DeepLinkRequest(
     val scheme: String? = uri.scheme?.lowercase()
     val host: String? = uri.host?.lowercase()
     val pathSegments: List<String> = uri.pathSegments
-    val queryParams: Map<String, String> = uri.queryParameterNames
-        .associateWith { uri.getQueryParameter(it) ?: "" }
+    val queryParams: Map<String, String> = uri.queryParameterNames.associateWith { uri.getQueryParameter(it) ?: "" }
 }
 
 /**
@@ -51,7 +50,7 @@ data class DeepLinkMatchResult<T : Routes>(
 )
 
 /**
- * Matches a DeepLinkRequest against a DeepLinkPattern.
+ * Matches a [DeepLinkRequest] against a [DeepLinkPattern].
  */
 class DeepLinkMatcher<T : Routes>(
     private val request: DeepLinkRequest,
@@ -99,11 +98,9 @@ class DeepLinkMatcher<T : Routes>(
 }
 
 /**
- * Registry of all supported deep link patterns.
+ * Registry of supported deep link patterns for type-safe documentation and early pattern matching.
  *
- * Note: The Rust-based bitkitcore.decode() remains the primary parser for complex
- * Bitcoin/Lightning URIs. These patterns provide type-safe documentation and
- * early pattern matching for known routes.
+ * Note: [com.synonym.bitkitcore.decode] remains the primary parser for complex Bitcoin/Lightning URIs.
  */
 object DeepLinkPatterns {
     // bitkit:// scheme patterns
@@ -147,9 +144,6 @@ object DeepLinkPatterns {
         uriPattern = "${UriScheme.HTTPS.withSlashes}www.bitkit.to/treasure-hunt".toUri()
     )
 
-    /**
-     * All registered patterns for matching.
-     */
     val all: List<DeepLinkPattern<out Routes>> = listOf(
         RECOVERY_MODE,
         SEND_BITCOIN,
@@ -172,7 +166,7 @@ object DeepLinkPatterns {
     }
 }
 
-// TODO Temporary fix while these schemes can't be decoded
+// TODO Temporary fix while these schemes can't be decoded via bitkit-core
 fun String.removeLightningSchemes(): String = listOf(
     UriScheme.LNURL,
     UriScheme.LNURL_PAY,

app/src/main/java/to/bitkit/ui/nav/Routes.kt

@@ -7,6 +7,7 @@ import com.synonym.bitkitcore.Activity as BitkitCoreActivity
 
 @Stable
 sealed interface Routes : NavKey {
+
     @Serializable
     data object Home : Routes
 
@@ -254,20 +255,6 @@ sealed interface Routes : NavKey {
         }
     }
 
-    object ChangePin {
-        @Serializable
-        data object Start : Routes
-
-        @Serializable
-        data object New : Routes
-
-        @Serializable
-        data class Confirm(val newPin: String) : Routes
-
-        @Serializable
-        data object Result : Routes
-    }
-
     object Send {
         @Serializable
         data object Recipient : Routes
@@ -362,6 +349,20 @@ sealed interface Routes : NavKey {
 
         @Serializable
         data class Result(val isBioOn: Boolean) : Routes
+
+        object Change {
+            @Serializable
+            data object Start : Routes
+
+            @Serializable
+            data object New : Routes
+
+            @Serializable
+            data class Confirm(val newPin: String) : Routes
+
+            @Serializable
+            data object Result : Routes
+        }
     }
 
     object Backup {