Browse code Merge remote-tracking branch 'origin/master' into inviteActivity README master
commit 225ade63ce810cd27f6fe9d0885984cd0add9372 2 parents 232ead8 + 89f9d9f k-suzuki authored on 21 Oct 2021

Showing 69 changed files

• .idea/deploymentTargetDropDown.xml
• .idea/misc.xml
• app/build.gradle
• app/src/main/AndroidManifest.xml
• app/src/main/java/org/ntlab/acanthus_client/Acanthus.java
• app/src/main/java/org/ntlab/acanthus_client/entities/FollowJson.java
• app/src/main/java/org/ntlab/acanthus_client/entities/FollowUidJson.java
• app/src/main/java/org/ntlab/acanthus_client/entities/FollowerJson.java
• app/src/main/java/org/ntlab/acanthus_client/entities/FollowerUidJson.java
• app/src/main/java/org/ntlab/acanthus_client/entities/Position.java
• app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowersRest.java
• app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowsRest.java
• app/src/main/java/org/ntlab/acanthus_client/views/MainActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationConnectionModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationViewModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenViewModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.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/PaintScreenShot.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/Point.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/SendScreenShotActivity.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/tests/TestActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.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/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/drawable/ic_baseline_5g.xml
• app/src/main/res/drawable/ic_baseline_border_color.xml
• app/src/main/res/drawable/ic_baseline_cancel_24.xml
• app/src/main/res/drawable/ic_baseline_fast_forward.xml
• app/src/main/res/drawable/ic_baseline_fast_rewind.xml
• app/src/main/res/drawable/ic_baseline_library_add.xml
• app/src/main/res/drawable/ic_baseline_pause.xml
• app/src/main/res/drawable/ic_baseline_pending.xml
• app/src/main/res/drawable/ic_baseline_play_arrow.xml
• app/src/main/res/drawable/ic_baseline_refresh.xml
• app/src/main/res/drawable/ic_baseline_west.xml
• app/src/main/res/drawable/nittalab_ad.png
• app/src/main/res/drawable/niwatori.png
• app/src/main/res/drawable/tamashii.png
• app/src/main/res/drawable/yakiniku.png
• app/src/main/res/layout/activity_animation.xml
• app/src/main/res/layout/activity_animation_detail.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_login_screen.xml
• app/src/main/res/layout/activity_page.xml
• app/src/main/res/layout/activity_paint.xml
• app/src/main/res/layout/activity_send_screen_shot.xml
• app/src/main/res/layout/activity_sign_up.xml
• app/src/main/res/layout/activity_work_list.xml
• app/src/main/res/layout/follow_or_follower_list.xml
• app/src/main/res/layout/fragment_create.xml
• app/src/main/res/layout/fragment_edit.xml
• app/src/main/res/layout/fragment_mypage.xml
• app/src/main/res/layout/fragment_pen_detail.xml
• app/src/main/res/values/strings.xml

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml 0 → 100644

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/Acanthus.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/FollowJson.java 0 → 100644

Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/FollowUidJson.java 100644 → 0

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/FollowerJson.java 0 → 100644

Show notes View app/src/main/java/org/ntlab/acanthus_client/entities/FollowerUidJson.java 100644 → 0

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

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/resources/accounts/FollowersRest.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/views/MainActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationConnectionModel.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationViewModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/login/LoginScreenViewModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.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/PaintScreenShot.java 0 → 100644

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

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

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

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/tests/TestActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/title/TitleActivity.java

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

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

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

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/drawable/ic_baseline_5g.xml 0 → 100644

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/drawable/nittalab_ad.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/niwatori.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/tamashii.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/yakiniku.png 0 → 100644

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Show line notes below