diff --git a/JetNews/app/build.gradle b/JetNews/app/build.gradle index f5cbb880de..ae89f0abcd 100644 --- a/JetNews/app/build.gradle +++ b/JetNews/app/build.gradle @@ -90,7 +90,7 @@ dependencies { implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0-beta01" implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-beta01" - androidTestImplementation 'junit:junit:4.13' + androidTestImplementation 'junit:junit:4.13.1' androidTestImplementation 'androidx.test:rules:1.3.0' androidTestImplementation 'androidx.test:runner:1.3.0' androidTestImplementation "androidx.ui:ui-test:$compose_version" diff --git a/JetNews/app/src/androidTest/java/com/example/jetnews/HomeScreenSnackbarTest.kt b/JetNews/app/src/androidTest/java/com/example/jetnews/HomeScreenSnackbarTest.kt index 3d7f493fef..1cbeecc096 100644 --- a/JetNews/app/src/androidTest/java/com/example/jetnews/HomeScreenSnackbarTest.kt +++ b/JetNews/app/src/androidTest/java/com/example/jetnews/HomeScreenSnackbarTest.kt @@ -39,7 +39,7 @@ import org.junit.Test class HomeScreenSnackbarTest { @get:Rule - val composeTestRule = createComposeRule(disableTransitions = true) + val composeTestRule = createComposeRule() @OptIn( ExperimentalMaterialApi::class, diff --git a/JetNews/app/src/androidTest/java/com/example/jetnews/JetnewsUiTest.kt b/JetNews/app/src/androidTest/java/com/example/jetnews/JetnewsUiTest.kt index 9340f9dc5b..5aceada18f 100644 --- a/JetNews/app/src/androidTest/java/com/example/jetnews/JetnewsUiTest.kt +++ b/JetNews/app/src/androidTest/java/com/example/jetnews/JetnewsUiTest.kt @@ -32,7 +32,7 @@ import org.junit.Test class JetnewsUiTest { @get:Rule - val composeTestRule = createComposeRule(disableTransitions = true) + val composeTestRule = createComposeRule() @Before fun setUp() { diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/article/ArticleScreen.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/article/ArticleScreen.kt index f04bdf49c2..110ae4cac7 100644 --- a/JetNews/app/src/main/java/com/example/jetnews/ui/article/ArticleScreen.kt +++ b/JetNews/app/src/main/java/com/example/jetnews/ui/article/ArticleScreen.kt @@ -19,7 +19,6 @@ package com.example.jetnews.ui.article import android.content.Context import android.content.Intent import androidx.compose.foundation.AmbientContentColor -import androidx.compose.foundation.Icon import androidx.compose.foundation.Text import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -27,6 +26,7 @@ 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.Icon import androidx.compose.material.IconButton import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/article/PostContent.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/article/PostContent.kt index 102839619f..605d8fc958 100644 --- a/JetNews/app/src/main/java/com/example/jetnews/ui/article/PostContent.kt +++ b/JetNews/app/src/main/java/com/example/jetnews/ui/article/PostContent.kt @@ -214,7 +214,7 @@ private fun BulletParagraph( Box( modifier = Modifier .preferredSize(8.sp.toDp(), 8.sp.toDp()) - .alignWithSiblings { + .alignBy { // Add an alignment "baseline" 1sp below the bottom of the circle 9.sp.toIntPx() } @@ -224,7 +224,7 @@ private fun BulletParagraph( Text( modifier = Modifier .weight(1f) - .alignWithSiblings(FirstBaseline), + .alignBy(FirstBaseline), text = text, style = textStyle.merge(paragraphStyle) ) diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreen.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreen.kt index 445a4d02a9..2b63d478f8 100644 --- a/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreen.kt +++ b/JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreen.kt @@ -16,7 +16,6 @@ package com.example.jetnews.ui.home -import androidx.compose.foundation.Icon import androidx.compose.foundation.ScrollableColumn import androidx.compose.foundation.ScrollableRow import androidx.compose.foundation.Text @@ -33,6 +32,7 @@ import androidx.compose.material.CircularProgressIndicator 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 diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCards.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCards.kt index c161c9fb43..f33c643d44 100644 --- a/JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCards.kt +++ b/JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCards.kt @@ -16,16 +16,15 @@ package com.example.jetnews.ui.home -import androidx.compose.foundation.Icon 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.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.preferredSize import androidx.compose.material.AmbientEmphasisLevels +import androidx.compose.material.Icon import androidx.compose.material.IconToggleButton import androidx.compose.material.MaterialTheme import androidx.compose.material.ProvideEmphasis @@ -131,7 +130,7 @@ fun PostCardHistory(post: Post, navigateTo: (Screen) -> Unit) { ) } ProvideEmphasis(AmbientEmphasisLevels.current.medium) { - Icon(asset = Icons.Filled.MoreVert) + Icon(Icons.Filled.MoreVert) } } } @@ -144,19 +143,13 @@ fun BookmarkButton( ) { IconToggleButton( checked = isBookmarked, - onCheckedChange = { onClick() } + onCheckedChange = { onClick() }, + modifier = modifier ) { - modifier.fillMaxSize() if (isBookmarked) { - Icon( - asset = Icons.Filled.Bookmark, - modifier = modifier - ) + Icon(asset = Icons.Filled.Bookmark) } else { - Icon( - asset = Icons.Filled.BookmarkBorder, - modifier = modifier - ) + Icon(asset = Icons.Filled.BookmarkBorder) } } } diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/interests/InterestsScreen.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/interests/InterestsScreen.kt index 42f321532c..313c6c59be 100644 --- a/JetNews/app/src/main/java/com/example/jetnews/ui/interests/InterestsScreen.kt +++ b/JetNews/app/src/main/java/com/example/jetnews/ui/interests/InterestsScreen.kt @@ -16,7 +16,6 @@ package com.example.jetnews.ui.interests -import androidx.compose.foundation.Icon import androidx.compose.foundation.Image import androidx.compose.foundation.ScrollableColumn import androidx.compose.foundation.Text @@ -30,6 +29,7 @@ import androidx.compose.foundation.selection.toggleable import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Divider import androidx.compose.material.DrawerValue +import androidx.compose.material.Icon import androidx.compose.material.IconButton import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/interests/SelectTopicButton.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/interests/SelectTopicButton.kt index fcad3396fe..9916dd5f30 100644 --- a/JetNews/app/src/main/java/com/example/jetnews/ui/interests/SelectTopicButton.kt +++ b/JetNews/app/src/main/java/com/example/jetnews/ui/interests/SelectTopicButton.kt @@ -16,11 +16,11 @@ package com.example.jetnews.ui.interests -import androidx.compose.foundation.Icon import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.preferredSize import androidx.compose.foundation.shape.CircleShape import androidx.compose.material.AmbientEmphasisLevels +import androidx.compose.material.Icon import androidx.compose.material.MaterialTheme import androidx.compose.material.ProvideEmphasis import androidx.compose.material.Surface diff --git a/JetNews/build.gradle b/JetNews/build.gradle index acfb92e0ed..e56bdb773f 100644 --- a/JetNews/build.gradle +++ b/JetNews/build.gradle @@ -16,7 +16,7 @@ buildscript { ext.kotlin_version = '1.4.10' - ext.compose_version = '1.0.0-alpha05' + ext.compose_version = '1.0.0-SNAPSHOT' repositories { google() @@ -24,7 +24,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0-alpha13' + classpath 'com.android.tools.build:gradle:4.2.0-alpha15' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -35,6 +35,10 @@ plugins { subprojects { repositories { + maven { + def snapshot = "6922857" + url "https://androidx.dev/snapshots/builds/$snapshot/artifacts/repository/" + } google() jcenter() } diff --git a/JetNews/gradle/wrapper/gradle-wrapper.properties b/JetNews/gradle/wrapper/gradle-wrapper.properties index 715d777bf2..0136562534 100644 --- a/JetNews/gradle/wrapper/gradle-wrapper.properties +++ b/JetNews/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Sep 16 10:20:00 PDT 2020 +#Tue Oct 27 16:21:59 PDT 2020 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME