Merge branch 'master' into kuraoka_canvas

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge branch 'master' into kuraoka_canvas # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java README master
commit 2ceceeec305f56bf1d57aeb08052963ad6e03123 2 parents a6d1d15 + ae46238 r-kuraoka authored on 26 Oct 2021

Patch

Unified Split

Showing 12 changed files

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationCanvas.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationConnectionModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java

Ignore Space Show notes View app/src/main/res/drawable/nitta_naoya.jpg 0 → 100644

Show notes View app/src/main/res/menu/botton_nav_icon.xml 100644 → 0

Ignore Space Show notes View app/src/main/res/menu/botton_nav_top.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/values/strings.xml

Show line notes below