Merge pull request #4 from lhoyong/dev

Fix: touch event motion
lhoyong · Apr 5, 2018 · 1f39d95 · 1f39d95
2 parents cd9846a + cf60227
commit 1f39d95
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 13 deletions.
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 group = 'com.github.lhoyong'
-version = '0.0.1'
+version = '0.0.2'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion

diff --git a/lib/src/main/java/com/github/lhoyong/transparencyseekbar/TransParencySeekBar.kt b/lib/src/main/java/com/github/lhoyong/transparencyseekbar/TransParencySeekBar.kt
@@ -6,6 +6,7 @@ import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.drawable.Drawable
 import android.util.AttributeSet
+import android.util.Log
 import android.view.MotionEvent
 import android.view.View
 
@@ -35,6 +36,12 @@ class TransParencySeekBar @JvmOverloads constructor(
     // Use thumb
     var mEnabled: Boolean = a.getBoolean(R.styleable.TransParencySeekBar_enable, true)
 
+
+    /*     test value       */
+    var touchX: Float = 0F
+
+    /* ---- test value --- */
+
     init {
         a?.recycle()
     }
@@ -43,17 +50,19 @@ class TransParencySeekBar @JvmOverloads constructor(
     override fun onTouchEvent(event: MotionEvent): Boolean {
         if (mEnabled) {
             when (event.action) {
-                MotionEvent.ACTION_DOWN -> checkTouchPosition(event.x)
-                MotionEvent.ACTION_MOVE ->   if (isPressed) changeProgress(event.x)
-                MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL ->  isPressed = false
+                MotionEvent.ACTION_DOWN -> isPressed = true
+                MotionEvent.ACTION_MOVE -> if (isPressed) changeProgress(event.x)
+                MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
+                    isPressed = false
+                    touchX = 0F
+                }
             }
         }
         return mEnabled
     }
 
     @SuppressLint("DrawAllocation")
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-
         val height = View.getDefaultSize(suggestedMinimumHeight, heightMeasureSpec)
         val width = View.getDefaultSize(suggestedMinimumWidth, widthMeasureSpec)
 
@@ -109,16 +118,23 @@ class TransParencySeekBar @JvmOverloads constructor(
         return (width.toFloat() / 100) * percent
     }
 
-    // check for Touch Position
-    private fun checkTouchPosition(x: Float) {
-        if (thumbX + 20 >= x && thumbX - 20 <= x) isPressed = true
-        else isPressed = false
-    }
-
     // change Progress
     private fun changeProgress(x: Float) {
-        progress = ((maxProgress / 100) * ((thumbX / measuredWidth) * 100)).toInt()
-        thumbX = x
+        if (touchX == 0F) touchX = x
+        else if (thumbX < 0) {
+            thumbX = 0F
+            progress = 0
+        } else if (thumbX > measuredWidth) {
+            thumbX = measuredWidth.toFloat()
+            progress = maxProgress
+        } else {
+            progress = ((maxProgress.toFloat() / 100) * ((thumbX / measuredWidth) * 100)).toInt()
+            thumbX += x - touchX
+
+            if (x >= touchX) touchX += x - touchX
+            else touchX -= touchX - x
+        }
+
         invalidate()
     }
 }