diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1bf42f0..90507b0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -56,12 +56,12 @@
             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"
@@ -91,11 +91,11 @@
             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
diff --git a/app/src/main/java/com/example/nemophila/Nemophila.java b/app/src/main/java/com/example/nemophila/Nemophila.java
index 26e5d77..d87e5e1 100644
--- a/app/src/main/java/com/example/nemophila/Nemophila.java
+++ b/app/src/main/java/com/example/nemophila/Nemophila.java
@@ -3,10 +3,13 @@
 import android.app.Application;
 import android.content.SharedPreferences;
 
+import com.example.nemophila.entities.Account;
 import com.example.nemophila.entities.Shop;
 import com.google.type.LatLng;
 
 public class Nemophila extends Application {
+    private final int MAX_FILTER = 5;
+
     //アカウントのデータ
     private String name;
     private String uid;
@@ -19,12 +22,15 @@
     private Shop dummyShop;
 
     //カメラのデータ
-    private Float cameraLatitude;
-    private Float cameraLongitude;
+    private double cameraLatitude;
+    private double cameraLongitude;
     private float zoom;
 
-    //Getter
+    //フィルターのデータ
+    private String[] selectGenre = new String[MAX_FILTER];
+    private Account[] selectFriend = new Account[MAX_FILTER];
 
+    //Account関連のGetter
     public String getName() {
         if(name == null){
             SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE);
@@ -46,6 +52,8 @@
         }
         return token;
     }
+
+    //Shop関連のGetter
     public Shop getCurrentShop() {
         return currentShop;
     }
@@ -58,14 +66,16 @@
     public Shop getDummyShop() {
         return dummyShop;
     }
-    public Float getCameraLatitude() {
+
+    //Camera関連のGetter
+    public double getCameraLatitude() {
         if(cameraLatitude == 0){
             SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE);
             cameraLatitude = preferences.getFloat("cameraLatitude", 0);
         }
         return cameraLatitude;
     }
-    public Float getCameraLongitude() {
+    public double getCameraLongitude() {
         if(cameraLongitude == 0){
             SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE);
             cameraLongitude = preferences.getFloat("cameraLongitude", 0);
@@ -75,11 +85,19 @@
     public float getZoom() {
         if(zoom == 0.0){
             SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE);
-            zoom = preferences.getFloat("zoom", 0);
+            zoom = preferences.getFloat("zoom", 10);
         }
         return zoom;
     }
 
+    //フィルター関連のGetter
+    public String[] getSelectGenre() {
+        return selectGenre;
+    }
+    public Account[] getSelectFriend() {
+        return selectFriend;
+    }
+
     //Setter
     public void setName(String name) {
         SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE);
@@ -114,16 +132,16 @@
     public void setDummyShop(Shop dummyShop) {
         this.dummyShop = dummyShop;
     }
-    public void setCameraLatitude(Float cameraLatitude) {
+    public void setCameraLatitude(double cameraLatitude) {
         SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE);
         SharedPreferences.Editor editor = preferences.edit();
-        editor.putFloat("cameraLatitude", cameraLatitude);
+        editor.putFloat("cameraLatitude", (float) cameraLatitude);
         this.cameraLatitude = cameraLatitude;
     }
-    public void setCameraLongitude(Float cameraLongitude) {
+    public void setCameraLongitude(double cameraLongitude) {
         SharedPreferences preferences = getSharedPreferences("prefData", MODE_PRIVATE);
         SharedPreferences.Editor editor = preferences.edit();
-        editor.putFloat("cameraLongitude", cameraLongitude);
+        editor.putFloat("cameraLongitude", (float) cameraLongitude);
         this.cameraLongitude = cameraLongitude;
     }
     public void setZoom(float zoom) {
@@ -132,4 +150,12 @@
         editor.putFloat("zoom", zoom);
         this.zoom = zoom;
     }
+
+//    //フィルター関連のSetter
+//    public void setSelectGenre(String selectGenre) {
+//        this.selectGenre = selectGenre;
+//    }
+//    public void setSelectFriend(Account selectFriend) {
+//        this.selectFriend = selectFriend;
+//    }
 }
diff --git a/app/src/main/java/com/example/nemophila/ShopActivity.java b/app/src/main/java/com/example/nemophila/ShopActivity.java
index 53c5ff9..0053f0a 100644
--- a/app/src/main/java/com/example/nemophila/ShopActivity.java
+++ b/app/src/main/java/com/example/nemophila/ShopActivity.java
@@ -30,27 +30,38 @@
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_shop);
 
