From 63070609bd58f0e654764a7a3aad927711d2fbcf Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sat, 24 Mar 2018 03:59:25 -0400 Subject: [PATCH] Flatten swatch, add background to picker --- .../java/feature/themepicker/HSVPickerView.kt | 5 ++-- .../res/drawable/rounded_rectangle_4dp.xml | 27 +++++++++++++++++ .../src/main/res/layout/hsv_picker_view.xml | 29 +++++++++---------- 3 files changed, 44 insertions(+), 17 deletions(-) create mode 100755 presentation/src/main/res/drawable/rounded_rectangle_4dp.xml diff --git a/presentation/src/main/java/feature/themepicker/HSVPickerView.kt b/presentation/src/main/java/feature/themepicker/HSVPickerView.kt index bf309919..cc8ea055 100644 --- a/presentation/src/main/java/feature/themepicker/HSVPickerView.kt +++ b/presentation/src/main/java/feature/themepicker/HSVPickerView.kt @@ -26,6 +26,7 @@ import android.view.MotionEvent import android.view.View import com.moez.QKSMS.R import common.util.extensions.setBackgroundTint +import common.util.extensions.setTint import common.util.extensions.within import kotlinx.android.synthetic.main.hsv_picker_view.view.* @@ -64,7 +65,7 @@ class HSVPickerView @JvmOverloads constructor(context: Context, attrs: Attribute val range = max - min val hsv = floatArrayOf(hue, (x - min) / range, 1 - (y - min) / range) - swatchPreview.setBackgroundTint(Color.HSVToColor(hsv)) + swatch.setTint(Color.HSVToColor(hsv)) } else -> return@setOnTouchListener false @@ -81,7 +82,7 @@ class HSVPickerView @JvmOverloads constructor(context: Context, attrs: Attribute } fun setColor(color: Int) { - swatchPreview.setBackgroundTint(color) + swatch.setTint(color) // Convert the rgb color to HSV val hsv = FloatArray(3).apply { diff --git a/presentation/src/main/res/drawable/rounded_rectangle_4dp.xml b/presentation/src/main/res/drawable/rounded_rectangle_4dp.xml new file mode 100755 index 00000000..1a900304 --- /dev/null +++ b/presentation/src/main/res/drawable/rounded_rectangle_4dp.xml @@ -0,0 +1,27 @@ + + + + + + + + + + \ No newline at end of file diff --git a/presentation/src/main/res/layout/hsv_picker_view.xml b/presentation/src/main/res/layout/hsv_picker_view.xml index 12ce173a..42deec68 100644 --- a/presentation/src/main/res/layout/hsv_picker_view.xml +++ b/presentation/src/main/res/layout/hsv_picker_view.xml @@ -6,6 +6,17 @@ android:layout_height="wrap_content" tools:parentTag="feature.themepicker.HSVPickerView"> + + - - - - - + android:src="@drawable/circle" + tools:tint="@color/tools_theme" /> \ No newline at end of file