diff --git a/README.md b/README.md index 7b00653..531f2d7 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Android Developer Roadmap 2022 suggests learning paths to understanding Android Each node indicates concepts of Android systems, Android SDK, and generally used libraries. It would be helpful to refer to the [Android Developers Reference](https://developer.android.com/reference) or GitHub for the specific terminologies.
-In addition, this roadmap doesn't cover everything about Android development, and you don't need to learn everything from it. So we recommend only reading the sections that would be helpful to you. +In addition, **you don't need to learn everything from this roadmap**. So we recommend only reading the sections that would be helpful to you. ## Roadmap diff --git a/app/build.gradle b/app/build.gradle index 35b898b..2806edb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -48,6 +48,7 @@ dependencies { implementation "androidx.compose.foundation:foundation-layout:$compose_version" implementation "androidx.activity:activity-compose:$compose_activity_version" - implementation "com.github.skydoves:landscapist-glide:$landscapist_version" implementation "com.mxalbert.zoomable:zoomable:$zoomable_version" + + implementation("io.coil-kt:coil-compose:1.4.0") } diff --git a/app/src/main/kotlin/io/getstream/androiddeveloperroadmap/MainActivity.kt b/app/src/main/kotlin/io/getstream/androiddeveloperroadmap/MainActivity.kt index 10d852e..9d7dfc3 100644 --- a/app/src/main/kotlin/io/getstream/androiddeveloperroadmap/MainActivity.kt +++ b/app/src/main/kotlin/io/getstream/androiddeveloperroadmap/MainActivity.kt @@ -19,17 +19,16 @@ package io.getstream.androiddeveloperroadmap import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.compose.foundation.Image import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.height import androidx.compose.material.MaterialTheme import androidx.compose.material.Surface import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp +import coil.compose.rememberImagePainter import com.mxalbert.zoomable.Zoomable -import com.skydoves.landscapist.glide.GlideImage import io.getstream.androiddeveloperroadmap.ui.theme.AndroidDeveloperRoadmapTheme class MainActivity : ComponentActivity() { @@ -51,13 +50,18 @@ class MainActivity : ComponentActivity() { @Composable private fun Roadmap() { Zoomable( - modifier = Modifier.height(3200.dp) + modifier = Modifier.fillMaxSize(), ) { - GlideImage( - imageModel = "https://user-images.githubusercontent.com/24237865/144350753-5a52e6e5-3517-476c-8e5c-adad919abe8e.png", + Image( + painter = rememberImagePainter( + "https://user-images.githubusercontent.com/24237865/144350753-5a52e6e5-3517-476c-8e5c-adad919abe8e.png", + builder = { + placeholder(R.drawable.roadmap_preview) + } + ), modifier = Modifier.fillMaxSize(), - previewPlaceholder = R.drawable.roadmap_preview, - contentScale = ContentScale.Fit + contentScale = ContentScale.Fit, + contentDescription = null ) } } diff --git a/settings.gradle b/settings.gradle index f20e4a4..7b04270 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,8 +5,8 @@ pluginManagement { mavenCentral() } plugins { - id 'com.android.application' version '7.1.0-alpha13' - id 'com.android.library' version '7.1.0-alpha13' + id 'com.android.application' version '7.1.0-beta03' + id 'com.android.library' version '7.1.0-beta03' id 'org.jetbrains.kotlin.android' version '1.5.31' } }