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 5 commits
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
5 changes: 5 additions & 0 deletions JetNews/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ android {
kotlinCompilerVersion kotlin_version
kotlinCompilerExtensionVersion compose_version
}

packagingOptions {
excludes += "/META-INF/AL2.0"
excludes += "/META-INF/LGPL2.1"
}
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions JetNews/app/src/androidTest/java/com/example/jetnews/HomeScreenSnackbarTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import androidx.compose.material.SnackbarHostState
import androidx.compose.material.rememberScaffoldState
import androidx.compose.runtime.ExperimentalComposeApi
import androidx.compose.runtime.snapshots.snapshotFlow
import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.onNodeWithText
import androidx.test.platform.app.InstrumentationRegistry
import androidx.ui.test.assertIsDisplayed
import androidx.ui.test.createComposeRule
import androidx.ui.test.onNodeWithText
import com.example.jetnews.ui.home.HomeScreen
import com.example.jetnews.ui.state.UiState
import kotlinx.coroutines.flow.filterNotNull
Expand Down
8 changes: 4 additions & 4 deletions JetNews/app/src/androidTest/java/com/example/jetnews/JetnewsUiTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

package com.example.jetnews

import androidx.compose.ui.test.assertIsDisplayed
import androidx.compose.ui.test.hasSubstring
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
import androidx.test.filters.MediumTest
import androidx.test.platform.app.InstrumentationRegistry
import androidx.ui.test.assertIsDisplayed
import androidx.ui.test.createComposeRule
import androidx.ui.test.hasSubstring
import androidx.ui.test.onNodeWithText
import androidx.ui.test.performClick
import org.junit.Before
import org.junit.Ignore
import org.junit.Rule
Expand Down
4 changes: 2 additions & 2 deletions JetNews/app/src/androidTest/java/com/example/jetnews/TestHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ package com.example.jetnews

import android.content.Context
import androidx.compose.runtime.remember
import androidx.compose.ui.test.junit4.ComposeTestRule
import androidx.lifecycle.SavedStateHandle
import androidx.ui.test.ComposeTestRuleJUnit
import com.example.jetnews.ui.JetnewsApp
import com.example.jetnews.ui.NavigationViewModel

