Merge branch 'master' into kuraokaLocalPOSTID
commit fbab333dd78b0e76afaeb1ec06a7cee23f466003
2 parents b7d838f + 80e263a
倉岡 諒丞 authored on 13 Oct 2021
Showing 13 changed files
View
.idea/gradle.xml
View
.idea/misc.xml
View
app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java
View
app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java
View
app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.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/paint/PaintToolBar.java
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java 0 → 100644
View
app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java
View
app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageViewModel.java
View
app/src/main/res/drawable/flame_style.xml 0 → 100644
View
app/src/main/res/layout/fragment_edit.xml
View
app/src/main/res/layout/fragment_home.xml