Made the ARGB seek bars easier to grab in the color chooser dialog, fix some other color chooser logical issues. Resolves #1668.

color/src/main/java/com/afollestad/materialdialogs/color/ColorGridAdapter.kt

@@ -120,11 +120,11 @@ internal class ColorGridAdapter(
 
   internal fun updateSelection(@ColorInt color: Int) {
     selectedTopIndex = colors.indexOfFirst { it == color }
-    if (selectedTopIndex == -1 && subColors != null) {
+    if (subColors != null) {
       for (section in 0 until subColors.size) {
         selectedSubIndex = subColors[section].indexOfFirst { it == color }
-        if (selectedSubIndex != -1) {
-          inSub = true
+        inSub = selectedSubIndex != -1
+        if (inSub) {
           selectedSubIndex++ // compensate for the up arrow
           selectedTopIndex = section
           break

color/src/main/java/com/afollestad/materialdialogs/color/SeekBarGroupLayout.kt

@@ -0,0 +1,107 @@
+/*
+ * Licensed under Apache-2.0
+ *
+ * Designed and developed by Aidan Follestad (@afollestad)
+ */
+package com.afollestad.materialdialogs.color
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.util.Log
+import android.view.MotionEvent
+import android.view.MotionEvent.ACTION_DOWN
+import android.view.MotionEvent.ACTION_MOVE
+import android.view.MotionEvent.ACTION_UP
+import android.view.View
+import android.widget.RelativeLayout
+import android.widget.SeekBar
+import com.afollestad.materialdialogs.utils.MDUtil.dimenPx
+import kotlin.math.abs
+
+/** @author Aidan Follestad (afollestad) */
+class SeekBarGroupLayout(
+  context: Context,
+  attrs: AttributeSet? = null
+) : RelativeLayout(context, attrs) {
+
+  private val tolerance = dimenPx(R.dimen.seekbar_grouplayout_tolerance)
+  private var seekBars = listOf<SeekBar>()
+  private var grabbedBar: SeekBar? = null
+
+  override fun onFinishInflate() {
+    super.onFinishInflate()
+
+    val mySeekBars = mutableListOf<SeekBar>()
+    for (i in 0 until childCount) {
+      val child = getChildAt(i) as? SeekBar
+      child?.let(mySeekBars::add)
+    }
+    this.seekBars = mySeekBars
+  }
+
+  @SuppressLint("ClickableViewAccessibility")
+  override fun onTouchEvent(event: MotionEvent): Boolean {
+    val action = event.actionMasked
+
+    when (action) {
+      ACTION_DOWN -> {
+        val target = closestSeekBar(event)
+        if (target != null) {
+          log("Grabbed: ${target.idName()}")
+          grabbedBar = target
+          target.dispatchTouchEvent(event)
+          return true
+        }
+      }
+      ACTION_MOVE -> {
+        if (grabbedBar != null) {
+          grabbedBar!!.dispatchTouchEvent(event)
+          return true
+        }
+      }
+      ACTION_UP -> {
+        if (grabbedBar != null) {
+          log("Released: ${grabbedBar.idName()}")
+          grabbedBar!!.dispatchTouchEvent(event)
+          grabbedBar = null
+          return true
+        }
+      }
+    }
+
+    return super.onTouchEvent(event)
+  }
+
+  private fun closestSeekBar(event: MotionEvent): SeekBar? {
+    val y = event.y
+    var closest: SeekBar? = null
+    var smallestDiff = -1
+
+    for (bar in seekBars) {
+      val diff = abs(y - bar.middleY()).toInt()
+      log("Diff from ${bar.idName()} = $diff, tolerance = $tolerance")
+
+      if (diff <= tolerance && (smallestDiff == -1 || diff < smallestDiff)) {
+        log("New closest: ${bar.idName()}")
+        closest = bar
+        smallestDiff = diff
+      }
+    }
+
+    log("Final closest: ${closest?.idName()}")
+    return closest
+  }
+
+  private fun View.middleY() = this.y + (this.measuredHeight / 2f)
+
+  private fun SeekBar?.idName(): String {
+    return if (this == null) "" else this.resources.getResourceEntryName(this.id)
+  }
+
+  private fun log(message: String) {
+    if (BuildConfig.DEBUG) {
+      Log.d("SeekBarGroupLayout", message)
+    }
+  }
+}

color/src/main/res/layout-land/md_color_chooser_base_argb.xml

@@ -24,7 +24,7 @@
 
   <!-- Color SeekBars on the right -->
 
-  <RelativeLayout
+  <com.afollestad.materialdialogs.color.SeekBarGroupLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_toEndOf="@+id/preview_frame"
@@ -177,6 +177,6 @@
         style="@style/ColorChooser.ValueLabel"
         />
 
-  </RelativeLayout>
+  </com.afollestad.materialdialogs.color.SeekBarGroupLayout>
 
 </RelativeLayout>

color/src/main/res/layout/md_color_chooser_base_argb.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/colorArgbPage"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:orientation="vertical"
     android:paddingBottom="@dimen/color_grid_padding_bottom"
     android:paddingLeft="@dimen/color_grid_item_padding_double"
     android:paddingRight="@dimen/color_grid_item_padding_double"
-    tools:ignore="HardcodedText"
     >
 
   <!-- Preview -->
@@ -17,150 +17,159 @@
       android:id="@+id/preview_frame"
       android:layout_width="match_parent"
       android:layout_height="@dimen/color_argb_preview_height"
-      android:layout_marginBottom="@dimen/color_argb_preview_marginBottom"
       />
 
-  <!-- Alpha -->
-
-  <TextView
-      android:id="@+id/alpha_label"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentLeft="true"
-      android:layout_alignParentStart="true"
-      android:layout_below="@+id/preview_frame"
-      android:text="A"
-      style="@style/ColorChooser.Label"
-      />
-
-  <SeekBar
-      android:id="@+id/alpha_seeker"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_alignBottom="@id/alpha_label"
-      android:layout_alignTop="@id/alpha_label"
-      android:layout_marginLeft="@dimen/color_argb_seeker_marginSides"
-      android:layout_marginRight="@dimen/color_argb_seeker_marginSides"
-      android:layout_toEndOf="@id/alpha_label"
-      android:layout_toLeftOf="@+id/alpha_value"
-      android:layout_toRightOf="@id/alpha_label"
-      android:layout_toStartOf="@+id/alpha_value"
-      style="@style/ColorChooser.Seeker"
-      tools:ignore="UnusedAttribute"
-      />
-
-  <TextView
-      android:id="@+id/alpha_value"
-      android:layout_alignBottom="@id/alpha_label"
-      android:layout_alignParentEnd="true"
-      android:layout_alignParentRight="true"
-      android:layout_alignTop="@id/alpha_label"
-      style="@style/ColorChooser.ValueLabel"
-      />
-
-  <!-- Red -->
-
-  <TextView
-      android:id="@+id/red_label"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentLeft="true"
-      android:layout_alignParentStart="true"
-      android:layout_below="@+id/alpha_label"
-      android:text="R"
-      style="@style/ColorChooser.Label"
-      />
-
-  <SeekBar
-      android:id="@+id/red_seeker"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_alignBottom="@id/red_label"
-      android:layout_alignLeft="@id/alpha_seeker"
-      android:layout_alignRight="@id/alpha_seeker"
-      android:layout_alignTop="@id/red_label"
-      android:layout_toLeftOf="@+id/red_value"
-      android:layout_toStartOf="@+id/red_value"
-      style="@style/ColorChooser.Seeker"
-      />
-
-  <TextView
-      android:id="@+id/red_value"
-      android:layout_alignBottom="@id/red_label"
-      android:layout_alignParentEnd="true"
-      android:layout_alignParentRight="true"
-      android:layout_alignTop="@id/red_label"
-      style="@style/ColorChooser.ValueLabel"
-      />
-
-  <!-- Green -->
-
-  <TextView
-      android:id="@+id/green_label"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentLeft="true"
-      android:layout_alignParentStart="true"
-      android:layout_below="@+id/red_label"
-      android:text="G"
-      style="@style/ColorChooser.Label"
-      />
-
-  <SeekBar
-      android:id="@+id/green_seeker"
+  <com.afollestad.materialdialogs.color.SeekBarGroupLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_alignBottom="@id/green_label"
-      android:layout_alignLeft="@id/alpha_seeker"
-      android:layout_alignRight="@id/alpha_seeker"
-      android:layout_alignTop="@id/green_label"
-      android:layout_toLeftOf="@+id/green_value"
-      android:layout_toStartOf="@+id/green_value"
-      style="@style/ColorChooser.Seeker"
-      />
-
-  <TextView
-      android:id="@+id/green_value"
-      android:layout_alignBottom="@id/green_label"
-      android:layout_alignParentEnd="true"
-      android:layout_alignParentRight="true"
-      android:layout_alignTop="@id/green_label"
-      style="@style/ColorChooser.ValueLabel"
-      />
-
-  <!-- Blue -->
-
-  <TextView
-      android:id="@+id/blue_label"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentLeft="true"
-      android:layout_alignParentStart="true"
-      android:layout_below="@+id/green_label"
-      android:text="B"
-      style="@style/ColorChooser.Label"
-      />
-
-  <SeekBar
-      android:id="@+id/blue_seeker"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_alignBottom="@id/blue_label"
-      android:layout_alignLeft="@id/alpha_seeker"
-      android:layout_alignRight="@id/alpha_seeker"
-      android:layout_alignTop="@id/blue_label"
-      android:layout_toLeftOf="@+id/blue_value"
-      android:layout_toStartOf="@+id/blue_value"
-      style="@style/ColorChooser.Seeker"
-      />
-
-  <TextView
-      android:id="@+id/blue_value"
-      android:layout_alignBottom="@id/blue_label"
-      android:layout_alignParentEnd="true"
-      android:layout_alignParentRight="true"
-      android:layout_alignTop="@id/blue_label"
-      style="@style/ColorChooser.ValueLabel"
-      />
-
-</RelativeLayout>
+      android:paddingTop="@dimen/color_argb_preview_marginBottom"
+      tools:ignore="HardcodedText"
+      >
+
+    <!-- Alpha -->
+
+    <TextView
+        android:id="@+id/alpha_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/preview_frame"
+        android:text="A"
+        style="@style/ColorChooser.Label"
+        />
+
+    <SeekBar
+        android:id="@+id/alpha_seeker"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@id/alpha_label"
+        android:layout_alignTop="@id/alpha_label"
+        android:layout_marginLeft="@dimen/color_argb_seeker_marginSides"
+        android:layout_marginRight="@dimen/color_argb_seeker_marginSides"
+        android:layout_toEndOf="@id/alpha_label"
+        android:layout_toLeftOf="@+id/alpha_value"
+        android:layout_toRightOf="@id/alpha_label"
+        android:layout_toStartOf="@+id/alpha_value"
+        tools:ignore="UnusedAttribute"
+        style="@style/ColorChooser.Seeker"
+        />
+
+    <TextView
+        android:id="@+id/alpha_value"
+        android:layout_alignBottom="@id/alpha_label"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignTop="@id/alpha_label"
+        style="@style/ColorChooser.ValueLabel"
+        />
+
+    <!-- Red -->
+
+    <TextView
+        android:id="@+id/red_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/alpha_label"
+        android:text="R"
+        style="@style/ColorChooser.Label"
+        />
+
+    <SeekBar
+        android:id="@+id/red_seeker"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@id/red_label"
+        android:layout_alignLeft="@id/alpha_seeker"
+        android:layout_alignRight="@id/alpha_seeker"
+        android:layout_alignTop="@id/red_label"
+        android:layout_toLeftOf="@+id/red_value"
+        android:layout_toStartOf="@+id/red_value"
+        style="@style/ColorChooser.Seeker"
+        />
+
+    <TextView
+        android:id="@+id/red_value"
+        android:layout_alignBottom="@id/red_label"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignTop="@id/red_label"
+        style="@style/ColorChooser.ValueLabel"
+        />
+
+    <!-- Green -->
+
+    <TextView
+        android:id="@+id/green_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/red_label"
+        android:text="G"
+        style="@style/ColorChooser.Label"
+        />
+
+    <SeekBar
+        android:id="@+id/green_seeker"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@id/green_label"
+        android:layout_alignLeft="@id/alpha_seeker"
+        android:layout_alignRight="@id/alpha_seeker"
+        android:layout_alignTop="@id/green_label"
+        android:layout_toLeftOf="@+id/green_value"
+        android:layout_toStartOf="@+id/green_value"
+        style="@style/ColorChooser.Seeker"
+        />
+
+    <TextView
+        android:id="@+id/green_value"
+        android:layout_alignBottom="@id/green_label"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignTop="@id/green_label"
+        style="@style/ColorChooser.ValueLabel"
+        />
+
+    <!-- Blue -->
+
+    <TextView
+        android:id="@+id/blue_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/green_label"
+        android:layout_marginBottom="@dimen/color_argb_label_marginTop"
+        android:text="B"
+        style="@style/ColorChooser.Label"
+        />
+
+    <SeekBar
+        android:id="@+id/blue_seeker"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@id/blue_label"
+        android:layout_alignLeft="@id/alpha_seeker"
+        android:layout_alignRight="@id/alpha_seeker"
+        android:layout_alignTop="@id/blue_label"
+        android:layout_toLeftOf="@+id/blue_value"
+        android:layout_toStartOf="@+id/blue_value"
+        style="@style/ColorChooser.Seeker"
+        />
+
+    <TextView
+        android:id="@+id/blue_value"
+        android:layout_alignBottom="@id/blue_label"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignTop="@id/blue_label"
+        style="@style/ColorChooser.ValueLabel"
+        />
+
+  </com.afollestad.materialdialogs.color.SeekBarGroupLayout>
+
+</LinearLayout>

color/src/main/res/values/dimens.xml

@@ -16,7 +16,9 @@
   <dimen name="color_argb_preview_marginRight_landscape">8dp</dimen>
 
   <dimen name="color_argb_label_textSize">18sp</dimen>
-  <dimen name="color_argb_label_marginTop">16dp</dimen>
+  <dimen name="color_argb_label_marginTop">24dp</dimen>
   <dimen name="color_argb_seeker_marginSides">8dp</dimen>
 
+  <dimen name="seekbar_grouplayout_tolerance">36dp</dimen>
+
 </resources>