From ab550960516f4de60037ee504b184e1bcb9236b0 Mon Sep 17 00:00:00 2001 From: Kavish Devar Date: Fri, 26 Sep 2025 03:26:25 +0530 Subject: [PATCH] android: move padding to StyledScaffold's content because haze needs it --- .../me/kavishdevar/librepods/composables/StyledScaffold.kt | 7 +------ .../librepods/screens/AccessibilitySettingsScreen.kt | 3 ++- .../librepods/screens/AdaptiveStrengthScreen.kt | 4 +++- .../kavishdevar/librepods/screens/AirPodsSettingsScreen.kt | 1 + .../me/kavishdevar/librepods/screens/AppSettingsScreen.kt | 1 + .../java/me/kavishdevar/librepods/screens/DebugScreen.kt | 1 + .../me/kavishdevar/librepods/screens/HeadTrackingScreen.kt | 1 + .../librepods/screens/HearingAidAdjustmentsScreen.kt | 4 +++- .../me/kavishdevar/librepods/screens/HearingAidScreen.kt | 3 ++- .../java/me/kavishdevar/librepods/screens/Onboarding.kt | 3 ++- .../librepods/screens/PressAndHoldSettingsScreen.kt | 1 + .../java/me/kavishdevar/librepods/screens/RenameScreen.kt | 1 + .../librepods/screens/TransparencySettingsScreen.kt | 3 ++- .../kavishdevar/librepods/screens/TroubleshootingScreen.kt | 1 + 14 files changed, 22 insertions(+), 12 deletions(-) diff --git a/android/app/src/main/java/me/kavishdevar/librepods/composables/StyledScaffold.kt b/android/app/src/main/java/me/kavishdevar/librepods/composables/StyledScaffold.kt index acf7085..a72f152 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/composables/StyledScaffold.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/composables/StyledScaffold.kt @@ -116,12 +116,7 @@ fun StyledScaffold( } } - Box( - modifier = Modifier - .padding(horizontal = 16.dp) - ) { - content(topPadding + 64.dp, hazeState) - } + content(topPadding + 64.dp, hazeState) } } } diff --git a/android/app/src/main/java/me/kavishdevar/librepods/screens/AccessibilitySettingsScreen.kt b/android/app/src/main/java/me/kavishdevar/librepods/screens/AccessibilitySettingsScreen.kt index e39798c..d5615c3 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/screens/AccessibilitySettingsScreen.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/AccessibilitySettingsScreen.kt @@ -164,7 +164,8 @@ fun AccessibilitySettingsScreen(navController: NavController) { modifier = Modifier .fillMaxSize() .hazeSource(hazeState) - .verticalScroll(rememberScrollState()), + .verticalScroll(rememberScrollState()) + .padding(horizontal = 16.dp), verticalArrangement = Arrangement.spacedBy(16.dp) ) { Spacer(modifier = Modifier.height(spacerHeight)) diff --git a/android/app/src/main/java/me/kavishdevar/librepods/screens/AdaptiveStrengthScreen.kt b/android/app/src/main/java/me/kavishdevar/librepods/screens/AdaptiveStrengthScreen.kt index bd0bbcf..da0605a 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/screens/AdaptiveStrengthScreen.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/AdaptiveStrengthScreen.kt @@ -25,6 +25,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect @@ -106,7 +107,8 @@ fun AdaptiveStrengthScreen(navController: NavController) { ) { spacerHeight -> Column( modifier = Modifier - .fillMaxSize(), + .fillMaxSize() + .padding(horizontal = 16.dp), verticalArrangement = Arrangement.spacedBy(16.dp) ) { Spacer(modifier = Modifier.height(spacerHeight)) diff --git a/android/app/src/main/java/me/kavishdevar/librepods/screens/AirPodsSettingsScreen.kt b/android/app/src/main/java/me/kavishdevar/librepods/screens/AirPodsSettingsScreen.kt index 5dd112d..68041a2 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/screens/AirPodsSettingsScreen.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/AirPodsSettingsScreen.kt @@ -215,6 +215,7 @@ fun AirPodsSettingsScreen(dev: BluetoothDevice?, service: AirPodsService, modifier = Modifier .fillMaxSize() .hazeSource(hazeState) + .padding(horizontal = 16.dp) .verticalScroll(rememberScrollState()) ) { Spacer(modifier = Modifier.height(spacerHeight)) diff --git a/android/app/src/main/java/me/kavishdevar/librepods/screens/AppSettingsScreen.kt b/android/app/src/main/java/me/kavishdevar/librepods/screens/AppSettingsScreen.kt index de81d46..353e9c9 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/screens/AppSettingsScreen.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/AppSettingsScreen.kt @@ -211,6 +211,7 @@ fun AppSettingsScreen(navController: NavController) { .fillMaxSize() .verticalScroll(scrollState) .hazeSource(state = hazeState) + .padding(horizontal = 16.dp) ) { Spacer(modifier = Modifier.height(spacerHeight)) diff --git a/android/app/src/main/java/me/kavishdevar/librepods/screens/DebugScreen.kt b/android/app/src/main/java/me/kavishdevar/librepods/screens/DebugScreen.kt index cdacf70..f9dbdab 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/screens/DebugScreen.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/DebugScreen.kt @@ -353,6 +353,7 @@ fun DebugScreen(navController: NavController) { .fillMaxSize() .hazeSource(hazeState) .navigationBarsPadding() + .padding(horizontal = 16.dp) ) { Spacer(modifier = Modifier.height(spacerHeight)) LazyColumn( diff --git a/android/app/src/main/java/me/kavishdevar/librepods/screens/HeadTrackingScreen.kt b/android/app/src/main/java/me/kavishdevar/librepods/screens/HeadTrackingScreen.kt index 3ec0ac3..f4621d8 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/screens/HeadTrackingScreen.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/HeadTrackingScreen.kt @@ -153,6 +153,7 @@ fun HeadTrackingScreen(navController: NavController) { modifier = Modifier .fillMaxSize() .padding(top = 8.dp) + .padding(horizontal = 16.dp) .verticalScroll(scrollState) .hazeSource(state = hazeState) ) { diff --git a/android/app/src/main/java/me/kavishdevar/librepods/screens/HearingAidAdjustmentsScreen.kt b/android/app/src/main/java/me/kavishdevar/librepods/screens/HearingAidAdjustmentsScreen.kt index 122b364..1b26564 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/screens/HearingAidAdjustmentsScreen.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/HearingAidAdjustmentsScreen.kt @@ -26,6 +26,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api @@ -91,7 +92,8 @@ fun HearingAidAdjustmentsScreen(@Suppress("unused") navController: NavController modifier = Modifier .hazeSource(hazeState) .fillMaxSize() - .verticalScroll(verticalScrollState), + .verticalScroll(verticalScrollState) + .padding(horizontal = 16.dp), verticalArrangement = Arrangement.spacedBy(16.dp) ) { Spacer(modifier = Modifier.height(spacerHeight)) diff --git a/android/app/src/main/java/me/kavishdevar/librepods/screens/HearingAidScreen.kt b/android/app/src/main/java/me/kavishdevar/librepods/screens/HearingAidScreen.kt index 7153af4..d14fc94 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/screens/HearingAidScreen.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/HearingAidScreen.kt @@ -128,7 +128,8 @@ fun HearingAidScreen(navController: NavController) { .layerBackdrop(backdrop) .hazeSource(hazeState) .fillMaxSize() - .verticalScroll(verticalScrollState), + .verticalScroll(verticalScrollState) + .padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp) ) { Spacer(modifier = Modifier.height(spacerHeight)) diff --git a/android/app/src/main/java/me/kavishdevar/librepods/screens/Onboarding.kt b/android/app/src/main/java/me/kavishdevar/librepods/screens/Onboarding.kt index 95879e3..e6420bb 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/screens/Onboarding.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/Onboarding.kt @@ -167,7 +167,8 @@ fun Onboarding(navController: NavController, activityContext: Context) { ) { spacerHeight -> Column( modifier = Modifier - .fillMaxSize(), + .fillMaxSize() + .padding(horizontal = 16.dp), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(16.dp) ) { diff --git a/android/app/src/main/java/me/kavishdevar/librepods/screens/PressAndHoldSettingsScreen.kt b/android/app/src/main/java/me/kavishdevar/librepods/screens/PressAndHoldSettingsScreen.kt index 37cff81..032cbc4 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/screens/PressAndHoldSettingsScreen.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/PressAndHoldSettingsScreen.kt @@ -132,6 +132,7 @@ fun LongPress(navController: NavController, name: String) { modifier = Modifier .fillMaxSize() .padding(top = 8.dp) + .padding(horizontal = 16.dp) ) { Spacer(modifier = Modifier.height(spacerHeight)) Column( diff --git a/android/app/src/main/java/me/kavishdevar/librepods/screens/RenameScreen.kt b/android/app/src/main/java/me/kavishdevar/librepods/screens/RenameScreen.kt index 8d47612..9dd1f95 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/screens/RenameScreen.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/RenameScreen.kt @@ -94,6 +94,7 @@ fun RenameScreen(navController: NavController) { Column( modifier = Modifier .fillMaxSize() + .padding(horizontal = 16.dp) ) { Spacer(modifier = Modifier.height(spacerHeight)) val isDarkTheme = isSystemInDarkTheme() diff --git a/android/app/src/main/java/me/kavishdevar/librepods/screens/TransparencySettingsScreen.kt b/android/app/src/main/java/me/kavishdevar/librepods/screens/TransparencySettingsScreen.kt index 25ef6cd..565039e 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/screens/TransparencySettingsScreen.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/TransparencySettingsScreen.kt @@ -108,7 +108,8 @@ fun TransparencySettingsScreen(navController: NavController) { modifier = Modifier .hazeSource(hazeState) .fillMaxSize() - .verticalScroll(verticalScrollState), + .verticalScroll(verticalScrollState) + .padding(horizontal = 16.dp), verticalArrangement = Arrangement.spacedBy(16.dp) ) { Spacer(modifier = Modifier.height(spacerHeight)) diff --git a/android/app/src/main/java/me/kavishdevar/librepods/screens/TroubleshootingScreen.kt b/android/app/src/main/java/me/kavishdevar/librepods/screens/TroubleshootingScreen.kt index 25485b9..1124ad5 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/screens/TroubleshootingScreen.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/TroubleshootingScreen.kt @@ -226,6 +226,7 @@ fun TroubleshootingScreen(navController: NavController) { .fillMaxSize() .verticalScroll(scrollState) .hazeSource(state = hazeState) + .padding(horizontal = 16.dp) ) { Spacer(modifier = Modifier.height(spacerHeight))