From d91d7348605c9e3fee65c888d61679eac7ad2aad Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Mon, 1 Jul 2019 21:30:21 -0700
Subject: Update changelog

---
 sample/src/main/res/xml/kau_changelog.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sample/src/main/res/xml/kau_changelog.xml')

diff --git a/sample/src/main/res/xml/kau_changelog.xml b/sample/src/main/res/xml/kau_changelog.xml
index 62614ed..0a7b401 100644
--- a/sample/src/main/res/xml/kau_changelog.xml
+++ b/sample/src/main/res/xml/kau_changelog.xml
@@ -11,6 +11,9 @@
     <item text=":adapter: Make NoAnimatorChange an object; previously a class" />
     <item text=":core: KPref now supports in memory only variants for testing; pass KPrefBuilderInMemory to KPref constructor" />
     <item text=":core: KPref initializer takes in SharedPreferences so user can configure it" />
+    <item text=":core: Enhanced swipe view and make drag helper public" />
+    <item text="" />
+    <item text="" />
     <item text="" />
 
     <version title="v5.0.0" />
-- 
cgit v1.2.3


From 347f820db539de4823572a22ae8c16611167af72 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Mon, 1 Jul 2019 23:32:16 -0700
Subject: Revert viewdraghelper exposure

---
 core/src/main/kotlin/ca/allanwang/kau/swipe/SwipeBackLayout.kt  | 6 +++---
 core/src/main/kotlin/ca/allanwang/kau/swipe/ViewDragHelper.java | 2 +-
 sample/src/main/res/xml/kau_changelog.xml                       | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'sample/src/main/res/xml/kau_changelog.xml')

diff --git a/core/src/main/kotlin/ca/allanwang/kau/swipe/SwipeBackLayout.kt b/core/src/main/kotlin/ca/allanwang/kau/swipe/SwipeBackLayout.kt
index d26fb92..8f1da04 100644
--- a/core/src/main/kotlin/ca/allanwang/kau/swipe/SwipeBackLayout.kt
+++ b/core/src/main/kotlin/ca/allanwang/kau/swipe/SwipeBackLayout.kt
@@ -236,10 +236,10 @@ internal class SwipeBackLayout @JvmOverloads constructor(
 
     override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
         if (!swipeEnabled || disallowIntercept) return false
-        try {
-            return dragHelper.shouldInterceptTouchEvent(event)
+        return try {
+            dragHelper.shouldInterceptTouchEvent(event)
         } catch (e: Exception) {
-            return false
+            false
         }
     }
 
diff --git a/core/src/main/kotlin/ca/allanwang/kau/swipe/ViewDragHelper.java b/core/src/main/kotlin/ca/allanwang/kau/swipe/ViewDragHelper.java
index dab9bb8..f6e907a 100644
--- a/core/src/main/kotlin/ca/allanwang/kau/swipe/ViewDragHelper.java
+++ b/core/src/main/kotlin/ca/allanwang/kau/swipe/ViewDragHelper.java
@@ -28,7 +28,7 @@ import static ca.allanwang.kau.swipe.SwipeBackHelperKt.SWIPE_EDGE_TOP;
  * This is an extension of {@link androidx.customview.widget.ViewDragHelper}
  * Along with additional methods defined in {@link ViewDragHelperExtras}
  */
-public class ViewDragHelper implements ViewDragHelperExtras {
+class ViewDragHelper implements ViewDragHelperExtras {
     private static final String TAG = "ViewDragHelper";
 
     /**
diff --git a/sample/src/main/res/xml/kau_changelog.xml b/sample/src/main/res/xml/kau_changelog.xml
index 0a7b401..f91355b 100644
--- a/sample/src/main/res/xml/kau_changelog.xml
+++ b/sample/src/main/res/xml/kau_changelog.xml
@@ -11,7 +11,6 @@
     <item text=":adapter: Make NoAnimatorChange an object; previously a class" />
     <item text=":core: KPref now supports in memory only variants for testing; pass KPrefBuilderInMemory to KPref constructor" />
     <item text=":core: KPref initializer takes in SharedPreferences so user can configure it" />
-    <item text=":core: Enhanced swipe view and make drag helper public" />
     <item text="" />
     <item text="" />
     <item text="" />
-- 
cgit v1.2.3