Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into AddGroupByGroupID

Fork: 0

nitta-lab-2019 / CosmosClient

Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into AddGroupByGroupID DisplayGroupIDToInvite
commit c6aaca31953d9b8ebd007a4ad52d84e3bc194955 2 parents 481cd21 + 8997574 t-tai authored on 25 Jul 2019

Patch

Unified Split

Showing 41 changed files

                Ignore Space
               Show notes
              View
            
          
          9 ■■■■■
          app/src/main/java/com/example/cosmosclient/app/Cosmos.java
 public class Cosmos extends Application {
    private String token=null;
    private Group curGroup=null;
    private String uId=null;
    private String gId=null;
 
    //token処理
    public void setToken(String token){
        this.token = token;
    }
    public String getuId(){
        return uId;
    }
 
    //gId処理
    public void setgId(String gId){
        this.gId = gId;
    }
    public String getgId(){
        return gId;
    }
}
 public class Cosmos extends Application {
     private String token=null;
     private Group curGroup=null;
     private String uId=null;
-    private String gId=null;
     //token処理
     public void setToken(String token){
         this.token = token;
     }
     public String getuId(){
         return uId;
     }
-    //gId処理
-    public void setgId(String gId){
-        this.gId = gId;
-    }
-    public String getgId(){
-        return gId;
-    }
 }

                Ignore Space
               Show notes
              View
            
          
          5 ■■■■■
          app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java
 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;
import retrofit2.Callback;
                    public void onResponse(Call<CreateGroupResponse> call, Response<CreateGroupResponse> response) {
                        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);
                            Toast.makeText(CreateGroupActivity.this,
 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;
 import retrofit2.Callback;
                     public void onResponse(Call<CreateGroupResponse> call, Response<CreateGroupResponse> response) {
                         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);
                             Toast.makeText(CreateGroupActivity.this,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Show line notes below