Skip to content

Commit 72d4b59

Browse files
JoseAlcerrecaJoseAlcerreca
authored
[All] Update to Compose rc02
[All] Update to Compose rc02
2 parents b658672 + 6e4a15a commit 72d4b59

23 files changed

Lines changed: 107 additions & 79 deletions

File tree

‎.github/workflows/JetNews.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
- name: Build project and run local tests
4545
working-directory: ${{ env.SAMPLE_PATH }}
46-
run: ./gradlew spotlessCheck assembleDebug lintDebug testDebug --stacktrace
46+
run: ./gradlew spotlessCheck assembleDebug lintDebug testDebug --stacktrace --no-build-cache --rerun-tasks
4747

4848
- name: Upload build outputs (APKs)
4949
uses: actions/upload-artifact@v2

‎Crane/app/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@ dependencies {
114114
}
115115
}
116116

117-
implementation Libs.Accompanist.coil
118117
implementation Libs.Accompanist.insets
119118
implementation Libs.AndroidX.Activity.activityCompose
120119
implementation Libs.AndroidX.appcompat
@@ -131,6 +130,8 @@ dependencies {
131130
implementation Libs.Hilt.android
132131
kapt Libs.Hilt.compiler
133132

133+
implementation Libs.Coil.coilCompose
134+
134135
androidTestImplementation Libs.JUnit.junit
135136
androidTestImplementation Libs.AndroidX.Test.runner
136137
androidTestImplementation Libs.AndroidX.Test.espressoCore

‎Crane/app/src/main/java/androidx/compose/samples/crane/base/ExploreSection.kt‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ import androidx.compose.ui.graphics.Color
4747
import androidx.compose.ui.layout.ContentScale
4848
import androidx.compose.ui.res.painterResource
4949
import androidx.compose.ui.unit.dp
50-
import com.google.accompanist.coil.rememberCoilPainter
51-
import com.google.accompanist.imageloading.ImageLoadState
50+
import coil.annotation.ExperimentalCoilApi
51+
import coil.compose.ImagePainter.State.Loading
52+
import coil.compose.rememberImagePainter
5253
import com.google.accompanist.insets.navigationBarsHeight
5354

5455
@Composable
@@ -86,6 +87,7 @@ fun ExploreSection(
8687
}
8788
}
8889

