Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into RequestListActivity # Conflicts: # app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java AchieveRequests AreaInformationUpdate CompareStoreLocation GroupListActivity NotificationClass RequestListActivity StoreLocationClass UpdateRequestList areaInfo master searchNotificationsFix20191114 sendNotification updateAreaInformation

commit d2d8c4bf272064e3cc75c1f2990cf064250d9c64 2 parents 7bead93 + 6cc840e a-hongo authored on 29 Oct 2019

Showing 25 changed files

• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/cosmosclient/app/Cosmos.java
• app/src/main/java/com/example/cosmosclient/entities/AreaInformation.java
• app/src/main/java/com/example/cosmosclient/entities/Feature.java
• app/src/main/java/com/example/cosmosclient/entities/Group.java
• app/src/main/java/com/example/cosmosclient/entities/Location.java
• app/src/main/java/com/example/cosmosclient/entities/RequestList.java
• app/src/main/java/com/example/cosmosclient/entities/Requests.java
• app/src/main/java/com/example/cosmosclient/entities/UserResponse.java
• app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java
• app/src/main/java/com/example/cosmosclient/resources/ShopRest.java
• app/src/main/java/com/example/cosmosclient/resources/UsersRest.java
• app/src/main/java/com/example/cosmosclient/services/CosomosBackgroundService.java
• app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
• app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java
• app/src/main/java/com/example/cosmosclient/views/ForgotPasswordActivity.java
• app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java
• app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java
• app/src/main/java/com/example/cosmosclient/views/MemberListActivity.java
• app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java
• app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
• app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
• app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
• app/src/main/res/layout/activity_forgot_password.xml
• app/src/main/res/layout/nav_header_group_list.xml

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/app/Cosmos.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/AreaInformation.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/Feature.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/Group.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/Location.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/RequestList.java 0 → 100644

Show notes View app/src/main/java/com/example/cosmosclient/entities/Requests.java 100644 → 0

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/UserResponse.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/resources/ShopRest.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/resources/UsersRest.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/services/CosomosBackgroundService.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/ForgotPasswordActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/MemberListActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/SigninActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/SignupActivity.java

Ignore Space Show notes View app/src/main/res/layout/activity_forgot_password.xml

Ignore Space Show notes View app/src/main/res/layout/nav_header_group_list.xml

Show line notes below