codinux
/
Bankmeister
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using now Scaffold.drawerContent instead of SideMenu

This commit is contained in:
dankito 2024-09-05 04:37:55 +02:00
parent 1bb23c816f
commit 2315e4b84a
2 changed files with 39 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
composeApp/src/commonMain/kotlin/net/codinux/banking/ui/App.kt
View File

@ -14,7 +14,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp import androidx.compose.ui.unit.sp
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import net.codinux.banking.ui.appskeleton.BottomBar import net.codinux.banking.ui.appskeleton.BottomBar
import net.codinux.banking.ui.appskeleton.SideMenu import net.codinux.banking.ui.appskeleton.SideMenuContent
import net.codinux.banking.ui.composables.StateHandler import net.codinux.banking.ui.composables.StateHandler
import net.codinux.banking.ui.composables.transactions.TransactionsList import net.codinux.banking.ui.composables.transactions.TransactionsList
import net.codinux.banking.ui.config.Colors import net.codinux.banking.ui.config.Colors
@ -44,6 +44,8 @@ fun App() {
val uiSettings = DI.uiSettings val uiSettings = DI.uiSettings
val drawerState = DI.uiState.drawerState.collectAsState().value
val coroutineScope = rememberCoroutineScope() val coroutineScope = rememberCoroutineScope()
coroutineScope.launch { coroutineScope.launch {
@ -52,44 +54,45 @@ fun App() {
MaterialTheme(colors = colors, typography = typography) { MaterialTheme(colors = colors, typography = typography) {
SideMenu { Scaffold(
Scaffold( scaffoldState = rememberScaffoldState(drawerState),
bottomBar = { BottomBar() }, bottomBar = { BottomBar() },
backgroundColor = Colors.Zinc100, backgroundColor = Colors.Zinc100,
floatingActionButton = { floatingActionButton = {
FloatingActionButton( FloatingActionButton(
shape = CircleShape, shape = CircleShape,
modifier = Modifier.offset(x = 4.dp, y = fabPositionAdjustment), modifier = Modifier.offset(x = 4.dp, y = fabPositionAdjustment),
onClick = { uiState.showAddAccountDialog.value = true } onClick = { uiState.showAddAccountDialog.value = true }
) { ) {
Icon(Icons.Filled.Add, contentDescription = "Add a bank account") Icon(Icons.Filled.Add, contentDescription = "Add a bank account")
} }
}, },
snackbarHost = { snackbarHostState -> drawerContent = { SideMenuContent() },
StateHandler(uiState, snackbarHostState) drawerBackgroundColor = Colors.DrawerContentBackground,
snackbarHost = { snackbarHostState ->
StateHandler(uiState, snackbarHostState)
SnackbarHost( SnackbarHost(
hostState = snackbarHostState hostState = snackbarHostState
) { data -> ) { data ->
Snackbar( Snackbar(
modifier = Modifier.offset(y = fabPositionAdjustment - 4.dp).padding(horizontal = 12.dp), modifier = Modifier.offset(y = fabPositionAdjustment - 4.dp).padding(horizontal = 12.dp),
action = { if (data.actionLabel == null) null else { action = { if (data.actionLabel == null) null else {
TextButton( TextButton(
onClick = { data.performAction() }, onClick = { data.performAction() },
content = { Text(data.actionLabel!!, color = Colors.CodinuxSecondaryColor) } content = { Text(data.actionLabel!!, color = Colors.CodinuxSecondaryColor) }
) )
} }
}, },
content = { Text(data.message, color = snackbarTextColor) }, content = { Text(data.message, color = snackbarTextColor) },
backgroundColor = Colors.Primary backgroundColor = Colors.Primary
) )
}
}
) { scaffoldPadding ->
Column(Modifier.fillMaxSize().padding(scaffoldPadding), horizontalAlignment = Alignment.CenterHorizontally) {
TransactionsList(uiState, uiSettings)
} }
} }
) { scaffoldPadding ->
Column(Modifier.fillMaxSize().padding(scaffoldPadding), horizontalAlignment = Alignment.CenterHorizontally) {
TransactionsList(uiState, uiSettings)
}
} }
} }
} }

22
composeApp/src/commonMain/kotlin/net/codinux/banking/ui/appskeleton/SideMenu.kt
View File

@ -1,22 +0,0 @@
package net.codinux.banking.ui.appskeleton
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.material.ModalDrawer
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.ui.Modifier
import net.codinux.banking.ui.config.Colors
import net.codinux.banking.ui.config.DI
@Composable
fun SideMenu(appContent: @Composable () -> Unit) {
val drawerState = DI.uiState.drawerState.collectAsState().value
ModalDrawer(
modifier = Modifier.fillMaxHeight(),
drawerState = drawerState,
content = appContent,
drawerBackgroundColor = Colors.DrawerContentBackground,
drawerContent = { SideMenuContent() }
)
}