diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..1adb1c2
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="C:\Users\student\.android\avd\Pixel_3_API_28.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2023-07-06T07:29:36.126655900Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c86fa35..81be3c3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,28 +4,29 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.1425" />
-        <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/drawable/circle_button.xml" value="0.203" />
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/drawable/ic_baseline_my_location_24.xml" value="0.1" />
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/drawable/ic_launcher_background.xml" value="0.1425" />
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_gps.xml" value="0.13095238095238096" />
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_login.xml" value="0.13221884498480244" />
-        <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_main.xml" value="0.1" />
-        <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/flagment_side.xml" value="0.22291666666666668" />
-        <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/fragment_blank.xml" value="0.22291666666666668" />
-        <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/fragment_settings.xml" value="0.221875" />
-        <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/fragment_sidemenu.xml" value="0.22291666666666668" />
-        <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/menu/main_menu.xml" value="0.221875" />
+        <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_main.xml" value="0.25" />
         <entry key="..\:/Users/Student/StudioProjects/NemophilaClient/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.226" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/activity_friend.xml" value="0.36666666666666664" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/activity_shop.xml" value="0.36666666666666664" />
         <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/activity_shop_create.xml" value="0.36666666666666664" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/layout_friends_activity.xml" value="0.35260416666666666" />
+        <entry key="..\:/Users/student/AndroidStudioProjects/NemophilaClient/app/src/main/res/layout/layout_shop_activity_posts.xml" value="0.36666666666666664" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_change_pw.xml" value="0.22" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_login.xml" value="0.22314814814814815" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_main.xml" value="0.228125" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_maps.xml" value="0.17074275362318841" />
+        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_my_page_editor.xml" value="0.1625" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_mypage.xml" value="0.22135416666666666" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_post.xml" value="0.33" />
+        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_requesting.xml" value="0.22509057971014493" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_shop.xml" value="0.3229166666666667" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_shop_create.xml" value="0.2966485507246377" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_sign_up.xml" value="0.36614583333333334" />
+        <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/layout_my_page_activity_posts.xml" value="0.22509057971014493" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/layout_shop_activity_post.xml" value="0.35208333333333336" />
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/layout_shop_activity_posts.xml" value="0.35208333333333336" />
       </map>
