From 5fa1560a109cae5c647532f4c72ebd4b6523fcdc Mon Sep 17 00:00:00 2001
From: Nicholas Tinsley <nicholas@signal.org>
Date: Tue, 5 Mar 2024 12:50:28 -0500
Subject: [PATCH] Add stroke to draw tool color bar.

---
 .../org/thoughtcrime/securesms/scribbles/HSVColorSlider.kt  | 6 ++++++
 app/src/main/res/layout/v2_media_image_editor_hud.xml       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/HSVColorSlider.kt b/app/src/main/java/org/thoughtcrime/securesms/scribbles/HSVColorSlider.kt
index 2962745d82..da82c34643 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/HSVColorSlider.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/HSVColorSlider.kt
@@ -155,6 +155,11 @@ object HSVColorSlider {
     val radii: FloatArray = (1..8).map { 50f }.toFloatArray()
     val bounds = RectF()
     val clipPath = Path()
+    val paint = Paint().apply {
+      color = Color.WHITE
+      style = Paint.Style.STROKE
+      strokeWidth = ViewUtil.dpToPx(4).toFloat()
+    }
 
     return customizeOnDraw { wrapped, canvas ->
       canvas.save()
@@ -164,6 +169,7 @@ object HSVColorSlider {
       clipPath.rewind()
       clipPath.addRoundRect(bounds, radii, Path.Direction.CW)
 
+      canvas.drawPath(clipPath, paint)
       canvas.clipPath(clipPath)
       wrapped.draw(canvas)
       canvas.restore()
diff --git a/app/src/main/res/layout/v2_media_image_editor_hud.xml b/app/src/main/res/layout/v2_media_image_editor_hud.xml
index ce1fe7e8b2..77dce2a1d7 100644
--- a/app/src/main/res/layout/v2_media_image_editor_hud.xml
+++ b/app/src/main/res/layout/v2_media_image_editor_hud.xml
@@ -198,7 +198,7 @@
             android:id="@+id/image_editor_hud_draw_color_bar"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
+            android:layout_marginStart="20dp"
             android:splitTrack="false"
             android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@id/image_editor_hud_top_of_button_bar_spacing"