Skip to content

Commit 8b2920f

Browse files
committed
fix some padding issues
1 parent 34c096f commit 8b2920f

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ android {
3636
applicationId = "io.github.wiiznokes.gitnote"
3737
minSdk = 30
3838
targetSdk = 35
39-
versionCode = 3
40-
versionName = "25.05.3"
39+
versionCode = 4
40+
versionName = "25.05.4"
4141

4242
buildConfigField(
4343
"String",

app/src/main/java/io/github/wiiznokes/gitnote/ui/component/AppPage.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ import androidx.compose.foundation.layout.Arrangement
44
import androidx.compose.foundation.layout.Column
55
import androidx.compose.foundation.layout.ColumnScope
66
import androidx.compose.foundation.layout.RowScope
7+
import androidx.compose.foundation.layout.WindowInsets
78
import androidx.compose.foundation.layout.fillMaxSize
89
import androidx.compose.foundation.layout.padding
10+
import androidx.compose.foundation.layout.safeContent
911
import androidx.compose.foundation.rememberScrollState
1012
import androidx.compose.foundation.verticalScroll
1113
import androidx.compose.material.icons.Icons
@@ -14,6 +16,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api
1416
import androidx.compose.material3.IconButton
1517
import androidx.compose.material3.MaterialTheme
1618
import androidx.compose.material3.Scaffold
19+
import androidx.compose.material3.ScaffoldDefaults
1720
import androidx.compose.material3.Text
1821
import androidx.compose.material3.TopAppBar
1922
import androidx.compose.material3.TopAppBarDefaults
@@ -35,6 +38,7 @@ fun AppPage(
3538
verticalArrangement: Arrangement.Vertical = Arrangement.Top,
3639
horizontalAlignment: Alignment.Horizontal = Alignment.Start,
3740
disableVerticalScroll: Boolean = false,
41+
contentWindowInsets: WindowInsets = ScaffoldDefaults.contentWindowInsets,
3842
actions: @Composable RowScope.() -> Unit = {},
3943
bottomBar: @Composable () -> Unit = {},
4044
content: @Composable ColumnScope.() -> Unit

app/src/main/java/io/github/wiiznokes/gitnote/ui/screen/app/EditScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxSize
77
import androidx.compose.foundation.layout.fillMaxWidth
88
import androidx.compose.foundation.layout.padding
99
import androidx.compose.foundation.layout.safeContent
10+
import androidx.compose.foundation.layout.safeDrawing
1011
import androidx.compose.foundation.layout.width
1112
import androidx.compose.foundation.shape.RoundedCornerShape
1213
import androidx.compose.foundation.text.KeyboardActions
@@ -83,7 +84,7 @@ fun EditScreen(
8384
}
8485

8586
Scaffold(
86-
contentWindowInsets = WindowInsets.safeContent,
87+
contentWindowInsets = WindowInsets.safeDrawing,
8788
contentColor = MaterialTheme.colorScheme.background,
8889
topBar = {
8990

app/src/main/java/io/github/wiiznokes/gitnote/ui/screen/init/RemoteScreen.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ import androidx.compose.foundation.layout.Column
88
import androidx.compose.foundation.layout.ColumnScope
99
import androidx.compose.foundation.layout.Row
1010
import androidx.compose.foundation.layout.Spacer
11+
import androidx.compose.foundation.layout.WindowInsets
1112
import androidx.compose.foundation.layout.fillMaxWidth
1213
import androidx.compose.foundation.layout.height
1314
import androidx.compose.foundation.layout.padding
15+
import androidx.compose.foundation.layout.safeContent
1416
import androidx.compose.foundation.rememberScrollState
1517
import androidx.compose.foundation.text.KeyboardOptions
1618
import androidx.compose.material.icons.Icons
@@ -235,6 +237,7 @@ fun RemoteScreen(
235237
AppPage(
236238
title = stringResource(R.string.app_page_clone_repository),
237239
horizontalAlignment = Alignment.CenterHorizontally,
240+
contentWindowInsets = WindowInsets.safeContent,
238241
onBackClick = onBackClick,
239242
) {
240243

0 commit comments

Comments
 (0)