From 88f0c4f14a9e7d1ebde10c08f24e4f5153d035ab Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 12 Jan 2024 12:34:03 +0800 Subject: [PATCH 1/2] Fix issue with swipe to archive --- .../omnivore/ui/library/LibraryView.kt | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryView.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryView.kt index 944c848ef..caf8816b2 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryView.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryView.kt @@ -316,11 +316,20 @@ fun LibraryViewContent(libraryViewModel: LibraryViewModel, modifier: Modifier) { val currentItem by rememberUpdatedState(cardDataWithLabels.savedItem) val swipeState = rememberDismissState( confirmStateChange = { - if (it == DismissValue.DismissedToEnd || - currentThresholdFraction.value < swipeThreshold || - currentThresholdFraction.value > 1.0f - ) { - return@rememberDismissState false + when(it) { + DismissValue.Default -> { + return@rememberDismissState false + } + DismissValue.DismissedToEnd -> { + if (currentThresholdFraction.value < swipeThreshold) { + return@rememberDismissState false + } + } + DismissValue.DismissedToStart -> { + if (currentThresholdFraction.value < swipeThreshold) { + return@rememberDismissState false + } + } } if (it == DismissValue.DismissedToEnd) { // Archiving/UnArchiving. From 6aa70677ae9c8c4404e5792978326901567202d7 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Fri, 12 Jan 2024 12:47:05 +0800 Subject: [PATCH 2/2] Bump version --- android/Omnivore/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/Omnivore/app/build.gradle b/android/Omnivore/app/build.gradle index d388dff3d..33b6c7c04 100644 --- a/android/Omnivore/app/build.gradle +++ b/android/Omnivore/app/build.gradle @@ -19,8 +19,8 @@ android { applicationId "app.omnivore.omnivore" minSdk 26 targetSdk 33 - versionCode 186 - versionName "0.0.186" + versionCode 188 + versionName "0.0.188" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables {