Skip to content

Commit 21236e9

Browse files
fix: status bar padding
1 parent bd9f319 commit 21236e9

30 files changed

Lines changed: 87 additions & 27 deletions

File tree

auth/src/main/java/org/openedx/auth/presentation/logistration/LogistrationFragment.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
66
import android.view.ViewGroup
77
import androidx.compose.foundation.layout.Column
88
import androidx.compose.foundation.layout.Spacer
9+
import androidx.compose.foundation.layout.WindowInsets
910
import androidx.compose.foundation.layout.fillMaxSize
1011
import androidx.compose.foundation.layout.fillMaxWidth
1112
import androidx.compose.foundation.layout.height
@@ -123,15 +124,16 @@ private fun LogistrationScreen(
123124
.semantics {
124125
testTagsAsResourceId = true
125126
}
126-
.fillMaxSize()
127-
.navigationBarsPadding(),
128-
containerColor = MaterialTheme.appColors.background
127+
.fillMaxSize(),
128+
containerColor = MaterialTheme.appColors.background,
129+
contentWindowInsets = WindowInsets()
129130
) {
130131
Surface(
131132
modifier = Modifier
132133
.padding(it)
133134
.fillMaxSize()
134135
.verticalScroll(scrollState)
136+
.navigationBarsPadding()
135137
.displayCutoutForLandscape(),
136138
color = MaterialTheme.appColors.background
137139
) {

auth/src/main/java/org/openedx/auth/presentation/restore/RestorePasswordFragment.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Arrangement
1010
import androidx.compose.foundation.layout.Box
1111
import androidx.compose.foundation.layout.Column
1212
import androidx.compose.foundation.layout.Spacer
13+
import androidx.compose.foundation.layout.WindowInsets
1314
import androidx.compose.foundation.layout.fillMaxHeight
1415
import androidx.compose.foundation.layout.fillMaxSize
1516
import androidx.compose.foundation.layout.fillMaxWidth
@@ -142,7 +143,8 @@ private fun RestorePasswordScreen(
142143
.fillMaxSize()
143144
.navigationBarsPadding(),
144145
containerColor = MaterialTheme.appColors.background,
145-
snackbarHost = { SnackbarHost(snackbarHostState) }
146+
snackbarHost = { SnackbarHost(snackbarHostState) },
147+
contentWindowInsets = WindowInsets()
146148
) { paddingValues ->
147149

148150
val contentPaddings by remember {

auth/src/main/java/org/openedx/auth/presentation/signin/compose/SignInView.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Box
88
import androidx.compose.foundation.layout.Column
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.fillMaxHeight
1213
import androidx.compose.foundation.layout.fillMaxSize
1314
import androidx.compose.foundation.layout.fillMaxWidth
@@ -100,7 +101,8 @@ internal fun LoginScreen(
100101
.fillMaxSize()
101102
.navigationBarsPadding(),
102103
containerColor = MaterialTheme.appColors.background,
103-
snackbarHost = { SnackbarHost(snackbarHostState) }
104+
snackbarHost = { SnackbarHost(snackbarHostState) },
105+
contentWindowInsets = WindowInsets()
104106
) {
105107
val contentPaddings by remember {
106108
mutableStateOf(

auth/src/main/java/org/openedx/auth/presentation/signup/compose/SignUpView.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Arrangement
99
import androidx.compose.foundation.layout.Box
1010
import androidx.compose.foundation.layout.Column
1111
import androidx.compose.foundation.layout.Spacer
12+
import androidx.compose.foundation.layout.WindowInsets
1213
import androidx.compose.foundation.layout.fillMaxHeight
1314
import androidx.compose.foundation.layout.fillMaxSize
1415
import androidx.compose.foundation.layout.fillMaxWidth
@@ -166,7 +167,8 @@ internal fun SignUpView(
166167
.fillMaxSize()
167168
.navigationBarsPadding(),
168169
containerColor = MaterialTheme.appColors.background,
169-
snackbarHost = { SnackbarHost(snackbarHostState) }
170+
snackbarHost = { SnackbarHost(snackbarHostState) },
171+
contentWindowInsets = WindowInsets()
170172
) {
171173
val topBarPadding by remember {
172174
mutableStateOf(

core/src/main/java/org/openedx/core/ui/ComposeCommon.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,14 +1137,16 @@ fun AuthButtonsPanel(
11371137
onSignInClick: () -> Unit,
11381138
showRegisterButton: Boolean,
11391139
) {
1140-
Row {
1140+
Row(
1141+
verticalAlignment = Alignment.CenterVertically
1142+
) {
11411143
OpenEdXOutlinedButton(
11421144
modifier = Modifier
11431145
.testTag("btn_sign_in")
11441146
.then(
11451147
if (showRegisterButton) {
11461148
Modifier
1147-
.width(100.dp)
1149+
.width(120.dp)
11481150
.padding(end = 16.dp)
11491151
} else {
11501152
Modifier.weight(1f)

core/src/main/java/org/openedx/core/ui/WebContentScreen.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import android.webkit.WebViewClient
99
import androidx.compose.foundation.isSystemInDarkTheme
1010
import androidx.compose.foundation.layout.Box
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
@@ -60,7 +61,8 @@ fun WebContentScreen(
6061
.semantics {
6162
testTagsAsResourceId = true
6263
},
63-
containerColor = MaterialTheme.appColors.background
64+
containerColor = MaterialTheme.appColors.background,
65+
contentWindowInsets = WindowInsets()
6466
) {
6567
val screenWidth by remember(key1 = windowSize) {
6668
mutableStateOf(

course/src/main/java/org/openedx/course/presentation/container/NoAccessCourseContainerFragment.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Arrangement
88
import androidx.compose.foundation.layout.Box
99
import androidx.compose.foundation.layout.Column
1010
import androidx.compose.foundation.layout.Spacer
11+
import androidx.compose.foundation.layout.WindowInsets
1112
import androidx.compose.foundation.layout.fillMaxSize
1213
import androidx.compose.foundation.layout.fillMaxWidth
1314
import androidx.compose.foundation.layout.height
@@ -95,7 +96,8 @@ private fun NoAccessCourseContainerScreen(
9596
Scaffold(
9697
modifier = Modifier
9798
.fillMaxSize(),
98-
containerColor = MaterialTheme.appColors.background
99+
containerColor = MaterialTheme.appColors.background,
100+
contentWindowInsets = WindowInsets()
99101
) {
100102
val screenWidth by remember(key1 = windowSize) {
101103
mutableStateOf(

course/src/main/java/org/openedx/course/presentation/dates/CourseDatesScreen.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import androidx.compose.foundation.layout.IntrinsicSize
1919
import androidx.compose.foundation.layout.PaddingValues
2020
import androidx.compose.foundation.layout.Row
2121
import androidx.compose.foundation.layout.Spacer
22+
import androidx.compose.foundation.layout.WindowInsets
2223
import androidx.compose.foundation.layout.fillMaxHeight
2324
import androidx.compose.foundation.layout.fillMaxSize
2425
import androidx.compose.foundation.layout.fillMaxWidth
@@ -183,7 +184,8 @@ private fun CourseDatesUI(
183184

184185
Scaffold(
185186
modifier = Modifier.fillMaxSize(),
186-
containerColor = MaterialTheme.appColors.background
187+
containerColor = MaterialTheme.appColors.background,
188+
contentWindowInsets = WindowInsets()
187189
) {
188190
val modifierScreenWidth by remember(key1 = windowSize) {
189191
mutableStateOf(

course/src/main/java/org/openedx/course/presentation/handouts/HandoutsScreen.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Column
88
import androidx.compose.foundation.layout.PaddingValues
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.fillMaxSize
1213
import androidx.compose.foundation.layout.fillMaxWidth
1314
import androidx.compose.foundation.layout.padding
@@ -52,7 +53,8 @@ fun HandoutsScreen(
5253
Scaffold(
5354
modifier = Modifier
5455
.fillMaxSize(),
55-
containerColor = MaterialTheme.appColors.background
56+
containerColor = MaterialTheme.appColors.background,
57+
contentWindowInsets = WindowInsets()
5658
) {
5759
val screenWidth by remember(key1 = windowSize) {
5860
mutableStateOf(

course/src/main/java/org/openedx/course/presentation/handouts/HandoutsWebViewFragment.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
66
import android.view.ViewGroup
77
import androidx.compose.foundation.layout.Box
88
import androidx.compose.foundation.layout.Column
9+
import androidx.compose.foundation.layout.WindowInsets
910
import androidx.compose.foundation.layout.fillMaxSize
1011
import androidx.compose.foundation.layout.fillMaxWidth
1112
import androidx.compose.foundation.layout.padding
@@ -174,7 +175,8 @@ fun HandoutsEmptyScreen(
174175
.semantics {
175176
testTagsAsResourceId = true
176177
},
177-
containerColor = MaterialTheme.appColors.background
178+
containerColor = MaterialTheme.appColors.background,
179+
contentWindowInsets = WindowInsets()
178180
) {
179181
val screenWidth by remember(key1 = windowSize) {
180182
mutableStateOf(

0 commit comments

Comments
 (0)