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/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ee2c173..1bf42f0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -113,11 +113,11 @@ android:name=".PostActivity" android:exported="true" android:label="@string/title_activity_post"> - - + + - - + + () { @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); } }); }