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/build.gradle # app/src/main/AndroidManifest.xml AchieveRequests AddGroupByGroupID2 AreaInformation AreaInformationUpdate CompareStoreLocation CreateIntentService DG_gitignore DisplayGroupIDToInvite DisplayGroupIDToInviteSecond DisplayTitleRep GPSgetInService GroupListActivity JouinGroupLayoutRepair LineInvite MemberList NotificationClass RequestList RequestListActivity SearchResultDisplay StoreLocationClass UpdateRequestList areaInfo master master_backup removeDGBuild searchNotificationsFix20191114 sendNotification updateAreaInformation

commit a49a8ae8afe9e26ebf014b3b6c6c88b8f50a5aa3 2 parents 9a9bdf0 + 534c234 a-hongo authored on 4 Jul 2019

Showing 76 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/SigninResponse.java
• app/src/main/java/com/example/cosmosclient/entities/SignupResponse.java
• app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java
• app/src/main/java/com/example/cosmosclient/resources/UsersRest.java
• app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java
• app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
• app/src/main/java/com/example/cosmosclient/views/CheeseDynamicAdapter.java
• app/src/main/java/com/example/cosmosclient/views/Cheeses.java
• app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java
• app/src/main/java/com/example/cosmosclient/views/DynamicGridView.java
• app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java
• app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
• app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
• app/src/main/java/com/example/cosmosclient/yolp/Category.java
• app/src/main/java/com/example/cosmosclient/yolp/SubCategory.java
• app/src/main/java/com/example/cosmosclient/yolp/Yolp.java
• app/src/main/res/drawable/borderless_button.xml
• app/src/main/res/drawable/line_image.png
• app/src/main/res/layout/activity_add_request.xml
• app/src/main/res/layout/activity_make_group.xml
• app/src/main/res/layout/activity_signup.xml
• app/src/main/res/layout/app_bar_request_list.xml
• app/src/main/res/layout/content_group_list.xml
• app/src/main/res/layout/item_grid.xml
• app/src/main/res/values/integers.xml
• dynamicgrid/AndroidManifest.xml
• dynamicgrid/build.gradle
• dynamicgrid/build/generated/source/buildConfig/androidTest/debug/org/askerov/dynamicgrid/test/BuildConfig.java
• dynamicgrid/build/generated/source/buildConfig/debug/org/askerov/dynamicgrid/BuildConfig.java
• dynamicgrid/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml
• dynamicgrid/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
• dynamicgrid/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
• dynamicgrid/build/intermediates/apk_list/debug/mainApkListPersistenceDebug/apk-list.gson
• dynamicgrid/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml
• dynamicgrid/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json
• dynamicgrid/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json
• dynamicgrid/build/intermediates/compile_library_classes/debug/classes.jar
• dynamicgrid/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar
• dynamicgrid/build/intermediates/full_jar/debug/createFullJarDebug/full.jar
• dynamicgrid/build/intermediates/incremental/debug-mergeJniLibs/merge-state
• dynamicgrid/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
• dynamicgrid/build/intermediates/incremental/mergeDebugShaders/merger.xml
• dynamicgrid/build/intermediates/incremental/packageDebugAssets/merger.xml
• dynamicgrid/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
• dynamicgrid/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml
• dynamicgrid/build/intermediates/incremental/packageDebugResources/merger.xml
• dynamicgrid/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
• dynamicgrid/build/intermediates/instant_app_manifest/debug/output.json
• dynamicgrid/build/intermediates/instant_run_merged_manifests/debug/output.json
• dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/AbstractDynamicGridAdapter.class
• dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/BaseDynamicGridAdapter.class
• dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/BuildConfig.class
• dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/DynamicGridAdapterInterface.class
• dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/DynamicGridUtils.class
• dynamicgrid/build/intermediates/library_java_res/debug/res.jar
• dynamicgrid/build/intermediates/library_manifest/debug/AndroidManifest.xml
• dynamicgrid/build/intermediates/merged_manifests/debug/output.json
• dynamicgrid/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml
• dynamicgrid/build/intermediates/merged_manifests/debugAndroidTest/output.json
• dynamicgrid/build/intermediates/metadata_feature_manifest/debug/processDebugManifest/metadata-feature/output.json
• dynamicgrid/build/intermediates/packaged_res/debug/values/values.xml
• dynamicgrid/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt
• dynamicgrid/build/intermediates/runtime_library_classes/debug/classes.jar
• dynamicgrid/build/intermediates/symbols/debug/R.txt
• dynamicgrid/build/intermediates/transforms/mergeJniLibs/debug/__content__.json
• dynamicgrid/build/outputs/logs/manifest-merger-debug-report.txt
• dynamicgrid/res/values/dimens.xml
• dynamicgrid/res/values/id.xml
• dynamicgrid/src/org/askerov/dynamicgrid/AbstractDynamicGridAdapter.java
• dynamicgrid/src/org/askerov/dynamicgrid/BaseDynamicGridAdapter.java
• dynamicgrid/src/org/askerov/dynamicgrid/DynamicGridAdapterInterface.java
• dynamicgrid/src/org/askerov/dynamicgrid/DynamicGridUtils.java
• settings.gradle

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/SigninResponse.java

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

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/UsersRest.java

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

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

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

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

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

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/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/java/com/example/cosmosclient/yolp/Category.java

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

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

