Browse code Merge remote-tracking branch 'origin/master' into animationDetail # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java README master
commit caf8deaa65fa4885dc15094cd710f6709c9c3eac 2 parents 12bd1f1 + 6f66f89 h-fuji authored on 4 Nov 2021

Showing 34 changed files

• .idea/misc.xml
• app/build.gradle
• app/src/main/AndroidManifest.xml
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.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/PaintOnionCanvas.java
• 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/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/java/org/ntlab/acanthus_client/views/paint/page/PageViewModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserListViewAdapter.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageViewModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/FollowFollowerActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/FollowFollowerAdapter.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/UserListViewAdapter.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/UserPageViewModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListActivity.java
• app/src/main/res/layout/activity_follow_follower.xml
• app/src/main/res/layout/activity_follow_list.xml
• app/src/main/res/layout/activity_follower_list.xml
• app/src/main/res/layout/activity_page.xml
• app/src/main/res/layout/follow_or_follower_list.xml
• app/src/main/res/layout/fragment_follow_list.xml
• app/src/main/res/layout/fragment_follower_list.xml
• app/src/main/res/values/strings.xml

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View app/build.gradle

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintOnionCanvas.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintToolBar.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageConnectionModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageOperationModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageViewModel.java 0 → 100644

Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserListViewAdapter.java 100644 → 0

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java

Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageViewModel.java 100644 → 0

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/FollowFollowerActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/FollowFollowerAdapter.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/UserListViewAdapter.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/UserPageViewModel.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java 0 → 100644

Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListActivity.java 100644 → 0

Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java 100644 → 0

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListActivity.java

Ignore Space Show notes View app/src/main/res/layout/activity_follow_follower.xml 0 → 100644

Show notes View app/src/main/res/layout/activity_follow_list.xml 100644 → 0

Show notes View app/src/main/res/layout/activity_follower_list.xml 100644 → 0

Ignore Space Show notes View app/src/main/res/layout/activity_page.xml

Ignore Space Show notes View app/src/main/res/layout/follow_or_follower_list.xml

Ignore Space Show notes View app/src/main/res/layout/fragment_follow_list.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/fragment_follower_list.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/values/strings.xml

Show line notes below