Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into UpdateRequestList # Conflicts: # app/src/main/AndroidManifest.xml UpdateRequestList master
commit 9bf2193c20974f91ecca62423a48e1f8ddb653e9 2 parents 4edc937 + cab5f37 Aki Hongo authored on 15 Nov 2019

Showing 14 changed files

• app/build.gradle
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/cosmosclient/app/Cosmos.java
• app/src/main/java/com/example/cosmosclient/entities/Area.java
• app/src/main/java/com/example/cosmosclient/entities/AreaInformation.java
• app/src/main/java/com/example/cosmosclient/entities/CachePref.java
• app/src/main/java/com/example/cosmosclient/entities/CosmosLocation.java
• app/src/main/java/com/example/cosmosclient/entities/ObjectStorage.java
• app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java
• app/src/main/java/com/example/cosmosclient/services/NotificationDone.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/drawable/notification_icon.png
• app/src/test/java/com/example/cosmosclient/NotificationDoneTestMain.java

Ignore Space Show notes View app/build.gradle

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/Area.java 0 → 100644

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/CachePref.java 0 → 100644

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

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

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/services/NotificationDone.java 0 → 100644

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/drawable/notification_icon.png 0 → 100644

Ignore Space Show notes View app/src/test/java/com/example/cosmosclient/NotificationDoneTestMain.java 0 → 100644

Show line notes below