Re-implemented the ability to long tap on your primary/secondary color to open the color picker. May contain bugs.

Author: therealbluepandabear

app/src/main/java/com/therealbluepandabear/pixapencil/activities/canvas/oncreate/CanvasActivity+setupEventListeners.kt

@@ -7,20 +7,31 @@ import com.therealbluepandabear.pixapencil.R
 import com.therealbluepandabear.pixapencil.activities.canvas.*
 import com.therealbluepandabear.pixapencil.fragments.colorpicker.ColorPickerFragment
 
-fun CanvasActivity.setupEventListeners() {
-    binding.activityCanvasColorSwitcherView.setOnColorPickerTapped {
-        // this 'if' is very important, as without it multiple fragments would be added to the backstack
-        if (supportFragmentManager.backStackEntryCount == 0) {
-            supportFragmentManager.commit {
-                replace(
-                    R.id.activityCanvas_primaryFragmentHost,
-                    ColorPickerFragment.newInstance(
-                        paramOldColor = getSelectedColor(),
-                        paramColorPalette = null
-                    )
+private fun CanvasActivity.navigateToColorPicker() {
+    if (supportFragmentManager.backStackEntryCount == 0) {
+        supportFragmentManager.commit {
+            replace(
+                R.id.activityCanvas_primaryFragmentHost,
+                ColorPickerFragment.newInstance(
+                    paramOldColor = getSelectedColor(),
+                    paramColorPalette = null
                 )
-                addToBackStack(null)
-            }
+            )
+            addToBackStack(null)
         }
     }
+}
+
+fun CanvasActivity.setupEventListeners() {
+    binding.activityCanvasColorSwitcherView.setOnColorPickerTapped {
+        navigateToColorPicker()
+    }
+
+    binding.activityCanvasColorSwitcherView.setOnPrimaryColorLongTapped {
+        navigateToColorPicker()
+    }
+
+    binding.activityCanvasColorSwitcherView.setOnSecondaryColorLongTapped {
+        navigateToColorPicker()
+    }
 }

app/src/main/java/com/therealbluepandabear/pixapencil/customviews/colorswitcherview/ColorSwitcherView.kt

@@ -7,6 +7,7 @@ import android.graphics.Shader.TileMode
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.View
+import android.view.ViewConfiguration
 import androidx.core.content.ContextCompat
 import com.therealbluepandabear.pixapencil.R
 
@@ -95,6 +96,10 @@ class ColorSwitcherView(context: Context, attributeSet: AttributeSet) : View(con
 
     private var onColorPickerTapped: () -> Unit = { }
 
+    private var onPrimaryColorLongTapped: () -> Unit = { }
+
+    private var onSecondaryColorLongTapped: () -> Unit = { }
+
     private fun toDp(px: Int): Float {
         return px * resources.displayMetrics.density
     }
@@ -117,6 +122,14 @@ class ColorSwitcherView(context: Context, attributeSet: AttributeSet) : View(con
         this.onColorPickerTapped = onColorPickerTapped
     }
 
+    fun setOnPrimaryColorLongTapped(onPrimaryColorLongTapped: () -> Unit) {
+        this.onPrimaryColorLongTapped = onPrimaryColorLongTapped
+    }
+
+    fun setOnSecondaryColorLongTapped(onSecondaryColorLongTapped: () -> Unit) {
+        this.onSecondaryColorLongTapped = onSecondaryColorLongTapped
+    }
+
     fun setIsPrimarySelected(isPrimarySelected: Boolean) {
         this.isPrimarySelected = isPrimarySelected
         invalidate()
@@ -305,6 +318,14 @@ class ColorSwitcherView(context: Context, attributeSet: AttributeSet) : View(con
         }
     }
 
+    private val longPressedRunnable = Runnable {
+        if (isPrimarySelected) {
+            onPrimaryColorLongTapped.invoke()
+        } else {
+            onSecondaryColorLongTapped.invoke()
+        }
+    }
+
     @SuppressLint("ClickableViewAccessibility") /** I will un-suppress in future commits **/
     override fun onTouchEvent(event: MotionEvent): Boolean {
         val xOrY = if (!orientationLandscape) {
@@ -319,18 +340,34 @@ class ColorSwitcherView(context: Context, attributeSet: AttributeSet) : View(con
             event.x
         }
 
-        if ((xOrY in toDp(50)..toDp(100) - insetStroke) && isPrimarySelected
+        if ((xOrY in toDp(50)..toDp(100) - insetStroke)
             && inverse !in toDp(50)..toDp(70)) {
-            isPrimarySelected = false
-            invalidate()
-        } else if ((xOrY !in toDp(50)..toDp(100) - insetStroke) && !isPrimarySelected
+            // secondary color has been selected
+            handler.postDelayed(longPressedRunnable, ViewConfiguration.getLongPressTimeout().toLong())
+
+            if (isPrimarySelected) {
+                isPrimarySelected = false
+                invalidate()
+            }
+        } else if ((xOrY !in toDp(50)..toDp(100) - insetStroke)
                     && inverse !in toDp(50)..toDp(70)) {
-            isPrimarySelected = true
-            invalidate()
+            // primary color has been selected
+            handler.postDelayed(longPressedRunnable, ViewConfiguration.getLongPressTimeout().toLong())
+
+            if (!isPrimarySelected) {
+                isPrimarySelected = true
+                invalidate()
+            }
         } else if ((inverse in toDp(55)..toDp(70))) {
+            // color picker has been selected
+
             onColorPickerTapped.invoke()
         }
 
+        if (event.action == MotionEvent.ACTION_UP) {
+            handler.removeCallbacks(longPressedRunnable)
+        }
+
         return true
     }
 }