diff --git a/app/build.gradle b/app/build.gradle
index 8a3de6c..1fc7e27 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,14 +38,28 @@
 
 dependencies {
 
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'com.google.android.material:material:1.6.1'
-    implementation 'com.google.android.gms:play-services-maps:17.0.1'
+//    implementation 'androidx.appcompat:appcompat:1.4.2'
+//    implementation 'com.google.android.material:material:1.6.1'
+//    implementation 'com.google.android.gms:play-services-maps:17.0.1'
+//    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+//    implementation 'com.google.firebase:firebase-firestore:23.0.2'
+//    implementation 'androidx.navigation:navigation-fragment:2.6.0'
+//    implementation 'androidx.navigation:navigation-ui:2.6.0'
+//    testImplementation 'junit:junit:4.13.2'
+//    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+//    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.android.gms:play-services-maps:18.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.firebase:firebase-firestore:23.0.2'
+    implementation 'androidx.navigation:navigation-fragment:2.5.3'
+    implementation 'androidx.navigation:navigation-ui:2.5.3'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
 
     // Retrofit
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 90507b0..0a7c56c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,52 +16,71 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Nemophila"
-        tools:targetApi="31"
-        android:usesCleartextTraffic="true">
+        android:usesCleartextTraffic="true"
+        tools:targetApi="31">
+
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="${MAPS_API_KEY}" />
+
+        <activity
+            android:name=".MapsActivity"
+            android:exported="true"
+            android:label="Map">
+
+<!--             <intent-filter>-->
+<!--             <action android:name="android.intent.action.MAIN" />-->
+<!--             <category android:name="android.intent.category.LAUNCHER" />-->
+<!--             </intent-filter>-->
+        </activity>
 
         <activity
             android:name=".ShopCreateActivity"
             android:exported="true"
             android:label="@string/title_activity_shop_create">
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
 
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.MAIN" /> -->
+
+
+            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+            <!-- </intent-filter> -->
         </activity>
         <activity
             android:name=".GpsActivity"
             android:exported="true"
             android:label="@string/title_activity_gps">
-<!--             <intent-filter>-->
-<!--             <action android:name="android.intent.action.MAIN" />-->
+
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.MAIN" /> -->
 
 
-<!--             <category android:name="android.intent.category.LAUNCHER" />-->
-<!--             </intent-filter>-->
+            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+            <!-- </intent-filter> -->
         </activity>
-
         <activity
             android:name=".SignUpActivity"
             android:exported="true"
             android:label="@string/title_activity_sign_up">
-<!--             <intent-filter>-->
-<!--             <action android:name="android.intent.action.MAIN" />-->
+
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.MAIN" /> -->
 
 
-<!--             <category android:name="android.intent.category.LAUNCHER" />-->
-<!--             </intent-filter>-->
+            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+            <!-- </intent-filter> -->
         </activity>
         <activity
             android:name=".LoginActivity"
             android:exported="true"
             android:label="@string/title_activity_login">
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
+
+             <intent-filter>
+             <action android:name="android.intent.action.MAIN" />
 
 
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
+             <category android:name="android.intent.category.LAUNCHER" />
+             </intent-filter> 
         </activity>
         <activity
             android:name=".RequestedActivity"
@@ -73,61 +92,70 @@
             android:name=".FriendActivity"
             android:exported="false" />
         <activity
+            android:name=".RequestingActivity"
+            android:exported="true"
+            android:label="@string/title_activity_requesting">
+        </activity>
+        <activity
             android:name=".MyPageActivity"
             android:exported="true"
             android:label="@string/title_activity_my_page">
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
 
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.MAIN" /> -->
+
+
+            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+            <!-- </intent-filter> -->
         </activity>
 
-        <meta-data
-            android:name="com.google.android.geo.API_KEY"
-            android:value="${MAPS_API_KEY}" />
 
         <activity
             android:name=".MainActivity"
             android:exported="true"
             android:label="@string/title_activity_maps">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.MAIN" />-->
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+<!--                <category android:name="android.intent.category.LAUNCHER" />-->
+<!--            </intent-filter>-->
         </activity>
 
         <activity
             android:name=".TestActivity"
             android:exported="true"
             android:label="@string/title_activity_test">
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
 
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.MAIN" /> -->
+
+
+            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+            <!-- </intent-filter> -->
         </activity>
-
         <activity
             android:name=".PostActivity"
             android:exported="true"
             android:label="@string/title_activity_post">
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
 
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.MAIN" /> -->
+
+
+            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+            <!-- </intent-filter> -->
         </activity>
         <activity
             android:name=".ShopActivity"
             android:exported="true"
             android:label="@string/title_activity_shop">
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
 
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
+            <!-- <intent-filter> -->
+            <!-- <action android:name="android.intent.action.MAIN" /> -->
+
+
+            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
+            <!-- </intent-filter> -->
         </activity>
     </application>
 
diff --git a/app/src/main/java/com/example/nemophila/FriendActivity.java b/app/src/main/java/com/example/nemophila/FriendActivity.java
index ad12256..ffb93c8 100644
--- a/app/src/main/java/com/example/nemophila/FriendActivity.java
+++ b/app/src/main/java/com/example/nemophila/FriendActivity.java
@@ -1,15 +1,122 @@
 package com.example.nemophila;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
+import android.content.Intent;
 import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.example.nemophila.viewmodels.FriendViewModel;
+
+import java.util.ArrayList;
+import java.util.List;
 
 public class FriendActivity extends AppCompatActivity {
+    private FriendActivityAdapter adapter;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_friend);
 
+        // 初期化
+        List<FriendDataModel> friendsDataset = new ArrayList<>();  // 1行分の情報を持つDataModelを格納するリスト
+        RecyclerView rv = findViewById(R.id.friendsList);  // recyclerViewを取得
+        adapter = new FriendActivityAdapter(friendsDataset);  // adapterを取得
+        FriendViewModel friendViewModel = new ViewModelProvider(this).get(FriendViewModel.class);  // ViewModelを取得
+        Nemophila nemophila = (Nemophila) this.getApplication();
+
+
+        //一行ずつを縦に(LinearLayout)表示するLayoutManagerを宣言
+        LinearLayoutManager llm = new LinearLayoutManager(this);
+
+        // 詳細不明(おまじない)
+        RecyclerView.ItemDecoration itemDecoration =
+                new DividerItemDecoration(this, DividerItemDecoration.VERTICAL);
+        rv.addItemDecoration(itemDecoration);
+        rv.setHasFixedSize(true);
+        rv.setLayoutManager(llm);
+
+        String myUid = nemophila.getUid();  // 自身のidを取得
+//        friendViewModel.getFriends(myUid);  // 自身のフレンドの一覧を取得するメソッドを呼び出す
+        
+
+        // マイページ画面に画面遷移する
+        Button backButton = findViewById(R.id.backMyPage);
+        backButton.setOnClickListener(v -> {
+            Intent intent = new Intent(getApplication(), MyPageActivity.class);
+            startActivity(intent);
+        });
+        
+    }
+
+    // ----------- RecyclerView用の内部クラス ------------//
+    // Adapter
+    public class FriendActivityAdapter extends RecyclerView.Adapter<FriendsViewHolder> {
+        private List<FriendDataModel> list;
+
+        public FriendActivityAdapter(List<FriendDataModel> list) {
+            this.list = list;
+        }
+
+        public void setList(List<FriendDataModel> list) {
+            this.list = list;
+        }
+
+        @NonNull
+        @Override
+        public FriendsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int ViewType) {
+            View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_friends_activity, parent,false);
+            FriendsViewHolder vh = new FriendsViewHolder(inflate);
+            return vh;
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull FriendsViewHolder holder, int position) {
+            // 後からアイコンの登録をできるようにする
+            holder.nameView.setText(list.get(position).getName());
+        }
+
+        @Override
+        public int getItemCount() {
+            return list.size();
+        }
+    }
+
+    // ViewHolder
+    public class FriendsViewHolder extends RecyclerView.ViewHolder {
+        public ImageView iconView;
+        public TextView nameView;
+        public Button deleteButton;
+
+        public FriendsViewHolder(@NonNull View itemView) {
+            super(itemView);
+            iconView = itemView.findViewById(R.id.friendIcon);
+            nameView = itemView.findViewById(R.id.friendName);
+            deleteButton = itemView.findViewById(R.id.friendDelete);
+        }
+    }
+
+    // DataModel
+    public static class FriendDataModel {
+        private String name;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nemophila/MapsActivity.java b/app/src/main/java/com/example/nemophila/MapsActivity.java
new file mode 100644
index 0000000..0147d71
--- /dev/null
+++ b/app/src/main/java/com/example/nemophila/MapsActivity.java
@@ -0,0 +1,42 @@
+package com.example.nemophila;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.navigation.NavController;
+import androidx.navigation.fragment.NavHostFragment;
+import androidx.navigation.ui.AppBarConfiguration;
+import androidx.navigation.ui.NavigationUI;
+
+import android.os.Bundle;
+
+
+public class MapsActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_maps);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
+
+        // ナビゲーションホストを取得する
+        NavHostFragment navHostFragment =
+                (NavHostFragment)getSupportFragmentManager()
+                        .findFragmentById(R.id.navHostFragment);
+
+        // navHostFragmentのナビゲーションコントローラを取得する
+        NavController navController = navHostFragment.getNavController();
+
+        // アップバーのコンフィグレーションをビルドする
+        AppBarConfiguration appBarConfiguration =
+                new AppBarConfiguration.Builder(navController.getGraph())
+                        .setOpenableLayout((DrawerLayout)findViewById(R.id.drawer_layout))
+                        .build();
+
+        // ナビゲーションUIをセットアップする
+        NavigationUI.setupWithNavController(toolbar, navController, appBarConfiguration);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nemophila/MapsFragment.java b/app/src/main/java/com/example/nemophila/MapsFragment.java
new file mode 100644
index 0000000..16aa92e
--- /dev/null
+++ b/app/src/main/java/com/example/nemophila/MapsFragment.java
@@ -0,0 +1,49 @@
+package com.example.nemophila;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.google.android.gms.maps.CameraUpdateFactory;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.OnMapReadyCallback;
+import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.MarkerOptions;
+
+public class MapsFragment extends Fragment {
+
+    private OnMapReadyCallback callback = new OnMapReadyCallback() {
+
+        @Override
+        public void onMapReady(GoogleMap googleMap) {
+            LatLng sydney = new LatLng(-34, 151);
+            googleMap.addMarker(new MarkerOptions().position(sydney).title("Marker in Sydney"));
+            googleMap.moveCamera(CameraUpdateFactory.newLatLng(sydney));
+        }
+    };
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+
+        return inflater.inflate(R.layout.fragment_maps, container, false);
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        SupportMapFragment mapFragment =
+                (SupportMapFragment) getChildFragmentManager().findFragmentById(R.id.map);
+        if (mapFragment != null) {
+            mapFragment.getMapAsync(callback);
+        }
+    }
+}
\ 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 ae65759..6301b5d 100644
--- a/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java
+++ b/app/src/main/java/com/example/nemophila/MyPageEditorActivity.java
@@ -23,7 +23,7 @@
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_my_page_editor);
 
