PreferenceScreen: fix system bar paddings and nav bar color

This commit is contained in:
MM20 2021-09-26 13:26:50 +02:00
parent 703f0127d6
commit 3bb875f5a5
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389

View File

@ -1,5 +1,6 @@
package de.mm20.launcher2.ui.component.preferences package de.mm20.launcher2.ui.component.preferences
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyColumn
@ -9,7 +10,8 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.ArrowBack import androidx.compose.material.icons.rounded.ArrowBack
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import com.google.accompanist.insets.statusBarsPadding import androidx.compose.ui.graphics.Color
import com.google.accompanist.insets.systemBarsPadding
import com.google.accompanist.systemuicontroller.rememberSystemUiController import com.google.accompanist.systemuicontroller.rememberSystemUiController
import de.mm20.launcher2.ui.locals.LocalNavController import de.mm20.launcher2.ui.locals.LocalNavController
@ -21,28 +23,33 @@ fun PreferenceScreen(
val navController = LocalNavController.current val navController = LocalNavController.current
val systemUiController = rememberSystemUiController() val systemUiController = rememberSystemUiController()
systemUiController.setStatusBarColor(MaterialTheme.colors.surface) systemUiController.setStatusBarColor(MaterialTheme.colors.surface)
Scaffold( systemUiController.setNavigationBarColor(Color.Black)
topBar = { Box(
TopAppBar( modifier = Modifier.systemBarsPadding()
backgroundColor = MaterialTheme.colors.surface, ) {
title = { Scaffold(
Text(title) topBar = {
}, TopAppBar(
modifier = Modifier.statusBarsPadding(), backgroundColor = MaterialTheme.colors.surface,
navigationIcon = { title = {
IconButton(onClick = { Text(title)
navController?.navigateUp() },
}) { navigationIcon = {
Icon(imageVector = Icons.Rounded.ArrowBack, contentDescription = "Back") IconButton(onClick = {
navController?.navigateUp()
}) {
Icon(imageVector = Icons.Rounded.ArrowBack, contentDescription = "Back")
}
} }
} )
}) {
LazyColumn(
modifier = Modifier
.fillMaxSize()
.padding(it),
content = content
) )
}) { }
LazyColumn(
modifier = Modifier
.fillMaxSize()
.padding(it),
content = content
)
} }
} }