Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ import com.example.cahier.R
class CahierTextureBitmapStore(context: Context) : TextureBitmapStore {
private val resources = context.resources

private val textureResources: Map<String, Int> = mapOf(
private val textureResources:
Map<String, Int> = mapOf(
Comment thread
maxmmitchell marked this conversation as resolved.
Outdated
"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>()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,10 @@ object CustomBrushes {
"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)
"Wet paint" to (R.raw.wet_paint to R.drawable.water_drop_24px),
"Jelly Wobble" to (R.raw.jelly_wobble to R.drawable.airwave_24px),
"Pressure Wave" to (R.raw.pressure_wave to R.drawable.vital_signs_24px),
"Shading Pencil" to (R.raw.shading_pencil_v7 to R.drawable.edit_24px),
Comment thread
maxmmitchell marked this conversation as resolved.
Outdated
Comment thread
maxmmitchell marked this conversation as resolved.
Outdated
)

val loadedBrushes = brushFiles.mapNotNull { (name, pair) ->
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/airwave_24px.xml
Original file line number Diff line number Diff line change
@@ -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>
Binary file modified app/src/main/res/drawable/music_note_sixteenth.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/pencil.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/vital_signs_24px.xml
Original file line number Diff line number Diff line change
@@ -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>
Binary file added app/src/main/res/raw/calligraphy.brushfamily
Binary file not shown.
Binary file removed app/src/main/res/raw/calligraphy.gz
Binary file not shown.
Binary file added app/src/main/res/raw/flag_banner.brushfamily
Binary file not shown.
Binary file removed app/src/main/res/raw/flag_banner.gz
Binary file not shown.
Binary file added app/src/main/res/raw/graffiti.brushfamily
Binary file not shown.
Binary file removed app/src/main/res/raw/graffiti.gz
Binary file not shown.
Binary file added app/src/main/res/raw/groovy.brushfamily
Binary file not shown.
Binary file removed app/src/main/res/raw/groovy.gz
Binary file not shown.
Binary file added app/src/main/res/raw/holiday_lights.brushfamily
Binary file not shown.
Binary file removed app/src/main/res/raw/holiday_lights.gz
Binary file not shown.
Binary file added app/src/main/res/raw/jelly_wobble.brushfamily
Binary file not shown.
Binary file added app/src/main/res/raw/lace.brushfamily
Binary file not shown.
Binary file removed app/src/main/res/raw/lace.gz
Binary file not shown.
Binary file added app/src/main/res/raw/music.brushfamily
Binary file not shown.
Binary file removed app/src/main/res/raw/music.gz
Binary file not shown.
Binary file added app/src/main/res/raw/pressure_wave.brushfamily
Binary file not shown.
Binary file not shown.
Binary file added app/src/main/res/raw/shadow.brushfamily
Binary file not shown.
Binary file removed app/src/main/res/raw/shadow.gz
Binary file not shown.
Binary file added app/src/main/res/raw/twisted_yarn.brushfamily
Binary file not shown.
Binary file removed app/src/main/res/raw/twisted_yarn.gz
Binary file not shown.
Binary file added app/src/main/res/raw/wet_paint.brushfamily
Binary file not shown.
Binary file removed app/src/main/res/raw/wet_paint.gz
Binary file not shown.
Loading