Merge branch 'master' into animationDetail
commit c88af390957a74e0e74b2481b78c9ed305596e5b
2 parents 5461499 + fd872e5
k-fujii authored on 12 Oct 2021
Showing 21 changed files
View
.idea/gradle.xml
View
.idea/misc.xml
View
app/src/main/java/org/ntlab/acanthus_client/entities/FollowAddJson.java
View
app/src/main/java/org/ntlab/acanthus_client/entities/FollowUidJson.java
View
app/src/main/java/org/ntlab/acanthus_client/entities/FollowerUidJson.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/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListActivity.java 0 → 100644
View
app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListFragment.java 100644 → 0
View
app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java 0 → 100644
View
app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListFragment.java 100644 → 0
View
app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListActivity.java 0 → 100644
View
app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListFragment.java 100644 → 0
View
app/src/main/res/drawable/flame_style.xml 0 → 100644
View
app/src/main/res/layout/activity_follow_list.xml 0 → 100644
View
app/src/main/res/layout/activity_follower_list.xml 0 → 100644
View
app/src/main/res/layout/activity_work_list.xml 0 → 100644
View
app/src/main/res/layout/fragment_edit.xml
View
app/src/main/res/layout/fragment_home.xml