diff --git a/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java b/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java index 9823918..31b19b3 100644 --- a/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java +++ b/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java @@ -2,12 +2,10 @@ import com.example.cosmosclient.entities.SigninResponse; import com.example.cosmosclient.entities.SignupResponse; -import com.example.cosmosclient.entities.User; import retrofit2.Call; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; -import retrofit2.http.GET; import retrofit2.http.POST; import retrofit2.http.Path; import retrofit2.http.Query; @@ -19,8 +17,4 @@ @POST("users") @FormUrlEncoded Call createUser(@Field("name") String name, @Field("pw") String pw, @Field("icon-image") String icon_image); - - @GET("users/{uId}") - @FormUrlEncoded - Call getUserInfo(@Path("uId") String uId, @Field("token") String token); } diff --git a/app/src/main/java/com/example/cosmosclient/views/MakeGroupActivity.java b/app/src/main/java/com/example/cosmosclient/views/MakeGroupActivity.java index 93ea859..d3f50e2 100644 --- a/app/src/main/java/com/example/cosmosclient/views/MakeGroupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/MakeGroupActivity.java @@ -1,6 +1,5 @@ package com.example.cosmosclient.views; -import android.content.Intent; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.view.View; @@ -11,14 +10,7 @@ import com.example.cosmosclient.R; import com.example.cosmosclient.app.Cosmos; import com.example.cosmosclient.entities.Group; -import com.example.cosmosclient.entities.SignupResponse; -import com.example.cosmosclient.entities.User; import com.example.cosmosclient.resources.GroupsRest; -import com.example.cosmosclient.resources.UsersRest; -import com.example.cosmosclient.retrofitsample.Ele; - -import java.io.IOError; -import java.io.IOException; import retrofit2.Call; import retrofit2.Callback; @@ -33,7 +25,7 @@ super.onCreate(savedInstanceState); setContentView(R.layout.activity_make_group); - final EditText gruopNameText = findViewById(R.id.groupNameText); + final EditText groupNameText = findViewById(R.id.groupNameText); Button createGroupButton = findViewById(R.id.createGroupButton); String name; final String uId,token; @@ -41,6 +33,7 @@ //グループ作成に必要な情報の取得 Cosmos app = (Cosmos) getApplication(); uId = app.getuId(); + ////サインアップでトークンが返ってきてないため一時コメントアウト //token = app.getToken(); token="abcdef"; @@ -56,7 +49,7 @@ @Override public void onClick(View view){ try { - Call createGroup = makeGroupService.createGroup(gruopNameText.getText().toString(), uId, token); + Call createGroup = makeGroupService.createGroup(groupNameText.getText().toString(), uId, token); createGroup.enqueue(new Callback() { @Override @@ -64,11 +57,11 @@ if (response.isSuccessful()) { Group result = response.body(); - System.out.println(result.getgId()); - System.out.println(result.getName()); - System.out.println(result.getRequests()); - System.out.println(result.getUri()); - System.out.println(result.getgId()); +// //確認用 +// System.out.println(result.getgId()); +// System.out.println(result.getName()); +// System.out.println(result.getRequests()); +// System.out.println(result.getUri()); Toast.makeText(MakeGroupActivity.this, "グループを作成しました", Toast.LENGTH_SHORT).show(); @@ -76,12 +69,14 @@ } else { System.out.println(""); + Toast.makeText(MakeGroupActivity.this,"通信エラー",Toast.LENGTH_SHORT).show(); } } @Override public void onFailure(Call call, Throwable t) { t.printStackTrace(); + Toast.makeText(MakeGroupActivity.this,"グループ作成失敗",Toast.LENGTH_SHORT); } }); }catch(Exception e){ diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java index c0fa64f..efb8864 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java @@ -151,11 +151,11 @@ // intent.setType("image/*"); // intent.setAction(Intent.ACTION_GET_CONTENT); // startActivityForResult(intent, REQUEST_GALLERY); - CropImage.activity() - .setAspectRatio(1,1) - .setGuidelines(CropImageView.Guidelines.ON) - .start(SignupActivity.this); - +// CropImage.activity() +// .setAspectRatio(1,1) +// .setGuidelines(CropImageView.Guidelines.ON) +// .start(SignupActivity.this); +// } }); @@ -205,15 +205,15 @@ // iconChoice.setImageBitmap(bitmap); // //Bitmap bitmap = data.getExtras().getParcelable("data"); // } - if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) { - CropImage.ActivityResult result = CropImage.getActivityResult(data); - if (resultCode == RESULT_OK) { - Uri resultUri = result.getUri(); - iconChoice.setImageURI(resultUri); - } else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) { - Exception error = result.getError(); - } - } +// if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) { +// CropImage.ActivityResult result = CropImage.getActivityResult(data); +// if (resultCode == RESULT_OK) { +// Uri resultUri = result.getUri(); +// iconChoice.setImageURI(resultUri); +// } else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) { +// Exception error = result.getError(); +// } +// } }