added touch dispatch cancelling, fixed scrolling in ScrollView

suclike · Mar 23, 2020 · 2f496c9 · 2f496c9
1 parent 7c24e15
commit 2f496c9
Show file tree

Hide file tree

Showing 15 changed files with 111 additions and 43 deletions.
diff --git a/app/src/main/java/comprise/test/MainActivity.kt b/app/src/main/java/comprise/test/MainActivity.kt
@@ -34,30 +34,36 @@ class MainActivity : CompriseActivity() {
         card = makeCard()
 
         setContentView(
-            Column(
+            Stack(
+                width = LayoutSize.MATCH_PARENT,
                 height = LayoutSize.MATCH_PARENT,
                 name = "main layout",
                 children = listOf(
-                    makeActionBar(),
-                    Stack(
+                    Padding(
                         width = LayoutSize.MATCH_PARENT,
-                        height = LayoutSize(300.dp),
-                        children = listOf(
-                            ImageView(
-                                width = LayoutSize.MATCH_PARENT,
-                                height = LayoutSize.MATCH_PARENT,
-                                drawable = ColorDrawable(0xffafafaf.toInt())
-                            ),
-                            ScrollView(
-                                name = "scroll view",
-                                child = Padding(
+                        height = LayoutSize(356.dp),
+                        paddingTop = 56.dp,
+                        child = Stack(
+                            width = LayoutSize.MATCH_PARENT,
+                            height = LayoutSize(300.dp),
+                            children = listOf(
+                                ImageView(
                                     width = LayoutSize.MATCH_PARENT,
-                                    padding = 16.dp,
-                                    child = makeContent()
+                                    height = LayoutSize.MATCH_PARENT,
+                                    drawable = ColorDrawable(0xffafafaf.toInt())
+                                ),
+                                ScrollView(
+                                    name = "scroll view",
+                                    child = Padding(
+                                        width = LayoutSize.MATCH_PARENT,
+                                        padding = 16.dp,
+                                        child = makeContent()
+                                    )
                                 )
                             )
                         )
-                    )
+                    ),
+                    makeActionBar()
                 )
             )
         )

diff --git a/app/src/main/java/comprise/test/SearchToolbar.kt b/app/src/main/java/comprise/test/SearchToolbar.kt
@@ -6,7 +6,7 @@ import android.graphics.drawable.Drawable
 import comprise.material.IconButton
 import comprise.material.Toolbar
 import comprise.material.ToolbarStyle
-import comprise.theme.dp
+import comprise.dp
 import comprise.view.Clip
 import comprise.view.LayoutSize
 import comprise.view.ViewContainer

diff --git a/lib/src/main/java/comprise/theme/Utils.kt → lib/src/main/java/comprise/Utils.kt b/lib/src/main/java/comprise/theme/Utils.kt → lib/src/main/java/comprise/Utils.kt
@@ -1,4 +1,4 @@
-package comprise.theme
+package comprise
 
 import android.content.res.Resources
 
@@ -11,4 +11,12 @@ val Int.sp: Int
 val Float.dp: Float
     get() = (this * Resources.getSystem().displayMetrics.density)
 val Float.sp: Float
-    get() = (this * Resources.getSystem().displayMetrics.scaledDensity)
+    get() = (this * Resources.getSystem().displayMetrics.scaledDensity)
+
+inline fun <T, R> T?.letElse(ifNotNull: (T) -> R, ifNull: () -> R): R {
+    return if (this != null) {
+        ifNotNull(this)
+    } else {
+        ifNull()
+    }
+}
diff --git a/lib/src/main/java/comprise/material/ActionBar.kt b/lib/src/main/java/comprise/material/ActionBar.kt
@@ -3,7 +3,7 @@ package comprise.material
 import android.graphics.Path
 import android.graphics.RectF
 import android.graphics.drawable.Drawable
-import comprise.theme.dp
+import comprise.dp
 import comprise.view.LayoutSize
 import comprise.view.View
 import comprise.view.ViewContainer
@@ -52,7 +52,7 @@ class ActionBar(
 
     var background by ChildPropertDelegate<Drawable?>(toolbar::background)
 
-    var elevation by ChildPropertDelegate<Drawable?>(shadow::elevation)
+    var elevation by ChildPropertDelegate<StateList<Float>>(shadow::elevation)
 
     init {
         child = shadow

diff --git a/lib/src/main/java/comprise/material/IconButton.kt b/lib/src/main/java/comprise/material/IconButton.kt
@@ -1,7 +1,7 @@
 package comprise.material
 
 import android.graphics.drawable.Drawable
-import comprise.theme.dp
+import comprise.dp
 import comprise.view.LayoutSize
 import comprise.view.Padding
 import comprise.view.Ripple

diff --git a/lib/src/main/java/comprise/material/MaterialButton.kt b/lib/src/main/java/comprise/material/MaterialButton.kt
@@ -5,7 +5,7 @@ import android.graphics.RectF
 import android.graphics.drawable.Drawable
 import android.view.MotionEvent
 import comprise.theme.ButtonStyle
-import comprise.theme.dp
+import comprise.dp
 import comprise.view.*
 import comprise.widget.Button
 import comprise.widget.Shadow

diff --git a/lib/src/main/java/comprise/material/MaterialIcon.kt b/lib/src/main/java/comprise/material/MaterialIcon.kt
@@ -1,7 +1,7 @@
 package comprise.material
 
 import android.graphics.drawable.Drawable
-import comprise.theme.dp
+import comprise.dp
 import comprise.view.LayoutSize
 import comprise.widget.ImageView
 

diff --git a/lib/src/main/java/comprise/material/MaterialTextButton.kt b/lib/src/main/java/comprise/material/MaterialTextButton.kt
@@ -4,7 +4,7 @@ import android.content.res.ColorStateList
 import android.graphics.drawable.Drawable
 import android.text.Layout
 import android.view.MotionEvent
-import comprise.theme.dp
+import comprise.dp
 import comprise.view.LayoutSize
 import comprise.widget.TextView
 import comprise.widget.TextStyle

diff --git a/lib/src/main/java/comprise/material/MaterialTheme.kt b/lib/src/main/java/comprise/material/MaterialTheme.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import comprise.theme.dp
+import comprise.dp
 import comprise.widget.StateList
 import comprise.widget.TextStyle
 

diff --git a/lib/src/main/java/comprise/material/Toolbar.kt b/lib/src/main/java/comprise/material/Toolbar.kt
@@ -3,7 +3,7 @@ package comprise.material
 import android.graphics.Path
 import android.graphics.RectF
 import android.graphics.drawable.Drawable
-import comprise.theme.dp
+import comprise.dp
 import comprise.view.*
 import comprise.widget.ImageView
 import comprise.widget.Stack

diff --git a/lib/src/main/java/comprise/view/ViewGroup.kt b/lib/src/main/java/comprise/view/ViewGroup.kt
@@ -2,6 +2,7 @@ package comprise.view
 
 import android.graphics.Canvas
 import android.view.MotionEvent
+import comprise.letElse
 
 abstract class ViewGroup(
     width: LayoutSize = LayoutSize.WRAP_CONTENT,
@@ -14,6 +15,8 @@ abstract class ViewGroup(
 
     val children = ViewList(this)
 
+    private var touchReceiver: View? = null
+
     init {
         this.children.addAll(children)
     }
@@ -28,17 +31,43 @@ abstract class ViewGroup(
     }
 
     override fun touchEvent(ev: MotionEvent): Boolean {
-        children.forEach {
-            val event = MotionEvent.obtain(ev)
-            event.setLocation(event.x - it.x.toFloat(), event.y - it.y.toFloat())
-            if (event.x >= 0 && event.y >= 0 && event.x <= it.width && event.y <= it.height) {
-                if (it.touchEvent(event)) {
-                    event.recycle()
-                    return true
+        touchReceiver.letElse({
+            val result: Boolean
+            if (ev.action == MotionEvent.ACTION_DOWN) {
+                val event = MotionEvent.obtain(ev)
+                event.action = MotionEvent.ACTION_CANCEL
+                result = it.touchEvent(event)
+                event.recycle()
+                touchReceiver = null
+            } else if (ev.action == MotionEvent.ACTION_UP) {
+                val event = MotionEvent.obtain(ev)
+                event.setLocation(event.x - it.x.toFloat(), event.y - it.y.toFloat())
+                result = it.touchEvent(event)
+                touchReceiver = null
+                event.recycle()
+            } else {
+                val event = MotionEvent.obtain(ev)
+                event.setLocation(event.x - it.x.toFloat(), event.y - it.y.toFloat())
+                result = it.touchEvent(event)
+                if (!result)
+                    touchReceiver = null
+                event.recycle()
+            }
+            return result
+        }, {
+            children.forEach {
+                val event = MotionEvent.obtain(ev)
+                event.setLocation(event.x - it.x.toFloat(), event.y - it.y.toFloat())
+                if (event.x >= 0 && event.y >= 0 && event.x <= it.width && event.y <= it.height) {
+                    if (it.touchEvent(event)) {
+                        touchReceiver = it
+                        event.recycle()
+                        return true
+                    }
                 }
+                event.recycle()
             }
-            event.recycle()
-        }
+        })
         return super.touchEvent(ev)
     }
 }
diff --git a/lib/src/main/java/comprise/widget/Border.kt b/lib/src/main/java/comprise/widget/Border.kt
@@ -3,7 +3,7 @@ package comprise.widget
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.Path
-import comprise.theme.dp
+import comprise.dp
 import comprise.view.LayoutSize
 import comprise.view.View
 import comprise.view.ViewContainer

diff --git a/lib/src/main/java/comprise/widget/ScrollView.kt b/lib/src/main/java/comprise/widget/ScrollView.kt
@@ -6,6 +6,7 @@ import android.view.MotionEvent
 import comprise.view.LayoutSize
 import comprise.view.View
 import comprise.view.ViewContainer
+import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
 
@@ -19,6 +20,8 @@ class ScrollView(
     child: View? = null
 ) : ViewContainer(width, height, minWidth, minHeight, name, child) {
 
+    private val currentScroll = PointF()
+    private var scrolling = false
     val scroll = PointF()
 
     override fun draw(canvas: Canvas, editMode: Boolean, debugMode: Boolean) {
@@ -43,12 +46,30 @@ class ScrollView(
     private val prevTouch = PointF()
     override fun touchEvent(ev: MotionEvent): Boolean {
         child?.let {
-            if (ev.action == MotionEvent.ACTION_MOVE) {
+            if (ev.action == MotionEvent.ACTION_DOWN) {
+                scrolling = false
+                currentScroll.x = scroll.x
+                currentScroll.y = scroll.y
+            } else if (ev.action == MotionEvent.ACTION_MOVE) {
                 val maxScrollX = (it.width - width).toFloat()
-                scroll.x = max(0.0f, min(scroll.x + ev.x - prevTouch.x, maxScrollX))
+                currentScroll.x = max(0.0f, min(scroll.x + ev.x - prevTouch.x, maxScrollX))
                 val maxScrollY = (it.height - height).toFloat()
-                scroll.y = max(-maxScrollY, min(scroll.y + ev.y - prevTouch.y, 0.0f))
-                requestDraw()
+                currentScroll.y = max(-maxScrollY, min(scroll.y + ev.y - prevTouch.y, 0.0f))
+                if (abs(currentScroll.x - scroll.x) > SCROLL_TRESHOLD ||
+                    abs(currentScroll.y - scroll.y) > SCROLL_TRESHOLD
+                ) {
+                    scrolling = true
+                    val event = MotionEvent.obtain(ev)
+                    event.action = MotionEvent.ACTION_CANCEL
+                    event.offsetLocation(-currentScroll.x, -currentScroll.y)
+                    it.touchEvent(event)
+                    event.recycle()
+                }
+                if (scrolling) {
+                    scroll.x = currentScroll.x
+                    scroll.y = currentScroll.y
+                    requestDraw()
+                }
             }
             prevTouch.x = ev.x
             prevTouch.y = ev.y
@@ -59,4 +80,8 @@ class ScrollView(
         event.recycle()
         return result
     }
+
+    companion object {
+        const val SCROLL_TRESHOLD = 5.0f
+    }
 }
diff --git a/lib/src/main/java/comprise/widget/Shadow.kt b/lib/src/main/java/comprise/widget/Shadow.kt
@@ -6,7 +6,7 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Path
 import android.view.MotionEvent
-import comprise.theme.dp
+import comprise.dp
 import comprise.view.LayoutSize
 import comprise.view.View
 import comprise.view.ViewContainer

diff --git a/lib/src/main/java/comprise/widget/TextView.kt b/lib/src/main/java/comprise/widget/TextView.kt
@@ -5,7 +5,7 @@ import android.graphics.*
 import android.text.Layout
 import android.text.StaticLayout
 import android.text.TextPaint
-import comprise.theme.sp
+import comprise.sp
 import comprise.view.LayoutSize
 import comprise.view.View
 import kotlin.math.abs