Skip to content

[JetNews] Bump to alpha07 #280

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
yrezgui merged 10 commits into from
Nov 11, 2020
Merged

[JetNews] Bump to alpha07 #280

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4dcdb9b
[JetNews] bump to alpha07
yrezgui Nov 9, 2020
193caa8
[JetNews] Update imports (alpha07)
yrezgui Nov 9, 2020
b0e28ed
[JetNews] Rearrange imports (alpha07)
yrezgui Nov 9, 2020
24e7bf6
[JetNews] Update test imports (alpha07)
yrezgui Nov 9, 2020
b6ed842
[JetNews] Update spanshot to 6953474 (alpha07)
yrezgui Nov 10, 2020
d0ab6f3
[JetNews] Remove ContentAlpha.high
yrezgui Nov 10, 2020
01c0804
Merge branch 'dev_alpha07' into dev_alpha07
yrezgui Nov 11, 2020
95c442a
[Jetnews] Bring back a forgotten ContentAlpha.medium
yrezgui Nov 11, 2020
0295dce
Merge branch 'dev_alpha07' into dev_alpha07
yrezgui Nov 11, 2020
00a472b
Merge branch 'dev_alpha07' into dev_alpha07
yrezgui Nov 11, 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
[JetNews] Remove ContentAlpha.high
  • Loading branch information
@yrezgui
yrezgui committed Nov 10, 2020
commit d0ab6f3bcb67d70c38902eaa4b7fc7d1c3bc7c72
13 changes: 6 additions & 7 deletions JetNews/app/src/main/java/com/example/jetnews/ui/article/PostContent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,12 @@ private fun PostMetadata(metadata: Metadata) {
)
Spacer(Modifier.preferredWidth(8.dp))
Column {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
text = metadata.author.name,
style = typography.caption,
modifier = Modifier.padding(top = 4.dp)
)
}
Text(
text = metadata.author.name,
style = typography.caption,
modifier = Modifier.padding(top = 4.dp)
)

Providers(AmbientContentAlpha provides ContentAlpha.medium) {
Text(
text = "${metadata.date} • ${metadata.readTimeMinutes} min read",
Expand Down
28 changes: 11 additions & 17 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 @@ -26,9 +26,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.AmbientContentAlpha
import androidx.compose.material.CircularProgressIndicator
import androidx.compose.material.ContentAlpha
import androidx.compose.material.Divider
import androidx.compose.material.DrawerValue
import androidx.compose.material.ExperimentalMaterialApi
Expand All @@ -46,7 +44,6 @@ import androidx.compose.material.rememberDrawerState
import androidx.compose.material.rememberScaffoldState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.Providers
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.rememberCoroutineScope
Expand Down Expand Up @@ -314,13 +311,11 @@ private fun FullScreenLoading() {
*/
@Composable
private fun PostListTopSection(post: Post, navigateTo: (Screen) -> Unit) {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
modifier = Modifier.padding(start = 16.dp, top = 16.dp, end = 16.dp),
text = "Top stories for you",
style = MaterialTheme.typography.subtitle1
)
}
Text(
modifier = Modifier.padding(start = 16.dp, top = 16.dp, end = 16.dp),
text = "Top stories for you",
style = MaterialTheme.typography.subtitle1
)
PostCardTop(
post = post,
modifier = Modifier.clickable(onClick = { navigateTo(Screen.Article(post.id)) })
Expand Down Expand Up @@ -366,13 +361,12 @@ private fun PostListPopularSection(
navigateTo: (Screen) -> Unit
) {
Column {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
modifier = Modifier.padding(16.dp),
text = "Popular on Jetnews",
style = MaterialTheme.typography.subtitle1
)
}
Text(
modifier = Modifier.padding(16.dp),
text = "Popular on Jetnews",
style = MaterialTheme.typography.subtitle1
)

ScrollableRow(modifier = Modifier.padding(end = 16.dp)) {
posts.forEach { post ->
PostCardPopular(post, navigateTo, Modifier.padding(start = 16.dp, bottom = 16.dp))
Expand Down
19 changes: 9 additions & 10 deletions JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCardTop.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,15 @@ fun PostCardTop(post: Post, modifier: Modifier = Modifier) {
}
Spacer(Modifier.preferredHeight(16.dp))

Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
text = post.title,
style = typography.h6
)
Text(
text = post.metadata.author.name,
style = typography.body2
)
}
Text(
text = post.title,
style = typography.h6
)
Text(
text = post.metadata.author.name,
style = typography.body2
)

Providers(AmbientContentAlpha provides ContentAlpha.medium) {
Text(
text = "${post.metadata.date} - ${post.metadata.readTimeMinutes} min read",
Expand Down
42 changes: 18 additions & 24 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 @@ -23,13 +23,10 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.material.AmbientContentAlpha
import androidx.compose.material.Card
import androidx.compose.material.ContentAlpha
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Providers
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.imageResource
Expand Down Expand Up @@ -63,27 +60,24 @@ fun PostCardPopular(
.fillMaxWidth()
)
Column(modifier = Modifier.padding(16.dp)) {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
text = post.title,
style = MaterialTheme.typography.h6,
maxLines = 2,
overflow = TextOverflow.Ellipsis
)
Text(
text = post.metadata.author.name,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.body2
)
}
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
text = "${post.metadata.date} - " +
"${post.metadata.readTimeMinutes} min read",
style = MaterialTheme.typography.body2
)
}
Text(
text = post.title,
style = MaterialTheme.typography.h6,
maxLines = 2,
overflow = TextOverflow.Ellipsis
)
Text(
text = post.metadata.author.name,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
style = MaterialTheme.typography.body2
)

Text(
text = "${post.metadata.date} - " +
"${post.metadata.readTimeMinutes} min read",
style = MaterialTheme.typography.body2
)
}
}
}
Expand Down
14 changes: 5 additions & 9 deletions JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCards.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@ fun PostImage(post: Post, modifier: Modifier = Modifier) {

@Composable
fun PostTitle(post: Post) {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(post.title, style = MaterialTheme.typography.subtitle1)
}
Text(post.title, style = MaterialTheme.typography.subtitle1)
}

@Composable
Expand Down Expand Up @@ -118,12 +116,10 @@ fun PostCardHistory(post: Post, navigateTo: (Screen) -> Unit) {
modifier = Modifier.padding(end = 16.dp)
)
Column(Modifier.weight(1f)) {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
text = "BASED ON YOUR HISTORY",
style = MaterialTheme.typography.overline
)
}
Text(
text = "BASED ON YOUR HISTORY",
style = MaterialTheme.typography.overline
)
PostTitle(post = post)
AuthorAndReadTime(
post = post,
Expand Down
7 changes: 1 addition & 6 deletions JetNews/app/src/main/java/com/example/jetnews/ui/interests/SelectTopicButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,13 @@ package com.example.jetnews.ui.interests
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.AmbientContentAlpha
import androidx.compose.material.ContentAlpha
import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Done
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Providers
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.ui.tooling.preview.Preview
Expand All @@ -50,9 +47,7 @@ fun SelectTopicButton(
shape = CircleShape,
modifier = modifier.preferredSize(36.dp, 36.dp)
) {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Icon(icon)
}
Icon(icon)
}
}

Expand Down