diff --git a/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java b/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java new file mode 100644 index 0000000..6635b43 --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java @@ -0,0 +1,4 @@ +package com.example.cosmosclient.resources; + +public interface GroupsRest { +} diff --git a/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java b/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java new file mode 100644 index 0000000..2b40d63 --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/resources/UsersRest.java @@ -0,0 +1,21 @@ +package com.example.cosmosclient.resources; + +import com.example.cosmosclient.views.SigninResponse; +import com.example.cosmosclient.views.SignupResponse; + +import retrofit2.Call; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.POST; +import retrofit2.http.Path; +import retrofit2.http.Query; + +public interface UsersRest { + @POST("users/{uId}/login") + Call loginList(@Path("uId") String uId, @Query("pw") String pw); + + @POST("users") + @FormUrlEncoded + Call createUser(@Field("name") String name, @Field("pw") String pw, @Field("icon-image") String icon_image); + +} diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java index d95f002..b01364f 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java @@ -11,6 +11,7 @@ import android.widget.Toast; import com.example.cosmosclient.R; +import com.example.cosmosclient.resources.UsersRest; import retrofit2.Call; import retrofit2.Callback; @@ -48,7 +49,7 @@ .addConverterFactory(JacksonConverterFactory.create()) .build(); //interfaceから実装を取得 - final SigninService signinService = retrofit.create(SigninService.class); + final UsersRest signinService = retrofit.create(UsersRest.class); //Sign inボタンの処理 SigninButton.setOnClickListener(new View.OnClickListener() { @@ -65,7 +66,6 @@ if (response.isSuccessful()) { SigninResponse result = response.body(); Intent intent = new Intent(getApplication(), GroupList.class); - //intent.putExtra("UserInfomation",result); Toast.makeText(SigninActivity.this, "ログインしました", Toast.LENGTH_SHORT).show(); diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninService.java b/app/src/main/java/com/example/cosmosclient/views/SigninService.java deleted file mode 100644 index 84dcb18..0000000 --- a/app/src/main/java/com/example/cosmosclient/views/SigninService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.example.cosmosclient.views; - -import retrofit2.Call; -import retrofit2.http.POST; -import retrofit2.http.Path; -import retrofit2.http.Query; - -public interface SigninService { - @POST("users/{uId}/login") - Call loginList(@Path("uId") String uId, @Query("pw") String pw); -} 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 b3cffe2..2348adf 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java @@ -11,6 +11,7 @@ import android.widget.Toast; import com.example.cosmosclient.R; +import com.example.cosmosclient.resources.UsersRest; import retrofit2.Call; @@ -20,7 +21,6 @@ import retrofit2.converter.jackson.JacksonConverterFactory; public class SignupActivity extends AppCompatActivity{ -// public static final String UserInfomation="com.example.cosmosclient.views"; private boolean nameEnable; private boolean pwEnable; private boolean cpwEnable; @@ -37,7 +37,7 @@ .addConverterFactory(JacksonConverterFactory.create()) .build(); //interfaceから実装を取得 - final SignupService signupService = retrofit.create(SignupService.class); + final UsersRest signupService = retrofit.create(UsersRest.class); //各種idを取得 Button LoginButton = findViewById(R.id.LoginButton); @@ -80,7 +80,6 @@ if (response.isSuccessful()) { SignupResponse result = response.body(); Intent intent = new Intent(getApplication(), GroupList.class); - //intent.putExtra("UserInfomation",result); //test System.out.println(result.uId); diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupService.java b/app/src/main/java/com/example/cosmosclient/views/SignupService.java deleted file mode 100644 index 2ac3075..0000000 --- a/app/src/main/java/com/example/cosmosclient/views/SignupService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.example.cosmosclient.views; - -import retrofit2.Call; -import retrofit2.http.Field; -import retrofit2.http.FormUrlEncoded; -import retrofit2.http.POST; - -public interface SignupService { - @POST("users") - @FormUrlEncoded - Call createUser(@Field("name") String name, @Field("pw") String pw, @Field("icon-image") String icon_image); -}