diff --git a/app/src/main/java/com/example/nemophila/MyPageActivity.java b/app/src/main/java/com/example/nemophila/MyPageActivity.java index 5ebf6f5..747be89 100644 --- a/app/src/main/java/com/example/nemophila/MyPageActivity.java +++ b/app/src/main/java/com/example/nemophila/MyPageActivity.java @@ -64,10 +64,9 @@ }); //AccountViewModelとの通信とテキストの表示 AccountViewModel accountViewModel = new ViewModelProvider(this).get(AccountViewModel.class); - accountViewModel.getAccountLiveData().observe(this, new Observer () { + accountViewModel.getNameLiveData().observe(this, new Observer () { @Override - public void onChanged(Account account) { - String name = account.getName(); + public void onChanged(String name) { TextView myName = (TextView) findViewById(R.id.name); myName.setText(name); nemophila.setName(name); diff --git a/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java index 4a75d76..2022ee7 100644 --- a/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java +++ b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java @@ -36,10 +36,9 @@ } }); - accountViewModel.getAccountLiveData().observe(this, new Observer() { + accountViewModel.getNameLiveData().observe(this, new Observer() { @Override - public void onChanged(Account account) { - String name = account.getName(); + public void onChanged(String name) { TextView myName = (TextView) findViewById(R.id.name); myName.setText(name); nemophila.setName(name); @@ -48,6 +47,14 @@ } }); + accountViewModel.getPwLiveData().observe(this, new Observer() { + @Override + public void onChanged(String Pw) { + Intent intent = new Intent(MyPageEditorActivity.this, MyPageActivity.class); + startActivity(intent); + } + + }); //変更確定ボタンを押した場合の動き Button changeNameButton = (Button) findViewById(R.id.changeConfirm);