Merge branches 'MemberList' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into MemberList
commit 349ef0348e1ade4a45904356223f10cbf0bcd5f3
2 parents 954a6ad + 1c7ce2a
k-morimoto authored on 3 Oct 2019
Showing 10 changed files
View
app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java
View
app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java
View
app/src/main/java/com/example/cosmosclient/views/DisplayQRActivity.java
View
app/src/main/java/com/example/cosmosclient/views/MemberListActivity.java
View
app/src/main/res/layout/activity_add_member.xml
View
app/src/main/res/layout/activity_display_group_id.xml
View
app/src/main/res/layout/activity_display_qr.xml
View
app/src/main/res/layout/activity_join_group_by_id.xml
View
app/src/main/res/layout/activity_member_list.xml
View
app/src/main/res/layout/activity_qrcode_reading.xml