-        //NemophilaからcurrentShopを取得し店名の表示
+//        //テスト用に仮にcurrentShopをセット
+//        Shop kariShop = new Shop();
+//        kariShop.setSid("151347fa-2c90-44d7-ba48-f23f475b910d");
+//        kariShop.setName("店D");
+//        kariShop.setLongitude(56.7);
+//        kariShop.setLatitude(78.9);
+//        ((Nemophila)getApplication()).setCurrentShop(kariShop);
+
+        //NemophilaからcurrentShopを取得、店名の表示
         //currentshopに何もないとgetNameとgetSidでアプリが落ちます
         Shop shop;
         String shopName;
         String sid;
         shop = ((Nemophila)getApplication()).getCurrentShop();
-//        shopName = shop.getName();
-//        sid = shop.getSid();
+        shopName = shop.getName();
+        sid = shop.getSid();
         TextView nameView = (TextView) findViewById(R.id.shopName);
-        //テスト用に仮店名でセット
-        nameView.setText("お店A");
-//        nameView.setText(shopName);
+        nameView.setText(shopName);
 
         //右上のボタンで投稿画面(PostActivity)へ遷移
         Button toPostButton = (Button)findViewById(R.id.toPostAcButton);
         toPostButton.setOnClickListener(new View.OnClickListener(){
             public void onClick(View v){
-                Intent intent = new Intent(getApplication(), PostActivity.class);
+                Intent intent = new Intent(ShopActivity.this, PostActivity.class);
+                intent.putExtra("toPostSid",sid);
                 startActivity(intent);
             }
         });
+//        PostActivity側でsidを受け取ってください
+//        Intent intent = getIntent();
+//        sid = intent.getStringExtra("toPostSid");
+//        みたいな感じで受け取れるはずです
 
         //左上のボタンでメイン画面へ遷移
         Button returnButton = (Button)findViewById(R.id.shopAcReturnButton);
@@ -63,12 +74,14 @@
 
         List<PostDataModel> postsDataset = new ArrayList<>();
 
-        //RecyclerView(表示以外の設定)
+        //RecyclerView(表示の設定、直接表示するところはLivedataを購読しているonChanged内)
+        //xmlからrvにRecyclerViewを取得、アダプターを宣言
         RecyclerView rv = (RecyclerView) findViewById(R.id.postsList);
         adapter = new ShopActivityAdapter(postsDataset);
 
+        //一行ずつを縦に(LinearLayout)表示するLayoutManagerを宣言
         LinearLayoutManager llm = new LinearLayoutManager(this);
-
+        //
         RecyclerView.ItemDecoration itemDecoration =
                 new DividerItemDecoration(this, DividerItemDecoration.VERTICAL);
         rv.addItemDecoration(itemDecoration);
@@ -76,23 +89,21 @@
         rv.setHasFixedSize(true);
         rv.setLayoutManager(llm);
 
-        //PostViewModelを宣言し、LiveDataへの購読
+        //PostViewModelを宣言し、currentShopから取得したsidの店舗の投稿をロード
         PostsViewModel postsViewModel = new ViewModelProvider(this).get(PostsViewModel.class);
-        //通信テスト用データ(本来currentShopのsidをPostJsonに送る)
-        postsViewModel.loadShopPost("151347fa-2c90-44d7-ba48-f23f475b910d");
+        postsViewModel.loadShopPost(sid);
 
         //LiveDataへの購読
         postsViewModel.getShopPostLiveData().observe(this, new Observer<List<Post>>() {
             @Override
             public void onChanged(List<Post> ShopPosts) {
-                //postsDatasetを一旦クリアし、LiveDataから受け取ったデータを一つずつセット
+                //postsDatasetを一旦クリアし、LiveDataから受け取ったデータを一つずつセット(重複しないように)
                 postsDataset.clear();
                 for (Post post: ShopPosts){
                     PostDataModel data = new PostDataModel();
                     data.setName(post.getName());
                     data.setDate(post.getDate());
-
-                    //intで受け取った評価を対応した星の数のStringに変換
+                    //rateはintで受け取った評価に対応した星の数のStringに変換してセット
                     int intRate = post.getRate();
                     String strRate = "";
                     for (int i = 0; i < 5; i++){
@@ -108,7 +119,7 @@
 
                     postsDataset.add(data);
                 }
-                //RecyclerViewをonChangedが呼ばれるたび表示
+                //RecyclerViewをonChangedが呼ばれるたび表示(アダプターを更新してRecyclerViewにセット)
                 adapter.setList(postsDataset);
                 rv.setAdapter(adapter);
             }