diff --git a/app/src/main/java/com/example/nemophila/FriendActivity.java b/app/src/main/java/com/example/nemophila/FriendActivity.java index 718a01c..ad12256 100644 --- a/app/src/main/java/com/example/nemophila/FriendActivity.java +++ b/app/src/main/java/com/example/nemophila/FriendActivity.java @@ -10,5 +10,6 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_friend); + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/nemophila/MyPageActivity.java b/app/src/main/java/com/example/nemophila/MyPageActivity.java index a2f9074..82b4397 100644 --- a/app/src/main/java/com/example/nemophila/MyPageActivity.java +++ b/app/src/main/java/com/example/nemophila/MyPageActivity.java @@ -60,9 +60,11 @@ AccountViewModel accountViewModel = new ViewModelProvider(this).get(AccountViewModel.class); Nemophila nemophila = (Nemophila) getApplication(); String uid = nemophila.getUid(); -// String name = nemophila. -// TextView name = (TextView) findViewById(R.id.name); -// TextView id = (TextView) findViewById(R.id.id); + String name = nemophila.getName(); + TextView myname = (TextView) findViewById(R.id.name); + myname.setText(name); + TextView id = (TextView) findViewById(R.id.id); + id.setText(uid); } } \ No newline at end of file diff --git a/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java index b9b46be..393e666 100644 --- a/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java +++ b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java @@ -8,6 +8,7 @@ import android.view.View; import android.widget.Button; import android.widget.EditText; +import android.widget.TextView; import com.example.nemophila.viewmodels.AccountViewModel; @@ -19,6 +20,7 @@ setContentView(R.layout.activity_my_page_editor); //AccountViewModelとの通信 AccountViewModel accountViewModel = new ViewModelProvider(this).get(AccountViewModel.class); + EditText name = (EditText) findViewById(R.id.editName); //MyPageに戻るボタン Button backButton = (Button) findViewById(R.id.backMyPage); backButton.setOnClickListener(new View.OnClickListener() { @@ -54,5 +56,16 @@ startActivity(intent); } }); +// 削除ボタンを押したときの処理 + Button deleteAccountButton = (Button) findViewById(R.id.deleteAccount); + deleteAccountButton.setOnClickListener(new View.OnClickListener() { + public void onClick(View v) { + Nemophila nemophila = (Nemophila) getApplication(); + String uid = nemophila.getUid(); + String token = nemophila.getToken(); + Intent intent = new Intent(MyPageEditorActivity.this, LoginActivity.class); + startActivity(intent); + } + }); } -} \ No newline at end of file +} diff --git a/app/src/main/res/layout/activity_friend.xml b/app/src/main/res/layout/activity_friend.xml index 560f9dd..51e2fcb 100644 --- a/app/src/main/res/layout/activity_friend.xml +++ b/app/src/main/res/layout/activity_friend.xml @@ -6,4 +6,29 @@ android:layout_height="match_parent" tools:context=".FriendActivity"> + + + + +