Browse code Merge branch 'master' into Base64 # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/resources/gallery/StrokesRest.java README master
commit 7fd2e933781c0778e7ae94c42628e1fe8230a4d0 2 parents 8904d46 + b225d18 h-fuji authored on 26 Oct 2021

Showing 65 changed files

• .idea/misc.xml
• app/build.gradle
• 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/Pen.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/resources/gallery/StrokesRest.java
• app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationCanvas.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/main_menu_ui/edit/EditFragment.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/PaintToolBar.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/PenDetailsFragment.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/StrokeCanvasView.java
• app/src/main/java/org/ntlab/acanthus_client/views/tests/TestActivity.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/flame_edit_list.xml
• app/src/main/res/drawable/flame_home_list.xml
• app/src/main/res/drawable/flame_style.xml
• app/src/main/res/drawable/hamburger.jpg
• 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_person.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/note.png
• app/src/main/res/drawable/shape_style.xml
• app/src/main/res/drawable/yellow_gabyou.png
• app/src/main/res/layout/activity_animation.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_main.xml
• app/src/main/res/layout/activity_paint.xml
• app/src/main/res/layout/activity_sign_up.xml
• app/src/main/res/layout/activity_work_list.xml
• app/src/main/res/layout/animation_home.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_home.xml
• app/src/main/res/layout/fragment_pen_detail.xml
• app/src/main/res/layout/list.xml
• app/src/main/res/layout/work_list.xml
• app/src/main/res/menu/bottom_nav_menu.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/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/Pen.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/resources/gallery/StrokesRest.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/AnimationCanvas.java

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

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/main_menu_ui/edit/EditFragment.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/PaintToolBar.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/StrokeCanvasView.java 0 → 100644

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

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

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

Ignore Space Show notes View app/src/main/res/drawable/hamburger.jpg 0 → 100644

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_person.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/note.png 0 → 100644

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

Ignore Space Show notes View app/src/main/res/drawable/yellow_gabyou.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_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_main.xml

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

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/animation_home.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_home.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/layout/list.xml

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

Ignore Space Show notes View app/src/main/res/menu/bottom_nav_menu.xml

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

Show line notes below