-        //AccountViewModelとの通信
+        //LiveDataへの購読
         AccountViewModel accountViewModel = new ViewModelProvider(this).get(AccountViewModel.class);
         Nemophila nemophila = (Nemophila) getApplication();
         String name = nemophila.getName();
@@ -38,18 +38,17 @@
                 startActivity(intent);
             }
         });
-
+        //LiveDataへの購読
         accountViewModel.getNameLiveData().observe(this, new Observer<String>() {
             @Override
             public void onChanged(String name) {
                 TextView myName = (TextView) findViewById(R.id.editName);
                 myName.setText(name);
                 nemophila.setName(name);
-//                Intent intent = new Intent(MyPageEditorActivity.this, MyPageActivity.class);
-//                startActivity(intent);
             }
 
         });
+        //LiveDataへの購読
         accountViewModel.getPwLiveData().observe(this, new Observer<String>() {
             @Override
             public void onChanged(String Pw) {
@@ -58,6 +57,7 @@
             }
 
         });
+        //LiveDataへの購読
         accountViewModel.getPwErrorLiveData().observe(this, new Observer<String>() {
             @Override
             public void onChanged(String name) {
diff --git a/app/src/main/java/com/example/nemophila/PostActivity.java b/app/src/main/java/com/example/nemophila/PostActivity.java
index 6282a6f..cf0b6b2 100644
--- a/app/src/main/java/com/example/nemophila/PostActivity.java
+++ b/app/src/main/java/com/example/nemophila/PostActivity.java
@@ -1,6 +1,7 @@
 package com.example.nemophila;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
 import android.content.Intent;
@@ -15,11 +16,17 @@
 
 
 import com.example.nemophila.entities.Account;
+import com.example.nemophila.entities.Post;
 import com.example.nemophila.entities.Shop;
+import com.example.nemophila.resources.ShopsRest;
 import com.example.nemophila.viewmodels.PostsViewModel;
 import com.example.nemophila.viewmodels.ShopsViewModel;
 import com.google.android.material.snackbar.Snackbar;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
 import retrofit2.Retrofit;
 
 
@@ -53,6 +60,24 @@
         postsViewModel = new ViewModelProvider(this).get(PostsViewModel.class);
         shopsViewModel = new ViewModelProvider(this).get(ShopsViewModel.class);
 
+//店舗新規作成のオブザーバー
+        shopsViewModel.getCurrentLiveData().observe(this, new Observer<Shop>() {
+            @Override
+            public void onChanged(Shop shop) {
+                System.out.println("店舗新規作成完了");
+                postsViewModel.createPost(uid, token, shop.getSid(), rate, genre, comment, img1, img2, img3);
+
+                System.out.println("lat" + nemophila.getCurrentLatitude() + "\nlong" + nemophila.getCurrentLongitude());
+
+                //投稿時にリセット
+                nemophila.setDummyShop(null);
+                nemophila.setCurrentShop(null);
+
+                Intent intent = new Intent(getApplication(), MainActivity.class);
+                startActivity(intent);
+            }
+        });
+
         uid = nemophila.getUid();
         token = nemophila.getToken();
         shop = nemophila.getCurrentShop();
@@ -169,17 +194,24 @@
 //                    startActivity(intent);
                 } else {
                 //評価入力済の時
-                    shopsViewModel.createShop(shopName, nemophila.getCurrentLongitude(), nemophila.getCurrentLatitude());
-                    postsViewModel.createPost(uid, token, sid, rate, genre, comment, img1, img2, img3);
 
-                    //投稿時にリセット
-                    nemophila.setDummyShop(null);
-                    nemophila.setCurrentShop(null);
+                    if (shop == null) {
+                        shopsViewModel.createShop(shopName, nemophila.getCurrentLongitude(), nemophila.getCurrentLatitude());
+                    } else {
+                        postsViewModel.createPost(uid, token, sid, rate, genre, comment, img1, img2, img3);
+                        System.out.println("既存店舗に投稿");
+                        System.out.println("lat" + nemophila.getCurrentLatitude() + "\nlong" + nemophila.getCurrentLongitude());
 
-                    Intent intent = new Intent(getApplication(), MainActivity.class);
-                    startActivity(intent);
+                        //投稿時にリセット
+                        nemophila.setDummyShop(null);
+                        nemophila.setCurrentShop(null);
+
+                        Intent intent = new Intent(getApplication(), MainActivity.class);
+                        startActivity(intent);
+                    }
                 }
             }
+
         });
     }
 }
