Merge branch 'master' into michishitaEdit
commit 5b942dd38e0c7167391d3e089e61eeeb2bf0c95b
2 parents 3d16aed + 40b3c3e
s-michishita authored on 2 Jul 2021
Showing 7 changed files
View
app/src/main/java/org/ntlab/acanthus_client/entities/AnimationJson.java
View
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/edit/EditFragment.java
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/res/layout/animation_home.xml
View
app/src/main/res/layout/fragment_edit.xml