Merge branch 'master' into feature/get_pre_canvas
commit fa5947207603c1e4e2ca708f17d379625d4d94c9
2 parents ee569f7 + 1f80017
k-fujii authored on 28 Oct 2021
Showing 13 changed files
View
.idea/misc.xml
View
app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java
View
app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java
View
app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailViewModel.java
View
app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java
View
app/src/main/res/layout/activity_animation.xml
View
app/src/main/res/layout/activity_animation_detail.xml
View
app/src/main/res/layout/activity_follow_list.xml
View
app/src/main/res/layout/activity_follower_list.xml
View
app/src/main/res/layout/activity_invite.xml
View
app/src/main/res/layout/activity_userpage.xml
View
app/src/main/res/layout/follow_or_follower_list.xml
View
app/src/main/res/layout/fragment_edit.xml