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/app/Cosmos.java RequestListActivity UpdateRequestList master searchNotificationsFix20191114 sendNotification updateAreaInformation
commit 7d806e7ca03bcf45a1561175c2c1ce192c1587ae 2 parents 847992e + 60636b2 a-hongo authored on 12 Nov 2019

Showing 11 changed files

• app/src/main/java/com/example/cosmosclient/GPSresources/StoreLocationsMethods.java
• 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/CosmosLocation.java
• app/src/main/java/com/example/cosmosclient/entities/Feature.java
• app/src/main/java/com/example/cosmosclient/entities/Location.java
• app/src/main/java/com/example/cosmosclient/resources/LocationRest.java
• app/src/main/java/com/example/cosmosclient/resources/ShopRest.java
• app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java
• app/src/main/java/com/example/cosmosclient/views/RequestPermissionsActivty.java
• app/src/main/java/com/example/cosmosclient/views/SigninActivity.java

Show notes View app/src/main/java/com/example/cosmosclient/GPSresources/StoreLocationsMethods.java 100644 → 0

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

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

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

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

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

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

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

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

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

Show line notes below