diff --git a/app/src/main/java/com/example/nemophila/RequestedActivity.java b/app/src/main/java/com/example/nemophila/RequestedActivity.java
index 748c4b0..6f075f9 100644
--- a/app/src/main/java/com/example/nemophila/RequestedActivity.java
+++ b/app/src/main/java/com/example/nemophila/RequestedActivity.java
@@ -5,6 +5,7 @@
 import android.os.Bundle;
 
 public class RequestedActivity extends AppCompatActivity {
+    private RequestedAdapter adapter = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
diff --git a/app/src/main/java/com/example/nemophila/RequestedAdapter.java b/app/src/main/java/com/example/nemophila/RequestedAdapter.java
new file mode 100644
index 0000000..be91550
--- /dev/null
+++ b/app/src/main/java/com/example/nemophila/RequestedAdapter.java
@@ -0,0 +1,41 @@
+package com.example.nemophila;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.example.nemophila.entities.Account;
+import com.example.nemophila.viewmodels.AccountViewModel;
+
+import java.util.List;
+
+public class RequestedAdapter extends RecyclerView.Adapter<RequestedViewHolder> {
+    private List<Account> list;
+    public RequestedAdapter(List<Account> list) {
+        this.list = list;
+    }
+    public void setList(List<Account> list) {
+        this.list = list;
+    }
+
+    @NonNull
+    @Override
+    public RequestedViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_requested_activity, parent,false);
+        RequestedViewHolder vh = new RequestedViewHolder(inflate);
+        return vh;
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RequestedViewHolder holder, int position) {
+        holder.nameView.setText(list.get(position).getName());
+    }
+
+    @Override
+    public int getItemCount() {
+        return list.size();
+    }
+}
diff --git a/app/src/main/java/com/example/nemophila/RequestedViewHolder.java b/app/src/main/java/com/example/nemophila/RequestedViewHolder.java
new file mode 100644
index 0000000..e4ed3cc
--- /dev/null
+++ b/app/src/main/java/com/example/nemophila/RequestedViewHolder.java
@@ -0,0 +1,16 @@
+package com.example.nemophila;
+
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class RequestedViewHolder extends RecyclerView.ViewHolder {
+    public TextView nameView;
+
+    public RequestedViewHolder(@NonNull View view) {
+        super(view);
+        nameView = (TextView) view.findViewById(R.id.textView3);
+    }
+}
diff --git a/app/src/main/java/com/example/nemophila/RequestingActivity.java b/app/src/main/java/com/example/nemophila/RequestingActivity.java
new file mode 100644
index 0000000..6214a8e
--- /dev/null
+++ b/app/src/main/java/com/example/nemophila/RequestingActivity.java
@@ -0,0 +1,14 @@
+package com.example.nemophila;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+public class RequestingActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_requesting);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nemophila/ShopActivity.java b/app/src/main/java/com/example/nemophila/ShopActivity.java
index 0490659..3b9d9bb 100644
--- a/app/src/main/java/com/example/nemophila/ShopActivity.java
+++ b/app/src/main/java/com/example/nemophila/ShopActivity.java
@@ -2,6 +2,7 @@
 
 import static android.app.PendingIntent.getActivity;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
@@ -11,10 +12,13 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.example.nemophila.entities.Account;
 import com.example.nemophila.entities.Post;
 import com.example.nemophila.entities.Shop;
 import com.example.nemophila.viewmodels.PostsViewModel;
@@ -24,7 +28,7 @@
 import java.util.List;
 
 public class ShopActivity extends AppCompatActivity {
-    private ShopActivityAdapter adapter = null;
+    private ShopAcAdapter adapter = null;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -73,12 +77,12 @@
             }
         });
 
-        List<PostDataModel> postsDataset = new ArrayList<>();
+        List<ShopAcDataModel> postsDataset = new ArrayList<>();
 
         //RecyclerView(表示の設定、直接表示するところはLivedataを購読しているonChanged内)
         //xmlからrvにRecyclerViewを取得、アダプターを宣言
         RecyclerView rv = (RecyclerView) findViewById(R.id.postsList);
-        adapter = new ShopActivityAdapter(postsDataset);
+        adapter = new ShopAcAdapter(postsDataset);
 
         //一行ずつを縦に(LinearLayout)表示するLayoutManagerを宣言
         LinearLayoutManager llm = new LinearLayoutManager(this);
