diff --git a/app/src/main/java/com/example/citrusclient/Citrus.java b/app/src/main/java/com/example/citrusclient/Citrus.java index 07637ce..f7281ce 100644 --- a/app/src/main/java/com/example/citrusclient/Citrus.java +++ b/app/src/main/java/com/example/citrusclient/Citrus.java @@ -13,6 +13,7 @@ private Integer curDay; private String curLookingAccountId; private Integer curLookingBookId; + private String accountColor; //getter public String getToken(){ return token; @@ -26,6 +27,7 @@ public Integer getCurDay(){return curDay;} public String getCurLookingAccountId(){return curLookingAccountId;} public Integer getCurLookingBookId(){return curLookingBookId;} + public String getAccountColor(){return accountColor;} //setter public void setToken(String token){ @@ -40,4 +42,5 @@ public void setCurDay(Integer curDay){this.curDay = curDay;} public void setCurLookingAccountId(String curLookingAccountId){this.curLookingAccountId = curLookingAccountId;} public void setCurLookingBookId(Integer curLookingBookId){this.curLookingBookId = curLookingBookId;} + public void setAccountColor(String accountColor){this.accountColor = accountColor;} } diff --git a/app/src/main/java/com/example/citrusclient/rest/AccountsRest.java b/app/src/main/java/com/example/citrusclient/rest/AccountsRest.java index 0941f37..57c53fc 100644 --- a/app/src/main/java/com/example/citrusclient/rest/AccountsRest.java +++ b/app/src/main/java/com/example/citrusclient/rest/AccountsRest.java @@ -1,10 +1,14 @@ package com.example.citrusclient.rest; +import dalvik.annotation.optimization.FastNative; import retrofit2.Call; +import retrofit2.http.DELETE; import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; import retrofit2.http.POST; +import retrofit2.http.PUT; import retrofit2.http.Path; +import retrofit2.http.Query; public interface AccountsRest { @@ -27,4 +31,49 @@ @Path("account_id") String account_id, @Field("password") String password ); + + //仮 + //パスワード変更 + @FormUrlEncoded + @PUT("accounts/{account_id}/password") + Call changePW( + @Path("account_id") String account_id, + @Field("new_password") String new_password, + @Field("old_password") String old_password, + @Field("token") String token + ); + + //仮 + //アカウント削除 + @FormUrlEncoded + @DELETE("accounts/{account_id}") + Call deleteId( + @Path("account_id") String account_id, + @Query("token") String token, + @Query("password") String password + ); + + //仮 + //アカウントカラー変更 + @FormUrlEncoded + @PUT("accounts/{account_id}/accountColor") + Call changeColor( + @Path("account_id") String account_id, + @Field("accountColor") String accountColor, + @Field("token") String token + ); + + @FormUrlEncoded + @PUT("accounts/{account_id") + Call changeAccount( + @Path("account_id") String account_id, + @Field("new_account_id") String new_account_id, + @Field("old_password") String old_password, + @Field("token") String token + ); + + + + + } diff --git a/app/src/main/java/com/example/citrusclient/views/SignUpActivity.java b/app/src/main/java/com/example/citrusclient/views/SignUpActivity.java index 4b492b3..05e4305 100644 --- a/app/src/main/java/com/example/citrusclient/views/SignUpActivity.java +++ b/app/src/main/java/com/example/citrusclient/views/SignUpActivity.java @@ -103,6 +103,7 @@ String token = response.body(); citrus.setToken(token); citrus.setAccountId(id); + citrus.setAccountColor("#D5D5D5"); //画面遷移 handler.post(new Runnable() {