@@ -14,24 +14,31 @@ import androidx.compose.material3.MaterialTheme
1414import androidx.compose.material3.Scaffold
1515import androidx.compose.material3.Text
1616import androidx.compose.material3.TopAppBar
17+ import androidx.compose.material3.TopAppBarColors
1718import androidx.compose.material3.TopAppBarDefaults.topAppBarColors
19+ import androidx.compose.material3.contentColorFor
1820import androidx.compose.runtime.Composable
1921import androidx.compose.ui.Modifier
2022import androidx.compose.ui.graphics.Color
2123
24+ @OptIn(ExperimentalMaterial3Api ::class )
2225@Composable
2326fun TitleBarScaffold (
2427 title : String ,
2528 navigationIcon : (@Composable () -> Unit )? = null,
2629 navigateUp : (() -> Unit )? = null,
30+ containerColor : Color = MaterialTheme .colorScheme.background,
31+ contentColor : Color = contentColorFor(containerColor),
2732 actions : @Composable RowScope .() -> Unit = {},
2833 content : @Composable (PaddingValues ) -> Unit
2934) {
3035 Scaffold (
3136 modifier = Modifier .fillMaxSize(),
37+ containerColor = containerColor,
38+ contentColor = contentColor,
3239 topBar = {
3340 TitleBar (
34- title, navigationIcon, navigateUp, actions
41+ title, navigationIcon, navigateUp, actions = actions
3542 )
3643 }
3744 ) { paddingValues ->
@@ -46,6 +53,12 @@ fun TitleBar(
4653 title : String ,
4754 navigationIcon : (@Composable () -> Unit )? = null,
4855 navigateUp : (() -> Unit )? = null,
56+ colors : TopAppBarColors = topAppBarColors(
57+ containerColor = MaterialTheme .colorScheme.primary,
58+ navigationIconContentColor = Color .White ,
59+ titleContentColor = Color .White ,
60+ actionIconContentColor = Color .White
61+ ),
4962 actions : @Composable RowScope .() -> Unit = {}
5063) {
5164 TopAppBar (
@@ -64,12 +77,7 @@ fun TitleBar(
6477 }
6578 }
6679 },
67- colors = topAppBarColors(
68- containerColor = MaterialTheme .colorScheme.primary,
69- navigationIconContentColor = Color .White ,
70- titleContentColor = Color .White ,
71- actionIconContentColor = Color .White
72- ),
80+ colors = colors,
7381 actions = actions
7482 )
7583}
0 commit comments