| Merge branch 'master' into michishitaEdit | 
|---|
| app/src/main/AndroidManifest.xml | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/Acanthus.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.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/animation/AnimationViewModel.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java 0 → 100644 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailViewModel.java 0 → 100644 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeViewModel.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/ListAnimationViewAdapter.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/InvitesConnectionModel.java 100644 → 0 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintConnectionModel.java 100644 → 0 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintModelContainer.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/models/InvitesConnectionModel.java 0 → 100644 | 
|---|
| app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java 0 → 100644 | 
|---|
| app/src/main/res/layout/activity_animation.xml | 
|---|
| app/src/main/res/layout/activity_animation_detail.xml 0 → 100644 | 
|---|
| app/src/main/res/layout/fragment_mypage.xml | 
|---|