diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..eac51cb
--- /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_2_API_30_2.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2023-07-04T04:10:49.597477100Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c86fa35..21eb12b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,28 +4,24 @@
     <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_shop_create.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_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/src/main/java/com/example/nemophila/ShopActivity.java b/app/src/main/java/com/example/nemophila/ShopActivity.java
index 0490659..bd9b992 100644
--- a/app/src/main/java/com/example/nemophila/ShopActivity.java
+++ b/app/src/main/java/com/example/nemophila/ShopActivity.java
@@ -15,6 +15,7 @@
 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;
@@ -99,60 +100,76 @@
             @Override
             public void onChanged(List<Post> ShopPosts) {
 
-                //Nemophilaから選択中のジャンルを受け取って表示
+                //Nemophilaから選択中のジャンルを受け取る
 //                HashSet<String> selectingGenre = ((Nemophila)getApplication()).getSelectGenres();
-                //テスト用にHashsetにジャンルを入力
+                //テスト用に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にセット
+                    //dataを宣言　dataに投稿の必要なデータをセットし、それをpostsDatasetに追加してリストを作る
                     PostDataModel data = new PostDataModel();
-                    //選択したgenreで絞り込み検索(どれか一つでもあれば)
+                    //フィルター選択中かの判定のために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);
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..9bc2788
--- /dev/null
+++ b/app/src/main/java/com/example/nemophila/resources/FriendsRest.java
@@ -0,0 +1,35 @@
+package com.example.nemophila.resources;
+
+import retrofit2.Call;
+import retrofit2.http.DELETE;
+import retrofit2.http.GET;
+import retrofit2.http.PUT;
+
+public interface FriendsRest {
+
+    @GET("accounts/{uid}/friends")
+    Call<Void> getFriends(
+    );
+
+    @PUT("accounts/{uid}/friends/{fid}")
+    Call<Void> putFriend();
+
+    @DELETE("accounts/{uid}/friends/{fid}")
+    Call<Void> deleteFriend();
+
+    @GET("/accounts/{uid}/requesting")
+    Call<Void> getRequesting();
+
+    @PUT("accounts/{uid}/reqesting/{requesting_id}")
+    Call<Void> putRequesting();
+
+    @DELETE("accounts/{uid}/reqesting/{requesting_id}")
+    Call<Void> deleteRequesting();
+
+    @GET("accounts/{uid}/reqested")
+    Call<Void> getRequested();
+
+    @DELETE("accounts/{uid}/reqested/{reqested_id}")
+    Call<Void> deleteRequested();
+
+}
diff --git a/app/src/main/res/layout/activity_shop.xml b/app/src/main/res/layout/activity_shop.xml
index 5c98568..5b75b08 100644
--- a/app/src/main/res/layout/activity_shop.xml
+++ b/app/src/main/res/layout/activity_shop.xml
@@ -52,7 +52,7 @@
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/postsList"
         android:layout_width="400dp"
-        android:layout_height="480dp"
+        android:layout_height="450dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -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