Merge branch 'master' into michishitaEdit
commit 14067edc17aa6d5a6f98c550fadc7367aaed57a5
2 parents ad42f38 + 16f72ab
s-michishita authored on 16 Jul 2021
Showing 15 changed files
View
app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java
View
app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationViewModel.java
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageConnectionModel.java
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java
View
app/src/main/res/drawable/ic_paint_tool_button.xml 0 → 100644
View
app/src/main/res/drawable/sample1.png 0 → 100644
View
app/src/main/res/drawable/sample2.png 0 → 100644
View
app/src/main/res/drawable/sample3.png 0 → 100644
View
app/src/main/res/drawable/sample4.png 0 → 100644
View
app/src/main/res/drawable/sample5.png 0 → 100644
View
app/src/main/res/layout/activity_paint.xml