diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 53aecf0..e830906 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -41,17 +41,23 @@ android:name=".SignUpActivity" android:exported="true" android:label="@string/title_activity_sign_up"> - - + + - - + + + + + + + + - - + + - - + + diff --git a/app/src/main/java/com/example/nemophila/MyPageActivity.java b/app/src/main/java/com/example/nemophila/MyPageActivity.java index 82b4397..153245d 100644 --- a/app/src/main/java/com/example/nemophila/MyPageActivity.java +++ b/app/src/main/java/com/example/nemophila/MyPageActivity.java @@ -60,7 +60,8 @@ AccountViewModel accountViewModel = new ViewModelProvider(this).get(AccountViewModel.class); Nemophila nemophila = (Nemophila) getApplication(); String uid = nemophila.getUid(); - String name = nemophila.getName(); + Account account = accountViewModel.getAccount(uid); + String name = account.getName(); TextView myname = (TextView) findViewById(R.id.name); myname.setText(name); TextView id = (TextView) findViewById(R.id.id); diff --git a/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java index 393e666..69078c3 100644 --- a/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java +++ b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java @@ -20,7 +20,10 @@ setContentView(R.layout.activity_my_page_editor); //AccountViewModelとの通信 AccountViewModel accountViewModel = new ViewModelProvider(this).get(AccountViewModel.class); - EditText name = (EditText) findViewById(R.id.editName); + Nemophila nemophila = (Nemophila) getApplication(); + String name = nemophila.getName(); + EditText myname = (EditText) findViewById(R.id.editName); + myname.setText(name); //MyPageに戻るボタン Button backButton = (Button) findViewById(R.id.backMyPage); backButton.setOnClickListener(new View.OnClickListener() {