Skip to content

Commit a082bcb

Browse files
committed
Update demo codes
1 parent 859c4f6 commit a082bcb

File tree

7 files changed

+36
-38
lines changed

7 files changed

+36
-38
lines changed

app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ plugins {
44
}
55

66
android {
7-
compileSdk 31
7+
compileSdk 33
88

99
defaultConfig {
1010
applicationId "io.getstream.androiddeveloperroadmap"
1111
minSdk 21
12-
targetSdk 31
12+
targetSdk 33
1313
versionCode 1
1414
versionName "1.0"
1515
}
@@ -28,7 +28,7 @@ android {
2828
}
2929

3030
composeOptions {
31-
kotlinCompilerExtensionVersion compose_version
31+
kotlinCompilerExtensionVersion compose_compiler_version
3232
}
3333

3434
packagingOptions {
@@ -39,7 +39,6 @@ android {
3939
}
4040

4141
dependencies {
42-
implementation "androidx.core:core-ktx:1.7.0"
4342
implementation "androidx.compose.ui:ui:$compose_version"
4443
implementation "androidx.compose.material:material:$compose_version"
4544
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
@@ -48,7 +47,8 @@ dependencies {
4847
implementation "androidx.compose.foundation:foundation-layout:$compose_version"
4948
implementation "androidx.activity:activity-compose:$compose_activity_version"
5049

51-
implementation "com.mxalbert.zoomable:zoomable:$zoomable_version"
50+
implementation "com.github.skydoves:landscapist-coil:$landscapist_version"
51+
implementation "com.github.skydoves:landscapist-placeholder:$landscapist_version"
5252

53-
implementation("io.coil-kt:coil-compose:1.4.0")
53+
implementation "com.mxalbert.zoomable:zoomable:$zoomable_version"
5454
}

app/src/main/kotlin/io/getstream/androiddeveloperroadmap/MainActivity.kt

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,20 @@ package io.getstream.androiddeveloperroadmap
1919
import android.os.Bundle
2020
import androidx.activity.ComponentActivity
2121
import androidx.activity.compose.setContent
22-
import androidx.compose.foundation.Image
2322
import androidx.compose.foundation.layout.fillMaxSize
2423
import androidx.compose.material.MaterialTheme
2524
import androidx.compose.material.Surface
2625
import androidx.compose.runtime.Composable
2726
import androidx.compose.ui.Modifier
2827
import androidx.compose.ui.layout.ContentScale
2928
import androidx.compose.ui.tooling.preview.Preview
30-
import coil.compose.rememberImagePainter
3129
import com.mxalbert.zoomable.Zoomable
30+
import com.skydoves.landscapist.ImageOptions
31+
import com.skydoves.landscapist.coil.CoilImage
32+
import com.skydoves.landscapist.components.rememberImageComponent
33+
import com.skydoves.landscapist.placeholder.shimmer.ShimmerPlugin
3234
import io.getstream.androiddeveloperroadmap.ui.theme.AndroidDeveloperRoadmapTheme
35+
import io.getstream.androiddeveloperroadmap.ui.theme.shimmerHighLight
3336

3437
class MainActivity : ComponentActivity() {
3538
override fun onCreate(savedInstanceState: Bundle?) {
@@ -40,28 +43,29 @@ class MainActivity : ComponentActivity() {
4043
Surface(
4144
color = MaterialTheme.colors.background
4245
) {
43-
Roadmap()
46+
AndroidRoadmap()
4447
}
4548
}
4649
}
4750
}
4851
}
4952

5053
@Composable
51-
private fun Roadmap() {
54+
private fun AndroidRoadmap() {
5255
Zoomable(
5356
modifier = Modifier.fillMaxSize(),
5457
) {
55-
Image(
56-
painter = rememberImagePainter(
57-
"https://user-images.githubusercontent.com/24237865/144350753-5a52e6e5-3517-476c-8e5c-adad919abe8e.png",
58-
builder = {
59-
placeholder(R.drawable.roadmap_preview)
60-
}
61-
),
62-
modifier = Modifier.fillMaxSize(),
63-
contentScale = ContentScale.Fit,
64-
contentDescription = null
58+
val background = MaterialTheme.colors.background
59+
CoilImage(
60+
imageModel = "https://user-images.githubusercontent.com/24237865/144350753-5a52e6e5-3517-476c-8e5c-adad919abe8e.png",
61+
component = rememberImageComponent {
62+
// shows a shimmering effect when loading an image.
63+
+ShimmerPlugin(
64+
baseColor = background,
65+
highlightColor = shimmerHighLight
66+
)
67+
},
68+
imageOptions = ImageOptions(contentScale = ContentScale.Fit)
6569
)
6670
}
6771
}
@@ -70,6 +74,6 @@ private fun Roadmap() {
7074
@Composable
7175
private fun DefaultPreview() {
7276
AndroidDeveloperRoadmapTheme {
73-
Roadmap()
77+
AndroidRoadmap()
7478
}
7579
}

app/src/main/kotlin/io/getstream/androiddeveloperroadmap/ui/theme/Color.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ val Purple200 = Color(0xFFBB86FC)
2222
val Purple500 = Color(0xFF6200EE)
2323
val Purple700 = Color(0xFF3700B3)
2424
val Teal200 = Color(0xFF03DAC5)
25+
val background800 = Color(0xFF424242)
26+
val shimmerHighLight = Color(0xA3C2C2C2)

app/src/main/kotlin/io/getstream/androiddeveloperroadmap/ui/theme/Theme.kt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,6 @@ private val LightColorPalette = lightColors(
3232
primary = Purple500,
3333
primaryVariant = Purple700,
3434
secondary = Teal200
35-
36-
/* Other default colors to override
37-
background = Color.White,
38-
surface = Color.White,
39-
onPrimary = Color.White,
40-
onSecondary = Color.Black,
41-
onBackground = Color.Black,
42-
onSurface = Color.Black,
43-
*/
4435
)
4536

4637
@Composable

build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
buildscript {
22
ext {
3-
compose_version = '1.1.0-beta03'
3+
compose_version = '1.3.0-rc01'
4+
compose_compiler_version = '1.3.2'
45
compose_activity_version = '1.4.0'
5-
landscapist_version = '1.4.3'
6-
zoomable_version = '1.2.0'
6+
landscapist_version = '2.0.0'
7+
zoomable_version = '1.5.1'
78
}
89
}
910

1011
plugins {
11-
id "com.diffplug.spotless" version "5.15.0"
12+
id "com.diffplug.spotless" version "6.3.0"
1213
}
1314

1415
subprojects {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Wed Dec 01 10:04:43 KST 2021
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

settings.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ pluginManagement {
55
mavenCentral()
66
}
77
plugins {
8-
id 'com.android.application' version '7.1.0-beta03'
9-
id 'com.android.library' version '7.1.0-beta03'
10-
id 'org.jetbrains.kotlin.android' version '1.5.31'
8+
id 'com.android.application' version '7.3.0'
9+
id 'com.android.library' version '7.3.0'
10+
id 'org.jetbrains.kotlin.android' version '1.7.20'
1111
}
1212
}
1313
dependencyResolutionManagement {

0 commit comments

Comments
 (0)