Ignore Space Show notes View app/src/main/res/drawable/borderless_button.xml

Ignore Space Show notes View app/src/main/res/drawable/line_image.png 0 → 100644

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

Ignore Space Show notes View app/src/main/res/layout/activity_make_group.xml 0 → 100644

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

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

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

Ignore Space Show notes View app/src/main/res/layout/item_grid.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/values/integers.xml 0 → 100644

Ignore Space Show notes View dynamicgrid/AndroidManifest.xml 0 → 100644

Ignore Space Show notes View dynamicgrid/build.gradle 0 → 100644

Ignore Space Show notes View dynamicgrid/build/generated/source/buildConfig/androidTest/debug/org/askerov/dynamicgrid/test/BuildConfig.java 0 → 100644

Ignore Space Show notes View dynamicgrid/build/generated/source/buildConfig/debug/org/askerov/dynamicgrid/BuildConfig.java 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/annotation_processor_list/debug/annotationProcessors.json 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/apk_list/debug/mainApkListPersistenceDebug/apk-list.gson 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/compile_library_classes/debug/classes.jar 0 → 100644
Not supported

Ignore Space Show notes View dynamicgrid/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar 0 → 100644
Not supported

Ignore Space Show notes View dynamicgrid/build/intermediates/full_jar/debug/createFullJarDebug/full.jar 0 → 100644
Not supported

Ignore Space Show notes View dynamicgrid/build/intermediates/incremental/debug-mergeJniLibs/merge-state 0 → 100644
Not supported

Ignore Space Show notes View dynamicgrid/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/incremental/mergeDebugShaders/merger.xml 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/incremental/packageDebugAssets/merger.xml 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/incremental/packageDebugResources/compile-file-map.properties 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/incremental/packageDebugResources/merged.dir/values/values.xml 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/incremental/packageDebugResources/merger.xml 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/instant_app_manifest/debug/output.json 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/instant_run_merged_manifests/debug/output.json 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/AbstractDynamicGridAdapter.class 0 → 100644
Not supported

Ignore Space Show notes View dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/BaseDynamicGridAdapter.class 0 → 100644
Not supported

Ignore Space Show notes View dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/BuildConfig.class 0 → 100644
Not supported

Ignore Space Show notes View dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/DynamicGridAdapterInterface.class 0 → 100644
Not supported

Ignore Space Show notes View dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/DynamicGridUtils.class 0 → 100644
Not supported

Ignore Space Show notes View dynamicgrid/build/intermediates/library_java_res/debug/res.jar 0 → 100644
Not supported

Ignore Space Show notes View dynamicgrid/build/intermediates/library_manifest/debug/AndroidManifest.xml 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/merged_manifests/debug/output.json 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/merged_manifests/debugAndroidTest/output.json 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/metadata_feature_manifest/debug/processDebugManifest/metadata-feature/output.json 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/packaged_res/debug/values/values.xml 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/res/symbol-table-with-package/debug/package-aware-r.txt 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/runtime_library_classes/debug/classes.jar 0 → 100644
Not supported

Ignore Space Show notes View dynamicgrid/build/intermediates/symbols/debug/R.txt 0 → 100644

Ignore Space Show notes View dynamicgrid/build/intermediates/transforms/mergeJniLibs/debug/__content__.json 0 → 100644

Ignore Space Show notes View dynamicgrid/build/outputs/logs/manifest-merger-debug-report.txt 0 → 100644

Ignore Space Show notes View dynamicgrid/res/values/dimens.xml 0 → 100644

Ignore Space Show notes View dynamicgrid/res/values/id.xml 0 → 100644

Ignore Space Show notes View dynamicgrid/src/org/askerov/dynamicgrid/AbstractDynamicGridAdapter.java 0 → 100644

Ignore Space Show notes View dynamicgrid/src/org/askerov/dynamicgrid/BaseDynamicGridAdapter.java 0 → 100644

Ignore Space Show notes View dynamicgrid/src/org/askerov/dynamicgrid/DynamicGridAdapterInterface.java 0 → 100644

Ignore Space Show notes View dynamicgrid/src/org/askerov/dynamicgrid/DynamicGridUtils.java 0 → 100644

Ignore Space Show notes View settings.gradle

Show line notes below