Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 28 additions & 33 deletions app/src/main/java/to/bitkit/ui/ContentView.kt
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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(
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/to/bitkit/ui/screens/wallets/HomeScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -497,6 +497,7 @@ private fun Content(
onClose = onDismissEmptyState,
modifier = Modifier
.align(Alignment.BottomCenter)
.padding(bottom = 24.dp)
)
}
}
Expand Down
Loading