diff --git a/.idea/misc.xml b/.idea/misc.xml index 921d88c..37013f1 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,9 @@ + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index db53bb1..159f0bc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -39,6 +39,15 @@ + + + diff --git a/app/src/main/java/com/example/nemophila/FriendActivity.java b/app/src/main/java/com/example/nemophila/FriendActivity.java new file mode 100644 index 0000000..718a01c --- /dev/null +++ b/app/src/main/java/com/example/nemophila/FriendActivity.java @@ -0,0 +1,14 @@ +package com.example.nemophila; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class FriendActivity extends AppCompatActivity { + + @Override + 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 b902728..9424f3b 100644 --- a/app/src/main/java/com/example/nemophila/MyPageActivity.java +++ b/app/src/main/java/com/example/nemophila/MyPageActivity.java @@ -2,7 +2,10 @@ import androidx.appcompat.app.AppCompatActivity; +import android.content.Intent; import android.os.Bundle; +import android.view.View; +import android.widget.Button; public class MyPageActivity extends AppCompatActivity { @@ -10,5 +13,29 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_mypage); + 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); + startActivity(intent); + + } + }); + 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); + 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); + + } + }); } } \ 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 new file mode 100644 index 0000000..230015e --- /dev/null +++ b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java @@ -0,0 +1,14 @@ +package com.example.nemophila; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class MyPageEditorActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_my_page_editor); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/nemophila/RequestedActivity.java b/app/src/main/java/com/example/nemophila/RequestedActivity.java new file mode 100644 index 0000000..748c4b0 --- /dev/null +++ b/app/src/main/java/com/example/nemophila/RequestedActivity.java @@ -0,0 +1,14 @@ +package com.example.nemophila; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class RequestedActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_requested); + } +} \ 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 new file mode 100644 index 0000000..560f9dd --- /dev/null +++ b/app/src/main/res/layout/activity_friend.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_my_page_editor.xml b/app/src/main/res/layout/activity_my_page_editor.xml new file mode 100644 index 0000000..4c0d52c --- /dev/null +++ b/app/src/main/res/layout/activity_my_page_editor.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_mypage.xml b/app/src/main/res/layout/activity_mypage.xml index 8979249..7fd6be6 100644 --- a/app/src/main/res/layout/activity_mypage.xml +++ b/app/src/main/res/layout/activity_mypage.xml @@ -6,4 +6,112 @@ android:layout_height="match_parent" tools:context=".MyPageActivity"> + + + + + + +