Skip to content

Commit d94da55

Browse files
committed
Add safe padding to screens
1 parent 482f0b1 commit d94da55

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

app/src/main/java/audio/omgsoundboard/presentation/ui/about/AboutScreen.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ import android.net.Uri
99
import android.widget.Toast
1010
import androidx.compose.foundation.layout.Arrangement
1111
import androidx.compose.foundation.layout.Column
12+
import androidx.compose.foundation.layout.WindowInsets
1213
import androidx.compose.foundation.layout.fillMaxSize
1314
import androidx.compose.foundation.layout.fillMaxWidth
1415
import androidx.compose.foundation.layout.padding
16+
import androidx.compose.foundation.layout.safeDrawing
17+
import androidx.compose.foundation.layout.windowInsetsPadding
1518
import androidx.compose.foundation.rememberScrollState
1619
import androidx.compose.foundation.verticalScroll
1720
import androidx.compose.material.icons.Icons
@@ -49,7 +52,8 @@ fun AboutScreen(
4952
Column(
5053
modifier = Modifier
5154
.fillMaxSize()
52-
.verticalScroll(rememberScrollState()),
55+
.verticalScroll(rememberScrollState())
56+
.windowInsetsPadding(WindowInsets.safeDrawing),
5357
verticalArrangement = Arrangement.Top,
5458
horizontalAlignment = Alignment.CenterHorizontally
5559
) {

app/src/main/java/audio/omgsoundboard/presentation/ui/categories/CategoriesScreen.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ package audio.omgsoundboard.presentation.ui.categories
22

33
import androidx.compose.foundation.layout.Box
44
import androidx.compose.foundation.layout.Column
5+
import androidx.compose.foundation.layout.WindowInsets
56
import androidx.compose.foundation.layout.fillMaxSize
67
import androidx.compose.foundation.layout.padding
8+
import androidx.compose.foundation.layout.safeDrawing
9+
import androidx.compose.foundation.layout.windowInsetsPadding
710
import androidx.compose.foundation.lazy.LazyColumn
811
import androidx.compose.foundation.lazy.itemsIndexed
912
import androidx.compose.material.icons.Icons
@@ -52,7 +55,9 @@ fun CategoriesScreen(
5255

5356

5457
val state by viewModel.state.collectAsState()
55-
Box(modifier = Modifier.fillMaxSize()) {
58+
Box(
59+
modifier = Modifier.fillMaxSize().windowInsetsPadding(WindowInsets.safeDrawing)
60+
) {
5661
CategoriesScreenContent(state, viewModel::onEvent)
5762
Fab(
5863
modifier = Modifier.align(Alignment.BottomEnd).padding(12.dp),

app/src/main/java/audio/omgsoundboard/presentation/ui/sounds/SoundsScreen.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@ import androidx.compose.animation.slideInVertically
1414
import androidx.compose.animation.slideOutVertically
1515
import androidx.compose.foundation.layout.Box
1616
import androidx.compose.foundation.layout.Column
17+
import androidx.compose.foundation.layout.WindowInsets
1718
import androidx.compose.foundation.layout.fillMaxSize
1819
import androidx.compose.foundation.layout.padding
20+
import androidx.compose.foundation.layout.safeDrawing
21+
import androidx.compose.foundation.layout.windowInsetsPadding
1922
import androidx.compose.foundation.lazy.LazyColumn
2023
import androidx.compose.foundation.lazy.itemsIndexed
2124
import androidx.compose.material.icons.Icons
@@ -152,7 +155,9 @@ fun SoundsScreen(
152155
)
153156
}
154157
) {
155-
Box(modifier = Modifier.fillMaxSize()) {
158+
Box(
159+
modifier = Modifier.fillMaxSize().windowInsetsPadding(WindowInsets.safeDrawing)
160+
) {
156161
SoundsScreenContent(state, drawerState, viewModel::onEvent)
157162
AnimatedVisibility(
158163
modifier = Modifier.align(Alignment.BottomEnd),

0 commit comments

Comments
 (0)