Small fixes to Crane and Owl

Author: JoseAlcerreca

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

@@ -22,10 +22,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import coil.ImageLoader
 import coil.annotation.ExperimentalCoilApi
+import coil.compose.LocalImageLoader
 import coil.intercept.Interceptor
 import coil.request.ImageResult
 import coil.size.PixelSize
-import com.google.accompanist.coil.LocalImageLoader
 import okhttp3.HttpUrl
 
 @Composable

Owl/app/build.gradle

@@ -110,4 +110,5 @@ dependencies {
  androidTestImplementation Libs.AndroidX.Test.rules
  androidTestImplementation Libs.AndroidX.Test.Ext.junit
  androidTestImplementation Libs.AndroidX.Compose.uiTest
+ debugImplementation Libs.AndroidX.Compose.uiTestManifest
 }

Owl/app/src/androidTest/java/com/example/owl/ui/fakes/ProvideTestImageLoader.kt

@@ -25,14 +25,14 @@ import androidx.compose.ui.platform.LocalContext
 import coil.ImageLoader
 import coil.annotation.ExperimentalCoilApi
 import coil.bitmap.BitmapPool
+import coil.compose.LocalImageLoader
 import coil.decode.DataSource
 import coil.memory.MemoryCache
 import coil.request.DefaultRequestOptions
 import coil.request.Disposable
 import coil.request.ImageRequest
 import coil.request.ImageResult
 import coil.request.SuccessResult
-import com.google.accompanist.coil.LocalImageLoader
 
 /**
  * Replaces all remote images with a simple black drawable to make testing faster and hermetic.

Owl/app/src/debug/AndroidManifest.xml

@@ -32,18 +32,17 @@ import androidx.compose.ui.platform.LocalContext
 import coil.ImageLoader
 import coil.annotation.ExperimentalCoilApi
 import coil.compose.ImagePainter
+import coil.compose.LocalImageLoader
 import coil.compose.rememberImagePainter
 import coil.intercept.Interceptor
 import coil.request.ImageResult
 import coil.size.PixelSize
 import com.example.owl.R
 import com.example.owl.ui.theme.compositedOnSurface
-import com.google.accompanist.coil.LocalImageLoader
-import com.google.accompanist.coil.rememberCoilPainter
 import okhttp3.HttpUrl
 
 /**
- * A wrapper around [Image] and [rememberCoilPainter], setting a
+ * A wrapper around [Image] and [rememberImagePainter], setting a
  * default [contentScale] and showing content while loading.
  */
 @OptIn(ExperimentalCoilApi::class)

Owl/app/src/main/java/com/example/owl/ui/utils/NetworkImage.kt

@@ -70,6 +70,7 @@ object Libs {
  const val ui = "androidx.compose.ui:ui:$version"
  const val uiUtil = "androidx.compose.ui:ui-util:$version"
  const val uiTest = "androidx.compose.ui:ui-test-junit4:$version"
+ const val uiTestManifest = "androidx.compose.ui:ui-test-manifest:$version"
  }
 
  object ConstraintLayout {