Merge branches 'SigninAndUp' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into SigninAndUp
commit bb94de5e3eb11fe6782b5e7b35cda4260d857c9f
2 parents 3cd7dde + 447598e
k-morimoto authored on 4 Jul 2019
Showing 7 changed files
View
app/src/main/java/com/example/cosmosclient/entities/JoinGroupResponse.java 0 → 100644
View
app/src/main/java/com/example/cosmosclient/resources/JoinGroupRest.java 0 → 100644
View
app/src/main/java/com/example/cosmosclient/views/DisplayQRActivity.java
View
app/src/main/java/com/example/cosmosclient/views/JoinGroupActionsActivity.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_qrcode_reading.xml