Skip to content

[Jetcaster] Add ItemCount and Current Position Indicator to FollowedPodcasts #1338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@

package com.example.jetcaster.ui.home

import androidx.compose.animation.animateColorAsState
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand All @@ -33,6 +35,7 @@ import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.windowInsetsPadding
import androidx.compose.foundation.layout.windowInsetsTopHeight
import androidx.compose.foundation.lazy.LazyColumn
Expand Down Expand Up @@ -62,6 +65,8 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.geometry.CornerRadius
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
Expand Down Expand Up @@ -332,9 +337,9 @@ private fun FollowedPodcastItem(
onPodcastUnfollowed: (String) -> Unit,
modifier: Modifier = Modifier,
) {
Column(modifier = modifier) {
Spacer(Modifier.height(16.dp))

Column(
modifier = modifier.padding(vertical = 16.dp)
) {
FollowedPodcasts(
items = items,
pagerState = pagerState,
Expand All @@ -345,7 +350,7 @@ private fun FollowedPodcastItem(
.height(200.dp)
)

Spacer(Modifier.height(16.dp))
FollowedPodcastsIndicator(pagerState = pagerState)
}
}

Expand Down Expand Up @@ -424,6 +429,45 @@ fun FollowedPodcasts(
}
}

@OptIn(ExperimentalFoundationApi::class)
@Composable
fun FollowedPodcastsIndicator(
pagerState: PagerState,
modifier: Modifier = Modifier
) {
Row(
modifier = modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),
horizontalArrangement = Arrangement.Center
) {
val activeColor = MaterialTheme.colors.onSurface
val inactiveColor = MaterialTheme.colors.onSurface.copy(alpha = ContentAlpha.medium)

repeat(pagerState.pageCount) { index ->
val color by animateColorAsState(
targetValue = if (index == pagerState.currentPage) activeColor else inactiveColor,
label = "followedPodcastIndicatorColor",
)

Box(
Modifier
.size(8.dp)
.drawBehind {
drawRoundRect(
color = color,
cornerRadius = CornerRadius(8.dp.toPx())
)
}
)

if (index < pagerState.pageCount - 1) {
Spacer(modifier = Modifier.width(4.dp))
}
}
}
}

@Composable
private fun FollowedPodcastCarouselItem(
modifier: Modifier = Modifier,
Expand Down