From b0b9a36c91e31fc432f535944dc2faa053febcbe Mon Sep 17 00:00:00 2001 From: adityapanther Date: Sun, 18 Feb 2024 09:51:47 +0530 Subject: [PATCH] state reset added after dismiss --- build.gradle.kts | 2 +- sample/build.gradle.kts | 12 ++++++------ swiper/build.gradle.kts | 6 +++--- .../src/main/java/moe/tlaster/swiper/SwiperState.kt | 1 + 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9a02fb6..6c913e4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:8.1.0") + classpath("com.android.tools.build:gradle:8.1.4") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0") } } diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index bb351bb..fddd126 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -51,16 +51,16 @@ dependencies { androidTestImplementation(composeBom) implementation(project(":swiper")) - implementation("androidx.core:core-ktx:1.10.1") + implementation("androidx.core:core-ktx:1.12.0") implementation("androidx.appcompat:appcompat:1.6.1") - implementation("com.google.android.material:material:1.9.0") + implementation("com.google.android.material:material:1.11.0") implementation("androidx.compose.ui:ui:${rootProject.extra["compose_version"]}") implementation("androidx.compose.material:material:${rootProject.extra["compose_version"]}") implementation("androidx.compose.ui:ui-tooling:${rootProject.extra["compose_version"]}") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1") - implementation("androidx.activity:activity-compose:1.7.2") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") + implementation("androidx.activity:activity-compose:1.8.2") testImplementation("junit:junit:4.+") - androidTestImplementation("androidx.test.ext:junit:1.1.2") - androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") androidTestImplementation("androidx.compose.ui:ui-test-junit4:${rootProject.extra["compose_version"]}") } diff --git a/swiper/build.gradle.kts b/swiper/build.gradle.kts index ba4cdf7..6fd06b9 100644 --- a/swiper/build.gradle.kts +++ b/swiper/build.gradle.kts @@ -35,8 +35,8 @@ dependencies { implementation("androidx.compose.foundation:foundation") testImplementation("junit:junit:4.+") - androidTestImplementation("androidx.test.ext:junit:1.1.2") - androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") } afterEvaluate { @@ -45,7 +45,7 @@ afterEvaluate { create("release") { groupId = "moe.tlaster" artifactId = "swiper" - version = "0.7.1" + version = "0.7.2" from(components["release"]) } diff --git a/swiper/src/main/java/moe/tlaster/swiper/SwiperState.kt b/swiper/src/main/java/moe/tlaster/swiper/SwiperState.kt index 68ec189..7a93878 100644 --- a/swiper/src/main/java/moe/tlaster/swiper/SwiperState.kt +++ b/swiper/src/main/java/moe/tlaster/swiper/SwiperState.kt @@ -74,6 +74,7 @@ class SwiperState( dismissed = true _offset.animateTo(maxHeight.toFloat().withSign(_offset.value), initialVelocity = velocity) onDismiss.invoke() + restore() } private suspend fun restore() {