Merge branch 'master' into kuraokacanvas

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge branch 'master' into kuraokacanvas # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/entities/Position.java README master
commit 88082c0065ba2a20d26a04b4ea9d60c2c161a037 2 parents 97ecbee + d3e3e19 k-fujii authored on 7 Oct 2021

Patch

Unified Split

Showing 13 changed files

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View app/src/main/AndroidManifest.xml

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

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

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/Page.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/entities/Stroke.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeViewModel.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/SendScreenShotActivity.java 0 → 100644

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

Ignore Space Show notes View app/src/main/res/layout/activity_send_screen_shot.xml 0 → 100644

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

Show line notes below