diff --git a/.idea/misc.xml b/.idea/misc.xml
index b3a7a61..9cfb39a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -15,6 +15,7 @@
+
diff --git a/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java
index 2022ee7..b5e285c 100644
--- a/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java
+++ b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java
@@ -15,31 +15,32 @@
import com.example.nemophila.viewmodels.AccountViewModel;
public class MyPageEditorActivity extends AppCompatActivity {
-//マイページ編集画面の作成
+ //マイページ編集画面の作成
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_my_page_editor);
-//AccountViewModelとの通信
+
+ //AccountViewModelとの通信
AccountViewModel accountViewModel = new ViewModelProvider(this).get(AccountViewModel.class);
Nemophila nemophila = (Nemophila) getApplication();
String name = nemophila.getName();
EditText myName = (EditText) findViewById(R.id.editName);
myName.setText(name);
-//MyPageに戻るボタン
+
+ //MyPageに戻るボタン
Button backButton = (Button) findViewById(R.id.backMyPage);
backButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
Intent intent = new Intent(MyPageEditorActivity.this, MyPageActivity.class);
startActivity(intent);
-
}
});
accountViewModel.getNameLiveData().observe(this, new Observer() {
@Override
public void onChanged(String name) {
- TextView myName = (TextView) findViewById(R.id.name);
+ TextView myName = (TextView) findViewById(R.id.editName);
myName.setText(name);
nemophila.setName(name);
Intent intent = new Intent(MyPageEditorActivity.this, MyPageActivity.class);
@@ -56,21 +57,23 @@
});
-//変更確定ボタンを押した場合の動き
+ //変更確定ボタンを押した場合の動き
Button changeNameButton = (Button) findViewById(R.id.changeConfirm);
changeNameButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
-//名前とパスワードを取り込む
+ //名前とパスワードを取り込む
EditText editName = (EditText) findViewById(R.id.editName);
String newName = editName.getText().toString();
EditText editOldPw = (EditText) findViewById(R.id.editOldPw);
String oldPw = editOldPw.getText().toString();
EditText editNewPw = (EditText) findViewById(R.id.editNewPw);
String newPw = editNewPw.getText().toString();
-//Nemophilaから(id)(token)をgetしてaccountViewModelに送る
+
+ //Nemophilaから(id)(token)をgetしてaccountViewModelに送る
String uid = nemophila.getUid();
String token = nemophila.getToken();
if(newName!=null) {
+ System.out.println(newName);
accountViewModel.changeName(uid, newName, token);
}
if(oldPw!=null && newPw!=null) {
@@ -78,7 +81,8 @@
}
}
});
-// 削除ボタンを押したときの処理
+
+ //削除ボタンを押したときの処理
Button deleteAccountButton = (Button) findViewById(R.id.deleteAccount);
deleteAccountButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
diff --git a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
index b484c47..d71c92f 100644
--- a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
+++ b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
@@ -85,7 +85,7 @@
}
@Override
public void onFailure(Call call, Throwable t) {
- System.out.println("correspondence error" + t);
+ System.out.println("ChangePw NetworkError" + t);
}
});
}
@@ -99,14 +99,14 @@
public void onResponse(Call call, Response response) {
if (response.isSuccessful()) {
nameLiveData.setValue(name);
- System.out.println("Success ChangeName");
+ System.out.println("Success ChangeName:" + name);
} else {
System.out.println("response error");
}
}
@Override
public void onFailure(Call call, Throwable t) {
- System.out.println("correspondence error" + t);
+ System.out.println("ChangeName NetWorkError" + t);
}
});
}