Skip to content

Commit

Permalink
fix: welcome screen large screen [WPB-6427] (#2690)
Browse files Browse the repository at this point in the history
  • Loading branch information
Garzas committed Feb 13, 2024
1 parent ceb0052 commit 6f7e5ca
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
Expand Up @@ -165,13 +165,7 @@ private fun WelcomeContent(
ServerTitle(serverLinks = state, modifier = Modifier.padding(top = dimensions().spacing16x))
}

Column(
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center,
modifier = Modifier.weight(1f, true)
) {
WelcomeCarousel()
}
WelcomeCarousel(modifier = Modifier.weight(1f, true))

Column(
modifier = Modifier
Expand Down Expand Up @@ -230,7 +224,7 @@ private fun WelcomeContent(

@OptIn(ExperimentalFoundationApi::class)
@Composable
private fun WelcomeCarousel() {
private fun WelcomeCarousel(modifier: Modifier = Modifier) {
val delay = integerResource(id = R.integer.welcome_carousel_item_time_ms)
val icons: List<Int> = typedArrayResource(id = R.array.welcome_carousel_icons).drawableResIdList()
val texts: List<String> = stringArrayResource(id = R.array.welcome_carousel_texts).toList()
Expand All @@ -249,7 +243,7 @@ private fun WelcomeCarousel() {
CompositionLocalProvider(LocalOverscrollConfiguration provides null) {
HorizontalPager(
state = pagerState,
modifier = Modifier.fillMaxWidth()
modifier = modifier.fillMaxWidth()
) { page ->
val (pageIconResId, pageText) = circularItemsList[page]
WelcomeCarouselItem(pageIconResId = pageIconResId, pageText = pageText)
Expand Down Expand Up @@ -300,6 +294,7 @@ private fun WelcomeCarouselItem(pageIconResId: Int, pageText: String) {
Column(
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center,
modifier = Modifier.fillMaxWidth()
) {
Image(
painter = painterResource(id = pageIconResId),
Expand Down

0 comments on commit 6f7e5ca

Please sign in to comment.