Merge branch 'master' into UserPageEdit
|
---|
.idea/gradle.xml |
---|
.idea/misc.xml |
---|
app/src/main/AndroidManifest.xml |
---|
app/src/main/java/org/ntlab/acanthus_client/Acanthus.java |
---|
app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java |
---|
app/src/main/java/org/ntlab/acanthus_client/entities/Position.java |
---|
app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java |
---|
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/AnimationConnectionModel.java 0 → 100644 |
---|
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 |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java |
---|
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/PaintScreenShot.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/SendScreenShotActivity.java 100644 → 0 |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageConnectionModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageOperationModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java |
---|
app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java |
---|
app/src/main/res/drawable/flame_style.xml 0 → 100644 |
---|
app/src/main/res/drawable/niwatori.png 0 → 100644 |
---|
|
app/src/main/res/drawable/tamashii.png 0 → 100644 |
---|
|
app/src/main/res/drawable/yakiniku.png 0 → 100644 |
---|
|
app/src/main/res/layout/activity_animation.xml |
---|
app/src/main/res/layout/activity_page.xml |
---|
app/src/main/res/layout/activity_paint.xml |
---|
app/src/main/res/layout/activity_send_screen_shot.xml 100644 → 0 |
---|
app/src/main/res/layout/fragment_create.xml |
---|
app/src/main/res/layout/fragment_edit.xml |
---|
app/src/main/res/layout/fragment_home.xml |
---|
app/src/main/res/layout/fragment_mypage.xml |
---|