diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..0969446
--- /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-06-06T06:58:03.734039100Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bbe0982..a0ea01c 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,6 +4,12 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/Users/student/StudioProjects/NemophilaClient/app/src/main/res/layout/activity_login.xml" value="0.25" />
+        <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/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.25" />
         <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_post.xml" value="0.33" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 160fc79..f386f21 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.example.nemophila">
 
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+    
     <application
+        android:name=".Nemophila"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -12,8 +17,24 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Nemophila"
+        tools:targetApi="31"
+        android:usesCleartextTraffic="true">
+
         tools:targetApi="31">
         <activity
+            android:name=".GpsActivity"
+            android:exported="true"
+            android:label="@string/title_activity_gps">
+
+<!--             <intent-filter>-->
+<!--             <action android:name="android.intent.action.MAIN" />-->
+
+
+<!--             <category android:name="android.intent.category.LAUNCHER" />-->
+<!--             </intent-filter>-->
+        </activity>
+
+        <activity
             android:name=".SignUpActivity"
             android:exported="true"
             android:label="@string/title_activity_sign_up">
@@ -37,6 +58,15 @@
              </intent-filter>
         </activity>
         <activity
+            android:name=".RequestedActivity"
+            android:exported="false" />
+        <activity
+            android:name=".MyPageEditorActivity"
+            android:exported="false" />
+        <activity
+            android:name=".FriendActivity"
+            android:exported="false" />
+        <activity
             android:name=".MyPageActivity"
             android:exported="true"
             android:label="@string/title_activity_my_page">
@@ -61,11 +91,22 @@
 <!--                <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>-->
+        </activity>
+
         <activity
             android:name=".PostActivity"
             android:exported="true"
             android:label="@string/title_activity_post"></activity>
