Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2021/org.ntlab.acanthus_client into editFrag # Conflicts: # .idea/compiler.xml # .idea/misc.xml
commit 35eb596f77eb54791d8b70535aed6231473c954b 2 parents c0d4a08 + b7eefdc k-fujii authored on 20 Jul 2021

Showing 33 changed files

• .idea/gradle.xml
• 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/AnimationViewModel.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/main_menu_ui/home/HomeViewModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/ListAnimationViewAdapter.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageInfoConnectionModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/Invited/InvitedConnectionModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/MyPageInfoConnectionModel.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/PaintViewModel.java
• app/src/main/java/org/ntlab/acanthus_client/views/paint/models/AnimationOperatorModel.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/res/drawable/ic_paint_tool_button.xml
• app/src/main/res/drawable/sample1.png
• app/src/main/res/drawable/sample2.png
• app/src/main/res/drawable/sample3.png
• app/src/main/res/drawable/sample4.png
• app/src/main/res/drawable/sample5.png
• app/src/main/res/layout/activity_animation.xml
• app/src/main/res/layout/activity_main.xml
• app/src/main/res/layout/activity_paint.xml
• app/src/main/res/layout/animation_home.xml
• app/src/main/res/layout/fragment_home.xml
• app/src/main/res/menu/bottom_nav_menu.xml
• app/src/main/res/values/strings.xml

Ignore Space Show notes View .idea/gradle.xml

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/AnimationViewModel.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/main_menu_ui/home/HomeViewModel.java

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

Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java 100644 → 0

Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageInfoConnectionModel.java 100644 → 0

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

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/Invited/InvitedConnectionModel.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/MyPageInfoConnectionModel.java 0 → 100644

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

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

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

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

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

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

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

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

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