diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index aab75db..a9ea94a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,16 +50,6 @@
android:name=".LoginActivity"
android:exported="true"
android:label="@string/title_activity_login">
-
-
- android:label="@string/title_activity_login" >
-
-
-
-
-
-
-
android:name=".ChangePwActivity"
diff --git a/app/src/main/java/com/example/nemophila/MyPageActivity.java b/app/src/main/java/com/example/nemophila/MyPageActivity.java
index 9424f3b..d32f433 100644
--- a/app/src/main/java/com/example/nemophila/MyPageActivity.java
+++ b/app/src/main/java/com/example/nemophila/MyPageActivity.java
@@ -1,11 +1,22 @@
package com.example.nemophila;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
+import android.widget.TextView;
+
+import com.example.nemophila.FriendActivity;
+import com.example.nemophila.MainActivity;
+import com.example.nemophila.MyPageEditorActivity;
+import com.example.nemophila.R;
+import com.example.nemophila.RequestedActivity;
+import com.example.nemophila.entities.Account;
+import com.example.nemophila.viewmodels.AccountViewModel;
public class MyPageActivity extends AppCompatActivity {
@@ -13,29 +24,44 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_mypage);
- Button friendButton = (Button)findViewById(R.id.friend);
+
+ Button friendButton = (Button) findViewById(R.id.friend);
friendButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
- Intent intent = new Intent(MyPageActivity.this,FriendActivity.class);
+ Intent intent = new Intent(MyPageActivity.this, FriendActivity.class);
startActivity(intent);
}
});
- Button changeMyPageButton = (Button)findViewById(R.id.changeMyPage);
+ Button changeMyPageButton = (Button) findViewById(R.id.changeMyPage);
changeMyPageButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
- Intent intent = new Intent(MyPageActivity.this,MyPageEditorActivity.class);
+ Intent intent = new Intent(MyPageActivity.this, MyPageEditorActivity.class);
startActivity(intent);
-
}
+
});
- Button requestedButton = (Button)findViewById(R.id.requested);
- requestedButton.setOnClickListener(new View.OnClickListener() {
+
+ Button cancelButton = (Button) findViewById(R.id.cancel);
+ cancelButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
- Intent intent = new Intent(MyPageActivity.this,RequestedActivity.class);
+ Intent intent = new Intent(MyPageActivity.this, MainActivity.class);
startActivity(intent);
-
}
});
+ Button RequestedButton = (Button) findViewById(R.id.requested);
+ RequestedButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ Intent intent = new Intent(MyPageActivity.this, RequestedActivity.class);
+ startActivity(intent);
+ }
+ });
+
+ AccountViewModel accountViewModel = new ViewModelProvider(this).get(AccountViewModel.class);
+ TextView name = (TextView) findViewById(R.id.name);
+ TextView id = (TextView) findViewById(R.id.id);
+// accountViewModel.getAccountLiveData().observe(this, new Observer() {
+//
+// });
}
}
\ No newline at end of file