Fix scrolling

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRecyclerView.kt

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.conversation.v2
 
 import android.content.Context
 import android.util.AttributeSet
+import android.util.Log
 import android.view.MotionEvent
 import android.view.VelocityTracker
 import androidx.recyclerview.widget.RecyclerView
@@ -20,26 +21,29 @@ class ConversationRecyclerView : RecyclerView {
     }
 
     override fun onInterceptTouchEvent(e: MotionEvent): Boolean {
-        return false
-        /*
+        Log.d("Test", "here")
         val velocityTracker = velocityTracker ?: return super.onInterceptTouchEvent(e)
         velocityTracker.computeCurrentVelocity(1000) // Specifying 1000 gives pixels per second
         val vx = velocityTracker.xVelocity
         val vy = velocityTracker.yVelocity
+        Log.d("Test", "vx: $vx, vy: $vy")
         // Only allow swipes to the left; allowing swipes to the right interferes with some back gestures
         if (vx > 0) { return super.onInterceptTouchEvent(e) }
         // Return false if abs(v.x) > abs(v.y) so that only swipes that are more horizontal than vertical
         // get passed on to the message view
-        return abs(vx) < abs(vy)
-         */
+        if (abs(vx) > abs(vy)) {
+            return false
+        } else {
+            return super.onInterceptTouchEvent(e)
+        }
     }
 
-    override fun onTouchEvent(e: MotionEvent): Boolean {
+    override fun dispatchTouchEvent(e: MotionEvent): Boolean {
         when (e.action) {
             MotionEvent.ACTION_DOWN -> velocityTracker = VelocityTracker.obtain()
             MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> velocityTracker = null
         }
         velocityTracker?.addMovement(e)
-        return super.onTouchEvent(e)
+        return super.dispatchTouchEvent(e)
     }
 }

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt

@@ -153,7 +153,7 @@ class VisibleMessageView : LinearLayout {
 
     private fun handleIsSelectedChanged() {
         background = if (snIsSelected) {
-            ColorDrawable(context.resources.getColorWithID(R.color.accent, context.theme))
+            ColorDrawable(context.resources.getColorWithID(R.color.message_selected, context.theme))
         } else {
             null
         }