From d244ed4acf4f8296b70ce7d4f6eb92852451bb94 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 26 Mar 2018 00:34:02 -0400 Subject: [PATCH] Fix swiping for hue bar --- .../src/main/java/feature/themepicker/HSVPickerView.kt | 9 +++++---- presentation/src/main/res/layout/hsv_picker_view.xml | 9 ++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/presentation/src/main/java/feature/themepicker/HSVPickerView.kt b/presentation/src/main/java/feature/themepicker/HSVPickerView.kt index 566d5909..6b3d739b 100644 --- a/presentation/src/main/java/feature/themepicker/HSVPickerView.kt +++ b/presentation/src/main/java/feature/themepicker/HSVPickerView.kt @@ -79,14 +79,15 @@ class HSVPickerView @JvmOverloads constructor(context: Context, attrs: Attribute var hueThumbX = 0f - hueBackground.setOnTouchListener { _, event -> + hueGroup.setOnTouchListener { _, event -> + setupBounds() when (event.action) { MotionEvent.ACTION_DOWN -> { hueThumbX = event.x - event.rawX } MotionEvent.ACTION_MOVE -> { - hueThumb.x = (event.rawX + hueThumbX + hueThumb.width / 2).within(0f, width - hueThumb.width.toFloat()) + hueThumb.x = (event.rawX + hueThumbX + hueThumb.width / 2).within(min, max) } else -> return@setOnTouchListener false @@ -94,8 +95,8 @@ class HSVPickerView @JvmOverloads constructor(context: Context, attrs: Attribute true } - hueBackground.clipToOutline = true - hueBackground.setImageDrawable(GradientDrawable(GradientDrawable.Orientation.LEFT_RIGHT, hues)) + hueTrack.clipToOutline = true + hueTrack.setImageDrawable(GradientDrawable(GradientDrawable.Orientation.LEFT_RIGHT, hues)) } private fun setupBounds() { diff --git a/presentation/src/main/res/layout/hsv_picker_view.xml b/presentation/src/main/res/layout/hsv_picker_view.xml index d5912425..ed1d0b5d 100644 --- a/presentation/src/main/res/layout/hsv_picker_view.xml +++ b/presentation/src/main/res/layout/hsv_picker_view.xml @@ -52,18 +52,21 @@ tools:tint="@color/tools_theme" />