Annotate Custom Brushes + Add New Custom Brushes

app/src/main/java/com/example/cahier/core/ui/CahierTextureBitmapStore.kt

@@ -31,7 +31,8 @@ class CahierTextureBitmapStore(context: Context) : TextureBitmapStore {
 
     private val textureResources: Map<String, Int> = mapOf(
         "music-clef-g" to R.drawable.music_clef_g,
-        "music-note-sixteenth" to R.drawable.music_note_sixteenth
+        "music-note-sixteenth" to R.drawable.music_note_sixteenth,
+        "pencil" to R.drawable.pencil,
     )
 
     private val loadedBitmaps = mutableMapOf<String, Bitmap>()

app/src/main/java/com/example/cahier/features/drawing/CustomBrushes.kt

@@ -42,16 +42,19 @@ object CustomBrushes {
     @OptIn(ExperimentalInkCustomBrushApi::class)
     private fun loadCustomBrushes(context: Context): List<CustomBrush> {
         val brushFiles = mapOf(
-            "Calligraphy" to (R.raw.calligraphy to R.drawable.draw_24px),
-            "Flag Banner" to (R.raw.flag_banner to R.drawable.flag_24px),
-            "Graffiti" to (R.raw.graffiti to R.drawable.format_paint_24px),
-            "Groovy" to (R.raw.groovy to R.drawable.bubble_chart_24px),
-            "Holiday lights" to (R.raw.holiday_lights to R.drawable.lightbulb_24px),
-            "Lace" to (R.raw.lace to R.drawable.styler_24px),
-            "Music" to (R.raw.music to R.drawable.music_note_24px),
-            "Shadow" to (R.raw.shadow to R.drawable.blur_on_24px),
-            "Twisted yarn" to (R.raw.twisted_yarn to R.drawable.line_weight_24px),
-            "Wet paint" to (R.raw.wet_paint to R.drawable.water_drop_24px)
+            context.getString(R.string.calligraphy) to (R.raw.calligraphy to R.drawable.draw_24px),
+            context.getString(R.string.flag_banner) to (R.raw.flag_banner to R.drawable.flag_24px),
+            context.getString(R.string.graffiti) to (R.raw.graffiti to R.drawable.format_paint_24px),
+            context.getString(R.string.groovy) to (R.raw.groovy to R.drawable.bubble_chart_24px),
+            context.getString(R.string.holiday_lights) to (R.raw.holiday_lights to R.drawable.lightbulb_24px),
+            context.getString(R.string.lace) to (R.raw.lace to R.drawable.styler_24px),
+            context.getString(R.string.music) to (R.raw.music to R.drawable.music_note_24px),
+            context.getString(R.string.shadow) to (R.raw.shadow to R.drawable.blur_on_24px),
+            context.getString(R.string.twisted_yarn) to (R.raw.twisted_yarn to R.drawable.line_weight_24px),
+            context.getString(R.string.wet_paint) to (R.raw.wet_paint to R.drawable.water_drop_24px),
+            context.getString(R.string.jelly_wobble) to (R.raw.jelly_wobble to R.drawable.airwave_24px),
+            context.getString(R.string.pressure_wave) to (R.raw.pressure_wave to R.drawable.vital_signs_24px),
+            context.getString(R.string.shading_pencil) to (R.raw.shading_pencil to R.drawable.stylus_pencil_24px),
         )
 
         val loadedBrushes = brushFiles.mapNotNull { (name, pair) ->

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

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M750,346Q723,373 688,387Q653,401 618,401Q583,401 549,387.5Q515,374 488,346L413,271Q398,256 379,248.5Q360,241 340,241Q320,241 301,248.5Q282,256 267,271L192,346L135,289L210,214Q237,187 271,173.5Q305,160 340,160Q375,160 408.5,173.5Q442,187 469,214L544,289Q560,305 579,312.5Q598,320 618,320Q638,320 657.5,312.5Q677,305 693,289L768,214L825,271L750,346ZM750,546Q723,573 688.5,586.5Q654,600 619,600Q584,600 549.5,586.5Q515,573 488,546L413,471Q398,456 379,448.5Q360,441 340,441Q320,441 301,448.5Q282,456 267,471L192,546L135,490L210,414Q237,387 271,373.5Q305,360 340,360Q375,360 408.5,373.5Q442,387 469,414L544,489Q560,505 579,512.5Q598,520 618,520Q638,520 657.5,512.5Q677,505 693,489L768,414L825,471L750,546ZM749,746Q722,773 688,786.5Q654,800 619,800Q584,800 549.5,786.5Q515,773 488,746L412,671Q397,656 378,648.5Q359,641 339,641Q319,641 300,648.5Q281,656 266,671L191,746L135,690L210,614Q237,587 271,573.5Q305,560 340,560Q375,560 408.5,573.5Q442,587 469,614L544,689Q560,705 579.5,712.5Q599,720 619,720Q639,720 658,712.5Q677,705 693,689L768,614L824,671L749,746Z"/>
+</vector>

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

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M160,840L182,775Q190,750 211,735Q232,720 258,720L702,720Q728,720 749,735Q770,750 778,775L800,840L160,840ZM240,640L440,120L520,120L720,640L240,640ZM356,560L604,560L480,239L356,560ZM356,560L356,560L604,560L604,560L356,560Z"/>
+</vector>

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

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M326,789Q311,778 304,761L212,520L40,520L40,440L268,440L360,684L544,199Q551,182 566,171Q581,160 600,160Q619,160 634,171Q649,182 656,199L748,440L920,440L920,520L692,520L600,276L416,761Q409,778 394,789Q379,800 360,800Q341,800 326,789Z"/>
+</vector>

app/src/main/res/values/strings.xml

@@ -49,6 +49,19 @@
     <string name="marker">Marker</string>
     <string name="highlighter">Highlighter</string>
     <string name="dashed_line">Dashed line</string>
+    <string name="calligraphy">Calligraphy</string>
+    <string name="flag_banner">Flag Banner</string>
+    <string name="graffiti">Graffiti</string>
+    <string name="groovy">Groovy</string>
+    <string name="holiday_lights">Holiday Lights</string>
+    <string name="lace">Lace</string>
+    <string name="music">Music</string>
+    <string name="shadow">Shadow</string>
+    <string name="twisted_yarn">Twisted Yarn</string>
+    <string name="wet_paint">Wet Paint</string>
+    <string name="jelly_wobble">Jelly Wobble</string>
+    <string name="pressure_wave">Pressure Wave</string>
+    <string name="shading_pencil">Shading Pencil</string>
 
     <string name="note_image_preview">Note image preview</string>
     <string name="drawing_note_indicator">Drawing note indicator</string>