@@ -99,64 +103,181 @@
             @Override
             public void onChanged(List<Post> ShopPosts) {
 
-                //Nemophilaから選択中のジャンルを受け取って表示
-//                HashSet<String> selectingGenre = ((Nemophila)getApplication()).getSelectGenres();
-                //テスト用にHashsetにジャンルを入力
-                HashSet<String> selectingGenre = new HashSet<>();
-                selectingGenre.add("ラーメン");
-                selectingGenre.add("中華");
+                //Nemophilaから選択中のジャンルを受け取る
+                HashSet<String> selectingGenre = ((Nemophila)getApplication()).getSelectGenres();
+                //テスト用にHashSetにジャンルを入力
+//                HashSet<String> selectingGenre = new HashSet<>();
+//                selectingGenre.add("ラーメン");
+//                selectingGenre.add("中華");
 
+                //選択中に何かあれば表示
                 if(!(selectingGenre.isEmpty())) {
-                    String unitGenre = "";
-//                    for (String list : selectingGenre) {
-//                        unitGenre += selectingGenre;
-//                        unitGenre += ", ";
-//                    }
                     TextView genreView = (TextView) findViewById(R.id.shopAcGenre);
                     genreView.setText("選択中のジャンル：" + selectingGenre);
                 }
 
-                //テスト用にジャンルをラーメンにセット
-                String selectTestGenre = "";
-                selectTestGenre = "ラーメン";
-//                if(!(selectTestGenre.isEmpty())) {
-//                    TextView genreView = (TextView) findViewById(R.id.shopAcGenre);
-//                    genreView.setText("選択中のジャンル：" + selectTestGenre);
-//                }
+                //Nemophilaから選択中のフレンドを受け取る
+                HashSet<String> selectingFriend = ((Nemophila)getApplication()).getSelectFriends();
+
+                //テスト用にHashSetにフレンドを入力
+//                HashSet<String> selectingFriend = new HashSet<>();
+//                selectingFriend.add("1111");
+//                selectingFriend.add("1113");
+
+                //選択したフレンドの表示のための宣言
+                HashSet<String> selectingFriendName = new HashSet<>();
 
                 //postsDatasetを一旦クリアし、LiveDataから受け取ったデータを一つずつセット(重複しないように)
                 postsDataset.clear();
+
                 for (Post post: ShopPosts){
-                    //投稿一つあたりの各要素をdataにセット
-                    PostDataModel data = new PostDataModel();
-                    //選択したgenreで絞り込み検索(どれか一つでもあれば)
+                    //dataを宣言　dataに投稿の必要なデータをセットし、それをpostsDatasetに追加してリストを作る
+                    ShopAcDataModel data = new ShopAcDataModel();
+                    //フィルター選択中かの判定のためにgenreとuidを先に読み込む
                     String genre = post.getGenre();
+                    String uid = post.getUid();
+                    String name = post.getName();
 
-                    if(selectingGenre.contains(genre)) {
-                        data.setName(post.getName());
-                        data.setDate(post.getDate());
-                        //rateはintで受け取った評価に対応した星の数のStringに変換してセット
-                        int intRate = post.getRate();
-                        String strRate = "";
-                        for (int i = 0; i < 5; i++) {
-                            if (intRate > i) {
-                                strRate += "★";
-                            } else {
-                                strRate += "☆";
+                    //選択が何もない場合は全ての投稿を、選択ある場合は一致する投稿をdataにセット
+                    if(selectingGenre.isEmpty() || selectingGenre.contains(genre)) {
+                        if(selectingFriend.isEmpty() || selectingFriend.contains(uid)) {
+                            data.setName(name);
+                            data.setDate(post.getDate());
+                            //rateはintで受け取った評価に対応した星の数のStringに変換してセット
+                            int intRate = post.getRate();
+                            String strRate = "";
+                            for (int i = 0; i < 5; i++) {
+                                if (intRate > i) {
+                                    strRate += "★";
+                                } else {
+                                    strRate += "☆";
+                                }
                             }
-                        }
-                        data.setRate(strRate);
-                        data.setGenre(genre);
-                        data.setComment(post.getComment());
+                            data.setRate(strRate);
+                            data.setGenre(genre);
+                            data.setComment(post.getComment());
 
-                        //投稿一つの情報がdataに全部セットされたらDatasetに追加
-                        postsDataset.add(data);
+                            //投稿一つの情報がdataに全部セットされたらDatasetに追加
+                            postsDataset.add(data);
+                        }
+                    }
+                    //フレンド名を表示用HashSetにセット
+                    if(!(selectingFriend.isEmpty()) && selectingFriend.contains(uid)) {
+                        selectingFriendName.add(name);
                     }
                 }
+
+                //フレンド選択があればフレンド名を表示する
+                if(!(selectingFriend.isEmpty())) {
+                    TextView friendView = (TextView) findViewById(R.id.shopAcFriend);
+                    friendView.setText("表示中のフレンド：" + selectingFriendName);
+                }
+
                 //RecyclerViewをonChangedが呼ばれるたび表示(アダプターを更新してRecyclerViewにセット)
                 adapter.setList(postsDataset);
                 rv.setAdapter(adapter);
             }
         });
     }
