Merge branch 'master' into PaintScreenShot

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge branch 'master' into PaintScreenShot # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java README master
commit bd58d84e8c1a585730db61a377fbf2fbf1e94f0f 2 parents a96dd7e + 4a011a8 k-fujii authored on 14 Oct 2021

Patch

Unified Split

Showing 13 changed files

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

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/Position.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/AnimationConnectionModel.java 0 → 100644

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

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

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.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/PageConnectionModel.java

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

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

Ignore Space Show notes View app/src/main/res/layout/activity_animation.xml

Ignore Space Show notes View app/src/main/res/layout/activity_page.xml

Show line notes below