Skip to content

Commit

Permalink
Merge pull request DroidKaigi#313 from hiesiea/feature/fix_issue_37
Browse files Browse the repository at this point in the history
Increase the size of the first item on the Home tab.
  • Loading branch information
takahirom authored Mar 9, 2021
2 parents bcb27c8 + 29db946 commit fea0fe3
Show file tree
Hide file tree
Showing 2 changed files with 196 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -244,14 +244,24 @@ private fun FeedList(
state = listState
) {
itemsIndexed(feedContents.contents) { index, content ->
FeedItemRow(
content.first,
content.second,
onClickFeed,
isHome,
onFavoriteChange,
index != 0
)
if (isHome && index == 0) {
FirstFeedItem(
feedItem = content.first,
favorited = content.second,
onClick = onClickFeed,
showMediaLabel = isHome,
onFavoriteChange = onFavoriteChange
)
} else {
FeedItemRow(
content.first,
content.second,
onClickFeed,
isHome,
onFavoriteChange,
index != 0
)
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
package io.github.droidkaigi.feeder.feed

import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.material.Icon
import androidx.compose.material.IconToggleButton
import androidx.compose.material.LocalContentAlpha
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.constraintlayout.compose.ConstraintLayout
import androidx.constraintlayout.compose.Dimension
import io.github.droidkaigi.feeder.FeedItem
import io.github.droidkaigi.feeder.Media
import io.github.droidkaigi.feeder.core.NetworkImage
import io.github.droidkaigi.feeder.core.theme.ConferenceAppFeederTheme
import io.github.droidkaigi.feeder.core.theme.typography
import io.github.droidkaigi.feeder.fakeFeedContents

@Composable
fun FirstFeedItem(
feedItem: FeedItem,
favorited: Boolean,
showMediaLabel: Boolean = false,
onClick: (FeedItem) -> Unit,
onFavoriteChange: (FeedItem) -> Unit,
) {
ConstraintLayout(
modifier = Modifier
.clickable(
onClick = { onClick(feedItem) }
)
.fillMaxWidth()
.semantics(mergeDescendants = true) { }
) {
val (image, title, media, date, favorite) = createRefs()
NetworkImage(
url = feedItem.image.standardUrl,
modifier = Modifier
.constrainAs(image) {
top.linkTo(parent.top)
start.linkTo(parent.start)
end.linkTo(parent.end)
}
.wrapContentWidth()
.aspectRatio(16F / 9F),
contentScale = ContentScale.Crop,
contentDescription = null
)
Text(
modifier = Modifier.constrainAs(title) {
start.linkTo(parent.start, 20.dp)
top.linkTo(image.bottom, 20.dp)
end.linkTo(favorite.start, 20.dp)
width = Dimension.fillToConstraints
},
text = feedItem.title.jaTitle,
style = typography.h5,
maxLines = 2,
overflow = TextOverflow.Ellipsis
)
if (showMediaLabel) {
Text(
modifier = Modifier
.constrainAs(media) {
top.linkTo(title.bottom, 8.dp)
start.linkTo(parent.start, 20.dp)
bottom.linkTo(parent.bottom, 12.dp)
}
.background(
color = feedItem.media.color(),
shape = MaterialTheme.shapes.small
)
.padding(vertical = 4.dp, horizontal = 8.dp),
text = feedItem.media.text,
color = Color.White
)
}
CompositionLocalProvider(LocalContentAlpha provides 0.54f) {
Text(
modifier = Modifier.constrainAs(date) {
top.linkTo(title.bottom, 8.dp)
bottom.linkTo(parent.bottom, 12.dp)
if (showMediaLabel) {
start.linkTo(media.end, 12.dp)
} else {
start.linkTo(parent.start, 20.dp)
}
},
text = feedItem.publishedDateString(),
style = typography.caption
)
}
IconToggleButton(
checked = false,
modifier = Modifier.constrainAs(favorite) {
top.linkTo(image.bottom, 36.dp)
end.linkTo(parent.end, 20.dp)
},
content = {
Icon(
painterResource(
if (favorited) {
R.drawable
.ic_baseline_favorite_24
} else {
R.drawable
.ic_baseline_favorite_border_24
}
),
"favorite"
)
},
onCheckedChange = {
onFavoriteChange(feedItem)
}
)
}
}

@Composable
private fun Media.color() = when (this) {
Media.YouTube -> {
Color.Red
}
Media.Medium -> {
Color.DarkGray
}
Media.DroidKaigiFM -> {
MaterialTheme.colors.secondary
}
else -> {
Color.Gray
}
}

@Preview(showBackground = true)
@Composable
fun PreviewFirstFeedItem() {
ConferenceAppFeederTheme {
val feedItem = fakeFeedContents().feedItemContents[0]
FirstFeedItem(
feedItem = feedItem,
favorited = false,
showMediaLabel = false,
onClick = { },
onFavoriteChange = { }
)
}
}

@Preview(showBackground = true)
@Composable
fun PreviewFirstFeedItemWithMedia() {
ConferenceAppFeederTheme {
val feedItem = fakeFeedContents().feedItemContents[0]
FirstFeedItem(
feedItem = feedItem,
favorited = false,
showMediaLabel = true,
onClick = { },
onFavoriteChange = { }
)
}
}

0 comments on commit fea0fe3

Please sign in to comment.