Merge pull request #26 from SimformSolutionsPvtLtd/develop

Develop to Main LGTM.
SimformSolutionsPvtLtd · Mar 28, 2023 · c6364fa · c6364fa
2 parents 8f0eee3 + 5806f3f
commit c6364fa
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 10 deletions.
diff --git a/sspulltorefresh/src/main/java/com/simform/refresh/SSPullToRefreshLayout.kt b/sspulltorefresh/src/main/java/com/simform/refresh/SSPullToRefreshLayout.kt
@@ -208,15 +208,8 @@ class SSPullToRefreshLayout(context: Context?, attrs: AttributeSet? = null) :
         }
         refreshView.visibility = GONE
         addView(refreshView, mRefreshLayoutParams)
-        when(refreshView) {
-            is SSAnimationView -> { }
-            is SSLottieAnimationView -> {
-                refreshView.setAnimation(mLottieAnimationAssetFileName)
-            }
-            else -> {
-                throw ClassCastException("Need SSLottieAnimationView or SSGifAnimationView as RefreshView")
-            }
-        }
+        if (refreshView !is RefreshCallbacks) throw ClassCastException("RefreshView must implement RefreshCallbacks")
+        if (refreshView is SSLottieAnimationView) refreshView.setAnimation(mLottieAnimationAssetFileName)
         mRefreshView = refreshView
     }
 
@@ -685,7 +678,7 @@ class SSPullToRefreshLayout(context: Context?, attrs: AttributeSet? = null) :
             else -> {
             }
         }
-        return mIsBeingDragged
+        return if (mRefreshView.hasPoint(ev.rawX.toInt(), ev.rawY.toInt())) false else mIsBeingDragged
     }
 
     override fun onTouchEvent(ev: MotionEvent): Boolean {

diff --git a/sspulltorefresh/src/main/java/com/simform/refresh/ViewExtensions.kt b/sspulltorefresh/src/main/java/com/simform/refresh/ViewExtensions.kt
@@ -0,0 +1,31 @@
+package com.simform.refresh
+
+import android.view.View
+
+/**
+ * Defines the coordinates of the view in its window
+ *
+ * @return  Pair of [Int] representing x and y
+ */
+val View.windowCoordinates: Pair<Int, Int>
+    get() {
+        val location = IntArray(2)
+        getLocationInWindow(location)
+        val x = location[0]
+        val y = location[1]
+        return x to y
+    }
+
+/**
+ * Check if view bounds include the given point in window
+ *
+ * @param   x   The x coordinate of the point
+ * @param   y   The y coordinate of the point
+ *
+ * @return  True if the view contains given point, false otherwise
+ */
+fun View.hasPoint(x: Int, y: Int): Boolean {
+    val viewCoordinates = windowCoordinates
+    return x in viewCoordinates.first..(viewCoordinates.first + width) &&
+            y in viewCoordinates.second..(viewCoordinates.second + height)
+}