Skip to content

Commit ab55096

Browse files
committed
android: move padding to StyledScaffold's content
because haze needs it
1 parent 86a6a28 commit ab55096

14 files changed

+22
-12
lines changed

android/app/src/main/java/me/kavishdevar/librepods/composables/StyledScaffold.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,7 @@ fun StyledScaffold(
116116
}
117117
}
118118

119-
Box(
120-
modifier = Modifier
121-
.padding(horizontal = 16.dp)
122-
) {
123-
content(topPadding + 64.dp, hazeState)
124-
}
119+
content(topPadding + 64.dp, hazeState)
125120
}
126121
}
127122
}

android/app/src/main/java/me/kavishdevar/librepods/screens/AccessibilitySettingsScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@ fun AccessibilitySettingsScreen(navController: NavController) {
164164
modifier = Modifier
165165
.fillMaxSize()
166166
.hazeSource(hazeState)
167-
.verticalScroll(rememberScrollState()),
167+
.verticalScroll(rememberScrollState())
168+
.padding(horizontal = 16.dp),
168169
verticalArrangement = Arrangement.spacedBy(16.dp)
169170
) {
170171
Spacer(modifier = Modifier.height(spacerHeight))

android/app/src/main/java/me/kavishdevar/librepods/screens/AdaptiveStrengthScreen.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import androidx.compose.foundation.layout.Column
2525
import androidx.compose.foundation.layout.Spacer
2626
import androidx.compose.foundation.layout.fillMaxSize
2727
import androidx.compose.foundation.layout.height
28+
import androidx.compose.foundation.layout.padding
2829
import androidx.compose.material3.ExperimentalMaterial3Api
2930
import androidx.compose.runtime.Composable
3031
import androidx.compose.runtime.DisposableEffect
@@ -106,7 +107,8 @@ fun AdaptiveStrengthScreen(navController: NavController) {
106107
) { spacerHeight ->
107108
Column(
108109
modifier = Modifier
109-
.fillMaxSize(),
110+
.fillMaxSize()
111+
.padding(horizontal = 16.dp),
110112
verticalArrangement = Arrangement.spacedBy(16.dp)
111113
) {
112114
Spacer(modifier = Modifier.height(spacerHeight))

android/app/src/main/java/me/kavishdevar/librepods/screens/AirPodsSettingsScreen.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ fun AirPodsSettingsScreen(dev: BluetoothDevice?, service: AirPodsService,
215215
modifier = Modifier
216216
.fillMaxSize()
217217
.hazeSource(hazeState)
218+
.padding(horizontal = 16.dp)
218219
.verticalScroll(rememberScrollState())
219220
) {
220221
Spacer(modifier = Modifier.height(spacerHeight))

android/app/src/main/java/me/kavishdevar/librepods/screens/AppSettingsScreen.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ fun AppSettingsScreen(navController: NavController) {
211211
.fillMaxSize()
212212
.verticalScroll(scrollState)
213213
.hazeSource(state = hazeState)
214+
.padding(horizontal = 16.dp)
214215
) {
215216
Spacer(modifier = Modifier.height(spacerHeight))
216217

android/app/src/main/java/me/kavishdevar/librepods/screens/DebugScreen.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,7 @@ fun DebugScreen(navController: NavController) {
353353
.fillMaxSize()
354354
.hazeSource(hazeState)
355355
.navigationBarsPadding()
356+
.padding(horizontal = 16.dp)
356357
) {
357358
Spacer(modifier = Modifier.height(spacerHeight))
358359
LazyColumn(

android/app/src/main/java/me/kavishdevar/librepods/screens/HeadTrackingScreen.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ fun HeadTrackingScreen(navController: NavController) {
153153
modifier = Modifier
154154
.fillMaxSize()
155155
.padding(top = 8.dp)
156+
.padding(horizontal = 16.dp)
156157
.verticalScroll(scrollState)
157158
.hazeSource(state = hazeState)
158159
) {

android/app/src/main/java/me/kavishdevar/librepods/screens/HearingAidAdjustmentsScreen.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import androidx.compose.foundation.layout.Column
2626
import androidx.compose.foundation.layout.Spacer
2727
import androidx.compose.foundation.layout.fillMaxSize
2828
import androidx.compose.foundation.layout.height
29+
import androidx.compose.foundation.layout.padding
2930
import androidx.compose.foundation.rememberScrollState
3031
import androidx.compose.foundation.verticalScroll
3132
import androidx.compose.material3.ExperimentalMaterial3Api
@@ -91,7 +92,8 @@ fun HearingAidAdjustmentsScreen(@Suppress("unused") navController: NavController
9192
modifier = Modifier
9293
.hazeSource(hazeState)
9394
.fillMaxSize()
94-
.verticalScroll(verticalScrollState),
95+
.verticalScroll(verticalScrollState)
96+
.padding(horizontal = 16.dp),
9597
verticalArrangement = Arrangement.spacedBy(16.dp)
9698
) {
9799
Spacer(modifier = Modifier.height(spacerHeight))

android/app/src/main/java/me/kavishdevar/librepods/screens/HearingAidScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ fun HearingAidScreen(navController: NavController) {
128128
.layerBackdrop(backdrop)
129129
.hazeSource(hazeState)
130130
.fillMaxSize()
131-
.verticalScroll(verticalScrollState),
131+
.verticalScroll(verticalScrollState)
132+
.padding(16.dp),
132133
verticalArrangement = Arrangement.spacedBy(8.dp)
133134
) {
134135
Spacer(modifier = Modifier.height(spacerHeight))

android/app/src/main/java/me/kavishdevar/librepods/screens/Onboarding.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ fun Onboarding(navController: NavController, activityContext: Context) {
167167
) { spacerHeight ->
168168
Column(
169169
modifier = Modifier
170-
.fillMaxSize(),
170+
.fillMaxSize()
171+
.padding(horizontal = 16.dp),
171172
horizontalAlignment = Alignment.CenterHorizontally,
172173
verticalArrangement = Arrangement.spacedBy(16.dp)
173174
) {

0 commit comments

Comments
 (0)