Merge branch 'master' into michishitaEdit
|
---|
app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationViewModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageConnectionModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java |
---|
app/src/main/res/drawable/ic_paint_tool_button.xml 0 → 100644 |
---|
app/src/main/res/drawable/sample1.png 0 → 100644 |
---|
|
app/src/main/res/drawable/sample2.png 0 → 100644 |
---|
|
app/src/main/res/drawable/sample3.png 0 → 100644 |
---|
|
app/src/main/res/drawable/sample4.png 0 → 100644 |
---|
|
app/src/main/res/drawable/sample5.png 0 → 100644 |
---|
|
app/src/main/res/layout/activity_paint.xml |
---|