Skip to content

Commit 63ea448

Browse files
update jetpack compose version to 1.3.0
1 parent 1aa3b6e commit 63ea448

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

app/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ android {
3737
compose true
3838
}
3939
composeOptions {
40-
kotlinCompilerExtensionVersion '1.2.0'
40+
kotlinCompilerExtensionVersion '1.3.2'
4141
}
4242
packagingOptions {
4343
resources {
@@ -50,10 +50,10 @@ dependencies {
5050

5151
implementation project(':image')
5252

53-
implementation 'androidx.core:core-ktx:1.8.0'
53+
implementation 'androidx.core:core-ktx:1.9.0'
5454
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
5555

56-
implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:2.0.0'
56+
implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:2.1.0'
5757

5858
implementation "androidx.compose.ui:ui:$compose_version"
5959
// Tooling support (Previews, etc.)
@@ -66,12 +66,12 @@ dependencies {
6666
implementation "androidx.compose.material:material-icons-core:$compose_version"
6767
implementation "androidx.compose.material:material-icons-extended:$compose_version"
6868
// Integration with activities
69-
implementation 'androidx.activity:activity-compose:1.5.1'
69+
implementation 'androidx.activity:activity-compose:1.6.1'
7070
// Integration with ViewModels
7171
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1'
7272

7373
// Material Design 3 for Compose
74-
implementation "androidx.compose.material3:material3:1.0.0-alpha16"
74+
implementation "androidx.compose.material3:material3:1.0.0"
7575

7676
// Photo Picker
7777
implementation("com.google.modernstorage:modernstorage-photopicker:1.0.0-alpha06")
@@ -83,7 +83,7 @@ dependencies {
8383
implementation 'com.google.android.exoplayer:exoplayer:2.18.1'
8484

8585

86-
def nav_compose_version = "2.5.1"
86+
def nav_compose_version = "2.5.3"
8787
implementation "androidx.navigation:navigation-compose:$nav_compose_version"
8888

8989
def accompanist_version = "0.25.0"

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
22
ext {
3-
compose_version = '1.3.0-alpha03'
3+
compose_version = '1.3.0'
44
}
55
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
66
plugins {
7-
id 'com.android.application' version '7.2.1' apply false
8-
id 'com.android.library' version '7.2.1' apply false
9-
id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
7+
id 'com.android.application' version '7.3.1' apply false
8+
id 'com.android.library' version '7.3.1' apply false
9+
id 'org.jetbrains.kotlin.android' version '1.7.20' apply false
1010
}
1111

1212
task clean(type: Delete) {

image/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
compose true
3333
}
3434
composeOptions {
35-
kotlinCompilerExtensionVersion '1.2.0'
35+
kotlinCompilerExtensionVersion '1.3.2'
3636
}
3737

3838
packagingOptions {
@@ -44,13 +44,12 @@ android {
4444

4545
dependencies {
4646

47-
implementation 'androidx.core:core-ktx:1.8.0'
47+
implementation 'androidx.core:core-ktx:1.9.0'
4848

49-
implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:2.0.0'
49+
implementation 'com.github.SmartToolFactory:Compose-Extended-Gestures:2.1.0'
5050

5151
// Jetpack Compose
5252
implementation "androidx.compose.ui:ui:$compose_version"
53-
implementation "androidx.compose.ui:ui-tooling:$compose_version"
5453
implementation "androidx.compose.material:material:$compose_version"
5554
implementation "androidx.compose.runtime:runtime:$compose_version"
5655

image/src/main/java/com/smarttoolfactory/image/transform/MorphModifier.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ internal fun Modifier.morph(
6060
translationY = transform.translationY
6161
rotationZ = transform.rotation
6262
}
63-
.pointerMotionEvents(enabled,
63+
.pointerMotionEvents(
6464
onDown = { change ->
6565

6666
if (enabled) {
@@ -104,7 +104,8 @@ internal fun Modifier.morph(
104104
onUp = {
105105
touchRegion = TouchRegion.None
106106
onUp()
107-
}
107+
},
108+
key1 = enabled
108109
)
109110
},
110111
inspectorInfo = {

image/src/main/java/com/smarttoolfactory/image/transform/TransformModifier.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ internal fun Modifier.transform(
7272
var distanceToEdgeFromTouch = Offset.Zero
7373

7474
pointerMotionEvents(
75-
enabled,
7675
onDown = { change: PointerInputChange ->
7776

7877
if (enabled) {
@@ -463,7 +462,8 @@ internal fun Modifier.transform(
463462
touchRegion = TouchRegion.None
464463
rectTemp = rectDraw.copy()
465464
onUp(currentTransform, rectDraw)
466-
}
465+
},
466+
key1 = enabled
467467
)
468468
},
469469
inspectorInfo = {

0 commit comments

Comments
 (0)