Merge branch 'master' into color
commit 099f4aba26e7c3e7301b4b20b5616d6924d8d28b
2 parents 0eb3be7 + b7eefdc
t-tai authored on 20 Jul 2021
Showing 17 changed files
View
.idea/compiler.xml
View
.idea/gradle.xml
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeViewModel.java
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/ListAnimationViewAdapter.java
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java 100644 → 0
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageInfoConnectionModel.java 100644 → 0
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/Invited/InvitedConnectionModel.java 0 → 100644
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/model/MyPageInfoConnectionModel.java 0 → 100644
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/models/AnimationOperatorModel.java 0 → 100644
View
app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PageOperationModel.java 0 → 100644
View
app/src/main/res/layout/activity_main.xml
View
app/src/main/res/layout/activity_paint.xml
View
app/src/main/res/layout/animation_home.xml
View
app/src/main/res/layout/fragment_home.xml