-
         <activity
             android:name=".ShopActivity"
             android:exported="true"
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/GpsActivity.java b/app/src/main/java/com/example/nemophila/GpsActivity.java
new file mode 100644
index 0000000..6b78a26
--- /dev/null
+++ b/app/src/main/java/com/example/nemophila/GpsActivity.java
@@ -0,0 +1,139 @@
+package com.example.nemophila;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+import android.annotation.SuppressLint;
+import android.net.Uri;
+import android.os.Bundle;
+import android.content.pm.PackageManager;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.widget.TextView;
+import android.content.Intent;
+import android.provider.Settings;
+import android.util.Log;
+import android.widget.Toast;
+import android.Manifest;
+
+import android.os.Bundle;
+
+public class GpsActivity extends AppCompatActivity implements LocationListener {
+
+    LocationManager locationManager;
+
+    private final ActivityResultLauncher<String>
+            requestPermissionLauncher = registerForActivityResult(
+            new ActivityResultContracts.RequestPermission(),
+            isGranted -> {
+                if (isGranted) {
+                    locationStart();
+                }
+                else {
+                    Toast toast = Toast.makeText(this,
+                            "これ以上なにもできません", Toast.LENGTH_SHORT);
+                    toast.show();
+                }
+            });
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_gps);
+
+        if (ActivityCompat.checkSelfPermission(this,
+                Manifest.permission.ACCESS_FINE_LOCATION)
+                != PackageManager.PERMISSION_GRANTED) {
+
+            requestPermissionLauncher.launch(
+                    Manifest.permission.ACCESS_FINE_LOCATION);
+        }
+        else{
+            locationStart();
+        }
+    }
+
+    private void locationStart(){
+        Log.d("debug","locationStart()");
+
+        // LocationManager インスタンス生成
+        locationManager =
+                (LocationManager) getSystemService(LOCATION_SERVICE);
+
+        if (locationManager != null && locationManager.isProviderEnabled(
+                LocationManager.GPS_PROVIDER)) {
+
+            Log.d("debug", "location manager Enabled");
+        } else {
+            // GPSを設定するように促す
+            Intent settingsIntent =
+                    new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+            startActivity(settingsIntent);
+            Log.d("debug", "not gpsEnable, startActivity");
+        }
+
+        if (ContextCompat.checkSelfPermission(this,
+                Manifest.permission.ACCESS_FINE_LOCATION) !=
+                PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(this,
+                    new String[]{Manifest.permission.ACCESS_FINE_LOCATION,}, 1000);
+
+            Log.d("debug", "checkSelfPermission false");
+            return;
+        }
+
+        //解決しているはずの問題にエラーが起きています
+        //実行はできます
+        locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
+                1000, 50, this);
+
+    }
+
+
+    @SuppressLint("QueryPermissionsNeeded")
+    private void moveToGMap(Location location){
+        String str1 = String.valueOf(location.getLatitude());
+        String str2 = String.valueOf(location.getLongitude());
+
+        Uri uri = Uri.parse("geo:"+str1+","+str2+"?z=16");
+
+        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+        startActivity(intent);
+        if (intent.resolveActivity(getPackageManager()) != null) {
+            startActivity(intent);
+        }
+    }
+
+    @Override
+    public void onLocationChanged(Location location) {
+        // 緯度の表示
+        TextView textView1 = findViewById(R.id.text_view1);
+        String str1 = "Latitude:"+location.getLatitude();
+        textView1.setText(str1);
+
+        // 経度の表示
+        TextView textView2 = findViewById(R.id.text_view2);
+        String str2 = "Longitude:"+location.getLongitude();
+        textView2.setText(str2);
+
+        //GoogleMapに送って表示
+        //moveToGMap(location);
+
+        //MainActivityに送って表示
+    }
+
+    @Override
+    public void onProviderEnabled(String provider) {
+
+    }
+
+    @Override
+    public void onProviderDisabled(String provider) {
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nemophila/MainActivity.java b/app/src/main/java/com/example/nemophila/MainActivity.java
index 34a3d8c..d5c1cff 100644
--- a/app/src/main/java/com/example/nemophila/MainActivity.java
+++ b/app/src/main/java/com/example/nemophila/MainActivity.java
@@ -1,51 +1,328 @@
 package com.example.nemophila;
 
+import androidx.annotation.NonNull;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.fragment.app.FragmentActivity;
 
-import android.os.Bundle;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.widget.Toast;
+import android.annotation.SuppressLint;
+import android.net.Uri;
+import android.os.Bundle;
+import android.content.pm.PackageManager;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
+import android.widget.TextView;
+import android.content.Intent;
+import android.provider.Settings;
+import android.util.Log;
+import android.widget.Toast;
+import android.Manifest;
+
+import com.google.android.gms.maps.CameraUpdate;
 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.BitmapDescriptor;
+import com.google.android.gms.maps.model.BitmapDescriptorFactory;
+import com.google.android.gms.maps.model.GroundOverlay;
+import com.google.android.gms.maps.model.GroundOverlayOptions;
 import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.LatLngBounds;
+import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
 import com.example.nemophila.databinding.ActivityMainBinding;
 
-public class MainActivity extends FragmentActivity implements OnMapReadyCallback {
+import java.util.Locale;
+
+public class MainActivity extends FragmentActivity implements OnMapReadyCallback,LocationListener  {
 
     private GoogleMap mMap;
     private ActivityMainBinding binding;
+    private LatLng latlng;
+    private LatLng latlng2;
+    private LatLng location;
+
+    LocationManager locationManager;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        //現在地アイコンの取得
+        Drawable ic_current = ResourcesCompat.getDrawable(getResources(),R.drawable.ic_current_location,null);
 
         binding = ActivityMainBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
+        if (ActivityCompat.checkSelfPermission(this,
+                Manifest.permission.ACCESS_FINE_LOCATION)
+                != PackageManager.PERMISSION_GRANTED) {
+
+            requestPermissionLauncher.launch(
+                    Manifest.permission.ACCESS_FINE_LOCATION);
+        }
+        else{
+            locationStart();
+        }
+
         // Obtain the SupportMapFragment and get notified when the map is ready to be used.
         SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
                 .findFragmentById(R.id.map);
+        assert mapFragment != null;
         mapFragment.getMapAsync(this);
     }
 
-    /**
-     * Manipulates the map once available.
-     * This callback is triggered when the map is ready to be used.
-     * This is where we can add markers or lines, add listeners or move the camera. In this case,
-     * we just add a marker near Sydney, Australia.
-     * If Google Play services is not installed on the device, the user will be prompted to install
-     * it inside the SupportMapFragment. This method will only be triggered once the user has
-     * installed Google Play services and returned to the app.
+    /*
+    ここからマップに関する操作
      */
+    /*
     @Override
     public void onMapReady(GoogleMap googleMap) {
         mMap = googleMap;
 
-        // Add a marker in Sydney and move the
+        //マーカー（ピン）の登録・表示方法（例）
         LatLng ntlab = new LatLng(34.73, 135.26);
         mMap.addMarker(new MarkerOptions().position(ntlab).title("Marker in ntlab"));
         mMap.moveCamera(CameraUpdateFactory.newLatLng(ntlab));
+
+        //カメラの移動処理方法（例）
+        CameraUpdate cUpdate = CameraUpdateFactory.newLatLngZoom(
+                new LatLng(34.73, 135.26), 15);
+        mMap.moveCamera(cUpdate);
     }
-}
\ No newline at end of file
+    */
+
+    @Override
+    public void onMapReady(GoogleMap googleMap) {
+        mMap = googleMap;
+
+        //研究室周辺の緯度経度
+        double latitude = 34.7308032;
+        double longitude = 135.2630272;
+
+        latlng = new LatLng(latitude, longitude);
+        //テスト用
+        latlng2 = new LatLng(34.74, 135.26);
+
+        // 標準のマーカー
+        setMarker(latitude, longitude);
+
+        // アイコン画像をマーカーに設定
+        //画像関連がわかっていないのでパス
+        //setIcon(latitude, longitude);
+
+        // camera 移動 (初期画面)
+        //mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latlng, 15));
+
+        /*
+        //多分使わない
+        // タップした時のリスナーをセット
+        mMap.setOnMapClickListener(tapLocation -> {
+            // map(ピン以外)をtapされた位置の緯度経度
+            latlng = new LatLng(tapLocation.latitude, tapLocation.longitude);
+            String str = String.format(Locale.US, "%f, %f", tapLocation.latitude, tapLocation.longitude);
+            mMap.addMarker(new MarkerOptions().position(location).title(str));
+            mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latlng, 18));
+        });
+         */
+
+        //長押し時にその座標にピンを立てる
+        //長押し時にその座標を保存し、投稿画面に移り、投稿完了時にはピンを立てる
+        mMap.setOnMapLongClickListener(longpushLocation -> {
+            //長押しされた位置の緯度経度を取得
+            LatLng newlocation = new LatLng(longpushLocation.latitude, longpushLocation.longitude);
+
+            //投稿処理
+
+
+            //投稿が完了した場合
+            //ピンをその座標に立て、緯度経度をタイトルに設定
+            //タイトルはnullにする予定
+            mMap.addMarker(new MarkerOptions().position(newlocation).title(""+longpushLocation.latitude+" :"+ longpushLocation.longitude));
+            //ピンを立てた位置にカメラを移動
+            mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(newlocation, 18));
+        });
+
+        // ピンをクリックした場合
+        mMap.setOnMarkerClickListener(new GoogleMap.OnMarkerClickListener() {
+            @Override
+            public boolean onMarkerClick(Marker marker) {
+                //店の詳細と投稿一覧を表示
+                //ここでshopActivityを呼び出す
+
+                //下からクリックしたことを通知
+                Toast.makeText(MainActivity.this, "ピンクリック", Toast.LENGTH_SHORT).show();
+                return false;
+            }
+        });
+
+    }
+
+    //ピンの設定
+    private void setMarker(double latitude, double longitude){
+
+        MarkerOptions markerOptions = new MarkerOptions();
+        MarkerOptions markerOptions2 = new MarkerOptions();
+
+        markerOptions.position(latlng);
+        markerOptions.title("ntlab");
+        mMap.addMarker(markerOptions);
+
+        //テスト用
+        markerOptions2.position(latlng2);
+        markerOptions2.title(null);
+        mMap.addMarker(markerOptions2);
+
+        // ズーム
+        zoomMap(latitude, longitude);
+
+    }
+
+    private void zoomMap(double latitude, double longitude){
+        // 表示する東西南北の緯度経度を設定
+        double south = latitude * (1-0.00005);
+        double west = longitude * (1-0.00005);
+        double north = latitude * (1+0.00005);
+        double east = longitude * (1+0.00005);
+
+        // LatLngBounds (LatLng southwest, LatLng northeast)
+        //左下、右上
+        LatLngBounds bounds = LatLngBounds.builder()
+                .include(new LatLng(south , west))
+                .include(new LatLng(north, east))
+                .build();
+
+        int width = getResources().getDisplayMetrics().widthPixels;
+        int height = getResources().getDisplayMetrics().heightPixels;
+
+        // static CameraUpdate.newLatLngBounds(LatLngBounds bounds, int width, int height, int padding)
+        mMap.moveCamera(CameraUpdateFactory.
+                newLatLngBounds(bounds, width, height, 0));
+
+        //ズーム処理
+        mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latlng, 15f));
+    }
+
+    private void setIcon(double latitude, double longitude){
+        Drawable ic_current = ResourcesCompat.getDrawable(getResources(),R.drawable.icon,null);
+
+        //LatLng current_location = new LatLng(34.73080,135.2630272);
+        LatLng current_location = new LatLng(latitude,longitude);
+        //mMap.addMarker(new MarkerOptions().position(current_location).icon(BitmapDescriptorFactory.fromResource(R.drawable.icon)));
+        // マップに貼り付ける BitmapDescriptor生成
+        // 画像は自分で適当に用意します。ここではmipmapから持ってきましたが
+        BitmapDescriptor descriptor = BitmapDescriptorFactory.fromResource(R.drawable.icon);
+        //Drawable ic_current = ResourcesCompat.getDrawable(getResources(),R.drawable.ic_current_location,null);
+
+        // 貼り付設定
+        GroundOverlayOptions overlayOptions = new GroundOverlayOptions();
+        overlayOptions.image(descriptor);
+
+        //　public GroundOverlayOptions anchor (float u, float v)
+        // (0,0):top-left, (0,1):bottom-left, (1,0):top-right, (1,1):bottom-right
+        overlayOptions.anchor(0.5f, 0.5f);
+
+        // 張り付け画像の大きさ メートル単位
+        // public GroundOverlayOptions	position(LatLng location, float width, float height)
+        overlayOptions.position(current_location, 300f, 300f);
+
+        // マップに貼り付け・アルファを設定
+        GroundOverlay overlay = mMap.addGroundOverlay(overlayOptions);
+        // ズーム
+        zoomMap(latitude, longitude);
+
+        // 透明度
+        assert overlay != null;
+        overlay.setTransparency(0.0F);
+    }
+
+    private final ActivityResultLauncher<String>
+            requestPermissionLauncher = registerForActivityResult(
+            new ActivityResultContracts.RequestPermission(),
+            isGranted -> {
+                if (isGranted) {
+                    locationStart();
+                }
+                else {
+                    Toast toast = Toast.makeText(this,
+                            "これ以上なにもできません", Toast.LENGTH_SHORT);
+                    toast.show();
+                }
+            });
+
+    @SuppressLint("MissingPermission")
+    private void locationStart(){
+        Log.d("debug","locationStart()");
+
+        // LocationManager インスタンス生成
+        locationManager =
+                (LocationManager) getSystemService(LOCATION_SERVICE);
+
+        if (locationManager != null && locationManager.isProviderEnabled(
+                LocationManager.GPS_PROVIDER)) {
+
+            Log.d("debug", "location manager Enabled");
+        } else {
+            // GPSを設定するように促す
+            Intent settingsIntent =
+                    new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
+            startActivity(settingsIntent);
+            Log.d("debug", "not gpsEnable, startActivity");
+        }
+
+        if (ContextCompat.checkSelfPermission(this,
+                Manifest.permission.ACCESS_FINE_LOCATION) !=
+                PackageManager.PERMISSION_GRANTED) {
+            ActivityCompat.requestPermissions(this,
+                    new String[]{Manifest.permission.ACCESS_FINE_LOCATION,}, 1000);
+
+            Log.d("debug", "checkSelfPermission false");
+            return;
+        }
+
+        //解決しているはずの問題にエラーが起きています
+        //実行はできます
+        locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
+                1000, 50, this);
+
+    }
+
+    @Override
+    public void onLocationChanged(Location location) {
+        //現在地が変更されるたびに現在地アイコンを移動
+
+        // 緯度の表示
+        TextView textView1 = findViewById(R.id.text_view1);
+        String str1 = "Latitude:"+location.getLatitude();
+        textView1.setText(str1);
+
+        // 経度の表示
+        TextView textView2 = findViewById(R.id.text_view2);
+        String str2 = "Longitude:"+location.getLongitude();
+        textView2.setText(str2);
+//
+//        //GoogleMapに送って表示
+//        moveToGMap(location);
+          setIcon(location.getLatitude(),location.getLongitude());
+    }
+
+    @Override
+    public void onProviderEnabled(String provider) {
+
+    }
+
+    @Override
+    public void onProviderDisabled(String provider) {
+
+    }
+}
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/Nemophila.java b/app/src/main/java/com/example/nemophila/Nemophila.java
new file mode 100644
index 0000000..70e79e0
--- /dev/null
+++ b/app/src/main/java/com/example/nemophila/Nemophila.java
@@ -0,0 +1,24 @@
+package com.example.nemophila;
+
+import android.app.Application;
+
+public class Nemophila extends Application {
+    private String uid;
+    private String token;
+
+    //Getter
+    public String getUid() {
+        return uid;
+    }
+    public String getToken() {
+        return token;
+    }
+
+    //Setter
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+    public void setToken(String token) {
+        this.token = token;
+    }
+}
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/java/com/example/nemophila/ShopActivity.java b/app/src/main/java/com/example/nemophila/ShopActivity.java
index e456f6c..e8fdb1c 100644
--- a/app/src/main/java/com/example/nemophila/ShopActivity.java
+++ b/app/src/main/java/com/example/nemophila/ShopActivity.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 ShopActivity extends AppCompatActivity {
 
@@ -10,5 +13,13 @@
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_shop);
+
+        Button postButton = (Button)findViewById(R.id.postButton);
+        postButton.setOnClickListener(new View.OnClickListener(){
+            public void onClick(View v){
+                Intent intent = new Intent(getApplication(), PostActivity.class);
+                startActivity(intent);
+            }
+        });
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nemophila/TestActivity.java b/app/src/main/java/com/example/nemophila/TestActivity.java
new file mode 100644
index 0000000..a8ed66a
--- /dev/null
+++ b/app/src/main/java/com/example/nemophila/TestActivity.java
@@ -0,0 +1,36 @@
+package com.example.nemophila;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModelProvider;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+
+import com.example.nemophila.entities.Shop;
+import com.example.nemophila.viewmodels.ShopsViewModel;
+
+import java.util.Collection;
+
+public class TestActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_test);
+
+        //RoomViewModelへのアクセス
+        ShopsViewModel shopsViewModel = new ViewModelProvider(this).get(ShopsViewModel.class);
+
+
+        // setViewModelのテスト用
+        Button setViewModelButton = (Button)findViewById(R.id.setViewModel);
+        setViewModelButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                shopsViewModel.setViewArea(20.0, 40.0, 10.0, 30.0);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nemophila/entities/Shop.java b/app/src/main/java/com/example/nemophila/entities/Shop.java
index 6f68dee..9095f5a 100644
--- a/app/src/main/java/com/example/nemophila/entities/Shop.java
+++ b/app/src/main/java/com/example/nemophila/entities/Shop.java
@@ -1,4 +1,45 @@
 package com.example.nemophila.entities;
 
