Merge branch 'createFrag' into michishitaEdit
# Conflicts: # .idea/compiler.xml # .idea/misc.xml |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java 0 → 100644 |
---|
app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateViewModel.java 0 → 100644 |
---|
app/src/main/res/layout/fragment_create.xml 0 → 100644 |
---|
app/src/main/res/navigation/mobile_navigation.xml |
---|
build.gradle |
---|