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 c3a6f88..632820b 100644 --- a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java +++ b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java @@ -4,9 +4,6 @@ import com.example.cosmosclient.entities.Group; -import java.util.ArrayList; -import java.util.List; - public class Cosmos extends Application { private String token=null; private Group curGroup=null; diff --git a/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java b/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java index 37aa411..52bbefd 100644 --- a/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java +++ b/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java @@ -8,7 +8,7 @@ import retrofit2.http.POST; public interface GroupsRest { - @POST + @POST("groups") @FormUrlEncoded Call createGroup(@Field("name") String name,@Field("uId") String uId,@Field("token") String token); } 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 b8321c2..9823918 100644 --- a/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java +++ b/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java @@ -2,10 +2,12 @@ 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; @@ -18,6 +20,7 @@ @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/GroupListActivity.java b/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java index c7515bf..645e943 100644 --- a/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/GroupListActivity.java @@ -86,6 +86,8 @@ // Handle navigation view item clicks here. int id = item.getItemId(); if ( id == R.id.createNewGroupButton){ + Intent intent=new Intent(GroupListActivity.this,com.example.cosmosclient.views.MakeGroupActivity.class); + startActivity(intent); } else if (id == R.id.joinGroupButton){ Intent intent=new Intent(GroupListActivity.this, com.example.cosmosclient.views.JoinGroupActionsActivity.class); 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 a512d1d..93ea859 100644 --- a/app/src/main/java/com/example/cosmosclient/views/MakeGroupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/MakeGroupActivity.java @@ -6,12 +6,23 @@ import android.view.View; import android.widget.Button; import android.widget.EditText; +import android.widget.Toast; 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; +import retrofit2.Response; import retrofit2.Retrofit; import retrofit2.converter.jackson.JacksonConverterFactory; @@ -22,9 +33,16 @@ super.onCreate(savedInstanceState); setContentView(R.layout.activity_make_group); - EditText gruopNameText = findViewById(R.id.groupNameText); + final EditText gruopNameText = findViewById(R.id.groupNameText); Button createGroupButton = findViewById(R.id.createGroupButton); - String name,uId; + String name; + final String uId,token; + + //グループ作成に必要な情報の取得 + Cosmos app = (Cosmos) getApplication(); + uId = app.getuId(); + //token = app.getToken(); + token="abcdef"; //retrofitの処理 final Retrofit retrofit = new Retrofit.Builder() @@ -32,11 +50,43 @@ .addConverterFactory(JacksonConverterFactory.create()) .build(); //interfaceから実装を取得 - final GroupsRest makeGroupService = retrofit.create(Group.class); + final GroupsRest makeGroupService = retrofit.create(GroupsRest.class); createGroupButton.setOnClickListener(new View.OnClickListener(){ @Override public void onClick(View view){ + try { + Call createGroup = makeGroupService.createGroup(gruopNameText.getText().toString(), uId, token); + + createGroup.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + 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()); + + Toast.makeText(MakeGroupActivity.this, "グループを作成しました", Toast.LENGTH_SHORT).show(); + + finish(); + + } else { + System.out.println(""); + } + } + + @Override + public void onFailure(Call call, Throwable t) { + t.printStackTrace(); + } + }); + }catch(Exception e){ + e.printStackTrace(); + } } }); 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 cb93173..c0fa64f 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java @@ -112,13 +112,13 @@ startActivity(intent); Toast.makeText(SignupActivity.this, - "アカウントを作成しました", Toast.LENGTH_SHORT); + "アカウントを作成しました", Toast.LENGTH_SHORT).show(); finish(); } else { //onFailureでキャッチできないエラー用 Toast.makeText(SignupActivity.this, - "アカウント作成失敗", Toast.LENGTH_SHORT); + "アカウント作成失敗", Toast.LENGTH_SHORT).show(); } } @@ -127,7 +127,7 @@ public void onFailure(Call call, Throwable t) { t.printStackTrace(); Toast.makeText(SignupActivity.this, - "アカウント作成失敗", Toast.LENGTH_SHORT); + "アカウント作成失敗", Toast.LENGTH_SHORT).show(); } }); }