+
+    //RecyclerViewのための内部クラス
+
+    //Adapter
+    public class ShopAcAdapter extends RecyclerView.Adapter<ShopAcViewHolder> {
+
+        private List<ShopAcDataModel> list;
+
+        public ShopAcAdapter(List<ShopAcDataModel> list) {
+            this.list =list;
+        }
+
+        public void setList(List<ShopAcDataModel> list) {
+            this.list = list;
+        }
+
+        @NonNull
+        @Override
+        public ShopAcViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+
+            View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_shop_activity_posts, parent,false);
+            ShopAcViewHolder vh = new ShopAcViewHolder(inflate);
+            return vh;
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull ShopAcViewHolder holder, int position) {
+            holder.nameView.setText(list.get(position).getName());
+            holder.dateView.setText(list.get(position).getDate());
+            holder.rateView.setText(list.get(position).getRate());
+            holder.genreView.setText(list.get(position).getGenre());
+            holder.commentView.setText(list.get(position).getComment());
+        }
+
+        @Override
+        public int getItemCount() {
+            return list.size();
+        }
+    }
+
+    //ViewHolder
+    public class ShopAcViewHolder extends RecyclerView.ViewHolder {
+        public TextView nameView;
+        public TextView dateView;
+        public TextView rateView;
+        public TextView genreView;
+        public TextView commentView;
+
+        public ShopAcViewHolder(@NonNull View itemView) {
+            super(itemView);
+            nameView = (TextView) itemView.findViewById(R.id.userName);
+            dateView = (TextView) itemView.findViewById(R.id.date);
+            rateView = (TextView) itemView.findViewById(R.id.rate);
+            genreView = (TextView) itemView.findViewById(R.id.genre);
+            commentView = (TextView) itemView.findViewById(R.id.comment);
+        }
+    }
+
+    //DataModel
+    public static class ShopAcDataModel {
+        private String name;
+        private String date;
+        private String rate;
+        private String genre;
+        private String comment;
+
+        public String getName() {
+            return name;
+        }
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getDate() {
+            return date;}
+        public void setDate(String date) {
+            this.date = date;
+        }
+
+        public String getRate() {
+            return rate;
+        }
+        public void setRate(String rate) {
+            this.rate = rate;
+        }
+
+        public String getGenre() {
+            return genre;
+        }
+        public void setGenre(String genre) {
+            this.genre = genre;
+        }
+
+        public String getComment() {
+            return comment;
+        }
+        public void setComment(String comment) {
+            this.comment = comment;
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nemophila/ShopActivityAdapter.java b/app/src/main/java/com/example/nemophila/ShopActivityAdapter.java
index 24def3a..6f5c201 100644
--- a/app/src/main/java/com/example/nemophila/ShopActivityAdapter.java
+++ b/app/src/main/java/com/example/nemophila/ShopActivityAdapter.java
@@ -1,46 +1,46 @@
-package com.example.nemophila;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.RecyclerView;
-
-import java.util.List;
-
-public class ShopActivityAdapter extends RecyclerView.Adapter<PostsViewHolder> {
-
-    private List<PostDataModel> list;
-
-    public ShopActivityAdapter(List<PostDataModel> list) {
-        this.list =list;
-    }
-
-    public void setList(List<PostDataModel> list) {
-        this.list = list;
-    }
-
-    @NonNull
-    @Override
-    public PostsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-
-        View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_shop_activity_posts, parent,false);
-        PostsViewHolder vh = new PostsViewHolder(inflate);
-        return vh;
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull PostsViewHolder holder, int position) {
-        holder.nameView.setText(list.get(position).getName());
-        holder.dateView.setText(list.get(position).getDate());
-        holder.rateView.setText(list.get(position).getRate());
-        holder.genreView.setText(list.get(position).getGenre());
-        holder.commentView.setText(list.get(position).getComment());
-    }
-
-    @Override
-    public int getItemCount() {
-        return list.size();
-    }
-}
+//package com.example.nemophila;
+//
+//import android.view.LayoutInflater;
+//import android.view.View;
+//import android.view.ViewGroup;
+//
+//import androidx.annotation.NonNull;
+//import androidx.recyclerview.widget.RecyclerView;
+//
+//import java.util.List;
+//
+//public class ShopActivityAdapter extends RecyclerView.Adapter<PostsViewHolder> {
+//
+//    private List<PostDataModel> list;
+//
+//    public ShopActivityAdapter(List<PostDataModel> list) {
+//        this.list =list;
+//    }
+//
+//    public void setList(List<PostDataModel> list) {
+//        this.list = list;
+//    }
+//
+//    @NonNull
+//    @Override
+//    public PostsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+//
+//        View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_shop_activity_posts, parent,false);
+//        PostsViewHolder vh = new PostsViewHolder(inflate);
+//        return vh;
+//    }
+//
+//    @Override
+//    public void onBindViewHolder(@NonNull PostsViewHolder holder, int position) {
+//        holder.nameView.setText(list.get(position).getName());
+//        holder.dateView.setText(list.get(position).getDate());
+//        holder.rateView.setText(list.get(position).getRate());
+//        holder.genreView.setText(list.get(position).getGenre());
+//        holder.commentView.setText(list.get(position).getComment());
+//    }
+//
+//    @Override
+//    public int getItemCount() {
+//        return list.size();
+//    }
+//}
diff --git a/app/src/main/java/com/example/nemophila/resources/FriendsRest.java b/app/src/main/java/com/example/nemophila/resources/FriendsRest.java
new file mode 100644
index 0000000..dd66b14
--- /dev/null
+++ b/app/src/main/java/com/example/nemophila/resources/FriendsRest.java
@@ -0,0 +1,71 @@
+package com.example.nemophila.resources;
+
+import com.example.nemophila.entities.PostJson;
+
+import java.util.Collection;
+
+import retrofit2.Call;
+import retrofit2.http.DELETE;
+import retrofit2.http.Field;
+import retrofit2.http.FormUrlEncoded;
+import retrofit2.http.GET;
+import retrofit2.http.PUT;
+import retrofit2.http.Path;
+
+public interface FriendsRest {
+
+    @GET("accounts/{uid}/friends")
+    Call<Collection<String>> getFriends(
+            @Path("uid") String uid
+    );
+
+    @FormUrlEncoded
+    @PUT("accounts/{uid}/friends/{fid}")
+    Call<Void> putFriend(
+            @Path("uid") String uid,
+            @Path("fid") String fid,
+            @Field("token") String token
+    );
+
+    @DELETE("accounts/{uid}/friends/{fid}")
+    Call<Void> deleteFriend(
+            @Path("uid") String uid,
+            @Path("fid") String fid,
+            @Field("token") String token
+    );
+
+    @GET("/accounts/{uid}/requesting")
+    Call<Collection<String>> getRequesting(
+            @Path("uid") String uid
+    );
+
+    @FormUrlEncoded
+    @PUT("accounts/{uid}/reqesting/{requesting_id}")
+    Call<Void> putRequesting(
+            @Path("uid") String uid,
+            @Path("requesting_id") String requesting_id,
+            @Field("token") String token
+    );
+
+    @FormUrlEncoded
+    @DELETE("accounts/{uid}/reqesting/{requesting_id}")
+    Call<Void> deleteRequesting(
+            @Path("uid") String uid,
+            @Path("requesting_id") String requesting_id,
+            @Field("token") String token
+    );
+
+    @GET("accounts/{uid}/reqested")
+    Call<Collection<String>> getRequested(
+            @Path("uid") String uid
+    );
+
+    @FormUrlEncoded
+    @DELETE("accounts/{uid}/reqested/{reqested_id}")
+    Call<Void> deleteRequested(
+            @Path("uid") String uid,
+            @Path("requested_id") String requested_id,
+            @Field("token") String token
+    );
+
+}
diff --git a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
index d5dcbed..b670f3a 100644
--- a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
+++ b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
@@ -86,6 +86,7 @@
             public void onResponse(Call<Void> call, Response<Void> response) {
                 if (response.isSuccessful()) {
                     pwLiveData.setValue(newPw);
+                    System.out.println(response.code());
                     System.out.println("Success ChangePW");
                 } else {
                     if (response.code() == 401){
diff --git a/app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java
new file mode 100644
index 0000000..bf32a70
--- /dev/null
+++ b/app/src/main/java/com/example/nemophila/viewmodels/FriendViewModel.java
@@ -0,0 +1,65 @@
+package com.example.nemophila.viewmodels;
+
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+
+import com.example.nemophila.entities.Post;
+import com.example.nemophila.resources.AccountsRest;
+import com.example.nemophila.resources.FriendsRest;
+
+import java.util.Collection;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.converter.jackson.JacksonConverterFactory;
+
+public class FriendViewModel extends ViewModel {
+    // フィールド
+    private final Retrofit retrofit;
+    private final FriendsRest friendsRest;
+    // ライブデータ
+    private final MutableLiveData<String> friendsLiveData;
+    private final MutableLiveData<String> requestedLiveData;
+    private final MutableLiveData<Collection<Post>> requestingLiveData;
+
+    // コンストラクタ
+    public FriendViewModel() {
+        this.retrofit = new Retrofit.Builder()
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/nemophila/")
+                .addConverterFactory(JacksonConverterFactory.create())
+                .build();
+        this.friendsRest = retrofit.create(FriendsRest.class);
+        this.friendsLiveData = new MutableLiveData<>();
+        this.requestedLiveData = new MutableLiveData<>();
+        this.requestingLiveData = new MutableLiveData<>();
+    }
+
+    // ライブデータの取得（ゲッター）
+    public MutableLiveData<String> getFriendsLiveData() {
+        return friendsLiveData;
+    }
+    public MutableLiveData<String> getRequestedLiveData() {
+        return requestedLiveData;
+    }
+    public MutableLiveData<Collection<Post>> getRequestingLiveData() { return requestingLiveData; }
+
+    public void searchFriend(String uid,String fid, String token) {
+        Call<Void> call = friendsRest.putFriend(uid,fid,token);
+        call.enqueue(new Callback<Void>() {
+            @Override
+            public void onResponse(Call<Void> call, Response<Void> response) {
+                if (response.isSuccessful()) {
+                    System.out.println("Successful");
+                } else {
+                    System.out.println("ResponseError");
+                }
+            }
+            @Override
+            public void onFailure(Call<Void> call, Throwable t) {
+                System.out.println(" NetworkError" + t);
+            }
+        });
+    }
+}
diff --git a/app/src/main/res/layout/activity_friend.xml b/app/src/main/res/layout/activity_friend.xml
index 51e2fcb..5ac6e12 100644
--- a/app/src/main/res/layout/activity_friend.xml
+++ b/app/src/main/res/layout/activity_friend.xml
@@ -19,16 +19,25 @@
         app:layout_constraintVertical_bias="0.073" />
 
     <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/friendsList"
         android:layout_width="409dp"
         android:layout_height="639dp"
-        tools:layout_editor_absoluteX="1dp"
-        tools:layout_editor_absoluteY="91dp" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.454"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/title"
+        app:layout_constraintVertical_bias="0.576" />
 
     <Button
         android:id="@+id/backMyPage"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="戻る"
-        tools:layout_editor_absoluteX="322dp"
-        tools:layout_editor_absoluteY="31dp" />
+        app:layout_constraintBottom_toBottomOf="@+id/friendsList"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.95"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.023" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
new file mode 100644
index 0000000..05b3440
--- /dev/null
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.drawerlayout.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/drawer_layout"
+    tools:context=".MapsActivity">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <fragment
+            android:id="@+id/navHostFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:name="androidx.navigation.fragment.NavHostFragment"
+            app:defaultNavHost="true"
+            app:navGraph="@navigation/navigation" />
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#00000000"/>
+
+        <SearchView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:layout_marginLeft="50dp"
+            android:layout_marginRight="50dp"
+            android:layout_gravity="center_horizontal"
+            />
+
+    </FrameLayout>
+
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/navView"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        app:menu="@menu/navdrawer_menu" />
+</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_requested.xml b/app/src/main/res/layout/activity_requested.xml
index 86eabce..32ff931 100644
--- a/app/src/main/res/layout/activity_requested.xml
+++ b/app/src/main/res/layout/activity_requested.xml
@@ -6,4 +6,39 @@
     android:layout_height="match_parent"
     tools:context=".RequestedActivity">
 
+    <Button
+        android:id="@+id/CancelButton"
+        android:layout_width="50dp"
+        android:layout_height="55dp"
+        android:backgroundTint="#00BCD4"
+        android:text="←"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.05"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.023"
+        tools:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/textView2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="申請を受けているユーザー"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.497"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.049" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="409dp"
+        android:layout_height="658dp"
+        android:layout_marginStart="2dp"
+        android:layout_marginEnd="2dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_requesting.xml b/app/src/main/res/layout/activity_requesting.xml
new file mode 100644
index 0000000..b0eb893
--- /dev/null
+++ b/app/src/main/res/layout/activity_requesting.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".RequestingActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_shop.xml b/app/src/main/res/layout/activity_shop.xml
index 5c98568..8e57be7 100644
--- a/app/src/main/res/layout/activity_shop.xml
+++ b/app/src/main/res/layout/activity_shop.xml
@@ -52,12 +52,12 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/postsList"
         android:layout_width="400dp"
-        android:layout_height="480dp"
+        android:layout_height="460dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/shopAcGenre"
+        app:layout_constraintTop_toBottomOf="@+id/shopAcFriend"
         app:layout_constraintVertical_bias="0.669" />
 
     <TextView
@@ -72,4 +72,16 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.175" />
 
+    <TextView
+        android:id="@+id/shopAcFriend"
+        android:layout_width="400dp"
+        android:layout_height="wrap_content"
+        android:text="選択中のフレンド：なし"
+        app:layout_constraintBottom_toTopOf="@+id/postsList"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/shopAcGenre"
+        app:layout_constraintVertical_bias="0.21" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_maps.xml b/app/src/main/res/layout/fragment_maps.xml
new file mode 100644
index 0000000..59319fb
--- /dev/null
+++ b/app/src/main/res/layout/fragment_maps.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <fragment
+        android:id="@+id/map"
+        android:name="com.google.android.gms.maps.SupportMapFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_friends_activity.xml b/app/src/main/res/layout/layout_friends_activity.xml
new file mode 100644
index 0000000..d891315
--- /dev/null
+++ b/app/src/main/res/layout/layout_friends_activity.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/friendIcon"
+        android:layout_width="111dp"
+        android:layout_height="56dp"
+        android:layout_weight="1"
+        tools:srcCompat="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/friendName"
+        android:layout_width="259dp"
+        android:layout_height="41dp"
+        android:layout_weight="1"
+        android:text="TextView" />
+
+    <Button
+        android:id="@+id/friendDelete"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="削除" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_requested_activity.xml b/app/src/main/res/layout/layout_requested_activity.xml
new file mode 100644
index 0000000..5e34e2c
--- /dev/null
+++ b/app/src/main/res/layout/layout_requested_activity.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="45dp"
+        android:layout_height="45dp"
+        android:layout_weight="1"
+        tools:srcCompat="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/textView3"
+        android:layout_width="150dp"
+        android:layout_height="45dp"
+        android:layout_weight="1"
+        android:text="彌永　慎之介"
+        android:textSize="20sp" />
+
+    <Button
+        android:id="@+id/button3"
+        android:layout_width="25dp"
+        android:layout_height="45dp"
+        android:layout_weight="1"
+        android:backgroundTint="#FFFFFF"
+        android:text="承認"
+        android:textColor="#4CAF50" />
+
+    <Button
+        android:id="@+id/button5"
+        android:layout_width="25dp"
+        android:layout_height="45dp"
+        android:layout_weight="1"
+        android:backgroundTint="#FFFFFF"
+        android:text="拒否"
+        android:textColor="#F44336" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/navdrawer_menu.xml b/app/src/main/res/menu/navdrawer_menu.xml
new file mode 100644
index 0000000..6048d10
--- /dev/null
+++ b/app/src/main/res/menu/navdrawer_menu.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+        <item
+            android:id="@+id/friendsFragment"
+            android:title="友達"
+            />
+
+        <item
+            android:id="@+id/timelineFragment"
+            android:title="タイムライン"
+            />
+
+        <item
+            android:id="@+id/settingsFragment"
+            android:title="設定"
+            />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/navigation.xml b/app/src/main/res/navigation/navigation.xml
new file mode 100644
index 0000000..a021417
--- /dev/null
+++ b/app/src/main/res/navigation/navigation.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/navigation"
+    app:startDestination="@id/map">
+
+    <fragment
+        android:id="@+id/map"
+        android:name="com.example.nemophila.MapsFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:layout="@layout/fragment_maps" >
+        <action
+            android:id="@+id/action_map_to_friendsFragment"
+            app:destination="@id/friendsFragment" />
+        <action
+            android:id="@+id/action_map_to_settingsFragment"
+            app:destination="@id/settingsFragment" />
+        <action
+            android:id="@+id/action_map_to_timelineFragment"
+            app:destination="@id/timelineFragment" />
+    </fragment>
+<!--    <fragment-->
+<!--        android:id="@+id/friendsFragment"-->
+<!--        android:name="com.example.nemophila.FriendsFragment"-->
+<!--        android:label="fragment_profile"-->
+<!--        tools:layout="@layout/fragment_friends" />-->
+<!--    <fragment-->
+<!--        android:id="@+id/timelineFragment"-->
+<!--        android:name="com.example.nemophila.TimelineFragment"-->
+<!--        android:label="fragment_settings"-->
+<!--        tools:layout="@layout/fragment_timeline" />-->
+<!--    <fragment-->
+<!--        android:id="@+id/settingsFragment"-->
+<!--        android:name="com.example.nemophila.SettingsFragment"-->
+<!--        android:label="fragment_settings"-->
+<!--        tools:layout="@layout/fragment_settings" />-->
+
+</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 946d321..b8304c8 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Nemophila" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.Nemophila" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 504a6fe..34b735c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,6 +9,7 @@
     <string name="title_activity_test">TestActivity</string>
     <string name="title_activity_gps">GpsActivity</string>
     <string name="title_activity_shop_create">ShopCreateActivity</string>
+    <string name="title_activity_requesting">RequestingActivity</string>
     <string name="username">UserName</string>
     <string name="make_a_new_account">Make a new Account</string>
     <string name="password">Password</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index fb6c8f6..c01376d 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Nemophila" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.Nemophila" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
diff --git a/build.gradle b/build.gradle
index 3eaaa77..98b5d27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.3.0' apply false
-    id 'com.android.library' version '7.3.0' apply false
+    id 'com.android.application' version '7.2.1' apply false
+    id 'com.android.library' version '7.2.1' apply false
     id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.0' apply false
 }