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/MainActivity.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationCanvas.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateViewModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java |
---|
app/src/main/res/layout/activity_animation.xml |
---|
app/src/main/res/layout/activity_sign_up.xml |
---|
app/src/main/res/layout/activity_title.xml |
---|
app/src/main/res/layout/fragment_mypage.xml |
---|
app/src/main/res/values/colors.xml |
---|
app/src/main/res/values/themes.xml |
---|