Skip to content

Merge develop into master #106

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jul 3, 2020
Merged

Merge develop into master #106

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1accb58
Apdate to AGP 4.2c3.
nickbutcher Jul 2, 2020
3bfc4a7
Fix shadow and ripple on Popular cards.
nickbutcher Jul 2, 2020
bc46d19
Merge pull request #105 from android/nb/agp-4-2-c3
nickbutcher Jul 2, 2020
ee0c453
Merge branch 'master' into develop
nickbutcher Jul 3, 2020
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
Prev Previous commit
Next Next commit
Fix shadow and ripple on Popular cards. 
Change-Id: Id256da2041e7132b80f6f5b7501fcf569127adb6
  • Loading branch information
@nickbutcher
nickbutcher committed Jul 2, 2020
commit 3bfc4a701b209ccd12e7a69bcf0fe369bf48a658
4 changes: 2 additions & 2 deletions JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,9 @@ private fun HomeScreenPopularSection(
style = MaterialTheme.typography.subtitle1
)
}
HorizontalScroller(modifier = Modifier.padding(end = 16.dp, bottom = 16.dp)) {
HorizontalScroller(modifier = Modifier.padding(end = 16.dp)) {
posts.forEach { post ->
PostCardPopular(post, navigateTo, Modifier.padding(start = 16.dp))
PostCardPopular(post, navigateTo, Modifier.padding(start = 16.dp, bottom = 16.dp))
}
}
HomeScreenDivider()
Expand Down
3 changes: 1 addition & 2 deletions JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCardYourNetwork.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,8 @@ fun PostCardPopular(
Card(
shape = MaterialTheme.shapes.medium,
modifier = modifier.preferredSize(280.dp, 240.dp)
.clickable(onClick = { navigateTo(Screen.Article(post.id)) })
) {
Column {
Column(modifier = Modifier.clickable(onClick = { navigateTo(Screen.Article(post.id)) })) {
val image = post.image ?: imageResource(R.drawable.placeholder_4_3)
Image(
asset = image,
Expand Down