diff --git a/app/build.gradle b/app/build.gradle
index cae72cc..1c335be 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -60,3 +60,6 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
     implementation 'com.google.code.gson:gson:2.8.9' // Gsonライブラリの追加
 }
+dependencies {
+    implementation 'com.google.android.material:material:1.5.0'
+}
diff --git a/app/src/main/java/com/example/oplogy/FirestoreReception.java b/app/src/main/java/com/example/oplogy/FirestoreReception.java
index 0d69f20..006c41b 100644
--- a/app/src/main/java/com/example/oplogy/FirestoreReception.java
+++ b/app/src/main/java/com/example/oplogy/FirestoreReception.java
@@ -27,8 +27,11 @@ public class FirestoreReception {
     //ClassIdを引数にデータの作成を行う
     public void getDocumentsByClassId(int classId) {
         myDataList.clear();
-        CollectionReference collectionRef = db.collection("testDistinct");
+        //pixel6a
+        CollectionReference collectionRef = db.collection("test0711Data");
 
+        //xiaomi
+//        CollectionReference collectionRef = db.collection("testDistinct");
         // classIdが引数のものを取得する
         collectionRef.whereEqualTo("classId", classId).get()
                 .addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
diff --git a/app/src/main/java/com/example/oplogy/Maps.java b/app/src/main/java/com/example/oplogy/Maps.java
index d94af0a..b6867c1 100644
--- a/app/src/main/java/com/example/oplogy/Maps.java
+++ b/app/src/main/java/com/example/oplogy/Maps.java
@@ -42,9 +42,6 @@ import java.util.Map;
 
 public class Maps extends FragmentActivity implements OnMapReadyCallback, View.OnClickListener, GoogleMap.OnMarkerClickListener {
 
-    ImageView backMain;
-    private GoogleMap mMap;
-    private LinearLayout locationsName;
     //GoogleMapAPiで使用可能な色
     private static final int[] COLORS = new int[]{Color.parseColor("#007FFF"), // HUE_AZURE
             Color.parseColor("#0000FF"), // HUE_BLUE
@@ -57,13 +54,14 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O
             Color.parseColor("#8A2BE2"), // HUE_VIOLET
             Color.parseColor("#FFFF00") // HUE_YELLOW
     };
-    private int colorIndex = 0;
     private final List<LatLng> latLngList = new ArrayList<>();
     private final List<String> nameList = new ArrayList<>();
     private final List<Integer> colorList = new ArrayList<>();
-
     private final Map<String, Runnable> dateMap = new HashMap<>();
-
+    ImageView backMain;
+    private GoogleMap mMap;
+    private LinearLayout locationsName;
+    private int colorIndex = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -213,11 +211,22 @@ public class Maps extends FragmentActivity implements OnMapReadyCallback, View.O
 
     //家庭訪問のscheduleを7桁の整数から○月〇日●時〇分(6041200→06月12日05時20分)に変換
     private String formatSchedule(String schedule) {
-        String monthString = "0" + schedule.substring(0, 1);
-        String dayString = schedule.substring(1, 3);
-        String hourString = schedule.substring(3, 5);
-        String minuteString = schedule.substring(5, 7);
-        return monthString + "月" + dayString + "日" + hourString + "時" + minuteString + "分";
+        Log.d("Maps", "schedule: " + schedule);
+        if (schedule.length() != 7) {
+            schedule = "0" + schedule;
+            String monthString = schedule.substring(0, 2);
+            String dayString = schedule.substring(2, 4);
+            String hourString = "0" + schedule.substring(4, 5);
+            String minuteString = schedule.substring(5, 7);
+            return monthString + "月" + dayString + "日" + hourString + "時" + minuteString + "分";
+        } else {
+            String monthString = "0" + schedule.substring(0, 1);
+            String dayString = schedule.substring(1, 3);
+            String hourString = schedule.substring(3, 5);
+            String minuteString = schedule.substring(5, 7);
+            return monthString + "月" + dayString + "日" + hourString + "時" + minuteString + "分";
+
+        }
     }
 
     // 共有プリファレンスからMyDataListを取得するメソッド
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index e7d57c6..67f2e23 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -7,27 +7,28 @@
     android:orientation="vertical"
     android:weightSum="20"
     tools:context=".MainActivity">
+
+
     <Space
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="2"/>
+        android:layout_weight="2" />
 
 
-<!--    ID作成のレイアウト-->
+    <!--    ID作成のレイアウト-->
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_weight="3"
-        android:weightSum="2"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:weightSum="2">
 
         <ImageView
             android:id="@+id/imageUuid"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:src="@drawable/checked_image"
             android:layout_weight="1"
-            />
+            android:src="@drawable/checked_image" />
 
         <TextView
             android:id="@+id/creatUUID"
@@ -37,110 +38,107 @@
             android:layout_weight="1"
             android:gravity="left"
             android:text="ID作成"
-            android:textSize="50dp"
-            />
+            android:textSize="50dp" />
 
     </LinearLayout>
 
 
-<!--    セットアップのレイアウト-->
+    <!--    セットアップのレイアウト-->
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_weight="3"
-        android:weightSum="2"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:weightSum="2">
 
         <ImageView
             android:id="@+id/imageSetup"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:src="@drawable/checked_image"
             android:layout_weight="1"
-            />
+            android:src="@drawable/checked_image" />
 
         <TextView
             android:id="@+id/setUp"
             android:layout_width="99dp"
             android:layout_height="wrap_content"
-            android:text="セットアップ"
-            android:textSize="40dp"
-            android:textStyle="bold"
+            android:layout_gravity="center"
             android:layout_weight="1"
             android:gravity="left"
-            android:layout_gravity="center"/>
+            android:text="セットアップ"
+            android:textSize="40dp"
+            android:textStyle="bold" />
     </LinearLayout>
 
 
     <Space
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="3"/>
+        android:layout_weight="3" />
 
 
-<!--    ルート表示のレイアウト-->
+    <!--    ルート表示のレイアウト-->
     <LinearLayout
         android:layout_width="400dp"
         android:layout_height="0dp"
-        android:layout_weight="3"
-        android:weightSum="2"
         android:layout_gravity="center"
-        android:orientation="horizontal">
+        android:layout_weight="3"
+        android:orientation="horizontal"
+        android:weightSum="2">
 
         <ImageView
             android:id="@+id/imageRoot"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:src="@drawable/pin"
             android:layout_weight="1"
-            />
+            android:src="@drawable/pin" />
 
         <TextView
             android:id="@+id/root"
             android:layout_width="99dp"
             android:layout_height="wrap_content"
-            android:text="ルート表示"
-            android:textSize="40dp"
-            android:textStyle="bold"
+            android:layout_gravity="center"
             android:layout_weight="1"
             android:gravity="left"
-            android:layout_gravity="center"/>
+            android:text="ルート表示"
+            android:textSize="40dp"
+            android:textStyle="bold" />
     </LinearLayout>
 
 
-<!--    提出状況のレイアウト-->
+    <!--    提出状況のレイアウト-->
     <LinearLayout
         android:layout_width="350dp"
         android:layout_height="0dp"
-        android:layout_weight="3"
         android:layout_gravity="center"
-        android:weightSum="2"
-        android:orientation="horizontal">
+        android:layout_weight="3"
+        android:orientation="horizontal"
+        android:weightSum="2">
 
         <ImageView
             android:id="@+id/imageSubmission"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:src="@drawable/submission"
             android:layout_weight="1"
-            />
+            android:src="@drawable/submission" />
 
         <TextView
             android:id="@+id/submission"
             android:layout_width="99dp"
             android:layout_height="wrap_content"
-            android:text="提出状況"
-            android:textSize="40dp"
-            android:textStyle="bold"
+            android:layout_gravity="center"
             android:layout_weight="1"
             android:gravity="left"
-            android:layout_gravity="center"/>
+            android:text="提出状況"
+            android:textSize="40dp"
+            android:textStyle="bold" />
     </LinearLayout>
 
 
-
-
-
-
-
-</LinearLayout>
\ No newline at end of file
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/bottom_navigation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        app:menu="@menu/bottom_nav_menu" />
+</LinearLayout>
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
new file mode 100644
index 0000000..6f4688c
--- /dev/null
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<item
+        android:id="@+id/home"
+        android:icon="@drawable/all_ok"
+        android:title="Home" />
+    <item
+        android:id="@+id/submission"
+        android:icon="@drawable/back_button"
+        android:title="SetUp" />
+    <item
+        android:id="@+id/setting"
+        android:icon="@drawable/pin"
+        android:title="Root" />
+</menu>
\ No newline at end of file