Browse code Merge branch 'master' into feature/#170_create_page_edit # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java README master
commit 3c3e03f5c06208bc6e7fab44c965793197611864 2 parents 9c736ef + aadd618 k-fujii authored on 14 Oct 2021

Showing 29 changed files

• .idea/gradle.xml
• .idea/misc.xml
• app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java
• app/src/main/java/org/ntlab/acanthus_client/entities/FollowAddJson.java
• app/src/main/java/org/ntlab/acanthus_client/entities/FollowUidJson.java
• app/src/main/java/org/ntlab/acanthus_client/entities/FollowerUidJson.java
• app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java
• app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java
• app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java
• app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.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/PenDetailsFragment.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.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/followList/FollowListActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/followList/FollowListFragment.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListFragment.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/workList/WorkListFragment.java
• app/src/main/res/drawable/flame_style.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_work_list.xml
• app/src/main/res/layout/fragment_edit.xml
• app/src/main/res/layout/fragment_home.xml

Ignore Space Show notes View .idea/gradle.xml

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/Animation.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/FollowAddJson.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/FollowUidJson.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/FollowerUidJson.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/Stroke.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.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/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/PenDetailsFragment.java 0 → 100644

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/userpage/UserPageActivity.java

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

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/drawable/flame_style.xml 0 → 100644

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

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

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

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

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

Show line notes below