diff --git a/mobile/src/main/java/ru/omni_devel/cards/Elements.kt b/mobile/src/main/java/ru/omni_devel/cards/Elements.kt index 7be999f..06490f9 100644 --- a/mobile/src/main/java/ru/omni_devel/cards/Elements.kt +++ b/mobile/src/main/java/ru/omni_devel/cards/Elements.kt @@ -37,13 +37,13 @@ import androidx.core.graphics.toColorInt @Composable fun Page(name: String, innerPadding: PaddingValues, content: @Composable () -> Unit) { - Column( - modifier = Modifier.padding(innerPadding) - ) { - TopBar(name) + Column() { + TopBar(name, innerPadding) Column( - modifier = Modifier.padding(horizontal = 16.dp) + modifier = Modifier + .padding(horizontal = 16.dp) + .background(MaterialTheme.colorScheme.background) ) { content() } @@ -51,12 +51,16 @@ fun Page(name: String, innerPadding: PaddingValues, content: @Composable () -> U } @Composable -fun TopBar(text: String) { +fun TopBar(text: String, innerPadding: PaddingValues) { Row( - modifier = Modifier.fillMaxWidth().background(MaterialTheme.colorScheme.primaryContainer).padding(horizontal = 12.dp, vertical = 16.dp) + modifier = Modifier + .fillMaxWidth() + .background(MaterialTheme.colorScheme.primaryContainer) + .padding(innerPadding) ) { Text( text, + modifier = Modifier.padding(vertical = 4.dp, horizontal = 12.dp), fontSize = 24.sp, color = MaterialTheme.colorScheme.onPrimaryContainer )