From dcff7e8c6c833cceabb0387af6122c8908f127bc Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 23 Mar 2018 20:06:20 -0400 Subject: [PATCH] Allow dragging swatch --- .../themepicker/ThemePickerActivity.kt | 36 +++++++++++++++++-- .../src/main/res/layout/theme_picker_hsl.xml | 22 ++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt b/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt index 4f01f935..b9ca6610 100644 --- a/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt +++ b/presentation/src/main/java/feature/themepicker/ThemePickerActivity.kt @@ -20,6 +20,7 @@ package feature.themepicker import android.os.Bundle import android.support.v7.widget.LinearLayoutManager +import android.view.MotionEvent import com.moez.QKSMS.R import com.uber.autodispose.android.lifecycle.scope import com.uber.autodispose.kotlin.autoDisposable @@ -30,6 +31,7 @@ import kotlinx.android.synthetic.main.theme_picker_activity.* import kotlinx.android.synthetic.main.theme_picker_hsl.* import javax.inject.Inject + class ThemePickerActivity : QkThemedActivity(), ThemePickerView { override val viewModelClass = ThemePickerViewModel::class @@ -61,13 +63,41 @@ class ThemePickerActivity : QkThemedActivity(), ThemePicke colors.background .autoDisposable(scope()) .subscribe { color -> window.decorView.setBackgroundColor(color) } + + var dX = 0f + var dY = 0f + + hue.setOnTouchListener { _, event -> + when (event.action) { + MotionEvent.ACTION_DOWN -> { + dX = swatch.x - event.rawX + dY = swatch.y - event.rawY + + swatch.animate() + .x(event.rawX + dX) + .y(event.rawY + dY) + .setDuration(0) + .start() + } + + MotionEvent.ACTION_MOVE -> + swatch.animate() + .x(event.rawX + dX) + .y(event.rawY + dY) + .setDuration(0) + .start() + + else -> return@setOnTouchListener false + } + true + } } override fun render(state: ThemePickerState) { - hue.setBackgroundTint(state.hue) - themeAdapter.threadId = state.threadId themeAdapter.selectedColor = state.selectedColor - } + hue.setBackgroundTint(state.hue) + swatchPreview.setBackgroundTint(state.selectedColor) + } } \ No newline at end of file diff --git a/presentation/src/main/res/layout/theme_picker_hsl.xml b/presentation/src/main/res/layout/theme_picker_hsl.xml index 299f0685..4dbcd519 100644 --- a/presentation/src/main/res/layout/theme_picker_hsl.xml +++ b/presentation/src/main/res/layout/theme_picker_hsl.xml @@ -29,4 +29,26 @@ app:layout_constraintStart_toStartOf="@id/hue" app:layout_constraintTop_toTopOf="@id/hue" /> + + + + + + + + \ No newline at end of file