Merge branch 'master' into feat/buttons-v59

Author: jvsena42

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

@@ -1,10 +1,8 @@
 package to.bitkit.ui
 
 import android.content.Intent
-import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.DrawerState
 import androidx.compose.material3.DrawerValue
 import androidx.compose.material3.rememberDrawerState
@@ -447,39 +445,36 @@ fun ContentView(
                         }
                     }
                 ) {
-                    RootNavHost(
-                        navController = navController,
-                        drawerState = drawerState,
-                        walletViewModel = walletViewModel,
-                        appViewModel = appViewModel,
-                        activityListViewModel = activityListViewModel,
-                        settingsViewModel = settingsViewModel,
-                        currencyViewModel = currencyViewModel,
-                        transferViewModel = transferViewModel,
-                    )
-                }
-
-                val navBackStackEntry by navController.currentBackStackEntryAsState()
-
-                val currentRoute = navBackStackEntry?.destination?.route
+                    Box(modifier = Modifier.fillMaxSize()) {
+                        RootNavHost(
+                            navController = navController,
+                            drawerState = drawerState,
+                            walletViewModel = walletViewModel,
+                            appViewModel = appViewModel,
+                            activityListViewModel = activityListViewModel,
+                            settingsViewModel = settingsViewModel,
+                            currencyViewModel = currencyViewModel,
+                            transferViewModel = transferViewModel,
+                        )
 
-                val showTabBar = currentRoute in listOf(
-                    Routes.Home::class.qualifiedName,
-                    Routes.AllActivity::class.qualifiedName,
-                )
+                        val navBackStackEntry by navController.currentBackStackEntryAsState()
+                        val currentRoute = navBackStackEntry?.destination?.route
+                        val showTabBar = currentRoute in listOf(
+                            Routes.Home::class.qualifiedName,
+                            Routes.AllActivity::class.qualifiedName,
+                        )
 
-                AnimatedVisibility(
-                    visible = showTabBar && currentSheet == null,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .align(Alignment.BottomCenter)
-                ) {
-                    TabBar(
-                        hazeState = hazeState,
-                        onSendClick = { appViewModel.showSheet(Sheet.Send()) },
-                        onReceiveClick = { appViewModel.showSheet(Sheet.Receive) },
-                        onScanClick = { navController.navigateToScanner() },
-                    )
+                        if (showTabBar) {
+                            TabBar(
+                                hazeState = hazeState,
+                                onSendClick = { appViewModel.showSheet(Sheet.Send()) },
+                                onReceiveClick = { appViewModel.showSheet(Sheet.Receive) },
+                                onScanClick = { navController.navigateToScanner() },
+                                modifier = Modifier
+                                    .align(Alignment.BottomCenter)
+                            )
+                        }
+                    }
                 }
 
                 DrawerMenu(

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

@@ -488,7 +488,7 @@ private fun Content(
                         onEmptyActivityRowClick = onClickEmptyActivityRow,
                     )
 
-                    VerticalSpacer(120.dp) // scrollable empty space behind footer
+                    VerticalSpacer(150.dp) // scrollable empty space behind footer
                 }
             }
             if (homeUiState.showEmptyState) {
@@ -497,6 +497,7 @@ private fun Content(
                     onClose = onDismissEmptyState,
                     modifier = Modifier
                         .align(Alignment.BottomCenter)
+                        .padding(bottom = 24.dp)
                 )
             }
         }