Skip to content

Commit 19930a9

Browse files
authored
fix: a bug when Discover and Program screens appear on the left side of the tablet (#269)
1 parent 6dd2adf commit 19930a9

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

discovery/src/main/java/org/openedx/discovery/presentation/NativeDiscoveryFragment.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.fillMaxHeight
1313
import androidx.compose.foundation.layout.fillMaxSize
1414
import androidx.compose.foundation.layout.fillMaxWidth
1515
import androidx.compose.foundation.layout.height
16+
import androidx.compose.foundation.layout.navigationBarsPadding
1617
import androidx.compose.foundation.layout.padding
1718
import androidx.compose.foundation.layout.statusBarsPadding
1819
import androidx.compose.foundation.layout.widthIn
@@ -241,6 +242,7 @@ internal fun DiscoveryScreen(
241242
horizontal = 16.dp,
242243
vertical = 32.dp,
243244
)
245+
.navigationBarsPadding()
244246
) {
245247
AuthButtonsPanel(
246248
onRegisterClick = onRegisterClick,

discovery/src/main/java/org/openedx/discovery/presentation/WebViewDiscoveryFragment.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.Column
1414
import androidx.compose.foundation.layout.fillMaxHeight
1515
import androidx.compose.foundation.layout.fillMaxSize
1616
import androidx.compose.foundation.layout.fillMaxWidth
17+
import androidx.compose.foundation.layout.navigationBarsPadding
1718
import androidx.compose.foundation.layout.padding
1819
import androidx.compose.foundation.layout.widthIn
1920
import androidx.compose.material.CircularProgressIndicator
@@ -197,6 +198,7 @@ private fun WebViewDiscoveryScreen(
197198
horizontal = 16.dp,
198199
vertical = 32.dp,
199200
)
201+
.navigationBarsPadding()
200202
) {
201203
AuthButtonsPanel(
202204
onRegisterClick = onRegisterClick,
@@ -220,7 +222,7 @@ private fun WebViewDiscoveryScreen(
220222
}
221223

222224
Column(
223-
modifier = modifierScreenWidth
225+
modifier = Modifier
224226
.fillMaxSize()
225227
.padding(it)
226228
.statusBarsInset()
@@ -235,8 +237,8 @@ private fun WebViewDiscoveryScreen(
235237

236238
Surface {
237239
Box(
238-
modifier = Modifier
239-
.fillMaxSize()
240+
modifier = modifierScreenWidth
241+
.fillMaxHeight()
240242
.background(Color.White),
241243
contentAlignment = Alignment.TopCenter
242244
) {

discovery/src/main/java/org/openedx/discovery/presentation/info/CourseInfoFragment.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.Column
1111
import androidx.compose.foundation.layout.fillMaxHeight
1212
import androidx.compose.foundation.layout.fillMaxSize
1313
import androidx.compose.foundation.layout.fillMaxWidth
14+
import androidx.compose.foundation.layout.navigationBarsPadding
1415
import androidx.compose.foundation.layout.padding
1516
import androidx.compose.foundation.layout.widthIn
1617
import androidx.compose.material.CircularProgressIndicator
@@ -269,7 +270,7 @@ private fun CourseInfoScreen(
269270
}
270271

271272
Column(
272-
modifier = modifierScreenWidth
273+
modifier = Modifier
273274
.fillMaxSize()
274275
.padding(it)
275276
.statusBarsInset()
@@ -284,9 +285,10 @@ private fun CourseInfoScreen(
284285

285286
Surface {
286287
Box(
287-
modifier = Modifier
288-
.fillMaxSize()
289-
.background(Color.White),
288+
modifier = modifierScreenWidth
289+
.fillMaxHeight()
290+
.background(Color.White)
291+
.navigationBarsPadding(),
290292
contentAlignment = Alignment.TopCenter
291293
) {
292294
if (hasInternetConnection) {

discovery/src/main/java/org/openedx/discovery/presentation/program/ProgramFragment.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ private fun ProgramInfoScreen(
258258
}
259259

260260
Column(
261-
modifier = modifierScreenWidth
261+
modifier = Modifier
262262
.fillMaxSize()
263263
.padding(it)
264264
.statusBarsInset()
@@ -273,8 +273,8 @@ private fun ProgramInfoScreen(
273273

274274
Surface {
275275
Box(
276-
modifier = Modifier
277-
.fillMaxSize()
276+
modifier = modifierScreenWidth
277+
.fillMaxHeight()
278278
.background(Color.White),
279279
contentAlignment = Alignment.TopCenter
280280
) {

0 commit comments

Comments
 (0)