Skip to content

Commit 007b82a

Browse files
committed
Update demo project
1 parent 7065e5e commit 007b82a

File tree

8 files changed

+201
-147
lines changed

8 files changed

+201
-147
lines changed

app/build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,24 @@ plugins {
44
}
55

66
android {
7-
compileSdk 33
7+
namespace "io.getstream.androiddeveloperroadmap"
8+
compileSdk 34
89

910
defaultConfig {
1011
applicationId "io.getstream.androiddeveloperroadmap"
11-
minSdk 21
12-
targetSdk 33
12+
minSdk 23
13+
targetSdk 34
1314
versionCode 1
1415
versionName "1.0"
1516
}
1617

1718
compileOptions {
18-
sourceCompatibility JavaVersion.VERSION_1_8
19-
targetCompatibility JavaVersion.VERSION_1_8
19+
sourceCompatibility JavaVersion.VERSION_17
20+
targetCompatibility JavaVersion.VERSION_17
2021
}
2122

2223
kotlinOptions {
23-
jvmTarget = '1.8'
24+
jvmTarget = '17'
2425
}
2526

2627
buildFeatures {
@@ -50,5 +51,5 @@ dependencies {
5051
implementation "com.github.skydoves:landscapist-coil:$landscapist_version"
5152
implementation "com.github.skydoves:landscapist-placeholder:$landscapist_version"
5253

53-
implementation "com.mxalbert.zoomable:zoomable:$zoomable_version"
54+
implementation "me.saket.telephoto:zoomable:0.6.2"
5455
}

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ import androidx.compose.runtime.Composable
2626
import androidx.compose.ui.Modifier
2727
import androidx.compose.ui.layout.ContentScale
2828
import androidx.compose.ui.tooling.preview.Preview
29-
import com.mxalbert.zoomable.Zoomable
3029
import com.skydoves.landscapist.ImageOptions
3130
import com.skydoves.landscapist.coil.CoilImage
3231
import com.skydoves.landscapist.components.rememberImageComponent
3332
import com.skydoves.landscapist.placeholder.shimmer.ShimmerPlugin
3433
import io.getstream.androiddeveloperroadmap.ui.theme.AndroidDeveloperRoadmapTheme
3534
import io.getstream.androiddeveloperroadmap.ui.theme.shimmerHighLight
35+
import me.saket.telephoto.zoomable.rememberZoomableState
36+
import me.saket.telephoto.zoomable.zoomable
3637

3738
class MainActivity : ComponentActivity() {
3839
override fun onCreate(savedInstanceState: Bundle?) {
@@ -52,22 +53,21 @@ class MainActivity : ComponentActivity() {
5253

5354
@Composable
5455
private fun AndroidRoadmap() {
55-
Zoomable(
56-
modifier = Modifier.fillMaxSize(),
57-
) {
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)
69-
)
70-
}
56+
val background = MaterialTheme.colors.background
57+
CoilImage(
58+
modifier = Modifier
59+
.fillMaxSize()
60+
.zoomable(rememberZoomableState()),
61+
imageModel = { "https://user-images.githubusercontent.com/24237865/144350753-5a52e6e5-3517-476c-8e5c-adad919abe8e.png" },
62+
component = rememberImageComponent {
63+
// shows a shimmering effect when loading an image.
64+
+ShimmerPlugin(
65+
baseColor = background,
66+
highlightColor = shimmerHighLight
67+
)
68+
},
69+
imageOptions = ImageOptions(contentScale = ContentScale.Fit)
70+
)
7171
}
7272

7373
@Preview(showBackground = true)

build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
buildscript {
22
ext {
3-
compose_version = '1.3.0-rc01'
4-
compose_compiler_version = '1.3.2'
5-
compose_activity_version = '1.4.0'
6-
landscapist_version = '2.0.0'
3+
compose_version = '1.5.2'
4+
compose_compiler_version = '1.5.3'
5+
compose_activity_version = '1.7.2'
6+
landscapist_version = '2.2.10'
77
zoomable_version = '1.5.1'
88
}
99
}
1010

1111
plugins {
12-
id "com.diffplug.spotless" version "6.3.0"
12+
id 'com.android.application' version '8.1.2' apply false
13+
id 'org.jetbrains.kotlin.android' version '1.9.10' apply false
14+
id "com.diffplug.spotless" version "6.7.0" apply false
1315
}
1416

1517
subprojects {

gradle/wrapper/gradle-wrapper.jar

1.52 KB
Binary file not shown.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Wed Dec 01 10:04:43 KST 2021
21
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
64
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)