diff --git a/app/src/main/java/org/ntlab/amaryllis/client/entities/MessageJson.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/MessageJson.java new file mode 100644 index 0000000..b1b7c55 --- /dev/null +++ b/app/src/main/java/org/ntlab/amaryllis/client/entities/MessageJson.java @@ -0,0 +1,11 @@ +package org.ntlab.amaryllis.client.entities; + +public class MessageJson { + private String message; + public MessageJson(String message) { + this.message = message; + } + public String getMessage() { + return message; + } +} diff --git a/app/src/main/java/org/ntlab/amaryllis/client/entities/PutIntroductionResponse.java b/app/src/main/java/org/ntlab/amaryllis/client/entities/PutIntroductionResponse.java deleted file mode 100644 index 7fd3839..0000000 --- a/app/src/main/java/org/ntlab/amaryllis/client/entities/PutIntroductionResponse.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.ntlab.amaryllis.client.entities; - -public class PutIntroductionResponse { -} diff --git a/app/src/main/java/org/ntlab/amaryllis/client/fragment/AccountFragment.java b/app/src/main/java/org/ntlab/amaryllis/client/fragment/AccountFragment.java index 95bac7e..2ac9d40 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/fragment/AccountFragment.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/fragment/AccountFragment.java @@ -15,12 +15,13 @@ import android.widget.EditText; import android.text.TextWatcher; import android.widget.TextView; +import android.widget.Toast; import org.ntlab.amaryllis.client.Amaryllis; import org.ntlab.amaryllis.client.MainActivity; import org.ntlab.amaryllis.client.R; import org.ntlab.amaryllis.client.SignUpActivity; -import org.ntlab.amaryllis.client.entities.SignUpJson; +import org.ntlab.amaryllis.client.entities.MessageJson; import org.ntlab.amaryllis.client.resources.AccountsRest; @@ -90,7 +91,11 @@ .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/amaryllis/") .addConverterFactory(JacksonConverterFactory.create()) .build(); + final AccountsRest accountsFragment = retrofit.create(AccountsRest.class); + Amaryllis app =(Amaryllis) getActivity().getApplication(); + final String uid = app.getUid(); + final String token = app.getToken(); nameEditText = (EditText)view.findViewById(R.id.name); nameEditText.addTextChangedListener(this); nameTextView = view.findViewById(R.id.name); @@ -99,9 +104,7 @@ introductionEditText =(EditText)view.findViewById(R.id.introduction); introductionEditText.addTextChangedListener(this); introductionTextView = view.findViewById(R.id.introduction); - introductionEditText.setEnabled(false); changeButton = (Button)view.findViewById(R.id.change); - changeButton.setEnabled(true); logoutButton = (Button)view.findViewById(R.id.logout); logoutButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { @@ -109,8 +112,26 @@ ma.method(); ma.logout(); } - }); + }); + changeButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Call call = accountsFragment.changeIntroduction(uid,token,introductionEditText.getText().toString()); + call.enqueue(new Callback(){ + @Override + public void onResponse(Call call, Response response) { + MessageJson messageJson = response.body(); + System.out.println("RESPONSE!" ); + //introductionEditText.setText(); + } + @Override + public void onFailure(Call call, Throwable t) { + System.out.println("!!!!!!!!!!!!!!!!!!!!!!!!" + t); + } + }); } + }); + } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -132,9 +153,6 @@ @Override public void afterTextChanged(Editable s) { - if(nameTextView.length() == 0 && introductionTextView.length() == 0){ - changeButton.setEnabled(false); - } } } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java b/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java index 3e5d2c0..1a4e1ef 100644 --- a/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java +++ b/app/src/main/java/org/ntlab/amaryllis/client/resources/AccountsRest.java @@ -17,7 +17,7 @@ import org.ntlab.amaryllis.client.entities.PostFollowersResponse; import org.ntlab.amaryllis.client.entities.PostFollowingsResponse; import org.ntlab.amaryllis.client.entities.PostHistoryResponse; -import org.ntlab.amaryllis.client.entities.PutIntroductionResponse; +import org.ntlab.amaryllis.client.entities.MessageJson; import org.ntlab.amaryllis.client.entities.PutPasswordResponse; import org.ntlab.amaryllis.client.entities.SignUpJson; @@ -161,12 +161,12 @@ ); //自己紹介の修正 + @FormUrlEncoded @PUT("accounts/{uid}/introduction") - Call putIntroduction( - @Path("uId") String uId, - @Field("password") String password, - @Field("new_introduction") String new_introduction, - @Field("message") String message + Call changeIntroduction( + @Path("uid") String uid, + @Field("token") String token, + @Field("new_introduction") String newIntroduction ); //ボイスメモの視聴履歴