Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into RequestListActivity
commit 5e981f4e49034d454c5fc85cd0ad6980f46b235d
2 parents 8d93777 + a6df921
a-hongo authored on 26 Sep 2019
Showing 13 changed files
View
app/src/main/AndroidManifest.xml
View
app/src/main/java/com/example/cosmosclient/entities/JoinGroupResponse.java
View
app/src/main/java/com/example/cosmosclient/resources/JoinGroupRest.java
View
app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java
View
app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java 0 → 100644
View
app/src/main/java/com/example/cosmosclient/views/DisplayQRActivity.java
View
app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java
View
app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java
View
app/src/main/res/layout/activity_add_member.xml
View
app/src/main/res/layout/activity_display_group_id.xml 0 → 100644
View
app/src/main/res/layout/activity_join_group_actions.xml
View
app/src/main/res/layout/activity_join_group_by_id.xml
View
app/src/main/res/layout/activity_qrcode_reading.xml