90+
@OptIn(ExperimentalCoilApi::class)
8991
@Composable
9092
private fun ExploreItem(
9193
modifier: Modifier = Modifier,
@@ -99,15 +101,20 @@ private fun ExploreItem(
99101
) {
100102
ExploreImageContainer {
101103
Box {
102-
val painter = rememberCoilPainter(item.imageUrl, fadeIn = true)
104+
val painter = rememberImagePainter(
105+
data = item.imageUrl,
106+
builder = {
107+
crossfade(true)
108+
}
109+
)
103110
Image(
104111
painter = painter,
105112
contentDescription = null,
106113
contentScale = ContentScale.Crop,
107114
modifier = Modifier.fillMaxSize(),
108115
)
109116

110-
if (painter.loadState is ImageLoadState.Loading) {
117+
if (painter.state is Loading) {
111118
Image(
112119
painter = painterResource(id = R.drawable.ic_crane_logo),
113120
contentDescription = null,

‎Crane/app/src/main/java/androidx/compose/samples/crane/util/NetworkUtil.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import androidx.compose.runtime.remember
2222
import androidx.compose.ui.platform.LocalContext
2323
import coil.ImageLoader
2424
import coil.annotation.ExperimentalCoilApi
25+
import coil.compose.LocalImageLoader
2526
import coil.intercept.Interceptor
2627
import coil.request.ImageResult
2728
import coil.size.PixelSize
28-
import com.google.accompanist.coil.LocalImageLoader
2929
import okhttp3.HttpUrl
3030

3131
@Composable

‎Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ object Versions {
2121
}
2222

2323
object Libs {
24-
// FIXME Hilt currently incompatible with AGP 7.0.0-beta04
25-
// https://github.com/google/dagger/issues/2337
26-
// https://github.com/google/dagger/issues/2700
27-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta03"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta05"
2825
const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"
2926

3027
object GoogleMaps {
@@ -37,8 +34,7 @@ object Libs {
3734
}
3835

3936
object Accompanist {
40-
const val version = "0.13.0"
41-
const val coil = "com.google.accompanist:accompanist-coil:$version"
37+
const val version = "0.14.0"
4238
const val insets = "com.google.accompanist:accompanist-insets:$version"
4339
}
4440

@@ -64,7 +60,7 @@ object Libs {
6460

6561
object Compose {
6662
const val snapshot = ""
67-
const val version = "1.0.0-rc01"
63+
const val version = "1.0.0-rc02"
6864

6965
const val runtime = "androidx.compose.runtime:runtime:$version"
7066
const val runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
@@ -107,6 +103,10 @@ object Libs {
107103
private const val version = "4.13"
108104
const val junit = "junit:junit:$version"
109105
}
106+
107+
object Coil {
108+
const val coilCompose = "io.coil-kt:coil-compose:1.3.0"
109+
}
110110
}
111111

112112
object Urls {

‎JetNews/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616

1717
buildscript {
1818
ext.kotlin_version = '1.5.10'
19-
ext.compose_version = '1.0.0-rc01'
19+
ext.compose_version = '1.0.0-rc02'
2020
ext.coroutines_version = '1.4.2'
21-
ext.accompanist_version = '0.13.0'
21+
ext.accompanist_version = '0.14.0'
2222

2323
repositories {
2424
google()
2525
mavenCentral()
2626
}
2727

2828
dependencies {
29-
classpath 'com.android.tools.build:gradle:7.0.0-beta04'
29+
classpath 'com.android.tools.build:gradle:7.0.0-beta05'
3030
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
3131
}
3232
}

‎Jetcaster/app/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,11 @@ dependencies {
111111
implementation Libs.AndroidX.Lifecycle.viewmodel
112112
implementation Libs.AndroidX.Lifecycle.viewModelCompose
113113

114-
implementation Libs.Accompanist.coil
115114
implementation Libs.Accompanist.pager
116115
implementation Libs.Accompanist.insets
117116

117+
implementation Libs.Coil.coilCompose
118+
118119
implementation Libs.OkHttp.okhttp
119120
implementation Libs.OkHttp.logging
120121

‎Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ import androidx.compose.ui.text.style.TextOverflow
6262
import androidx.compose.ui.tooling.preview.Preview
6363
import androidx.compose.ui.unit.dp
6464
import androidx.lifecycle.viewmodel.compose.viewModel
65+
import coil.compose.rememberImagePainter
6566
import com.example.jetcaster.R
6667
import com.example.jetcaster.data.PodcastWithExtraInfo
6768
import com.example.jetcaster.ui.home.discover.Discover
@@ -73,7 +74,6 @@ import com.example.jetcaster.util.contrastAgainst
7374
import com.example.jetcaster.util.quantityStringResource
7475
import com.example.jetcaster.util.rememberDominantColorState
7576
import com.example.jetcaster.util.verticalGradientScrim
76-
import com.google.accompanist.coil.rememberCoilPainter
7777
import com.google.accompanist.insets.statusBarsHeight
7878
import com.google.accompanist.pager.ExperimentalPagerApi
7979
import com.google.accompanist.pager.HorizontalPager
@@ -355,7 +355,7 @@ private fun FollowedPodcastCarouselItem(
355355
) {
356356
if (podcastImageUrl != null) {
357357
Image(
358-
painter = rememberCoilPainter(podcastImageUrl),
358+
painter = rememberImagePainter(data = podcastImageUrl),
359359
contentDescription = null,
360360
contentScale = ContentScale.Crop,
361361
modifier = Modifier

‎Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/category/PodcastCategory.kt‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ import androidx.constraintlayout.compose.ConstraintLayout
6464
import androidx.constraintlayout.compose.Dimension.Companion.fillToConstraints
6565
import androidx.constraintlayout.compose.Dimension.Companion.preferredWrapContent
6666
import androidx.lifecycle.viewmodel.compose.viewModel
67+
import coil.compose.rememberImagePainter
6768
import com.example.jetcaster.R
6869
import com.example.jetcaster.data.Episode
6970
import com.example.jetcaster.data.Podcast
@@ -74,7 +75,6 @@ import com.example.jetcaster.ui.theme.JetcasterTheme
7475
import com.example.jetcaster.ui.theme.Keyline1
7576
import com.example.jetcaster.util.ToggleFollowPodcastIconButton
7677
import com.example.jetcaster.util.viewModelProviderFactoryOf
77-
import com.google.accompanist.coil.rememberCoilPainter
7878
import java.time.format.DateTimeFormatter
7979
import java.time.format.FormatStyle
8080

@@ -146,7 +146,12 @@ fun EpisodeListItem(
146146

147147
// If we have an image Url, we can show it using Coil
148148
Image(
149-
painter = rememberCoilPainter(podcast.imageUrl, fadeIn = true),
149+
painter = rememberImagePainter(
150+
data = podcast.imageUrl,
151+
builder = {
152+
crossfade(true)
153+
}
154+
),
150155
contentDescription = null,
151156
contentScale = ContentScale.Crop,
152157
modifier = Modifier
@@ -316,7 +321,12 @@ private fun TopPodcastRowItem(
316321
) {
317322
if (podcastImageUrl != null) {
318323
Image(
319-
painter = rememberCoilPainter(podcastImageUrl, fadeIn = true),
324+
painter = rememberImagePainter(
325+
data = podcastImageUrl,
326+
builder = {
327+
crossfade(true)
328+
}
329+
),
320330
contentDescription = null,
321331
contentScale = ContentScale.Crop,
322332
modifier = Modifier

‎Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,11 @@ object Versions {
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta04"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-beta05"
2525
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
2626

2727
object Accompanist {
28-
const val version = "0.13.0"
29-
const val coil = "com.google.accompanist:accompanist-coil:$version"
28+
const val version = "0.14.0"
3029
const val insets = "com.google.accompanist:accompanist-insets:$version"
3130
const val pager = "com.google.accompanist:accompanist-pager:$version"
3231
}
@@ -72,7 +71,7 @@ object Libs {
7271

7372
object Compose {
7473
const val snapshot = ""
75-
const val version = "1.0.0-rc01"
74+
const val version = "1.0.0-rc02"
7675

7776
@get:JvmStatic
7877
val snapshotUrl: String
@@ -121,4 +120,8 @@ object Libs {
121120
const val rome = "com.rometools:rome:$version"
122121
const val modules = "com.rometools:rome-modules:$version"
123122
}
123+
124+
object Coil {
125+
const val coilCompose = "io.coil-kt:coil-compose:1.3.0"
126+
}
124127
}

0 commit comments

Comments
 (0)