diff --git a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java
index 367fb6e..632820b 100644
--- a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java
+++ b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java
@@ -6,9 +6,8 @@
public class Cosmos extends Application {
private String token=null;
- private String curGroup=null;
+ private Group curGroup=null;
private String uId=null;
- private String gId=null;
//token処理
public void setToken(String token){
@@ -19,10 +18,10 @@
}
//Group処理
- public void setCurrentGroup(String g){
+ public void setCurrentGroup(Group g){
curGroup = g;
}
- public String getCurentGroup(){
+ public Group getCurentGroup(){
return curGroup;
}
@@ -33,12 +32,4 @@
public String getuId(){
return uId;
}
-
- //gId処理
- public void setgId(String gId){
- this.gId = gId;
- }
- public String getgId(){
- return gId;
- }
}
diff --git a/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java b/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java
index c0cd0b6..5580a7e 100644
--- a/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java
@@ -14,6 +14,7 @@
import com.example.cosmosclient.R;
import com.example.cosmosclient.app.Cosmos;
import com.example.cosmosclient.entities.CreateGroupResponse;
+import com.example.cosmosclient.entities.Group;
import com.example.cosmosclient.resources.GroupsRest;
import retrofit2.Call;
@@ -75,9 +76,11 @@
if (response.isSuccessful()) {
//成功時
CreateGroupResponse result = response.body();
+ Group g = new Group(result.gId,result.uri,groupNameText.getText().toString(),uId);
+
//app/CosmosにgIdを保存
Cosmos app = (Cosmos)getApplication();
- app.setgId(result.gId);
+ app.setCurrentGroup(g);
Intent intent = new Intent(getApplication(), RequestListActivity.class);
startActivity(intent);
diff --git a/dynamicgrid/build/generated/source/buildConfig/androidTest/debug/org/askerov/dynamicgrid/test/BuildConfig.java b/dynamicgrid/build/generated/source/buildConfig/androidTest/debug/org/askerov/dynamicgrid/test/BuildConfig.java
deleted file mode 100644
index 62d67e0..0000000
--- a/dynamicgrid/build/generated/source/buildConfig/androidTest/debug/org/askerov/dynamicgrid/test/BuildConfig.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package org.askerov.dynamicgrid.test;
-
-public final class BuildConfig {
- public static final boolean DEBUG = Boolean.parseBoolean("true");
- public static final String APPLICATION_ID = "org.askerov.dynamicgrid.test";
- public static final String BUILD_TYPE = "debug";
- public static final String FLAVOR = "";
- public static final int VERSION_CODE = -1;
- public static final String VERSION_NAME = "";
-}
diff --git a/dynamicgrid/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json b/dynamicgrid/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
deleted file mode 100644
index 5858633..0000000
--- a/dynamicgrid/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"dynamicgrid-debug.aar","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"org.askerov.dynamicgrid","split":""}}]
\ No newline at end of file
diff --git a/dynamicgrid/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/dynamicgrid/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
deleted file mode 100644
index 9e26dfe..0000000
--- a/dynamicgrid/build/intermediates/annotation_processor_list/debug/annotationProcessors.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/dynamicgrid/build/intermediates/apk_list/debug/mainApkListPersistenceDebug/apk-list.gson b/dynamicgrid/build/intermediates/apk_list/debug/mainApkListPersistenceDebug/apk-list.gson
deleted file mode 100644
index 23e2309..0000000
--- a/dynamicgrid/build/intermediates/apk_list/debug/mainApkListPersistenceDebug/apk-list.gson
+++ /dev/null
@@ -1 +0,0 @@
-[{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"dynamicgrid-debug.apk","fullName":"debug","baseName":"debug"}]
\ No newline at end of file
diff --git a/dynamicgrid/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml b/dynamicgrid/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml
deleted file mode 100644
index 969f1b9..0000000
--- a/dynamicgrid/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dynamicgrid/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json b/dynamicgrid/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json
deleted file mode 100644
index c0eb612..0000000
--- a/dynamicgrid/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"BUNDLE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"dynamicgrid-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"org.askerov.dynamicgrid","split":"","minSdkVersion":"14"}}]
\ No newline at end of file
diff --git a/dynamicgrid/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json b/dynamicgrid/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json
deleted file mode 100644
index 0637a08..0000000
--- a/dynamicgrid/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/dynamicgrid/build/intermediates/compile_library_classes/debug/classes.jar b/dynamicgrid/build/intermediates/compile_library_classes/debug/classes.jar
deleted file mode 100644
index 8040ff7..0000000
--- a/dynamicgrid/build/intermediates/compile_library_classes/debug/classes.jar
+++ /dev/null
Binary files differ
diff --git a/dynamicgrid/build/intermediates/full_jar/debug/createFullJarDebug/full.jar b/dynamicgrid/build/intermediates/full_jar/debug/createFullJarDebug/full.jar
deleted file mode 100644
index 8040ff7..0000000
--- a/dynamicgrid/build/intermediates/full_jar/debug/createFullJarDebug/full.jar
+++ /dev/null
Binary files differ
diff --git a/dynamicgrid/build/intermediates/incremental/debug-mergeJniLibs/merge-state b/dynamicgrid/build/intermediates/incremental/debug-mergeJniLibs/merge-state
deleted file mode 100644
index 1b7a50f..0000000
--- a/dynamicgrid/build/intermediates/incremental/debug-mergeJniLibs/merge-state
+++ /dev/null
Binary files differ
diff --git a/dynamicgrid/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/dynamicgrid/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
deleted file mode 100644
index bb00f40..0000000
--- a/dynamicgrid/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dynamicgrid/build/intermediates/instant_app_manifest/debug/output.json b/dynamicgrid/build/intermediates/instant_app_manifest/debug/output.json
deleted file mode 100644
index 49dde6d..0000000
--- a/dynamicgrid/build/intermediates/instant_app_manifest/debug/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"INSTANT_APP_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"dynamicgrid-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"org.askerov.dynamicgrid","split":"","minSdkVersion":"14"}}]
\ No newline at end of file
diff --git a/dynamicgrid/build/intermediates/instant_run_merged_manifests/debug/output.json b/dynamicgrid/build/intermediates/instant_run_merged_manifests/debug/output.json
deleted file mode 100644
index 9e89ad0..0000000
--- a/dynamicgrid/build/intermediates/instant_run_merged_manifests/debug/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"dynamicgrid-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"org.askerov.dynamicgrid","split":"","minSdkVersion":"14"}}]
\ No newline at end of file
diff --git a/dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/AbstractDynamicGridAdapter.class b/dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/AbstractDynamicGridAdapter.class
deleted file mode 100644
index 8255073..0000000
--- a/dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/AbstractDynamicGridAdapter.class
+++ /dev/null
Binary files differ
diff --git a/dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/BaseDynamicGridAdapter.class b/dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/BaseDynamicGridAdapter.class
deleted file mode 100644
index 5b9a838..0000000
--- a/dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/BaseDynamicGridAdapter.class
+++ /dev/null
Binary files differ
diff --git a/dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/BuildConfig.class b/dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/BuildConfig.class
deleted file mode 100644
index eeb491f..0000000
--- a/dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/BuildConfig.class
+++ /dev/null
Binary files differ
diff --git a/dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/DynamicGridAdapterInterface.class b/dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/DynamicGridAdapterInterface.class
deleted file mode 100644
index e2fdd98..0000000
--- a/dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/DynamicGridAdapterInterface.class
+++ /dev/null
Binary files differ
diff --git a/dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/DynamicGridUtils.class b/dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/DynamicGridUtils.class
deleted file mode 100644
index 5999f16..0000000
--- a/dynamicgrid/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/org/askerov/dynamicgrid/DynamicGridUtils.class
+++ /dev/null
Binary files differ
diff --git a/dynamicgrid/build/intermediates/library_java_res/debug/res.jar b/dynamicgrid/build/intermediates/library_java_res/debug/res.jar
deleted file mode 100644
index 15cb0ec..0000000
--- a/dynamicgrid/build/intermediates/library_java_res/debug/res.jar
+++ /dev/null
Binary files differ
diff --git a/dynamicgrid/build/intermediates/merged_manifests/debug/output.json b/dynamicgrid/build/intermediates/merged_manifests/debug/output.json
deleted file mode 100644
index 993b22e..0000000
--- a/dynamicgrid/build/intermediates/merged_manifests/debug/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"dynamicgrid-debug.aar","fullName":"debug","baseName":"debug"},"path":"..\\..\\library_manifest\\debug\\AndroidManifest.xml","properties":{"packageId":"org.askerov.dynamicgrid","split":""}}]
\ No newline at end of file
diff --git a/dynamicgrid/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml b/dynamicgrid/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml
deleted file mode 100644
index 7f936b7..0000000
--- a/dynamicgrid/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dynamicgrid/build/intermediates/merged_manifests/debugAndroidTest/output.json b/dynamicgrid/build/intermediates/merged_manifests/debugAndroidTest/output.json
deleted file mode 100644
index 54376bf..0000000
--- a/dynamicgrid/build/intermediates/merged_manifests/debugAndroidTest/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":-1,"enabled":true,"outputFile":"dynamicgrid-debug-androidTest.apk","fullName":"debugAndroidTest","baseName":"debug-androidTest"},"path":"AndroidManifest.xml","properties":{}}]
\ No newline at end of file
diff --git a/dynamicgrid/build/intermediates/metadata_feature_manifest/debug/processDebugManifest/metadata-feature/output.json b/dynamicgrid/build/intermediates/metadata_feature_manifest/debug/processDebugManifest/metadata-feature/output.json
deleted file mode 100644
index 245d472..0000000
--- a/dynamicgrid/build/intermediates/metadata_feature_manifest/debug/processDebugManifest/metadata-feature/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"METADATA_FEATURE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"dynamicgrid-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{}}]
\ No newline at end of file
diff --git a/dynamicgrid/build/intermediates/runtime_library_classes/debug/classes.jar b/dynamicgrid/build/intermediates/runtime_library_classes/debug/classes.jar
deleted file mode 100644
index 8040ff7..0000000
--- a/dynamicgrid/build/intermediates/runtime_library_classes/debug/classes.jar
+++ /dev/null
Binary files differ
diff --git a/dynamicgrid/build/intermediates/transforms/mergeJniLibs/debug/__content__.json b/dynamicgrid/build/intermediates/transforms/mergeJniLibs/debug/__content__.json
deleted file mode 100644
index 49b1382..0000000
--- a/dynamicgrid/build/intermediates/transforms/mergeJniLibs/debug/__content__.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"name":"resources","index":0,"scopes":["PROJECT"],"types":["NATIVE_LIBS"],"format":"DIRECTORY","present":false}]
\ No newline at end of file