Draw the highlight and ink marks flat, like the marks beside them

app/src/main/java/app/opendocument/droid/ui/widget/EditingTools.kt

@@ -109,7 +109,7 @@ class EditingTools(context: Context, attributeSet: AttributeSet?) :
         row.addView(textColor)
 
         // a tap flips the highlight on the selection, in the colour the long press picked
-        val highlight = newTool(R.drawable.ic_marker, R.string.tool_highlight, HIGHLIGHT_COLOR)
+        val highlight = newTool(R.drawable.ic_highlight, R.string.tool_highlight, HIGHLIGHT_COLOR)
         paintBar(highlight, HIGHLIGHT_COLOR)
         highlight.setOnClickListener {
             ifOffered(HIGHLIGHT_COLOR) {
@@ -515,7 +515,7 @@ class EditingTools(context: Context, attributeSet: AttributeSet?) :
         /** The marks a pdf takes, in the annotator's names. */
         private val MARKS =
             listOf(
-                Mark("highlight", R.drawable.ic_marker, R.string.tool_mark_highlight),
+                Mark("highlight", R.drawable.ic_highlight, R.string.tool_mark_highlight),
                 Mark("underline", R.drawable.ic_format_underlined, R.string.tool_mark_underline),
                 Mark(
                     "strikeOut",

app/src/main/res/drawable/ic_draw.xml

@@ -4,7 +4,13 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
+  <!-- the ink alone: a free stroke, with no pen over it. its humps are wider and higher than
+       ic_format_squiggly's wave, which stands for an underline rather than for drawing -->
   <path
-      android:fillColor="@android:color/white"
-      android:pathData="M18.85,10.39l1.06,-1.06c0.78,-0.78 0.78,-2.05 0,-2.83L18.5,5.09c-0.78,-0.78 -2.05,-0.78 -2.83,0l-1.06,1.06L18.85,10.39zM13.19,7.56L4,16.76V21h4.24l9.19,-9.19L13.19,7.56zM19,17.5c0,2.19 -2.54,3.5 -5,3.5c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1c1.54,0 3,-0.73 3,-1.5c0,-0.47 -0.48,-0.87 -1.23,-1.2l1.48,-1.48C18.32,15.45 19,16.29 19,17.5zM4.58,13.35C3.61,12.79 3,12.06 3,11c0,-1.8 1.89,-2.63 3.56,-3.36C7.59,7.18 9,6.56 9,6c0,-0.41 -0.78,-1 -2,-1C5.74,5 5.2,5.61 5.17,5.64C4.82,6.05 4.19,6.1 3.77,5.76C3.36,5.42 3.28,4.81 3.62,4.38C3.73,4.24 4.76,3 7,3c2.24,0 4,1.32 4,3c0,1.87 -1.93,2.72 -3.64,3.47C6.42,9.88 5,10.5 5,11c0,0.31 0.43,0.6 1.07,0.86L4.58,13.35z"/>
+      android:strokeColor="@android:color/white"
+      android:strokeWidth="2"
+      android:strokeLineCap="round"
+      android:strokeLineJoin="round"
+      android:fillColor="@android:color/transparent"
+      android:pathData="M3,15.5C5,8.5 8,8 9.5,13S13,19.5 15,14.5 19,8 21,10.5"/>
 </vector>

app/src/main/res/drawable/ic_highlight.xml

@@ -0,0 +1,17 @@
+<!-- a highlighter's stroke across a line of text, drawn flat like the marks beside it -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,4.5h16a0.75,0.75 0,0 1,0 1.5h-16a0.75,0.75 0,0 1,0 -1.5z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4.5,9h15a1.5,1.5 0,0 1,1.5 1.5v3a1.5,1.5 0,0 1,-1.5 1.5h-15a1.5,1.5 0,0 1,-1.5 -1.5v-3a1.5,1.5 0,0 1,1.5 -1.5z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,18h11a0.75,0.75 0,0 1,0 1.5h-11a0.75,0.75 0,0 1,0 -1.5z"/>
+</vector>