Merge branches 'SignUpInBranch' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into SignUpInBranch
commit d7826696f40eb1973bc9d40fa04d140229ca31d3
2 parents 2253356 + d5e1e70
k-morimoto authored on 9 Jul 2019
Showing 21 changed files
View
.idea/gradle.xml
View
app/src/main/AndroidManifest.xml
View
app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
View
app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
View
app/src/main/java/com/example/cosmosclient/yolp/Category.java 0 → 100644
View
app/src/main/java/com/example/cosmosclient/yolp/SubCategory.java 0 → 100644
View
app/src/main/java/com/example/cosmosclient/yolp/Yolp.java 0 → 100644
View
app/src/main/res/layout/activity_add_request.xml
View
app/src/main/res/layout/app_bar_request_list.xml
View
app/src/main/res/layout/content_request_list.xml
View
app/src/main/res/values/strings.xml
View
dynamicgrid/.gitignore 0 → 100644
View
dynamicgrid/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar
Not supported
View
dynamicgrid/build/intermediates/full_jar/debug/createFullJarDebug/full.jar 0 → 100644
Not supported
View
dynamicgrid/build/intermediates/incremental/debug-mergeJniLibs/merge-state
Not supported
View
dynamicgrid/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
View
dynamicgrid/build/intermediates/incremental/mergeDebugShaders/merger.xml
View
dynamicgrid/build/intermediates/incremental/packageDebugAssets/merger.xml
View
dynamicgrid/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
View
dynamicgrid/build/intermediates/incremental/packageDebugResources/merger.xml
View
dynamicgrid/build/outputs/logs/manifest-merger-debug-report.txt