fix: drawer menu positioning

Author: ovitrif

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 = {},
+                )
+            }
         }
     }
 }