Merge pull request #1326 from JulianJautz/PAINTROID-652_transparent_s…

…hape_frame PAINTROID-652 Accessibility of shape frames
Catrobat · Jan 30, 2024 · a6d9041 · a6d9041
2 parents 47744f2 + 6bc3b8e
commit a6d9041
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/tools/implementation/BaseToolWithShape.kt b/Paintroid/src/main/java/org/catrobat/paintroid/tools/implementation/BaseToolWithShape.kt
@@ -64,7 +64,7 @@ abstract class BaseToolWithShape @SuppressLint("VisibleForTests") constructor(
         contextCallback.getColor(R.color.pocketpaint_main_rectangle_tool_primary_color)
 
     @JvmField
-    var secondaryShapeColor: Int = contextCallback.getColor(R.color.pocketpaint_colorAccent)
+    var secondaryShapeColor: Int = contextCallback.getColor(R.color.pocketpaint_colorAccentAlpha60)
 
     @JvmField
     val linePaint: Paint

diff --git a/Paintroid/src/main/res/values/colors.xml b/Paintroid/src/main/res/values/colors.xml
@@ -23,6 +23,7 @@
     <color name="pocketpaint_colorPrimary">#138293</color>
     <color name="pocketpaint_colorPrimaryDark">#0D6775</color>
     <color name="pocketpaint_colorAccent">#157DA2</color>
+    <color name="pocketpaint_colorAccentAlpha60">#99157DA2</color>
     <color name="pocketpaint_text_color_link">#BD5800</color>
 
     <!-- PocketPaint main activity -->
@@ -31,9 +32,9 @@
     <color name="pocketpaint_main_drawing_surface_active">#00000000</color>
     <color name="pocketpaint_main_drawing_surface_inactive">#80000000</color>
     <color name="pocketpaint_main_drawing_surface_background">#D3D3D3</color>
-    <color name="pocketpaint_main_rectangle_tool_primary_color">#555555</color>
-    <color name="pocketpaint_main_rectangle_tool_accent_color">#33B5E5</color>
-    <color name="pocketpaint_main_rectangle_tool_highlight_color">#e56b33</color>
+    <color name="pocketpaint_main_rectangle_tool_primary_color">#99555555</color>
+    <color name="pocketpaint_main_rectangle_tool_accent_color">#9933B5E5</color>
+    <color name="pocketpaint_main_rectangle_tool_highlight_color">#99E56B33</color>
     <color name="pocketpaint_main_cursor_tool_inactive_primary_color">#555555</color>
 
     <!-- PocketPaint welcome activity -->