+import java.util.ArrayList;
+
 public class Shop {
+    private String id;
+    private String name;
+    private double longitude;
+    private double latitude;
+    private ArrayList<Post> posts = new ArrayList<>();
+
+    //Getter
+    public String getSid() {
+        return id;
+    }
+    public String getName() {
+        return name;
+    }
+    public double getLongitude() {
+        return longitude;
+    }
+    public double getLatitude() {
+        return  latitude;
+    }
+    public ArrayList<Post> getPosts() {
+        return posts;
+    }
+
+    //Setter
+    public void setSid(String id) {
+        this.id = id;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public void setLongitude(double longitude) {
+        this.longitude = longitude;
+    }
+    public void setLatitude(double latitude) {
+        this.latitude = latitude;
+    }
+    public void setPosts(ArrayList<Post> posts) {
+        this.posts = posts;
+    }
 }
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 c9f3dd6..d71048f 100644
--- a/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
+++ b/app/src/main/java/com/example/nemophila/viewmodels/AccountViewModel.java
@@ -1,4 +1,71 @@
 package com.example.nemophila.viewmodels;
 
-public class AccountViewModel {
+import com.example.nemophila.entities.Account;
+import com.example.nemophila.resources.AccountsRest;
+
+import androidx.lifecycle.ViewModel;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.converter.jackson.JacksonConverterFactory;
+
+public class AccountViewModel extends ViewModel {
+    // フィールド
+    private final Retrofit retrofit;
+    private final AccountsRest accountsRest;
+
+    // アカウントインスタンス
+    private Account account;
+
+    // コンストラクタ
+    public AccountViewModel() {
+        this.retrofit = new Retrofit.Builder()
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/nemophila/")
+                .addConverterFactory(JacksonConverterFactory.create())
+                .build();
+        this.accountsRest = retrofit.create(AccountsRest.class);
+        this.account = new Account();
+    }
+
+    // アカウント情報の取得
+    public void getAccount(String uid) {
+        Call<Account> call = accountsRest.getAccount(uid);
+
+        call.enqueue(new Callback<Account>() {
+            @Override
+            public void onResponse(Call<Account> call, Response<Account> response) {
+                if (response.isSuccessful()) {
+                    account = response.body();
+                } else {
+                    // エラー
+                }
+            }
+            @Override
+            public void onFailure(Call<Account> call, Throwable t) {
+                // エラー
+            }
+        });
+    }
+
+    // アカウント名の変更
+    public void changeName(String uid, String name, String token) {
+        Call<Void> call = accountsRest.changeName(uid, name, token);
+
+        call.enqueue(new Callback<Void>() {
+            @Override
+            public void onResponse(Call<Void> call, Response<Void> response) {
+                if (response.isSuccessful()) {
+                    // サクセスフル
+                } else {
+                    // エラー
+                }
+            }
+            @Override
+            public void onFailure(Call<Void> call, Throwable t) {
+                // エラー
+            }
+        });
+    }
 }
diff --git a/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java
new file mode 100644
index 0000000..aa5929d
--- /dev/null
+++ b/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java
@@ -0,0 +1,87 @@
+package com.example.nemophila.viewmodels;
+
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+
+import com.example.nemophila.entities.Post;
+import com.example.nemophila.resources.PostsRest;
+
+import java.util.Collection;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.converter.jackson.JacksonConverterFactory;
+
+public class PostsViewModel extends ViewModel {
+
+    //Field
+    final private Retrofit retrofit;
+    final private PostsRest postsRest;
+    private String pid;
+
+    //LiveData
+    final private MutableLiveData<Collection<Post>> postsLiveData;
+
+    //コンストラクタ
+    public PostsViewModel() {
+        this.postsLiveData = new MutableLiveData<>();
+        this.retrofit = new Retrofit.Builder()
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/Nemophila/")
+                .addConverterFactory(JacksonConverterFactory.create())
+                .build();
+        this.postsRest = retrofit.create(PostsRest.class);
+        this.pid = null;
+    }
+
+    //getter
+    public LiveData<Collection<Post>> getLiveData() {
+        return this.postsLiveData;
+    }
+
+    //API通信メソッド
+    public void fetchPosts(String uid) {
+        Call<Collection<Post>> call = postsRest.getAccountPosts(uid);
+        call.enqueue(new Callback<Collection<Post>>() {
+            @Override
+            public void onResponse(Call<Collection<Post>> call, Response<Collection<Post>> response) {
+                if (response.isSuccessful()) {
+                    postsLiveData.setValue(response.body());
+                } else {
+                    //レスポンスエラーを通知
+                }
+            }
+
+            @Override
+            public void onFailure(Call<Collection<Post>> call, Throwable t) {
+                //通信エラーを通知
+            }
+        });
+    }
+
+    public String createPost(String uid, String token, String sid,
+                           String rate, String genre, String comment,
+                           String image1, String image2, String image3) {
+
+        Call<String> call = postsRest.postAccountPost(uid ,token, sid, rate, genre, comment, image1, image2, image3);
+
+        call.enqueue(new Callback<String>() {
+            @Override
+            public void onResponse(Call<String> call, Response<String> response) {
+                if (response.isSuccessful()) {
+                    pid = response.body();
+                } else {
+                    //レスポンスエラーを通知
+                }
+            }
+
+            @Override
+            public void onFailure(Call<String> call, Throwable t) {
+                //通信エラーを通知
+            }
+        });
+        return pid;
+    }
+}
diff --git a/app/src/main/java/com/example/nemophila/viewmodels/ShopsViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/ShopsViewModel.java
new file mode 100644
index 0000000..963034e
--- /dev/null
+++ b/app/src/main/java/com/example/nemophila/viewmodels/ShopsViewModel.java
@@ -0,0 +1,63 @@
+package com.example.nemophila.viewmodels;
+
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+
+import com.example.nemophila.entities.Shop;
+import com.example.nemophila.resources.ShopsRest;
+
+import java.util.Collection;
+
+import retrofit2.Call;
+import retrofit2.Callback;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.converter.jackson.JacksonConverterFactory;
+
+public class ShopsViewModel extends ViewModel {
+    // フィールド
+    final private ShopsRest shopsRest;
+    final private Retrofit retrofit;
+
+    // ライブデータ
+    final private MutableLiveData<Collection<Shop>> shopsLiveData;
+
+    // コンストラクタ
+    public ShopsViewModel(){
+        this.shopsLiveData = new MutableLiveData<>();
+        this.retrofit = new Retrofit.Builder()
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/nemophila/")
+                .addConverterFactory(JacksonConverterFactory.create())
+                .build();
+        this.shopsRest = retrofit.create(ShopsRest.class);
+    }
+
+    // 画面を動かす, 又はGPSが移動する度に呼び出される
+    public void setViewArea(double ux, double uy, double lx, double ly){
+        // 画面内に収まる範囲の店舗を取得する
+        Call<Collection<Shop>> call = shopsRest.getShops(ux, uy, lx, ly);
+
+        call.enqueue(new Callback<Collection<Shop>>() {
+            // 通信が成功
+            @Override
+            public void onResponse(Call<Collection<Shop>> call, Response<Collection<Shop>> response) {
+                // 通信が正常に動作
+                if (response.isSuccessful()) {
+                    if (response.body() != null) {
+                        shopsLiveData.setValue(response.body());  // LiveDataを書き換える
+                    } else {
+                        System.out.println("response null : setViewModel");
+                    }
+                } else {
+                    System.out.println("ステータスコード 不正 : setViewModel");
+                }
+            }
+            // 通信が失敗
+            @Override
+            public void onFailure(Call<Collection<Shop>> call, Throwable t) {
+                System.out.println("通信失敗 : setViewModel");
+                System.out.println(t);
+            }
+        });
+    }
+}
diff --git a/app/src/main/res/drawable/ic_current_location.xml b/app/src/main/res/drawable/ic_current_location.xml
new file mode 100644
index 0000000..3514cf2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_current_location.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#029AFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94L13,1h-2v2.06C6.83,3.52 3.52,6.83 3.06,11L1,11v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94L11,23h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94L23,13v-2h-2.06zM12,19c-3.87,0 -7,-3.13 -7,-7s3.13,-7 7,-7 7,3.13 7,7 -3.13,7 -7,7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icon.jpg b/app/src/main/res/drawable/icon.jpg
new file mode 100644
index 0000000..6f2e35a
--- /dev/null
+++ b/app/src/main/res/drawable/icon.jpg
Binary files differ
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 @@
+<?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=".FriendActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_gps.xml b/app/src/main/res/layout/activity_gps.xml
new file mode 100644
index 0000000..8571a51
--- /dev/null
+++ b/app/src/main/res/layout/activity_gps.xml
@@ -0,0 +1,37 @@
+<?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=".GpsActivity">
+
+<TextView
+    android:id="@+id/text_view1"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="20dp"
+    android:textColor="#44f"
+    android:textSize="20sp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintHorizontal_bias="0.501"
+    app:layout_constraintLeft_toLeftOf="parent"
+    app:layout_constraintRight_toRightOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintVertical_bias="0.1" />
+
+<TextView
+    android:id="@+id/text_view2"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textSize="20sp"
+    android:textColor="#f44"
+    android:layout_margin="20dp"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintHorizontal_bias="0.501"
+    app:layout_constraintLeft_toLeftOf="parent"
+    app:layout_constraintRight_toRightOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintVertical_bias="0.2" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index cfbceaa..95d4392 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,9 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:map="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/map"
-    android:name="com.google.android.gms.maps.SupportMapFragment"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity" />
\ No newline at end of file
+    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"
+        tools:context=".MainActivity" />
+
+    <TextView
+        android:id="@+id/text_view1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="hello"/>
+
+    <TextView
+        android:id="@+id/text_view2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:text="hello"/>
+
+</FrameLayout>
\ 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 @@
+<?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=".MyPageEditorActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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">
 
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="200dp"
+        android:layout_height="30dp"
+        android:text="Name"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.468"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.067" />
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        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.069"
+        app:srcCompat="@drawable/ic_launcher_foreground" />
+
+    <TextView
+        android:id="@+id/id"
+        android:layout_width="200dp"
+        android:layout_height="30dp"
+        android:text="あなたのID"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.468"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/name"
+        app:layout_constraintVertical_bias="0.016" />
+
+    <Button
+        android:id="@+id/cancel"
+        android:layout_width="78dp"
+        android:layout_height="65dp"
+        android:text="閉じる"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.903"
+        app:layout_constraintStart_toEndOf="@+id/icon"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.078" />
+
+    <Button
+        android:id="@+id/friend"
+        android:layout_width="150dp"
+        android:layout_height="40dp"
+        android:layout_marginStart="50dp"
+        android:text="フレンド"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toTopOf="@+id/postScroll"
+        app:layout_constraintEnd_toStartOf="@+id/requested"
+        app:layout_constraintHorizontal_bias="0.404"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/id"
+        app:layout_constraintVertical_bias="0.159" />
+
+    <Button
+        android:id="@+id/requested"
+        android:layout_width="150dp"
+        android:layout_height="40dp"
+        android:layout_marginEnd="50dp"
+        android:text="フレンド申請"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toTopOf="@+id/postScroll"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/id"
+        app:layout_constraintVertical_bias="0.155" />
+
+    <Button
+        android:id="@+id/changeMyPage"
+        android:layout_width="200dp"
+        android:layout_height="40dp"
+        android:text="マイページ編集"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toTopOf="@+id/postScroll"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.536"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/id"
+        app:layout_constraintVertical_bias="0.602" />
+
+    <ScrollView
+        android:id="@+id/postScroll"
+        android:layout_width="413dp"
+        android:layout_height="382dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/id"
+        app:layout_constraintVertical_bias="1.0">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+    </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ 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
new file mode 100644
index 0000000..86eabce
--- /dev/null
+++ b/app/src/main/res/layout/activity_requested.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=".RequestedActivity">
+
+</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 cbe3bd2..108efca 100644
--- a/app/src/main/res/layout/activity_shop.xml
+++ b/app/src/main/res/layout/activity_shop.xml
@@ -6,4 +6,40 @@
     android:layout_height="match_parent"
     tools:context=".ShopActivity">
 
+    <TextView
+        android:id="@+id/shopName"
+        android:layout_width="252dp"
+        android:layout_height="36dp"
+        android:breakStrategy="high_quality"
+        android:gravity="center_horizontal"
+        android:text="お店の名前"
+        android:textSize="24sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.496"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.06" />
+
+    <Button
+        android:id="@+id/postButton"
+        android:layout_width="53dp"
+        android:layout_height="56dp"
+        android:text="+"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.956"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.032" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="379dp"
+        android:layout_height="621dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.854" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_test.xml b/app/src/main/res/layout/activity_test.xml
new file mode 100644
index 0000000..6915009
--- /dev/null
+++ b/app/src/main/res/layout/activity_test.xml
@@ -0,0 +1,20 @@
+<?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=".TestActivity">
+
+    <Button
+        android:id="@+id/setViewModel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="set View Model"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.149" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e19fa4c..d650b72 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,5 +6,7 @@
     <string name="title_activity_shop">ShopActivity</string>
     <string name="title_activity_login">LoginActivity</string>
     <string name="title_activity_sign_up">SignUpActivity</string>
+    <string name="title_activity_test">TestActivity</string>
+    <string name="title_activity_gps">GpsActivity</string>
 
 </resources>
\ No newline at end of file