Skip to content

Commit 55b58a4

Browse files
committed
Proper content padding for VideoPage
1 parent 4ad913c commit 55b58a4

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

app/src/main/java/com/javernaut/whatthecodec/presentation/root/ui/MainScreen.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.javernaut.whatthecodec.presentation.root.ui
22

33
import androidx.compose.foundation.ExperimentalFoundationApi
4+
import androidx.compose.foundation.layout.PaddingValues
45
import androidx.compose.foundation.layout.fillMaxSize
56
import androidx.compose.foundation.layout.height
6-
import androidx.compose.foundation.layout.padding
77
import androidx.compose.foundation.pager.HorizontalPager
88
import androidx.compose.foundation.pager.PagerState
99
import androidx.compose.foundation.pager.rememberPagerState
@@ -62,7 +62,7 @@ fun MainScreen(
6262
)
6363
}
6464
) {
65-
MainScreenContent(Modifier.padding(it), tabsToShow, screenState, pagerState)
65+
MainScreenContent(tabsToShow, screenState, pagerState, it, Modifier.fillMaxSize())
6666
}
6767
}
6868

@@ -137,15 +137,16 @@ private val AvailableTab.title: Int
137137
@Composable
138138
@ExperimentalFoundationApi
139139
private fun MainScreenContent(
140-
modifier: Modifier = Modifier,
141140
tabsToShow: List<AvailableTab>,
142141
screenState: ScreenState,
143142
pagerState: PagerState,
143+
contentPadding: PaddingValues,
144+
modifier: Modifier = Modifier,
144145
) {
145146
HorizontalPager(pagerState, modifier) { page ->
146147
val pageModifier = Modifier.fillMaxSize()
147148
when (tabsToShow[page]) {
148-
AvailableTab.VIDEO -> VideoPage(screenState.videoPage!!, pageModifier)
149+
AvailableTab.VIDEO -> VideoPage(screenState.videoPage!!, contentPadding, pageModifier)
149150
AvailableTab.AUDIO -> AudioPage(screenState.audioPage!!, pageModifier)
150151
AvailableTab.SUBTITLES -> SubtitlePage(screenState.subtitlesPage!!, pageModifier)
151152
}

app/src/main/java/com/javernaut/whatthecodec/presentation/video/VideoPage.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.javernaut.whatthecodec.presentation.video
22

33
import android.content.res.Resources
44
import androidx.annotation.StringRes
5+
import androidx.compose.foundation.layout.PaddingValues
56
import androidx.compose.foundation.layout.Row
67
import androidx.compose.foundation.layout.fillMaxWidth
78
import androidx.compose.foundation.layout.padding
@@ -27,13 +28,17 @@ import io.github.javernaut.mediafile.displayable.toDisplayable
2728
@Composable
2829
fun VideoPage(
2930
videoInfo: BasicVideoInfo,
31+
contentPadding: PaddingValues,
3032
modifier: Modifier = Modifier
3133
) {
32-
LazyColumn(modifier) {
34+
LazyColumn(
35+
modifier = modifier,
36+
contentPadding = contentPadding
37+
) {
3338
item {
3439
FramesHeader(videoInfo.preview, Modifier.fillMaxWidth())
3540
}
36-
val commonModifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 16.dp)
41+
val commonModifier = Modifier.padding(horizontal = 16.dp)
3742
item {
3843
Container(
3944
basicVideoInfo = videoInfo,
@@ -44,7 +49,7 @@ fun VideoPage(
4449
item {
4550
VideoStream(
4651
videoStream = videoInfo.videoStream,
47-
modifier = commonModifier
52+
modifier = commonModifier.padding(vertical = 16.dp)
4853
)
4954
}
5055
}

0 commit comments

Comments
 (0)