diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0407368..b19b47f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,7 +26,8 @@
         <activity
             android:name=".MapsActivity"
             android:exported="true"
-            android:label="Map">
+            android:label="Map"
+            android:windowSoftInputMode="adjustPan">
 
 <!--             <intent-filter>-->
 <!--             <action android:name="android.intent.action.MAIN" />-->
@@ -63,12 +64,12 @@
             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"
@@ -113,25 +114,25 @@
             android:exported="true"
             android:label="@string/title_activity_my_page">
 
-             <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=".MainActivity"
-            android:exported="true"
-            android:label="@string/title_activity_maps">
+<!--        <activity-->
+<!--            android:name=".MainActivity"-->
+<!--            android:exported="true"-->
+<!--            android:label="@string/title_activity_maps">-->
 <!--            <intent-filter>-->
 <!--                <action android:name="android.intent.action.MAIN" />-->
 
 <!--                <category android:name="android.intent.category.LAUNCHER" />-->
 <!--            </intent-filter>-->
-        </activity>
+<!--        </activity>-->
 
         <activity
             android:name=".TestActivity"
diff --git a/app/src/main/java/com/example/nemophila/MapsActivity.java b/app/src/main/java/com/example/nemophila/MapsActivity.java
index 569eb29..aede3f0 100644
--- a/app/src/main/java/com/example/nemophila/MapsActivity.java
+++ b/app/src/main/java/com/example/nemophila/MapsActivity.java
@@ -1,23 +1,44 @@
 package com.example.nemophila;
 
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.DialogFragment;
 import androidx.navigation.NavController;
 import androidx.navigation.fragment.NavHostFragment;
 import androidx.navigation.ui.AppBarConfiguration;
 import androidx.navigation.ui.NavigationUI;
 
+import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
+import android.os.Handler;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.google.android.material.navigation.NavigationView;
+
+import java.util.ArrayList;
+import java.util.List;
 
 
 public class MapsActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
 
-
+    Nemophila nemophila;
     DialogFragment filterDialog;
     private Handler handler;
 
@@ -31,9 +52,12 @@
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_maps);
 
+        nemophila = (Nemophila) this.getApplication();
+
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayShowTitleEnabled(false);
@@ -52,43 +76,25 @@
         NavigationView navigationView = (NavigationView) findViewById(R.id.navView);
         navigationView.setNavigationItemSelectedListener(this);
 
-//        // ナビゲーションホストを取得する
-//        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);
-
-
         // geocode Test
         handler = new Handler();
 
-        // 検索バーの処理
-        SearchView searchView = findViewById(R.id.tool_search);
-        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                new Thread(() -> {
-                    geoCode(query);
-                }).start();
-                return false;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-                return false;
-            }
-        });
+//        // 検索バーの処理
+//        SearchView searchView = findViewById(R.id.tool_search);
+//        searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+//            @Override
+//            public boolean onQueryTextSubmit(String query) {
+//                new Thread(() -> {
+//                    geoCode(query);
+//                }).start();
+//                return false;
+//            }
+//
+//            @Override
+//            public boolean onQueryTextChange(String newText) {
+//                return false;
+//            }
+//        });
 
         //filterDialog = new FilterDialog();
 
@@ -237,8 +243,13 @@
         list.deferNotifyDataSetChanged();
     }
 
+    @Override
+    public boolean onNavigationItemSelected(@NonNull MenuItem item) {
+        return false;
+    }
+
     // 内部クラス
-    private class MyAdapter extends ArrayAdapter<FilterDataModel>{
+    private class MyAdapter extends ArrayAdapter<FilterDataModel> {
         private LayoutInflater layoutInflater;
         public MyAdapter(Context context, int resourceId, List<FilterDataModel> objects){
             super(context, resourceId, objects);
@@ -265,7 +276,19 @@
                 @Override
                 public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
                     if(b) {
-                        Toast.makeText(MapsActivity.this, listData.get(position).getText(), Toast.LENGTH_SHORT).show();
+                        if(isGenre) {
+                            //Toast.makeText(MapsActivity.this, listData.get(position).getText(), Toast.LENGTH_SHORT).show();
+                            nemophila.setSelectGenres(listData.get(position).getText());
+                        } else {
+                            nemophila.setSelectFriends(listData.get(position).getText());
+                        }
+                    } else {
+                        if(isGenre) {
+                            //Toast.makeText(MapsActivity.this, listData.get(position).getText(), Toast.LENGTH_SHORT).show();
+                            nemophila.removeSelectGenres(listData.get(position).getText());
+                        } else {
+                            nemophila.removeSelectFriends(listData.get(position).getText());
+                        }
                     }
                     FilterDataModel data = getItem(position);
                     data.isChecked = b;
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
index 37b98b3..df097a4 100644
--- a/app/src/main/res/layout/activity_maps.xml
+++ b/app/src/main/res/layout/activity_maps.xml
@@ -29,9 +29,10 @@
             app:menu="@menu/tool_menu">
 
             <androidx.appcompat.widget.SearchView
-                android:id="@+id/searchView"
+                android:id="@+id/tool_search"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content"
+                app:queryHint="地名検索"/>
         </androidx.appcompat.widget.Toolbar>
 
 
@@ -68,7 +69,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        app:menu="@menu/navdrawer_menu" >
+         >
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/filter_item.xml b/app/src/main/res/layout/filter_item.xml
new file mode 100644
index 0000000..4902074
--- /dev/null
+++ b/app/src/main/res/layout/filter_item.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/filter_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.7"
+        android:textSize="20dp"
+        android:layout_marginStart="10dp"/>
+
+    <CheckBox
+        android:id="@+id/filter_checkbox"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.3"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/filter_layout.xml b/app/src/main/res/layout/filter_layout.xml
new file mode 100644
index 0000000..166c128
--- /dev/null
+++ b/app/src/main/res/layout/filter_layout.xml
@@ -0,0 +1,24 @@
+<?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">
+
+    <SearchView
+        android:id="@+id/search"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ListView
+        android:id="@+id/list"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/search" />
+</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 74d3ed7..81b0dfc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,4 +21,7 @@
     <string name="forgot_password">Forgot Password?</string>
     <string name="button">Button</string>
 
+    <string name="drawer_open">Drawer Open</string>
+    <string name="drawer_close">Drawer Close</string>
+
 </resources>
\ No newline at end of file