android: move padding to StyledScaffold's content

because haze needs it
This commit is contained in:
Kavish Devar
2025-09-26 03:26:25 +05:30
parent 86a6a28dc1
commit ab55096051
14 changed files with 22 additions and 12 deletions

View File

@@ -116,12 +116,7 @@ fun StyledScaffold(
} }
} }
Box( content(topPadding + 64.dp, hazeState)
modifier = Modifier
.padding(horizontal = 16.dp)
) {
content(topPadding + 64.dp, hazeState)
}
} }
} }
} }

View File

@@ -164,7 +164,8 @@ fun AccessibilitySettingsScreen(navController: NavController) {
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.hazeSource(hazeState) .hazeSource(hazeState)
.verticalScroll(rememberScrollState()), .verticalScroll(rememberScrollState())
.padding(horizontal = 16.dp),
verticalArrangement = Arrangement.spacedBy(16.dp) verticalArrangement = Arrangement.spacedBy(16.dp)
) { ) {
Spacer(modifier = Modifier.height(spacerHeight)) Spacer(modifier = Modifier.height(spacerHeight))

View File

@@ -25,6 +25,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.DisposableEffect
@@ -106,7 +107,8 @@ fun AdaptiveStrengthScreen(navController: NavController) {
) { spacerHeight -> ) { spacerHeight ->
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxSize(), .fillMaxSize()
.padding(horizontal = 16.dp),
verticalArrangement = Arrangement.spacedBy(16.dp) verticalArrangement = Arrangement.spacedBy(16.dp)
) { ) {
Spacer(modifier = Modifier.height(spacerHeight)) Spacer(modifier = Modifier.height(spacerHeight))

View File

@@ -215,6 +215,7 @@ fun AirPodsSettingsScreen(dev: BluetoothDevice?, service: AirPodsService,
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.hazeSource(hazeState) .hazeSource(hazeState)
.padding(horizontal = 16.dp)
.verticalScroll(rememberScrollState()) .verticalScroll(rememberScrollState())
) { ) {
Spacer(modifier = Modifier.height(spacerHeight)) Spacer(modifier = Modifier.height(spacerHeight))

View File

@@ -211,6 +211,7 @@ fun AppSettingsScreen(navController: NavController) {
.fillMaxSize() .fillMaxSize()
.verticalScroll(scrollState) .verticalScroll(scrollState)
.hazeSource(state = hazeState) .hazeSource(state = hazeState)
.padding(horizontal = 16.dp)
) { ) {
Spacer(modifier = Modifier.height(spacerHeight)) Spacer(modifier = Modifier.height(spacerHeight))

View File

@@ -353,6 +353,7 @@ fun DebugScreen(navController: NavController) {
.fillMaxSize() .fillMaxSize()
.hazeSource(hazeState) .hazeSource(hazeState)
.navigationBarsPadding() .navigationBarsPadding()
.padding(horizontal = 16.dp)
) { ) {
Spacer(modifier = Modifier.height(spacerHeight)) Spacer(modifier = Modifier.height(spacerHeight))
LazyColumn( LazyColumn(

View File

@@ -153,6 +153,7 @@ fun HeadTrackingScreen(navController: NavController) {
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.padding(top = 8.dp) .padding(top = 8.dp)
.padding(horizontal = 16.dp)
.verticalScroll(scrollState) .verticalScroll(scrollState)
.hazeSource(state = hazeState) .hazeSource(state = hazeState)
) { ) {

View File

@@ -26,6 +26,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExperimentalMaterial3Api
@@ -91,7 +92,8 @@ fun HearingAidAdjustmentsScreen(@Suppress("unused") navController: NavController
modifier = Modifier modifier = Modifier
.hazeSource(hazeState) .hazeSource(hazeState)
.fillMaxSize() .fillMaxSize()
.verticalScroll(verticalScrollState), .verticalScroll(verticalScrollState)
.padding(horizontal = 16.dp),
verticalArrangement = Arrangement.spacedBy(16.dp) verticalArrangement = Arrangement.spacedBy(16.dp)
) { ) {
Spacer(modifier = Modifier.height(spacerHeight)) Spacer(modifier = Modifier.height(spacerHeight))

View File

@@ -128,7 +128,8 @@ fun HearingAidScreen(navController: NavController) {
.layerBackdrop(backdrop) .layerBackdrop(backdrop)
.hazeSource(hazeState) .hazeSource(hazeState)
.fillMaxSize() .fillMaxSize()
.verticalScroll(verticalScrollState), .verticalScroll(verticalScrollState)
.padding(16.dp),
verticalArrangement = Arrangement.spacedBy(8.dp) verticalArrangement = Arrangement.spacedBy(8.dp)
) { ) {
Spacer(modifier = Modifier.height(spacerHeight)) Spacer(modifier = Modifier.height(spacerHeight))

View File

@@ -167,7 +167,8 @@ fun Onboarding(navController: NavController, activityContext: Context) {
) { spacerHeight -> ) { spacerHeight ->
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxSize(), .fillMaxSize()
.padding(horizontal = 16.dp),
horizontalAlignment = Alignment.CenterHorizontally, horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(16.dp) verticalArrangement = Arrangement.spacedBy(16.dp)
) { ) {

View File

@@ -132,6 +132,7 @@ fun LongPress(navController: NavController, name: String) {
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.padding(top = 8.dp) .padding(top = 8.dp)
.padding(horizontal = 16.dp)
) { ) {
Spacer(modifier = Modifier.height(spacerHeight)) Spacer(modifier = Modifier.height(spacerHeight))
Column( Column(

View File

@@ -94,6 +94,7 @@ fun RenameScreen(navController: NavController) {
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
.padding(horizontal = 16.dp)
) { ) {
Spacer(modifier = Modifier.height(spacerHeight)) Spacer(modifier = Modifier.height(spacerHeight))
val isDarkTheme = isSystemInDarkTheme() val isDarkTheme = isSystemInDarkTheme()

View File

@@ -108,7 +108,8 @@ fun TransparencySettingsScreen(navController: NavController) {
modifier = Modifier modifier = Modifier
.hazeSource(hazeState) .hazeSource(hazeState)
.fillMaxSize() .fillMaxSize()
.verticalScroll(verticalScrollState), .verticalScroll(verticalScrollState)
.padding(horizontal = 16.dp),
verticalArrangement = Arrangement.spacedBy(16.dp) verticalArrangement = Arrangement.spacedBy(16.dp)
) { ) {
Spacer(modifier = Modifier.height(spacerHeight)) Spacer(modifier = Modifier.height(spacerHeight))

View File

@@ -226,6 +226,7 @@ fun TroubleshootingScreen(navController: NavController) {
.fillMaxSize() .fillMaxSize()
.verticalScroll(scrollState) .verticalScroll(scrollState)
.hazeSource(state = hazeState) .hazeSource(state = hazeState)
.padding(horizontal = 16.dp)
) { ) {
Spacer(modifier = Modifier.height(spacerHeight)) Spacer(modifier = Modifier.height(spacerHeight))