Browse code Merge remote-tracking branch 'origin/master' into kuraoka_負荷処理テスト # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java
commit 970c36e93f05d988e5a1944b57c3cc8682b0aa9c 2 parents c9b398b + 1cdf447 Kryosuke authored on 28 Oct 2021

Showing 36 changed files

• .idea/misc.xml
• app/build.gradle
• app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/animation/AnimationViewModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailViewModel.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/main_menu_ui/home/HomeFragment.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.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/PaintConnectionModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.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/followList/FollowListActivity.java
• app/src/main/java/org/ntlab/acanthus_client/views/userpage/followerList/FollowerListActivity.java
• app/src/main/res/drawable/acanthus_icon_black_500x500_removebg.png
• app/src/main/res/drawable/flame_login.xml
• app/src/main/res/drawable/flame_theme_color.xml
• app/src/main/res/drawable/flame_theme_color_stroke.xml
• app/src/main/res/drawable/higeorgie.png
• app/src/main/res/drawable/nitta_lab.png
• app/src/main/res/drawable/note.png
• app/src/main/res/layout/activity_animation.xml
• app/src/main/res/layout/activity_login_screen.xml
• app/src/main/res/layout/activity_page.xml
• app/src/main/res/layout/activity_sign_up.xml
• app/src/main/res/layout/animation_home_header.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_search.xml
• app/src/main/res/values/colors.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/views/animation/AnimationActivity.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/animation_detail/AnimationDetailActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailViewModel.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/main_menu_ui/home/HomeFragment.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/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/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/title/TitleActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserListViewAdapter.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/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/res/drawable/acanthus_icon_black_500x500_removebg.png 0 → 100644

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

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

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

Show notes View app/src/main/res/drawable/higeorgie.png 100644 → 0

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

Show notes View app/src/main/res/drawable/note.png 100644 → 0

Ignore Space Show notes View app/src/main/res/layout/activity_animation.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_sign_up.xml

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

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_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_search.xml

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

Show line notes below