/**
* Launches the app from a test context
*/
fun ComposeTestRuleJUnit.launchJetNewsApp(context: Context) {
fun ComposeTestRule.launchJetNewsApp(context: Context) {
setContent {
JetnewsApp(
TestAppContainer(context),
Expand Down
2 changes: 1 addition & 1 deletion JetNews/app/src/main/java/com/example/jetnews/ui/JetnewsApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package com.example.jetnews.ui

import androidx.compose.animation.Crossfade
import androidx.compose.foundation.Image
import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand All @@ -31,6 +30,7 @@ import androidx.compose.foundation.layout.preferredWidth
import androidx.compose.material.Divider
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.material.TextButton
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Home
Expand Down
4 changes: 2 additions & 2 deletions JetNews/app/src/main/java/com/example/jetnews/ui/article/ArticleScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ package com.example.jetnews.ui.article

import android.content.Context
import android.content.Intent
import androidx.compose.foundation.AmbientContentColor
import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.material.AlertDialog
import androidx.compose.material.AmbientContentColor
import androidx.compose.material.Icon
import androidx.compose.material.IconButton
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Scaffold
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.material.TextButton
import androidx.compose.material.TopAppBar
import androidx.compose.material.icons.Icons
Expand Down
17 changes: 9 additions & 8 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 @@ -16,10 +16,8 @@

package com.example.jetnews.ui.article

import androidx.compose.foundation.AmbientContentColor
import androidx.compose.foundation.Image
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.Text
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
Expand All @@ -32,21 +30,24 @@ import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.foundation.layout.preferredWidth
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.text.FirstBaseline
import androidx.compose.material.AmbientEmphasisLevels
import androidx.compose.material.AmbientContentAlpha
import androidx.compose.material.AmbientContentColor
import androidx.compose.material.Colors
import androidx.compose.material.ContentAlpha
import androidx.compose.material.MaterialTheme
import androidx.compose.material.ProvideEmphasis
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.material.Typography
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.AccountCircle
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Providers
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.ColorFilter
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.layout.FirstBaseline
import androidx.compose.ui.platform.DensityAmbient
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.ParagraphStyle
Expand Down Expand Up @@ -82,7 +83,7 @@ fun PostContent(post: Post, modifier: Modifier = Modifier) {
Text(text = post.title, style = MaterialTheme.typography.h4)
Spacer(Modifier.preferredHeight(8.dp))
post.subtitle?.let { subtitle ->
ProvideEmphasis(AmbientEmphasisLevels.current.medium) {
Providers(AmbientContentAlpha provides ContentAlpha.medium) {
Text(
text = subtitle,
style = MaterialTheme.typography.body2,
Expand Down Expand Up @@ -122,14 +123,14 @@ private fun PostMetadata(metadata: Metadata) {
)
Spacer(Modifier.preferredWidth(8.dp))
Column {
ProvideEmphasis(AmbientEmphasisLevels.current.high) {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
text = metadata.author.name,
style = typography.caption,
modifier = Modifier.padding(top = 4.dp)
)
}
ProvideEmphasis(AmbientEmphasisLevels.current.medium) {
Providers(AmbientContentAlpha provides ContentAlpha.medium) {
Text(
text = "${metadata.date} • ${metadata.readTimeMinutes} min read",
style = typography.caption
Expand Down
15 changes: 8 additions & 7 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 @@ -18,7 +18,6 @@ package com.example.jetnews.ui.home

import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.ScrollableRow
import androidx.compose.foundation.Text
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
Expand All @@ -27,25 +26,27 @@ 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.AmbientEmphasisLevels
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
import androidx.compose.material.Icon
import androidx.compose.material.IconButton
import androidx.compose.material.MaterialTheme
import androidx.compose.material.ProvideEmphasis
import androidx.compose.material.Scaffold
import androidx.compose.material.ScaffoldState
import androidx.compose.material.SnackbarResult
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.material.TextButton
import androidx.compose.material.TopAppBar
import androidx.compose.material.rememberDrawerState
import androidx.compose.material.rememberScaffoldState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedTask
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 @@ -139,7 +140,7 @@ fun HomeScreen(
// Show snackbar using a coroutine, when the coroutine is cancelled the snackbar will
// automatically dismiss. This coroutine will cancel whenever posts.hasError changes, and
// only start when posts.hasError is true (due to the above if-check).
LaunchedTask(posts.hasError) {
LaunchedEffect(posts.hasError) {
val snackbarResult = scaffoldState.snackbarHostState.showSnackbar(
message = errorMessage,
actionLabel = retryMessage
Expand Down Expand Up @@ -313,7 +314,7 @@ private fun FullScreenLoading() {
*/
@Composable
private fun PostListTopSection(post: Post, navigateTo: (Screen) -> Unit) {
ProvideEmphasis(AmbientEmphasisLevels.current.high) {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
modifier = Modifier.padding(start = 16.dp, top = 16.dp, end = 16.dp),
text = "Top stories for you",
Expand Down Expand Up @@ -365,7 +366,7 @@ private fun PostListPopularSection(
navigateTo: (Screen) -> Unit
) {
Column {
ProvideEmphasis(AmbientEmphasisLevels.current.high) {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
modifier = Modifier.padding(16.dp),
text = "Popular on Jetnews",
Expand Down
12 changes: 6 additions & 6 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 @@ -17,17 +17,18 @@
package com.example.jetnews.ui.home

import androidx.compose.foundation.Image
import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.material.AmbientEmphasisLevels
import androidx.compose.material.AmbientContentAlpha
import androidx.compose.material.ContentAlpha
import androidx.compose.material.MaterialTheme
import androidx.compose.material.ProvideEmphasis
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Providers
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.layout.ContentScale
Expand All @@ -54,8 +55,7 @@ fun PostCardTop(post: Post, modifier: Modifier = Modifier) {
}
Spacer(Modifier.preferredHeight(16.dp))

val emphasisLevels = AmbientEmphasisLevels.current
ProvideEmphasis(emphasisLevels.high) {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
text = post.title,
style = typography.h6
Expand All @@ -65,7 +65,7 @@ fun PostCardTop(post: Post, modifier: Modifier = Modifier) {
style = typography.body2
)
}
ProvideEmphasis(emphasisLevels.medium) {
Providers(AmbientContentAlpha provides ContentAlpha.medium) {
Text(
text = "${post.metadata.date} - ${post.metadata.readTimeMinutes} min read",
style = typography.body2
Expand Down
12 changes: 6 additions & 6 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 @@ -17,18 +17,19 @@
package com.example.jetnews.ui.home

import androidx.compose.foundation.Image
import androidx.compose.foundation.Text
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
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.AmbientEmphasisLevels
import androidx.compose.material.AmbientContentAlpha
import androidx.compose.material.Card
import androidx.compose.material.ContentAlpha
import androidx.compose.material.MaterialTheme
import androidx.compose.material.ProvideEmphasis
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 @@ -62,8 +63,7 @@ fun PostCardPopular(
.fillMaxWidth()
)
Column(modifier = Modifier.padding(16.dp)) {
val emphasisLevels = AmbientEmphasisLevels.current
ProvideEmphasis(emphasisLevels.high) {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
text = post.title,
style = MaterialTheme.typography.h6,
Expand All @@ -77,7 +77,7 @@ fun PostCardPopular(
style = MaterialTheme.typography.body2
)
}
ProvideEmphasis(emphasisLevels.high) {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
text = "${post.metadata.date} - " +
"${post.metadata.readTimeMinutes} min read",
Expand Down
15 changes: 8 additions & 7 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 @@ -17,23 +17,24 @@
package com.example.jetnews.ui.home

import androidx.compose.foundation.Image
import androidx.compose.foundation.Text
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.material.AmbientEmphasisLevels
import androidx.compose.material.AmbientContentAlpha
import androidx.compose.material.ContentAlpha
import androidx.compose.material.Icon
import androidx.compose.material.IconToggleButton
import androidx.compose.material.MaterialTheme
import androidx.compose.material.ProvideEmphasis
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Bookmark
import androidx.compose.material.icons.filled.BookmarkBorder
import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Providers
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.imageResource
Expand All @@ -51,7 +52,7 @@ fun AuthorAndReadTime(
modifier: Modifier = Modifier
) {
Row(modifier) {
ProvideEmphasis(AmbientEmphasisLevels.current.medium) {
Providers(AmbientContentAlpha provides ContentAlpha.medium) {
val textStyle = MaterialTheme.typography.body2
Text(
text = post.metadata.author.name,
Expand All @@ -78,7 +79,7 @@ fun PostImage(post: Post, modifier: Modifier = Modifier) {

@Composable
fun PostTitle(post: Post) {
ProvideEmphasis(AmbientEmphasisLevels.current.high) {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(post.title, style = MaterialTheme.typography.subtitle1)
}
}
Expand Down Expand Up @@ -117,7 +118,7 @@ fun PostCardHistory(post: Post, navigateTo: (Screen) -> Unit) {
modifier = Modifier.padding(end = 16.dp)
)
Column(Modifier.weight(1f)) {
ProvideEmphasis(AmbientEmphasisLevels.current.medium) {
Providers(AmbientContentAlpha provides ContentAlpha.high) {
Text(
text = "BASED ON YOUR HISTORY",
style = MaterialTheme.typography.overline
Expand All @@ -129,7 +130,7 @@ fun PostCardHistory(post: Post, navigateTo: (Screen) -> Unit) {
modifier = Modifier.padding(top = 4.dp)
)
}
ProvideEmphasis(AmbientEmphasisLevels.current.medium) {
Providers(AmbientContentAlpha provides ContentAlpha.medium) {
Icon(Icons.Filled.MoreVert)
}
}
Expand Down
2 changes: 1 addition & 1 deletion JetNews/app/src/main/java/com/example/jetnews/ui/interests/InterestsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package com.example.jetnews.ui.interests

import androidx.compose.foundation.Image
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
Expand All @@ -36,6 +35,7 @@ import androidx.compose.material.Scaffold
import androidx.compose.material.ScaffoldState
import androidx.compose.material.Tab
import androidx.compose.material.TabRow
import androidx.compose.material.Text
import androidx.compose.material.TopAppBar
import androidx.compose.material.rememberDrawerState
import androidx.compose.material.rememberScaffoldState
Expand Down
Loading