Merge pull request '本番環境移行' (#60) from 本番環境以降 into master

Reviewed-on: #60

.idea/gradle.xml

@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

app/build.gradle

@@ -52,3 +52,11 @@ dependencies {
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
 }
+
+//Map用の依存関係の追加
+dependencies {
+    implementation 'com.google.android.gms:play-services-maps:18.0.0'
+    implementation 'com.google.android.gms:play-services-location:18.0.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
+    implementation 'com.google.code.gson:gson:2.8.9' // Gsonライブラリの追加
+}

app/src/main/AndroidManifest.xml

@@ -3,6 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission
+        android:name="android.permission.ACCESS_FINE_LOCATION"
+        tools:ignore="CoarseFineLocation" />
 
     <application
         android:allowBackup="true"
@@ -15,6 +18,9 @@
         android:theme="@style/Theme.Oplogy"
         tools:ignore="ExtraText"
         tools:targetApi="31">
+        <activity
+            android:name=".SettingView"
+            android:exported="false" />
         <activity
             android:name=".SetUpActivity"
             android:exported="false" />
@@ -37,15 +43,9 @@
             android:name=".Maps"
             android:exported="false"
             android:label="@string/title_activity_maps" />
-        <activity
-            android:name=".TutorialActivity"
-            android:exported="false" />
         <activity
             android:name=".SubmissionActivity"
             android:exported="false" />
-        <activity
-            android:name=".RootSearchActivity"
-            android:exported="false" />
         <activity
             android:name=".CreateUUID"
             android:exported="false" />

app/src/main/java/com/example/oplogy/Converters.java

@@ -16,11 +16,11 @@ public class Converters {
     // タイムスタンプを文字列(yyyy-mm-dd,日時)に変換
     @TypeConverter
     public static List<String> fromTimestampList(List<Timestamp> timestamps) {
-        List<String> strings = new ArrayList<>();
+        List<String> stringsList = new ArrayList<>();
         for (Timestamp timestamp : timestamps) {
-            strings.add(format.format(timestamp.toDate()));
+            stringsList.add(format.format(timestamp.toDate()));
         }
-        return strings;
+        return stringsList;
     }
 
     @TypeConverter

app/src/main/java/com/example/oplogy/CreateSchedule.java

@@ -1,6 +1,7 @@
 package com.example.oplogy;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.location.Address;
 import android.location.Geocoder;
 import android.util.Log;
@@ -23,8 +24,10 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 //保護者の希望とSetUpActivityによって設定された情報をもとにスケジュールとルートを作成する
-public class CreateRoot {
+public class CreateSchedule {
     MyDataClass data;//Firestoreから受け取ったdataを入れる変数
+
+    String startPointString;//家庭訪問の開始地点
     String startTimeHomeVisitString;//家庭訪問の開始時間
     String endTimeHomeVisitString;//家庭訪問の終了時間
     String intervalTimeString;//家庭訪問の一家庭当たりの時間
@@ -39,16 +42,26 @@ public class CreateRoot {
     private final AppDatabase db;
     private int arraySizeInt;
 
-    boolean notSecondDuplicatesBoolean = true;//スケジュールの重複の有無(第一希望日のみで通った場合も考えて初期はtrue)
+    private boolean notSecondDuplicatesBoolean;//スケジュールの重複の有無(第一希望日のみで通った場合も考えて初期はtrue)
 
-    String[] testdata = {"20240604", "20240605", "20240606"};
+    String[] homeVisitDaysString;
 
-    public CreateRoot(AppCompatActivity activity) {
+
+    public CreateSchedule(AppCompatActivity activity) {
         this.db = Room.databaseBuilder(activity.getApplicationContext(), AppDatabase.class, "SetUpTable").build();
+        this.notSecondDuplicatesBoolean = true; // 初期値をtrueに設定する
+        SharedPreferences sharedPreferences = activity.getSharedPreferences("visitingDate", Context.MODE_PRIVATE);
+
+        String firstDay = sharedPreferences.getString("day1", null);
+        String secondDay = sharedPreferences.getString("day2", null);
+        String thirdDay = sharedPreferences.getString("day3", null);
+
+        Log.d("createSchedule","day1"+firstDay+"day2"+secondDay+"thirdday"+thirdDay);
+        homeVisitDaysString = new String[]{firstDay, secondDay, thirdDay};
     }
 
     //MainActivityからデータを受け取る
-    public Boolean receiveData(List<MyDataClass> myDataList, Context context) {
+    public String receiveData(List<MyDataClass> myDataList, Context context) {
 
         //myDataListの要素data第一希望日と第二希望日に以下を追加する
         //・保護者の希望時間帯の長さ
@@ -90,22 +103,31 @@ public class CreateRoot {
             boolean notDuplicatesBoolean = createSchedule(myDataList, intervalArrayInt);
 
             //スケジュールの重複の確認
-            if (!notDuplicatesBoolean) {
+            if (notDuplicatesBoolean) {
+                //スケジュールを基準にソートする
+                sortSchedule(myDataList);
+            }else{
                 //第二希望日で同じ処理を行う
-                Log.d("CreateRoot", "第二希望");
+                Log.d("CreateSchedule", "第二希望");
                 secondSetData(myDataList);
                 secondTimeZoneSort(myDataList);
                 notSecondDuplicatesBoolean = secondCreateSchedule(myDataList, intervalArrayInt);
+                //スケジュールを基準にソートする
+                sortSchedule(myDataList);
             }
         });
+        // 重複がなければ開始地点の緯度経度を返す
         if (notSecondDuplicatesBoolean) {
-            sortSchedule(myDataList);
-            geocodeAddress(myDataList, context);
+            // 保護者の住所を緯度経度に変換する
+            String startPointLatLngString = geocodeAddress(myDataList, context);
+            Log.d("CreateSchedule", "startPointLatLngString" + startPointLatLngString);
             outPutLogSchedule(myDataList);
-            return notSecondDuplicatesBoolean;
+            return startPointLatLngString;
+        } else {
+            // 重複があるときは""を返す
+            Log.d("CreateSchedule", "重複によるエラー");
+            return "";
         }
-        Log.d("CreateRoot", "重複によるエラー");
-        return !notSecondDuplicatesBoolean;
     }
 
 
@@ -114,12 +136,12 @@ public class CreateRoot {
             // 希望時間帯の終了時刻から開始時刻を引いて希望時間帯の長さ(timezone)に入れる
             data = myDataList.get(i);
             //保護者の第一希望日
-            List<Timestamp> firstDay = data.getFirstDay();
+            List<Timestamp> firstDayList = data.getFirstDay();
 
             //保護者の第一希望日の開始時間
-            Timestamp parentStartTimestamp = firstDay.get(0);
+            Timestamp parentStartTimestamp = firstDayList.get(0);
             //保護者の第一希望日の終了時間
-            Timestamp parentEndTimestamp = firstDay.get(1);
+            Timestamp parentEndTimestamp = firstDayList.get(1);
             //保護者の第一希望日の希望時間帯の長さ
             Long timezoneLong = parentEndTimestamp.getSeconds() - parentStartTimestamp.getSeconds();
             data.setTimezone(timezoneLong);
@@ -158,11 +180,11 @@ public class CreateRoot {
             data = myDataList.get(i);
             if (myDataList.get(i).getSecondDay() != null) {
                 //保護者の第二希望日
-                List<Timestamp> secondDay = data.getSecondDay();
+                List<Timestamp> secondDayList = data.getSecondDay();
                 //保護者の第二希望日の開始時間
-                Timestamp parentStartTimestamp = secondDay.get(0);
+                Timestamp parentStartTimestamp = secondDayList.get(0);
                 //保護者の第二希望日の終了時間
-                Timestamp parentEndTimestamp = secondDay.get(1);
+                Timestamp parentEndTimestamp = secondDayList.get(1);
                 //保護者の第二希望日の希望時間帯の長さ
                 Long secondDayTimezoneLong = parentEndTimestamp.getSeconds() - parentStartTimestamp.getSeconds();
                 data.setTimezone(secondDayTimezoneLong);
@@ -211,12 +233,12 @@ public class CreateRoot {
 
     private void outPutLogSort(List<MyDataClass> myDataList) {
         for (int i = 0; i < myDataList.size(); i++) {
-            Log.d("CreateRoot", "(index: " + i + ") data: " + myDataList.get(i).getPatronName());
-            Log.d("CreateRoot", "(index: " + i + ") data: " + myDataList.get(i).getClass());
-            Log.d("CreateRoot", "(index: " + i + ") timezone: " + myDataList.get(i).getTimezone());
-            Log.d("CreateRoot", "(index: " + i + ") startDate: " + myDataList.get(i).getStartDateString());
-            Log.d("CreateRoot:outPutLogBeforeSort", "parentStartTimeString: " + myDataList.get(i).getParentStartTimeString());
-            Log.d("CreateRoot:outPutLogBeforeSort", "parentEndTimeString: " + myDataList.get(i).getParentEndTimeString());
+            Log.d("CreateSchedule", "(index: " + i + ") data: " + myDataList.get(i).getPatronName());
+            Log.d("CreateSchedule", "(index: " + i + ") data: " + myDataList.get(i).getClass());
+            Log.d("CreateSchedule", "(index: " + i + ") timezone: " + myDataList.get(i).getTimezone());
+            Log.d("CreateSchedule", "(index: " + i + ") startDate: " + myDataList.get(i).getStartDateString());
+            Log.d("CreateSchedule:outPutLogBeforeSort", "parentStartTimeString: " + myDataList.get(i).getParentStartTimeString());
+            Log.d("CreateSchedule:outPutLogBeforeSort", "parentEndTimeString: " + myDataList.get(i).getParentEndTimeString());
 
         }
     }
@@ -225,6 +247,7 @@ public class CreateRoot {
         // setUpActivityによって入力され、Roomに保存された値を取り出す処理
         //Roomの操作の定義
         SetUpTableDao setUpTableDao = db.setUpTableDao();
+        startPointString = setUpTableDao.getStartPoint();
         startTimeHomeVisitString = setUpTableDao.getStartTime();
         endTimeHomeVisitString = setUpTableDao.getEndTime();
         intervalTimeString = setUpTableDao.getIntervalTime();
@@ -234,11 +257,11 @@ public class CreateRoot {
 
     //Roomからのデータ取得に関するログ
     void outPutLogRoomData() {
-        Log.d("CreateRoot:outPutLogRoomData", "開始時間" + startTimeHomeVisitString);
-        Log.d("CreateRoot:outPutLogRoomData", "終了時刻" + endTimeHomeVisitString);
-        Log.d("CreateRoot:outPutLogRoomData", "一家庭当たりの所要時間" + intervalTimeString);
-        Log.d("CreateRoot:outPutLogRoomData", "休憩開始時刻" + startBreakTimeString);
-        Log.d("CreateRoot:outPutLogRoomData", "休憩終了時刻" + endBreakTimeString);
+        Log.d("CreateSchedule:outPutLogRoomData", "開始時間" + startTimeHomeVisitString);
+        Log.d("CreateSchedule:outPutLogRoomData", "終了時刻" + endTimeHomeVisitString);
+        Log.d("CreateSchedule:outPutLogRoomData", "一家庭当たりの所要時間" + intervalTimeString);
+        Log.d("CreateSchedule:outPutLogRoomData", "休憩開始時刻" + startBreakTimeString);
+        Log.d("CreateSchedule:outPutLogRoomData", "休憩終了時刻" + endBreakTimeString);
     }
 
     private void timeCalculation(String endTimeHomeVisitString, String startBreakTime, String endBreakTime) {
@@ -264,17 +287,18 @@ public class CreateRoot {
             if (intervalMinutesInt % 100 >= 60) {
                 intervalMinutesInt += 40; // 下2桁が60以上の場合は繰り上げる
             }
+            //教師の休憩時間を除く処理
             if (intervalMinutesInt < startBreakTimeMinutesInt || intervalMinutesInt >= endBreakTimeMinutesInt) {
                 intervalList.add(intervalMinutesInt);
             }
         }
 
-
+        //[3]は家庭訪問の〇日目
         int[][][] intervalArrayInt = new int[3][intervalList.size()][2];
         for (int i = 0; i < intervalList.size(); i++) {
             for (int j = 0; j < 3; j++) {
-                intervalArrayInt[j][i][0] = intervalList.get(i);
-                intervalArrayInt[j][i][1] = 0;//割り当てされていないことを表す
+                intervalArrayInt[j][i][0] = intervalList.get(i);//家庭訪問のスケジュール区切りの時間を要素に入れる
+                intervalArrayInt[j][i][1] = 0;//家庭訪問のスケジュールにまだ保護者が割り当てられていないことを表す
             }
         }
 
@@ -283,7 +307,7 @@ public class CreateRoot {
 
     private void outPutLogIntervalArray(int[][][] intervalArrayInt) {
         for (int i = 0; i < intervalArrayInt[0].length; i++) {
-            Log.d("CreateRoot", "inteintervalArray:(intex:" + i + ") :" + intervalArrayInt[0][i][0]);
+            Log.d("CreateSchedule", "inteintervalArray:(intex:" + i + ") :" + intervalArrayInt[0][i][0]);
         }
     }
 
@@ -293,8 +317,10 @@ public class CreateRoot {
         for (int i = 0; i < myDataList.size(); i++) {
             for (int j = 0; j < intervalArrayInt[0].length - 1; j++) {
                 for (int x = 0; x < 3; x++) {
-                    if (testdata[x].equals(myDataList.get(i).getStartDateString()) && myDataList.get(i).getSchedule() == 0) {
-                        checkSchedule(myDataList, intervalArrayInt, i, j, x, myDataList.get(i).getStartDateString());
+                    //家庭訪問の●日目が保護者の第一希望日かを判定する
+                    //まだスケジュールを割り当てていない保護者かを判定する
+                    if (homeVisitDaysString[x].equals(myDataList.get(i).getStartDateString()) && myDataList.get(i).getSchedule() == 0) {
+                        checkSchedule(myDataList, intervalArrayInt, i, j, x, myDataList.get(i).getStartDateString(),homeVisitDaysString);
                         break;
                     }
                 }
@@ -303,7 +329,7 @@ public class CreateRoot {
         }
 
         for (int i = 0; i < myDataList.size(); i++) {
-            if (myDataList.get(i).getSchedule() == 0) {
+            if (myDataList.get(i).getSchedule() == 0) {//重複により割り当てがされていない保護者がいないかの確認
                 return false;
             }
         }
@@ -314,57 +340,81 @@ public class CreateRoot {
         for (int i = 0; i < myDataList.size(); i++) {
             for (int j = 0; j < intervalArrayInt[0].length - 1; j++) {
                 for (int x = 0; x < 3; x++) {
-                    if (testdata[x].equals(myDataList.get(i).getSecondDayStartDateString()) && myDataList.get(i).getSchedule() == 0) {
-                        checkSchedule(myDataList, intervalArrayInt, i, j, x, myDataList.get(i).getSecondDayStartDateString());
+                    //家庭訪問の●日目が保護者の第一希望日かを判定する
+                    //まだスケジュールを割り当てていない保護者かを判定する
+                    if (homeVisitDaysString[x].equals(myDataList.get(i).getSecondDayStartDateString()) && myDataList.get(i).getSchedule() == 0) {
+                        checkSchedule(myDataList, intervalArrayInt, i, j, x, myDataList.get(i).getSecondDayStartDateString(),homeVisitDaysString);
                     }
                 }
             }
         }
 
+
         for (int i = 0; i < myDataList.size(); i++) {
-            if (myDataList.get(i).getSchedule() == 0) {
+            if (myDataList.get(i).getSchedule() == 0) {//重複により割り当てがされていない保護者がいないかの確認
                 return false;
-
             }
         }
         return true;
     }
 
-    private void checkSchedule(List<MyDataClass> myDataList, int[][][] intervalArrayInt, int i, int j, int x, String desiredDateString) {
+    private void checkSchedule(List<MyDataClass> myDataList, int[][][] intervalArrayInt, int i, int j, int x, String desiredDateString, String[] homeVisitDaysString) {
+        //保護者の希望時間の開始と終了の間にまだ保護者の割り当てがされていないスケジュールの空き時間があるかの判定
         if (intervalArrayInt[x][j][0] >= Integer.parseInt(myDataList.get(i).getParentStartTimeString()) && intervalArrayInt[x][j + 1][0] <= Integer.parseInt(myDataList.get(i).getParentEndTimeString()) && intervalArrayInt[x][j][1] == 0) {
-            intervalArrayInt[x][j][1] += 1;//割り当て済みを表す
-            myDataList.get(i).setSchedule(Integer.parseInt(desiredDateString.substring(4, 8) + intervalArrayInt[x][j][0]));
+            intervalArrayInt[x][j][1] += 1;//その時間が割り当て済みでありこと
+            myDataList.get(i).setScheduleDay(homeVisitDaysString[x]);
+            Log.d("CreateSchedule","getScheduleDay"+myDataList.get(i).getScheduleDay());
+            myDataList.get(i).setSchedule(Integer.parseInt(desiredDateString.substring(4, 8) + intervalArrayInt[x][j][0]));//スケジュールをmyDataListに入れる(例:6041240(6月4日12時40分))
         }
     }
 
     private void sortSchedule(List<MyDataClass> myDataList) {
         Comparator<MyDataClass> comparator = Comparator.comparing(MyDataClass::getSchedule);
+        //スケジュールを元にmyDataListをソートする
         myDataList.sort(comparator);
     }
 
 
-    private void geocodeAddress(List<MyDataClass> myDataList, Context context) {
+    private String geocodeAddress(List<MyDataClass> myDataList, Context context) {
         try {
             Geocoder geocoder = new Geocoder(context, Locale.getDefault());
             for (int i = 0; i < myDataList.size(); i++) {
-                List<Address> addresses = geocoder.getFromLocationName(myDataList.get(i).getAddress().toString(), 1);
-                if (addresses != null && !addresses.isEmpty()) {
-                    Address addressResult = addresses.get(0);
+                List<Address> addressesList = geocoder.getFromLocationName(myDataList.get(i).getAddress().toString(), 1);
+                if (addressesList != null && !addressesList.isEmpty()) {
+                    Address addressResult = addressesList.get(0);
+                    //保護者の住所を緯度経度に変換する
                     double latitudeDouble = addressResult.getLatitude();
                     double longitudeDouble = addressResult.getLongitude();
-                    myDataList.get(i).setLatLng(new LatLng(latitudeDouble, longitudeDouble));
+                    //保護者の住所の緯度経度をmyDataListに追加する
+                    myDataList.get(i).setLatLngString(String.valueOf(new LatLng(latitudeDouble, longitudeDouble)));
                 }
             }
+            //SetUpで設定した家庭訪問の開始地点を緯度経度に変換
+            String startPointLatLngString = String.valueOf(geocoder.getFromLocationName(startPointString, 1));
+            String[] startPointLatLngArray = startPointLatLngString.split(",");
+            if (startPointLatLngArray.length >= 3) {
+                //[Address[addressLines=[0:"日本、〒510-8102 三重県三重郡朝日町小向８５２−１"],feature=８５２−１,admin=三重県,sub-admin=三重郡,locality=朝日町,thoroughfare=null,postalCode=510-8102,countryCode=JP,countryName=日本,hasLatitude=true,latitude=35.0351632,hasLongitude=true,longitude=136.66538770000003,phone=null,url=null,extras=null]]
+                //というようになっているので配列の後ろから6番目が緯度、4番目が経度
+                //不要なlatitude=とlongitude=を取り除く
+                String latitude = startPointLatLngArray[startPointLatLngArray.length - 6].trim().replace("latitude=", "");
+                String longitude = startPointLatLngArray[startPointLatLngArray.length - 4].trim().replace("longitude=", "");
+                Log.d("CreateSchedule", "Latitude: " + latitude + ", Longitude: " + longitude);
+                // 文字列を結合して形式を整える
+                startPointLatLngString = latitude + "," + longitude;
+                Log.d("CreateSchedule", "startPointLatLngString: " + startPointLatLngString);
+                return startPointLatLngString;
+            }
         } catch (IOException e) {
-            Log.e("CreateRoot", "緯度経度の取得に失敗: " + e);
+            Log.e("CreateSchedule", "緯度経度の取得に失敗: " + e);
         }
+        return null;
     }
 
     private void outPutLogSchedule(List<MyDataClass> myDataList) {
         for (int i = 0; i < myDataList.size(); i++) {
-            Log.d("CreateRoot:outPutLogSchedule", "(index: " + i + ") data: " + myDataList.get(i));
-            Log.d("CreateRoot:outPutLogSchedule", "(index: " + i + ") Schedule: " + myDataList.get(i).getSchedule());
-            Log.d("CreateRoot", "(index: " + i + ") LatLng" + myDataList.get(i).getLatLng());
+            Log.d("CreateSchedule:outPutLogSchedule", "(index: " + i + ") data: " + myDataList.get(i));
+            Log.d("CreateSchedule:outPutLogSchedule", "(index: " + i + ") Schedule: " + myDataList.get(i).getSchedule());
+            Log.d("CreateSchedule", "(index: " + i + ") LatLng" + myDataList.get(i).getLatLngString());
         }
     }
 }

app/src/main/java/com/example/oplogy/CreateUUID.java

@@ -5,12 +5,12 @@ import java.util.List;
 
 public class CreateUUID {
 
-    public static int generateUUID(List<String> classIdList ){
+    public static int generateUUID(List<Integer> classIdList) {
         while (true) {
-            String uuid = String.valueOf((int)(Math.random() * 1000000));
+            int uuidInt = (int) (Math.random() * 1000000);
             boolean isDuplicate = false;
-            for(String classId : classIdList){
-                if(classId.equals(uuid)){
+            for (int classIdInt : classIdList) {
+                if (classIdInt == uuidInt) {
                     //重複があればフラグを立て、ループを抜ける
                     isDuplicate = true;
                     break;
@@ -19,9 +19,9 @@ public class CreateUUID {
             //重複がなければ生成したUUIDを返す
             if (!isDuplicate) {
                 //firestoreに挿入処理
-                //テスト用
-                uuid="100";
-                return Integer.parseInt(uuid);
+                InsertClassIdforFirebase insertClassIdforFirebase = new InsertClassIdforFirebase();
+                insertClassIdforFirebase.insertClassId(uuidInt);
+                return uuidInt;
             }
         }
     }

app/src/main/java/com/example/oplogy/DatePick.java

@@ -7,8 +7,8 @@ import android.widget.DatePicker;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
+
 import java.util.Calendar;
-import java.util.Objects;
 
 public class DatePick extends DialogFragment implements
         DatePickerDialog.OnDateSetListener {
@@ -19,16 +19,16 @@ public class DatePick extends DialogFragment implements
 
         //デフォルトのタイムゾーンおよびロケールを使用してカレンダを取得
         final Calendar c = Calendar.getInstance();
-        int year = c.get(Calendar.YEAR);
-        int month = c.get(Calendar.MONTH);
-        int day = c.get(Calendar.DAY_OF_MONTH);
+        int yearInt = c.get(Calendar.YEAR);
+        int monthInt = c.get(Calendar.MONTH);
+        int dayInt = c.get(Calendar.DAY_OF_MONTH);
 
-        return new DatePickerDialog(requireActivity(), (DatePickerDialog.OnDateSetListener) getActivity(), year, month, day);
+        return new DatePickerDialog(requireActivity(), (DatePickerDialog.OnDateSetListener) getActivity(), yearInt, monthInt, dayInt);
     }
 
 
     @Override
-    public void onDateSet(DatePicker datePicker, int year, int month, int day) {
+    public void onDateSet(DatePicker datePicker, int yearInt, int monthInt, int dayInt) {
 
     }
 }

app/src/main/java/com/example/oplogy/FirestoreReception.java

@@ -16,21 +16,20 @@ import java.util.Map;
 
 public class FirestoreReception {
 
+    //firestoreから受け取ったデータを束ねるためのマップ
+    public List<MyDataClass> myDataList = new ArrayList<>();
     private FirebaseFirestore db;
 
     public FirestoreReception() {
         db = FirebaseFirestore.getInstance();
     }
 
-    //firestoreから受け取ったデータを束ねるためのマップ
-    public List<MyDataClass> myDataList = new ArrayList<>();
-
     //ClassIdを引数にデータの作成を行う
     public void getDocumentsByClassId(int classId) {
         myDataList.clear();
-        CollectionReference collectionRef = db.collection("QuestionnaireForms");
+        CollectionReference collectionRef = db.collection("QuestionForm");
+
 
-        // classIdが引数のものを取得する
         collectionRef.whereEqualTo("classId", classId).get()
                 .addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
                     @Override

app/src/main/java/com/example/oplogy/FirestoreReception_classIdDatabase.java

@@ -4,8 +4,6 @@ import android.util.Log;
 
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
-import com.google.firebase.firestore.CollectionReference;
-import com.google.firebase.firestore.DocumentSnapshot;
 import com.google.firebase.firestore.FirebaseFirestore;
 import com.google.firebase.firestore.QueryDocumentSnapshot;
 import com.google.firebase.firestore.QuerySnapshot;
@@ -14,17 +12,16 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 public class FirestoreReception_classIdDatabase {
     private FirebaseFirestore db;
-    private List<String> classIdList= new ArrayList<>();
+    private List<Integer> classIdList= new ArrayList<>();
 
     public FirestoreReception_classIdDatabase() {
         db = FirebaseFirestore.getInstance();
     }
 
 
-    public List<String> getAllDocumentsFromClassIdDatabase() {
+    public List<Integer> getAllDocumentsFromClassIdDatabase() {
         db.collection("classId_Database")
                 .get()
                 .addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
@@ -34,7 +31,7 @@ public class FirestoreReception_classIdDatabase {
                             for (QueryDocumentSnapshot document : task.getResult()) {
                                 Log.d("結果", document.getId() + " => " + document.getData());
                                 //データをListに追加
-                                classIdList.add((String) document.get("classId"));
+                                classIdList.add(((Long) document.get("classId")).intValue());
                             }
                         } else {
                             Log.d("結果", "Error getting documents: ", task.getException());
@@ -45,7 +42,7 @@ public class FirestoreReception_classIdDatabase {
         return classIdList;
     }
 
-    public List<String> getClassIdList() {
+    public List<Integer> getClassIdList() {
         return classIdList;
     }
 }

app/src/main/java/com/example/oplogy/GeoCoder.java

@@ -1,59 +0,0 @@
-package com.example.oplogy;
-
-import android.content.Context;
-import android.location.Address;
-import android.location.Geocoder;
-import android.util.Log;
-
-import com.google.android.gms.maps.model.LatLng;
-import com.google.firebase.Timestamp;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-public class GeoCoder {
-    private Context context;
-
-    public void processData(Map<String, Object> data, Context context) {
-        try {
-            this.context = context;
-
-            //家庭訪問先の住所
-            List<String> address = (List<String>) data.get("address");
-            //家庭訪問の第一希望日(配列0が希望時間帯のはじめ、配列1がおわり)
-            List<Timestamp> firstDay = (List<Timestamp>) data.get("firstDay");
-            //出席番号
-            Long studentNumber = (Long) data.get("studentNumber");
-            // 住所を緯度経度に変換
-            LatLng latLng = geocodeAddress(address.get(0));
-
-            //デバッグ用ログ
-            Log.d("FirestoreReception", "address: " + address.get(0));
-            Log.d("FirestoreReception", "firstDay: " + firstDay.get(0));
-            Log.d("FirestoreReception", "firstDay: " + firstDay.get(1));
-            Log.d("FirestoreReception", "studentNumber: " + studentNumber);
-            Log.d("FirestoreReception", "latLng: " + latLng);
-
-        } catch (NullPointerException e) {
-            Log.e("NullPointerException", "getの中身がnull" + e);
-        }
-    }
-
-    private LatLng geocodeAddress(String address) {
-        try {
-            Geocoder geocoder = new Geocoder(context, Locale.getDefault());
-            List<Address> addresses = geocoder.getFromLocationName(address, 1);
-            if (addresses != null && !addresses.isEmpty()) {
-                Address addressResult = addresses.get(0);
-                double latitude = addressResult.getLatitude();
-                double longitude = addressResult.getLongitude();
-                return new LatLng(latitude, longitude);
-            }
-        } catch (IOException e) {
-            Log.e("GeocodingException", "Error geocoding address: " + address, e);
-        }
-        return null;
-    }
-}

app/src/main/java/com/example/oplogy/InsertClassIdforFirebase.java

@@ -0,0 +1,19 @@
+package com.example.oplogy;
+
+import com.google.firebase.firestore.FirebaseFirestore;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class InsertClassIdforFirebase {
+    public void insertClassId(int classId) {
+        FirebaseFirestore db = FirebaseFirestore.getInstance();
+
+        Map<String, Object> data = new HashMap<>();
+        data.put("classId", classId); // classId is inserted as a number
+
+        db.collection("classId_Database").add(data)
+                .addOnSuccessListener(documentReference -> System.out.println("DocumentSnapshot added with ID: " + documentReference.getId()))
+                .addOnFailureListener(e -> System.err.println("Error adding document: " + e));
+    }
+}

app/src/main/java/com/example/oplogy/MainActivity.java

@@ -1,7 +1,8 @@
 package com.example.oplogy;
 
-import android.content.DialogInterface;
+import android.app.ProgressDialog;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -14,61 +15,43 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.room.Room;
 
 import com.google.firebase.firestore.FirebaseFirestore;
+import com.google.gson.Gson;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
 
+
     //    ダイアログの宣言
     private AlertDialog alertDialog;
-
     //    ID作成のTextViewとImageView
-    private TextView creatUUID;
-    private ImageView imageUuid;
-
-
-    //    セットアップのTextViewとImageView
-    private TextView setUp;
-    private ImageView imageSetup;
-
-    //    セットアップのTextViewとImageView
     private TextView root;
     private ImageView imageRoot;
     //    提出状況のTextViewとImageView
     private TextView submission;
     private ImageView imageSubmission;
+    private TextView SettingView;
+    private ImageView imageSettingView;
 
     //firestoreの受信関連
     private FirebaseFirestore db;
     private FirestoreReception firestoreReception;
-    private FirestoreReception_classIdDatabase firestoreReception_classIdDatabase;
 
     //取得するためのクラスID
     private int classId;
-    private String address;
 
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
-//        ID作成用のインテント
-        creatUUID = findViewById(R.id.creatUUID);
-        creatUUID.setOnClickListener(this);
-        imageUuid = findViewById(R.id.imageUuid);
-        imageUuid.setOnClickListener(this);
 
 
-//        セットアップ用のインテント
-        setUp = findViewById(R.id.setUp);
-        setUp.setOnClickListener(this);
-        imageSetup = findViewById(R.id.imageSetup);
-        imageSetup.setOnClickListener(this);
-
 //        ルート作成用のインテント
         root = findViewById(R.id.root);
         root.setOnClickListener(this);
@@ -81,18 +64,22 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         imageSubmission = findViewById(R.id.imageSubmission);
         imageSubmission.setOnClickListener(this);
 
+//        設定用のインテント
+        SettingView = findViewById(R.id.setting);
+        SettingView.setOnClickListener(this);
+        imageSettingView = findViewById(R.id.imageSetting);
+        imageSettingView.setOnClickListener(this);
+
 //      firestoreの受信関連
         db = FirebaseFirestore.getInstance();
         firestoreReception = new FirestoreReception();
         Log.d("MainActivity", "geocodeAddress");
 
 
-        //TODO:classIdの初期値を取得
         ExecutorService executor = Executors.newSingleThreadExecutor();
         executor.execute(() -> {
             try {
-                AppDatabase db = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "SetUpTable")
-                        .build();
+                AppDatabase db = getDatabaseInstance();
                 SetUpTableDao setUpTableDao = db.setUpTableDao();
                 classId = setUpTableDao.getClassId();
                 firestoreReception.getDocumentsByClassId(classId);
@@ -106,201 +93,251 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     }
 
 
-
     //    クリック処理
     @Override
     public void onClick(View view) {
-//        ID作成のクリック処理
-        if (view == creatUUID) {
-            imageUuid.setImageResource(R.drawable.ischecked_uuid);
-            showUUIDYesNoDialog();//UUIDを表示するかのダイアログ
-        }
-        if (view == imageUuid) {
-            imageUuid.setImageResource(R.drawable.ischecked_uuid);
-            showUUIDYesNoDialog();//UUIDを表示するかのダイアログ
-        }
-//        セットアップのクリック処理
-        if (view == setUp) {
-            imageSetup.setImageResource(R.drawable.ischecked_uuid);
-            Intent toSetup = new Intent(MainActivity.this, SetUpActivity.class);
-            toSetup.putExtra("classId", classId);
-            startActivity(toSetup);
-            finish();   // 画面遷移後元の状態に戻す
-        }
-        if (view == imageSetup) {
-            imageSetup.setImageResource(R.drawable.ischecked_uuid);
-            Intent toSetup = new Intent(MainActivity.this, SetUpActivity.class);
-            startActivity(toSetup);
-            finish();   // 画面遷移後元の状態に戻す
-        }
-
 //        ルート作成のクリック処理
         if (view == root) {
             imageRoot.setImageResource(R.drawable.pin);
-            fetchDataAndCreateRoute();
-
+            checkSetupAndCreateRoute(this::fetchDataAndCreateRoute);
         }
         if (view == imageRoot) {
             imageRoot.setImageResource(R.drawable.pin);
-            fetchDataAndCreateRoute();
+            checkSetupAndCreateRoute(this::fetchDataAndCreateRoute);
         }
 //        提出状況のクリック処理
         if (view == submission) {
+            checkSetupAndCreateRoute(() -> {
                 ArrayList<SubmissionStudent> submissionStudents = getSubmissionStudents();
                 Intent toSubmission = new Intent(MainActivity.this, SubmissionActivity.class);
                 toSubmission.putParcelableArrayListExtra("submissionStudents", submissionStudents);
                 startActivity(toSubmission);
+            });
         }
         if (view == imageSubmission) {
+            checkSetupAndCreateRoute(() -> {
                 ArrayList<SubmissionStudent> submissionStudents = getSubmissionStudents();
                 Intent toSubmission = new Intent(MainActivity.this, SubmissionActivity.class);
                 toSubmission.putParcelableArrayListExtra("submissionStudents", submissionStudents);
                 startActivity(toSubmission);
-        }
-    }
-
-    //UUIDを表示するかのダイアログ
-    private void showUUIDYesNoDialog() {
-        firestoreReception_classIdDatabase = new FirestoreReception_classIdDatabase();
-        List<String> classIdList = firestoreReception_classIdDatabase.getAllDocumentsFromClassIdDatabase();
-
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle("クラスID");
-        builder.setMessage("あなたのクラスIDを表示しますか？");
-
-        builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                classId = CreateUUID.generateUUID(classIdList);
-                Toast.makeText(MainActivity.this, "クラスID: " + classId, Toast.LENGTH_SHORT).show();
-            }
             });
-        builder.setNegativeButton("No", new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                Log.d("DialogNO", "DialogでNoが選ばれました");
         }
+        if (view == SettingView) {
+            Intent toSettingView = new Intent(MainActivity.this, SettingView.class);
+            startActivity(toSettingView);
+        }
+        if (view == imageSettingView) {
+            Intent toSettingView = new Intent(MainActivity.this, SettingView.class);
+            startActivity(toSettingView);
+        }
+    }
+
+
+    //ルート作成、提出状況の遷移を行う前のチェックを行う処理
+    private void checkSetupAndCreateRoute(Runnable onSetupComplete) {
+        if (isClassIdSet()) {
+            isSetupExists(classId).thenAccept(setupExists -> {
+                if (setupExists) {
+                    runOnUiThread(onSetupComplete);
+                } else {
+                    runOnUiThread(() -> {
+                        Toast.makeText(this, "先に設定画面で情報を入力してください", Toast.LENGTH_SHORT).show();
                     });
-
-        alertDialog = builder.create();
-        alertDialog.show();
-
                 }
+            }).exceptionally(ex -> {
+                ex.printStackTrace();
+                runOnUiThread(() -> {
+                    Toast.makeText(this, "エラーが発生しました", Toast.LENGTH_LONG).show();
+                });
+                return null;
+            });
+        } else {
+            Toast.makeText(this, "先に設定画面で情報を入力してください", Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    // クラスIDが設定されているかどうかを判定
+    private boolean isClassIdSet() {
+        // classIdが0より大きい場合、trueを返す
+        return classId > 0;
+    }
+
+    // セットアップが存在するかどうかを判定
+    private CompletableFuture<Boolean> isSetupExists(int classId) {
+        final ExecutorService executorService = Executors.newSingleThreadExecutor();
+        return CompletableFuture.supplyAsync(() -> {
+            AppDatabase db = getDatabaseInstance();
+            SetUpTableDao setUpTableDao = db.setUpTableDao();
+            //データベースの値を全取得
+            List<SetUpTable> checkData = setUpTableDao.getAll();
+            for (SetUpTable setUpTable : checkData) {
+                //SetUpTableのclassIdと引数のclassIdが一致する場合、trueを返す
+                if (setUpTable.classId == classId) {
+                    return true;
+                }
+            }
+            return false;
+            //処理完了時にexecutorServiceをシャットダウン
+        }, executorService).whenComplete((result, throwable) -> executorService.shutdown());
+    }
+
 
     //ルート作成の非同期処理
     private void fetchDataAndCreateRoute() {
-        //非同期処理の開始
         ExecutorService executor = Executors.newSingleThreadExecutor();
 
-        CountDownLatch latch = new CountDownLatch(2);
-
-        // タスク1: ローカルDBから生徒数を取得してtotalStudentと比較
         executor.execute(() -> {
-            AppDatabase db = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "SetUpTable").build();
+            AppDatabase db = getDatabaseInstance();
             SetUpTableDao setUpTableDao = db.setUpTableDao();
+            int totalStudentInt = setUpTableDao.getTotalStudent();
+            int myDataListSizeInt = firestoreReception.getMyDataListSize();
 
-            Log.d("MainActivity", "db" + setUpTableDao.getAll());
-
-            int totalStudent = setUpTableDao.getTotalStudent();
-            int myDataListSize = firestoreReception.getMyDataListSize();
-
+            //総生徒数と提出済みになっている生徒の数が一致するかの確認
             runOnUiThread(() -> {
-                if (totalStudent != myDataListSize) {
-                    showRouteCreationDialog(latch);
+                if (totalStudentInt != myDataListSizeInt) {
+                    //未提出者がいることの警告ダイアログ
+                    showRouteCreationDialog();
                 } else {
-                    latch.countDown();
+                    //ルート作成
+                    createRoute(executor);
                 }
             });
         });
 
-        // タスク2: ルート作成を行う
+        // `fetchDataAndCreateRoute`メソッド内では、shutdownを呼び出さない
+    }
+
+    //  未提出者がいることの警告ダイアログ
+    private void showRouteCreationDialog() {
+        new AlertDialog.Builder(MainActivity.this)
+                .setTitle("警告")
+                .setMessage("人数が足りてませんがそれでもルート作成を行いますか？")
+                .setPositiveButton("OK", (dialog, which) -> {
+                    // 新しいExecutorServiceを作成してタスクを実行
+                    ExecutorService dialogExecutor = Executors.newSingleThreadExecutor();
+                    createRoute(dialogExecutor);
+                    dialogExecutor.shutdown();
+                })
+                .setNegativeButton("Cancel", (dialog, which) -> {
+                    dialog.dismiss();
+                })
+                .show();
+    }
+
+//  ルート作成の非同期処理
+
+    private void createRoute(ExecutorService executor) {
+        // ProgressDialogを作成
+        ProgressDialog progressDialog = new ProgressDialog(MainActivity.this);
+        progressDialog.setMessage("Loading...");
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+
         executor.execute(() -> {
             List<MyDataClass> myDataList = null;
             while (myDataList == null) {
                 myDataList = firestoreReception.getMyDataList();
                 try {
                     Thread.sleep(3000);
-                    Log.d("MainActivity", "myDataList" + myDataList.size());
                 } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
+                    Thread.currentThread().interrupt();
+                    runOnUiThread(progressDialog::dismiss); // 進行状況ダイアログを閉じる
+                    return;
                 }
             }
-            Log.d("MainActivity", "myDataList" + myDataList.size());
-            CreateRoot createRoot = new CreateRoot(MainActivity.this);
-            Boolean notDuplicates = createRoot.receiveData(myDataList,getApplicationContext());
-            latch.countDown();
-
-            if (notDuplicates) {
-                Log.d("MainActivity", "スケジュール作成成功");
-            } else {
-                showErrorDialog(latch, myDataList);
-            }
-        });
-
-        new Thread(() -> {
-            try {
-                latch.await();  // Both tasks must call countDown() before this returns
-                runOnUiThread(() -> {
-                    Intent toRoot = new Intent(MainActivity.this, Maps.class);
-                    startActivity(toRoot);
-                });
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }).start();
-
-        executor.shutdown();
-    }
 
-    //ルート作成のダイアログ
-    private void showRouteCreationDialog(CountDownLatch latch) {
-        new AlertDialog.Builder(MainActivity.this)
-                .setTitle("警告")
-                .setMessage("人数が足りてませんがそれでもルート作成を行いますか？")
-                .setPositiveButton("OK", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        latch.countDown();
-                    }
-                })
-                .setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        dialog.dismiss();
-                    }
-                })
-                .show();
-    }
-
-    public void showErrorDialog(CountDownLatch latch, List<MyDataClass> myDataList) {
-        List<Integer> studentNumbers = new ArrayList<>();
+            //final宣言することによって、スレッドセーフになる(ラムダ式内で使えるようにする)
+            final List<MyDataClass> finalMyDataList = myDataList;
+            CreateSchedule createSchedule = new CreateSchedule(MainActivity.this);
+            String startPointLatLngString = createSchedule.receiveData(myDataList, getApplicationContext());
+            Boolean notDuplicatesBoolean = null;
             for (int i = 0; i < myDataList.size(); i++) {
                 if (myDataList.get(i).getSchedule() == 0) {
-                studentNumbers.add(myDataList.get(i).getStudentNumber());
+                    notDuplicatesBoolean = false;
+                    break;
+                } else {
+                    notDuplicatesBoolean = true;
                 }
             }
-        StringBuilder message = new StringBuilder("保護者の重複が重大でルート作成ができません。調整してください。\n出席番号: ");
+            Boolean finalNotDuplicatesBoolean = notDuplicatesBoolean;
+            Log.d("MainActivity", "重複判定" + String.valueOf(finalNotDuplicatesBoolean));
+
+            runOnUiThread(() -> {
+                progressDialog.dismiss(); // 進行状況ダイアログを閉じる
+                if (finalNotDuplicatesBoolean) {
+                    Log.d("MainActivity", "スケジュール作成成功");
+                    saveMyDataList(finalMyDataList);
+                    Intent toRoot = new Intent(MainActivity.this, Maps.class);
+                    toRoot.putExtra("startPointLatLngString", startPointLatLngString);
+                    startActivity(toRoot);
+                } else {
+                    // 保護者の重複による警告ダイアログ
+                    showErrorDialog(finalMyDataList);
+                }
+            });
+
+            // createRouteの最後にexecutorをシャットダウン
+            executor.shutdown();
+        });
+    }
+
+    //  作成したルートを(Mapに渡せるように)保存するメソッド
+    private void saveMyDataList(List<MyDataClass> myDataList) {
+        // 共有プリファレンスのインスタンスを取得
+        SharedPreferences sharedPreferences = getSharedPreferences("MyDataList", MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+
+        // MyDataListをJSON形式に変換
+        Gson gson = new Gson();
+        String jsonString = gson.toJson(myDataList);
+
+        // JSON形式のデータを共有プリファレンスに保存
+        editor.putString("myDataList", jsonString);
+        editor.apply();
+    }
+
+    //  保護者の重複による警告ダイアログ
+    private void showErrorDialog(List<MyDataClass> myDataList) {
+        List<Integer> studentNumbers = new ArrayList<>();
+        for (MyDataClass data : myDataList) {
+            if (data.getSchedule() == 0) {
+                studentNumbers.add(data.getStudentNumber());
+            }
+        }
+        StringBuilder message = new StringBuilder("保護者の重複が重大でルート作成ができません。保護者に連絡して調整してください。\n\n");
         for (int i = 0; i < studentNumbers.size(); i++) {
-            message.append(studentNumbers.get(i));
-            if (i < studentNumbers.size() - 1) {
-                message.append(", ");
-            }
+            message.append("出席番号:" + studentNumbers.get(i));
+            message.append("\n保護者名:" + myDataList.get(i).getPatronName());
+            message.append("\n第一希望 " + myDataList.get(i).getStartDateString().substring(4, 6) + "月");
+            message.append(myDataList.get(i).getStartDateString().substring(6, 8) + "日");
+            message.append(" " + myDataList.get(i).getParentStartTimeString().substring(0, 2));
+            message.append(":" + myDataList.get(i).getParentStartTimeString().substring(2, 4));
+            message.append("～" + myDataList.get(i).getParentEndTimeString().substring(0, 2));
+            message.append(":" + myDataList.get(i).getParentEndTimeString().substring(2, 4));
+            message.append("\n第二希望 " + myDataList.get(i).getSecondDayStartDateString().substring(4, 6) + "月");
+            message.append(myDataList.get(i).getSecondDayStartDateString().substring(6, 8) + "日");
+            message.append(" " + myDataList.get(i).getSecondDayParentStartTimeString().substring(0, 2));
+            message.append(":" + myDataList.get(i).getSecondDayParentStartTimeString().substring(2, 4));
+            message.append("～" + myDataList.get(i).getSecondDayParentEndTimeString().substring(0, 2));
+            message.append(":" + myDataList.get(i).getSecondDayParentEndTimeString().substring(2, 4) + "\n\n");
         }
         new AlertDialog.Builder(MainActivity.this)
                 .setTitle("警告")
                 .setMessage(message.toString())
-                .setPositiveButton("OK", new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
+                .setPositiveButton("OK", (dialog, which) -> {
                     dialog.dismiss();
-                    }
                 })
                 .show();
     }
 
+    //  データベースのインスタンスを取得するメソッド
+    private AppDatabase getDatabaseInstance() {
+        return Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "SetUpTable").build();
+    }
+
+
     //提出状況の取得
-    private ArrayList<SubmissionStudent> getSubmissionStudents() {
+    public ArrayList<SubmissionStudent> getSubmissionStudents() {
         ArrayList<SubmissionStudent> submissionStudents = new ArrayList<>();
         List<MyDataClass> myDataList = firestoreReception.getMyDataList();
 
@@ -308,40 +345,44 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         CountDownLatch latch = new CountDownLatch(1);
 
         executor.execute(() -> {
+            try {
                 // 1. Roomデータベースから全生徒数を取得
-            AppDatabase db = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "SetUpTable").build();
+                AppDatabase db = getDatabaseInstance();
                 SetUpTableDao setUpTableDao = db.setUpTableDao();
-            int totalStudent = setUpTableDao.getTotalStudent();
+                int totalStudentInt = setUpTableDao.getTotalStudent();
+
                 // 2. Firestoreから生徒番号のリストを取得
-            ArrayList<Integer> firestoreStudentNumbers = new ArrayList<>();
+                ArrayList<Integer> firestoreStudentNumbersList = new ArrayList<>();
                 for (MyDataClass myData : myDataList) {
-                int studentNumber = myData.getStudentNumber();
-                firestoreStudentNumbers.add(studentNumber);
+                    int studentNumberInt = myData.getStudentNumber();
+                    firestoreStudentNumbersList.add(studentNumberInt);
                 }
 
                 // 3. SubmissionStudentオブジェクトのリストを作成
-            for (int i = 1; i <= totalStudent; i++) {
-                boolean submitted = firestoreStudentNumbers.contains(i);
+                for (int i = 1; i <= totalStudentInt; i++) {
+                    boolean submitted = firestoreStudentNumbersList.contains(i);
                     submissionStudents.add(new SubmissionStudent(i, submitted));
                 }
-
+            } catch (Exception e) {
+                e.printStackTrace(); // ログにエラーメッセージを出力
+            } finally {
                 // 4. データベース操作が完了したことを通知
                 latch.countDown();
+            }
         });
 
         try {
-            // データベース操作が完了するのを待つ
-            latch.await();
+            latch.await(); // 非同期処理が完了するまで待機
         } catch (InterruptedException e) {
             e.printStackTrace();
+        } finally {
+            executor.shutdown(); // ExecutorServiceをシャットダウン
         }
 
-        executor.shutdown();
-
-        // SubmissionStudentオブジェクトのリストを返す
         return submissionStudents;
     }
 
+
     @Override
     protected void onDestroy() {
         super.onDestroy();

app/src/main/java/com/example/oplogy/Maps.java

@@ -1,16 +1,22 @@
 package com.example.oplogy;
 
+import android.content.SharedPreferences;
+import android.graphics.Color;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.OvalShape;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+import android.widget.TextView;
+
 import androidx.fragment.app.FragmentActivity;
 
-import android.content.Intent;
-import android.graphics.Color;
-import android.media.Image;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ImageView;
-import android.widget.TextView;
-
+import com.example.oplogy.databinding.MapsBinding;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.OnMapReadyCallback;
@@ -19,102 +25,480 @@ import com.google.android.gms.maps.model.BitmapDescriptorFactory;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
-import com.example.oplogy.databinding.MapsBinding;
-import com.google.android.gms.maps.model.Polyline;
 import com.google.android.gms.maps.model.PolylineOptions;
-import com.google.maps.DirectionsApi;
-import com.google.maps.DirectionsApiRequest;
-import com.google.maps.GeoApiContext;
-import com.google.maps.model.DirectionsResult;
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
 
-import java.util.Locale;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.lang.reflect.Type;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
-public class Maps extends FragmentActivity implements OnMapReadyCallback,View.OnClickListener{
+public class Maps extends FragmentActivity implements OnMapReadyCallback, View.OnClickListener, GoogleMap.OnMarkerClickListener {
 
-    //        ボタンの戻る処理
+    //GoogleMapAPiで使用可能な色
+    private static final int[] COLORS = new int[]{Color.parseColor("#007FFF"), // HUE_AZURE
+            Color.parseColor("#0000FF"), // HUE_BLUE
+            Color.parseColor("#00FFFF"), // HUE_CYAN
+            Color.parseColor("#00FF00"), // HUE_GREEN
+            Color.parseColor("#FF00FF"), // HUE_MAGENTA
+            Color.parseColor("#FFA500"), // HUE_ORANGE
+            Color.parseColor("#FF0000"), // HUE_RED
+            Color.parseColor("#FF007F"), // HUE_ROSE
+            Color.parseColor("#8A2BE2"), // HUE_VIOLET
+            Color.parseColor("#FFFF00") // HUE_YELLOW
+    };
+    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 MapsBinding binding;
-
-    private LatLng loc;
+    private LinearLayout locationsName;
+    private int colorIndex = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-     binding = MapsBinding.inflate(getLayoutInflater());
+        // バインディングの設定
+        com.example.oplogy.databinding.MapsBinding binding = MapsBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
-        // Obtain the SupportMapFragment and get notified when the map is ready to be used.
-        SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
-                .findFragmentById(R.id.map);
+        // マップフラグメントの設定
+        SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map);
         mapFragment.getMapAsync(this);
 
+        // 各UI要素の設定
         backMain = findViewById(R.id.BackMain);
         backMain.setOnClickListener(this);
+
+        locationsName = findViewById(R.id.locationsName);
+
+        // スピナーの設定
+        String dateDataString = formatDate(getSharedPreferencesData(0)) + "/" + formatDate(getSharedPreferencesData(1)) + "/" + formatDate(getSharedPreferencesData(2));
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        String[] dates = dateDataString.split("/");
+        for (String date : dates) {
+            adapter.add(date);
         }
 
+        // 各日付に対応するRunnableを設定する
+        for (int i = 0; i < 3; i++) {
+            int finalI = i;
+            String dayString = getSharedPreferencesData(i);
+            String formattedDayString = formatDate(dayString);
+            dateMap.put(formattedDayString, () -> loadMapAndNames(createlocationData(finalI), getscrollViewlData(finalI)));
+        }
 
+        Spinner dateSpinner = findViewById(R.id.date);
+        dateSpinner.setAdapter(adapter);
 
-    /**
-     * 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.
-     */
+        // スピナーのアイテム選択リスナーを設定
+        dateSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                String selectedItemString = (String) parent.getItemAtPosition(position);
+                Runnable mapLoader = dateMap.get(selectedItemString);
+                if (mapLoader != null) {
+                    mapLoader.run();
+                }
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                // Do nothing
+            }
+        });
+    }
+
+    //ルート表示を押して最初に表示されるルート(3日間の家庭訪問における1日目)の設定
     @Override
     public void onMapReady(GoogleMap googleMap) {
+        //Google mapの定義
         mMap = googleMap;
-
-        /// 地図の倍率を指定
-
-        // ↓ここに地点の処理を書いておく↓
-        // Add a marker in Sydney and move the camera
-        loc = new LatLng(35.09050879999539, 136.87845379325216);
-        mMap.addMarker(new MarkerOptions().position(loc).title("名古屋港水族館"));
-        /// 表示位置を地図に指定
-        mMap.moveCamera(CameraUpdateFactory.newLatLng(loc));
-
-        mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(loc, 17));
-
-        LatLng startLatLng = new LatLng(35.09050879999539, 136.87845379325216);
-        LatLng secandLatLng = new LatLng(35.09284820618655, 136.88165119390393);
-        LatLng thirdLatLng = new LatLng(35.09364708442631, 136.88171563326418);
-
-
-        Marker startMaker = mMap.addMarker(new MarkerOptions()
-                .position(startLatLng)
-                .title("名古屋港水族館")
-        );
-
-        Marker secondMaker = mMap.addMarker(new MarkerOptions()
-                .position(secandLatLng)
-                .title("2番目")
-        );
-
-        Marker thirdMaker = mMap.addMarker(new MarkerOptions()
-                .position(thirdLatLng)
-                .title("3番目")
-        );
-
-        drowRoute(startLatLng,secandLatLng,thirdLatLng);
+        mMap.setOnMarkerClickListener(this);
+        //家庭訪問1日目のスケジュール順に緯度経度の情報をString型の変数に格納
+        //35.1711355,136.88552149999998/35.1696089,136.884084/35.1732838,136.88832890000003/...
+        String locationDataString = createlocationData(0);
+        //家庭訪問1日目のスケジュール順に住所や出席番号、家庭訪問の開始時間の情報をString型の変数に格納
+        //開始地点/出席番号2番:鈴木次郎<〒453-0015 愛知県名古屋市中村区椿町６−９ 地下１階～５階> 06月04日12時00分/...
+        String scrollViewlDataString = getscrollViewlData(0);
+        loadMapAndNames(locationDataString, scrollViewlDataString);
     }
 
-    private  void drowRoute(LatLng startLatLng,LatLng secondLatLung,LatLng thirdLatLng){
-        GeoApiContext context = new GeoApiContext.Builder()
-                .apiKey("AIzaSyBQ1Ak-I2NL5TP4K59ZI0VgzKk6HNZuusw")
-                .build();
+    //家庭訪問の〇日目が何月何日かを返すメソッド
+    private String getSharedPreferencesData(int i) {
+        SharedPreferences sharedPreferences = getSharedPreferences("visitingDate", MODE_PRIVATE);
+        // SetUpで設定した8桁の数字表記の家庭訪問日を日付表記に変更
+        String dayString;
+        if (i == 0) {
+            dayString = sharedPreferences.getString("day1", null);
+        } else if (i == 1) {
+            dayString = sharedPreferences.getString("day2", null);
+        } else {
+            dayString = sharedPreferences.getString("day3", null);
+        }
+        return dayString;
+    }
+
+    //家庭訪問の日付を8桁の整数表記から○月〇日(20240707→07月07日)表記に変更する
+    private String formatDate(String date) {
+        if (date == null || date.length() != 8) {
+            return "";
+        }
+        String monthString = date.substring(4, 6);
+        String dayString = date.substring(6, 8);
+        return monthString + "月" + dayString + "日";
+    }
+
+    //家庭訪問1日目のスケジュール順に緯度経度の情報をString型の変数に格納
+    private String createlocationData(int i) {
+        //家庭訪問の開始地点の緯度経度
+        String startPointLatLngString = getIntent().getStringExtra("startPointLatLngString");
+        List<MyDataClass> myDataList = getMyDataList();
+        //家庭訪問の緯度経度情報をまとめる変数
+        StringBuilder latlngString = new StringBuilder();
+        for (int y = -1; y < myDataList.size(); y++) {
+            if (y < 0) {
+                //家庭訪問の開始地点を追加
+                latlngString.append(startPointLatLngString);
+            } else if (myDataList.get(y).getScheduleDay().equals(getSharedPreferencesData(i))) {
+                if (latlngString.length() > 0) {
+                    //区切りのスラッシュ
+                    latlngString.append("/");
+                }
+                //mydataListから取り出した家庭訪問の各家庭の住所の緯度経度を追加
+                //この時点ではlongitude latitudeのような不要な文字があるのでformatLatLngメソッドで緯度経度だけのデータにする
+                latlngString.append(formatLatLng(myDataList.get(y)));
+            }
+        }
+        //各家庭の緯度経度をまとめたものを返す
+        return latlngString.toString();
+    }
+
+    //緯度と経度は(35.1711355,136.88552149999998)のように()の中に入っているのでそこだけを取り出す
+    private String formatLatLng(MyDataClass myData) {
+        String latlngString = myData.getLatLngString();
+        int startIndex = latlngString.indexOf("(") + 1;
+        int endIndex = latlngString.indexOf(")");
+        return latlngString.substring(startIndex, endIndex);
+    }
+
+    //ScrollViewにて表示するdataの作成メソッド
+    private String getscrollViewlData(int i) {
+        List<MyDataClass> myDataList = getMyDataList();
+        String homeVisitDataString = "";
+        for (int y = -1; y < myDataList.size(); y++) {
+            if (y < 0) {
+                //家庭訪問の開始地点
+                homeVisitDataString += "開始地点/";
+            } else if (myDataList.get(y).getScheduleDay().equals(getSharedPreferencesData(i)) && y + 1 < myDataList.size()) {
+                //出席番号:生徒の名前 <住所> 家庭訪問の開始時間+/
+                homeVisitDataString += "出席番号" + String.valueOf(myDataList.get(y).getStudentNumber()) + "番:" + myDataList.get(y).getChildName() + "<" + myDataList.get(y).getAddress().get(0) + "> " + formatSchedule(String.valueOf(myDataList.get(y).getSchedule())) + "/";
+            } else if (myDataList.get(y).getScheduleDay().equals(getSharedPreferencesData(i))) {
+                homeVisitDataString += "出席番号" + String.valueOf(myDataList.get(y).getStudentNumber()) + "番:" + myDataList.get(y).getChildName() + " <" + myDataList.get(y).getAddress().get(0) + "> " + formatSchedule(String.valueOf(myDataList.get(y).getSchedule()));
+            }
+        }
+        return homeVisitDataString;
+    }
+
+    //家庭訪問のscheduleを7桁の整数から○月〇日●時〇分(6041200→06月12日05時20分)に変換
+    private String formatSchedule(String schedule) {
+        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を取得するメソッド
+    private List<MyDataClass> getMyDataList() {
+        // 共有プリファレンスのインスタンスを取得
+        SharedPreferences sharedPreferences = getSharedPreferences("MyDataList", MODE_PRIVATE);
+
+        // 共有プリファレンスからJSON形式のデータを取得
+        String jsonString = sharedPreferences.getString("myDataList", "");
+
+        // JSON形式のデータをMyDataListに変換
+        Gson gson = new Gson();
+        Type type = new TypeToken<List<MyDataClass>>() {
+        }.getType();
+        List<MyDataClass> myDataList = gson.fromJson(jsonString, type);
+
+        return myDataList;
+    }
+
+
+    //mapやgetscrollViewlに値を渡すハブの役割のメソッド
+    private void loadMapAndNames(String locationData, String nameData) {
+        try {
+            //mapに関するすべてのデータをリセット
+            latLngList.clear();
+            nameList.clear();
+            colorList.clear();
+            locationsName.removeAllViews();
+            mMap.clear();
+
+            // locationDataをスラッシュで分割して緯度経度リストを取得
+            String[] locArrayString = locationData.split("/");
+            // nameDataをスラッシュで分割して名前リストを取得
+            String[] nameArrayString = nameData.split("/");
+
+            for (int i = 0; i < locArrayString.length; i++) {
+                // 緯度経度をカンマで分割してLatLngオブジェクトを作成
+                String[] latLngString = locArrayString[i].split(",");
+                if (latLngString.length == 2) {
+                    double latitudeDouble = Double.parseDouble(latLngString[0]);
+                    double longitudeDouble = Double.parseDouble(latLngString[1]);
+                    LatLng position = new LatLng(latitudeDouble, longitudeDouble);
+                    latLngList.add(position);
+
+                    // 名前リストから対応する名前を取得
+                    String nameString = nameArrayString.length > i ? nameArrayString[i] : "Unknown";
+                    nameList.add(nameString);
+
+                    // 色リストから次の色を取得
+                    int colorInt = getNextColor();
+                    colorList.add(colorInt);
+
+                    // 地図にピンを追加
+                    addPinToMap(nameString, position, colorInt);
+                    // スクロールビューに場所を追加
+                    addLocationToScrollView(nameString, colorInt);
+                }
+            }
+
+            // 最初の位置にカメラを移動し、ルートを描画
+            if (!latLngList.isEmpty()) {
+                mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLngList.get(0), 17));
+                drawRoute();  // ルートを描画するメソッドを呼び出す
+            }
+        } catch (Exception e) {
+            Log.e("Maps", "エラーが発生しました。原因は以下", e);
+        }
+    }
+
+    // ルートを描画するメソッド
+    // Google マップの Directions API を使用してルート情報を取得し、ポリラインで描画
+    private void drawRoute() {
+        new Thread(() -> {
+            try {
+                StringBuilder urlBuilder = new StringBuilder("https://maps.googleapis.com/maps/api/directions/json?");
+                urlBuilder.append("origin=").append(latLngList.get(0).latitude).append(",").append(latLngList.get(0).longitude);
+                urlBuilder.append("&destination=").append(latLngList.get(latLngList.size() - 1).latitude).append(",").append(latLngList.get(latLngList.size() - 1).longitude);
+                if (latLngList.size() > 2) {
+                    urlBuilder.append("&waypoints=");
+                    for (int i = 1; i < latLngList.size() - 1; i++) {
+                        urlBuilder.append("via:").append(latLngList.get(i).latitude).append(",").append(latLngList.get(i).longitude);
+                        if (i < latLngList.size() - 2) {
+                            urlBuilder.append("|");
+                        }
+                    }
+                }
+                urlBuilder.append("&mode=driving");
+                //APiキーの設定
+                urlBuilder.append("&key=").append("AIzaSyBQ1Ak-I2NL5TP4K59ZI0VgzKk6HNZuusw");
+
+                String urlString = urlBuilder.toString();
+                Log.d("Maps", "Directions API URL: " + urlString);
+
+                // Directions APIにリクエストを送信してレスポンスを取得
+                URL url = new URL(urlString);
+                HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+                conn.setRequestMethod("GET");
+                InputStreamReader isr = new InputStreamReader(conn.getInputStream());
+                BufferedReader br = new BufferedReader(isr);
+                StringBuilder jsonResults = new StringBuilder();
+                String lineString;
+                while ((lineString = br.readLine()) != null) {
+                    jsonResults.append(lineString);
+                }
+                br.close();
+
+                Log.d("Maps", "API response: " + jsonResults.toString());
+                // レスポンスからルート情報を取得してポリラインで描画
+                JsonObject jsonObject = new Gson().fromJson(jsonResults.toString(), JsonObject.class);
+                JsonArray routes = jsonObject.getAsJsonArray("routes");
+                if (routes.size() > 0) {
+                    JsonObject route = routes.get(0).getAsJsonObject();
+                    JsonObject polyline = route.getAsJsonObject("overview_polyline");
+                    String encodedString = polyline.get("points").getAsString();
+                    List<LatLng> points = decodePoly(encodedString);
+
+                    Log.d("Maps", "Polyline points: " + points);
+
+                    runOnUiThread(() -> mMap.addPolyline(new PolylineOptions().addAll(points).width(5).color(Color.BLUE)));
+                } else {
+                    // ルートが見つからなかった場合のエラーメッセージを表示
+                    JsonPrimitive errorMessage = jsonObject.getAsJsonPrimitive("error_message");
+                    if (errorMessage != null) {
+                        Log.e("Maps", "エラーが発生しました。原因は以下: " + errorMessage.getAsString());
+                    } else {
+                        Log.e("Maps", "原因不明のエラー");
+                    }
+                }
+            } catch (Exception e) {
+                Log.e("Maps", "ルートの描画に失敗しました", e);
+            }
+        }).start();
+    }
+
+    // エンコードされた文字列から座標情報をデコードするためのメソッド
+    private List<LatLng> decodePoly(String encoded) {
+        List<LatLng> poly = new ArrayList<>(); // 座標情報を格納するリスト
+        int index = 0, len = encoded.length();// 文字列のインデックスと長さ
+        int latInt = 0, lng = 0; // 緯度と経度の初期値
+
+        // 文字列の長さに達するまで繰り返す
+        while (index < len) {
+            int b, shift = 0, result = 0;
+            // バイト値を取得し、ビットシフトとOR演算を行って座標値を復元する
+            do {
+                b = encoded.charAt(index++) - 63;
+                result |= (b & 0x1f) << shift;
+                shift += 5;
+            } while (b >= 0x20);
+            int dlat = ((result & 1) != 0 ? ~(result >> 1) : (result >> 1));
+            latInt += dlat;
+
+            shift = 0;
+            result = 0;
+            // バイト値を取得し、ビットシフトとOR演算を行って座標値を復元する
+            do {
+                b = encoded.charAt(index++) - 63;
+                result |= (b & 0x1f) << shift;
+                shift += 5;
+            } while (b >= 0x20);
+            int dlng = ((result & 1) != 0 ? ~(result >> 1) : (result >> 1));
+            lng += dlng;
+            // LatLngオブジェクトを作成してリストに追加する
+            LatLng p = new LatLng((((double) latInt / 1E5)), (((double) lng / 1E5)));
+            poly.add(p);
+        }
+        // 座標情報のリストを返す
+        return poly;
+    }
+
+    // Colorクラスを使用して、与えられた色から色相値を計算するメソッド
+    private float getHueFromColor(int color) {
+        float[] hsv = new float[3];
+        Color.colorToHSV(color, hsv);//整数の色値をHSV（色相、彩度、明度）の形式に変換し、色相値を取得します。
+        return hsv[0];
+    }
+
+    //mapにピンを追加するメソッド
+    private void addPinToMap(String locationName, LatLng position, int color) {
+        // マーカーオプションを作成し、位置、タイトル、色を設定する
+        Marker marker = mMap.addMarker(new MarkerOptions().position(position).title(locationName).icon(BitmapDescriptorFactory.defaultMarker(getHueFromColor(color))));
+        if (marker != null) {
+            marker.setTag(locationName);
+        }
+    }
+
+    // スクロールビューに位置情報を追加するメソッド
+    // スクロールビューに位置情報を追加するメソッド
+// スクロールビューに位置情報を追加するメソッド
+    private void addLocationToScrollView(String locationName, int color) {
+        runOnUiThread(() -> {
+            try {
+                // テキストビューの作成
+                TextView textView = new TextView(this);
+                textView.setText(locationName);
+                textView.setTextSize(20);
+                textView.setPadding(16, 16, 16, 16);
+                textView.setTextColor(Color.BLACK); // 文字色を黒に設定
+                textView.setBackgroundColor(Color.WHITE); // 背景色を白に設定
+
+                // 円を作成
+                ShapeDrawable circle = new ShapeDrawable(new OvalShape());
+                circle.setIntrinsicWidth(30);
+                circle.setIntrinsicHeight(30);
+                circle.getPaint().setColor(color);
+
+                // 左側に円を表示するためにDrawableを設定
+                textView.setCompoundDrawablesWithIntrinsicBounds(circle, null, null, null);
+                textView.setCompoundDrawablePadding(16);
+
+                // テキストビューにクリックリスナーを追加
+                textView.setOnClickListener(v -> {
+                    for (int j = 0; j < nameList.size(); j++) {
+                        if (nameList.get(j).equals(locationName)) {
+                            mMap.animateCamera(CameraUpdateFactory.newLatLngZoom(latLngList.get(j), 17));
+                            break;
+                        }
+                    }
+                });
+
+                // ボーダーラインの作成
+                View border = new View(this);
+                border.setLayoutParams(new LinearLayout.LayoutParams(
+                        LinearLayout.LayoutParams.MATCH_PARENT, // 横幅は親と同じ
+                        2 // 高さは2dp
+                ));
+                border.setBackgroundColor(Color.GRAY); // ボーダーラインの色を設定
+
+                // レイアウトの作成
+                LinearLayout layout = new LinearLayout(this);
+                layout.setOrientation(LinearLayout.VERTICAL);
+                layout.addView(textView);
+                layout.addView(border);
+
+                // スクロールビューにレイアウトを追加
+                locationsName.addView(layout);
+            } catch (Exception e) {
+                Log.e("Maps", "エラーが発生しました。原因は以下", e);
+            }
+        });
+    }
+
+
+    private int getNextColor() {
+        int color = COLORS[colorIndex];
+        colorIndex = (colorIndex + 1) % COLORS.length;
+        return color;
     }
 
     @Override
     public void onClick(View view) {
-        if(view == backMain){
-            Intent backMain = new Intent(Maps.this,MainActivity.class);
-            startActivity(backMain);
+        if (view.getId() == R.id.BackMain) {
+            finish();
         }
     }
+
+
+    @Override
+    //マーカーがクリックされた際の処理を行うメソッド
+    public boolean onMarkerClick(Marker marker) {
+        // マーカーから場所の名前を取得します。
+        String locationName = (String) marker.getTag();
+        // 場所の名前がnullではない場合に処理を実行します。
+        if (locationName != null) {
+            // マーカーのタイトルとして場所の名前を設定します。
+            marker.setTitle(locationName);
+            // マーカーの情報ウィンドウを表示します。
+            marker.showInfoWindow();
+        }
+        // デフォルトの動作も実行するためにfalseを返します。
+        return false;
+    }
 }

app/src/main/java/com/example/oplogy/MyDataClass.java

@@ -1,135 +1,136 @@
 package com.example.oplogy;
 
-import com.google.android.gms.maps.model.LatLng;
 import com.google.firebase.Timestamp;
 
 import java.util.List;
 
 public class MyDataClass {
 
-    String patronName;
-    int classId;
-    List<String> address;
-    List<Timestamp> firstDay;
-    int studentNumber;
-    String childName;
-    List<Timestamp> thirdDay;
-    List<Timestamp> secondDay;
-    double latitude;
-    private Long Timezone;
+    private String patronNameString;
+    private int classIdInt;
+    private List<String> addressList;
+    private List<Timestamp> firstDayList;
+    private int studentNumberInt;
+    private String childNameString;
+    private List<Timestamp> thirdDayList;
+    private List<Timestamp> secondDayList;
+    private double latitudeDouble;
+    private Long timezoneLong;
     private String startDateString;
     private String endDateString;
-    private String AssignedStartTime;
-    private int AssignedIndex;
-    private boolean linking;
+    private String assignedStartTimeString;
+    private int assignedIndexInt;
+    private boolean linkingBoolean;
     private String parentStartTimeString;
     private String parentEndTimeString;
-    private int schedule;
+    private int scheduleInt;
     private String secondDayStartDateString;
     private String secondDayEndDateString;
-    private Long secondDayTimezone;
+    private Long secondDayTimezoneLong;
     private String secondDayParentStartTimeString;
     private String secondDayParentEndTimeString;
-    private LatLng latLng;
+    private String latLngString;
+
+    private String ScheduleDayString;
 
 
     public MyDataClass(String patronName, int classId, List<String> address, List<Timestamp> firstDay, int studentNumber, String childName, List<Timestamp> thirdDay, List<Timestamp> secondDay) {
-        this.patronName = patronName;
-        this.classId = classId;
-        this.address = address;
-        this.firstDay = firstDay;
-        this.studentNumber = studentNumber;
-        this.childName = childName;
-        this.thirdDay = thirdDay;
-        this.secondDay = secondDay;
+        this.patronNameString = patronName;
+        this.classIdInt = classId;
+        this.addressList = address;
+        this.firstDayList = firstDay;
+        this.studentNumberInt = studentNumber;
+        this.childNameString = childName;
+        this.thirdDayList = thirdDay;
+        this.secondDayList = secondDay;
     }
 
     @Override
     public String toString() {
         return "MyDataClass{" +
-                "patronName='" + patronName + '\'' +
-                ", classId=" + classId +
-                ", address=" + address +
-                ", firstDay=" + firstDay +
-                ", studentNumber=" + studentNumber +
-                ", childName='" + childName + '\'' +
-                ", thirdDay=" + thirdDay +
-                ", secondDay=" + secondDay +
+                "patronName='" + patronNameString + '\'' +
+                ", classId=" + classIdInt +
+                ", address=" + addressList +
+                ", firstDay=" + firstDayList +
+                ", studentNumber=" + studentNumberInt +
+                ", childName='" + childNameString + '\'' +
+                ", thirdDay=" + thirdDayList +
+                ", secondDay=" + secondDayList +
                 '}';
     }
 
     //getter
     public String getPatronName() {
-        return patronName;
+        return patronNameString;
     }
 
     //setter
-    public void setPatronName(String patronName) {
-        this.patronName = patronName;
+    public void setPatronName(String patronNameString) {
+        this.patronNameString = patronNameString;
     }
 
     public int getClassId() {
-        return classId;
+        return classIdInt;
     }
 
     public void setClassId(int classId) {
-        this.classId = classId;
+        this.classIdInt = classId;
     }
 
     public List<String> getAddress() {
-        return address;
+        return addressList;
     }
 
     public void setAddress(List<String> address) {
-        this.address = address;
+        this.addressList = address;
     }
 
     public List<Timestamp> getFirstDay() {
-        return firstDay;
+        return firstDayList;
     }
 
     public void setFirstDay(List<Timestamp> firstDay) {
-        this.firstDay = firstDay;
+        this.firstDayList = firstDay;
     }
 
     public int getStudentNumber() {
-        return studentNumber;
+        return studentNumberInt;
     }
 
     public void setStudentNumber(int studentNumber) {
-        this.studentNumber = studentNumber;
+        this.studentNumberInt = studentNumber;
     }
 
     public String getChildName() {
-        return childName;
+        return childNameString;
     }
 
     public void setChildName(String childName) {
-        this.childName = childName;
+        this.childNameString = childName;
     }
 
     public List<Timestamp> getThirdDay() {
-        return thirdDay;
+        return thirdDayList;
     }
 
     public void setThirdDay(List<Timestamp> thirdDay) {
-        this.thirdDay = thirdDay;
+        this.thirdDayList = thirdDay;
     }
 
     public List<Timestamp> getSecondDay() {
-        return secondDay;
+        return secondDayList;
     }
 
     public void setSecondDay(List<Timestamp> secondDay) {
-        this.secondDay = secondDay;
+        this.secondDayList = secondDay;
     }
 
     public double getLatitude() {
-        return latitude;
+        return latitudeDouble;
     }
 
-    public void setLatitude(double latitude) {
-        this.latitude = latitude;
+    public void setLatitude(double latitudeDouble) {
+        this.latitudeDouble = latitudeDouble;
     }
 
     public void setEndDateString(String endDateString) {
@@ -137,11 +138,11 @@ public class MyDataClass {
     }
 
     public Long getTimezone() {
-        return Timezone;
+        return timezoneLong;
     }
 
-    public void setTimezone(Long Timezone) {
-        this.Timezone = Timezone;
+    public void setTimezone(Long timezoneLong) {
+        this.timezoneLong = timezoneLong;
     }
 
     public String getStartDateString() {
@@ -153,29 +154,29 @@ public class MyDataClass {
     }
 
 
-    public void setAssignedStartTime(String AssignedStartTime) {
-        this.AssignedStartTime = AssignedStartTime;
+    public void setAssignedStartTime(String assignedStartTime) {
+        this.assignedStartTimeString = assignedStartTime;
 
     }
 
-    public String setAssignedEndTime(String s) {
-        return AssignedStartTime;
+    public String getAssignedEndTime() {
+        return assignedStartTimeString;
     }
 
-    public void setAssignedIndex(int AssignedIndex) {
-        this.AssignedIndex = AssignedIndex;
+    public void setAssignedIndex(int assignedIndexInt) {
+        this.assignedIndexInt = assignedIndexInt;
     }
 
     public int getAssignedIndex() {
-        return AssignedIndex;
+        return assignedIndexInt;
     }
 
     public void setLinking(boolean linking) {
-        this.linking = linking;
+        this.linkingBoolean = linking;
     }
 
     public boolean getLinking() {
-        return linking;
+        return linkingBoolean;
     }
 
     public void setParentStartTimeString(String parentStartTimeString) {
@@ -194,12 +195,12 @@ public class MyDataClass {
         return parentEndTimeString;
     }
 
-    public void setSchedule(int schedule) {
-        this.schedule = schedule;
+    public void setSchedule(int scheduleInt) {
+        this.scheduleInt = scheduleInt;
     }
 
     public int getSchedule() {
-        return schedule;
+        return scheduleInt;
     }
 
     public void setSecondDayStartDateString(String secondDayStartDateString) {
@@ -211,11 +212,11 @@ public class MyDataClass {
     }
 
     public void setSecondDayTimezone(Long secondDayTimezone) {
-        this.secondDayTimezone = secondDayTimezone;
+        this.secondDayTimezoneLong = secondDayTimezone;
     }
 
     public Long getSecondDayTimezone() {
-        return secondDayTimezone;
+        return secondDayTimezoneLong;
     }
 
 
@@ -239,11 +240,20 @@ public class MyDataClass {
         return secondDayStartDateString;
     }
 
-    public void setLatLng(LatLng latLng) {
-        this.latLng=latLng;
+    public void setLatLngString(String latLng) {
+        this.latLngString = latLng;
     }
 
-    public LatLng getLatLng() {
-        return latLng;
+    public String getLatLngString() {
+        return latLngString;
+    }
+
+
+    public void setScheduleDay(String ScheduleDayString) {
+        this.ScheduleDayString = ScheduleDayString;
+    }
+
+    public String getScheduleDay() {
+        return ScheduleDayString;
     }
 }

app/src/main/java/com/example/oplogy/RootSearchActivity.java

@@ -1,14 +0,0 @@
-package com.example.oplogy;
-
-import android.os.Bundle;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-public class RootSearchActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.root_search);
-    }
-}

app/src/main/java/com/example/oplogy/SetUpActivity.java

@@ -2,7 +2,6 @@ package com.example.oplogy;
 
 import static android.content.ContentValues.TAG;
 
-
 import android.annotation.SuppressLint;
 import android.app.DatePickerDialog;
 import android.app.TimePickerDialog;
@@ -31,17 +30,27 @@ import java.util.concurrent.Executors;
 public class SetUpActivity extends FragmentActivity
         implements TimePickerDialog.OnTimeSetListener, DatePickerDialog.OnDateSetListener {
 
-    String teacherName;
-    String startPoint;
-    String firstDay;
-    String secondDay;
-    String thirdDay;
-    String startTime;
-    String endTime;
-    String intervalTime;
-    String startBreakTime;
-    String endBreakTime;
-    int totalStudent;
+    String teacherNameString;
+    String startPointString;
+    String firstDayString;
+    String secondDayString;
+    String thirdDayString;
+    String startTimeString;
+    String endTimeString;
+    String intervalTimeString;
+    String startBreakTimeString;
+    String endBreakTimeString;
+    int totalStudentString;
+    String stringYearString;
+    String stringMonthString;
+    String stringDayOfMonthString;
+    String stringHourOfDayString;
+    String stringMinuteString;
+    Button setFirstDay;
+    Button setSecondDay;
+    Button setThirdDay;
+    Button setStartTimeButton;
+    Button setEndTimeButton;
     private TextView setTeacherName;
     private TextView setStartPoint;
     private TextView setStartTime;
@@ -49,24 +58,8 @@ public class SetUpActivity extends FragmentActivity
     private TextView setStartBreakTime;
     private TextView setEndBreakTime;
     private TextView setTotalStudent;
-    private int isDateSelected;
-    private int isStartTimeSelected;
-
-    String stringYear;
-    String stringMonth;
-    String stringDayOfMonth;
-
-
-    String stringHourOfDay;
-    String stringMinute;
-
-    Button setFirstDay;
-    Button setSecondDay;
-    Button setThirdDay;
-    Button setStartTimeButton;
-    Button setEndTimeButton;
-
-
+    private int isDateSelectedInt;
+    private int isStartTimeSelectedInt;
 
     @SuppressLint("MissingInflatedId")
     @Override
@@ -74,7 +67,7 @@ public class SetUpActivity extends FragmentActivity
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_set_up);
 
-        int classId= getIntent().getIntExtra("classId", 100000);
+        int classIdInt = getIntent().getIntExtra("classId", 100000);
 
         setTeacherName = findViewById(R.id.teacherName);                    //先生の名前
         setStartPoint = findViewById(R.id.startPoint);                      //開始地点
@@ -104,37 +97,49 @@ public class SetUpActivity extends FragmentActivity
         Button reset = findViewById(R.id.resetButton);
 
         toMain.setOnClickListener(view -> {
-            Intent intent = new Intent(SetUpActivity.this,MainActivity.class); //main画面へ戻る処理
+            Intent intent = new Intent(SetUpActivity.this, SettingView.class); //main画面へ戻る処理
             startActivity(intent);
         });
 
         setUp.setOnClickListener(view -> {
 
-            teacherName = setTeacherName.getText().toString(); //各変数に値を挿入
-            Log.d(TAG, "Teacher Name: " + teacherName);
-            startPoint = setStartPoint.getText().toString();
-            Log.d(TAG, "Start Point: " + startPoint);
-            Log.d(TAG, "First Day:" + firstDay);
-            Log.d(TAG, "Second Day:" + secondDay);
-            Log.d(TAG, "Third Day:" + thirdDay);
-            Log.d(TAG, "Start Time" + startTime);
-            Log.d(TAG, "End Time" + endTime);
-            if (setTenMinute.isChecked()){                    //ラジオボタンの状態を取得
-                intervalTime = "10";
-            } else if (setFifteenMinute.isChecked()) {
-                intervalTime = "15";
-            } else if (setThirtyMinute.isChecked()) {
-                intervalTime = "30";
-            } else {
-                intervalTime = "0";
-            }
-            Log.d(TAG, "Interval Time" + intervalTime);
-            Log.d(TAG, "Start Break Time" + startBreakTime);
-            Log.d(TAG, "End Break Time" + endBreakTime);
-            totalStudent = Integer.parseInt(setTotalStudent.getText().toString()); //数値型に変更
-            Log.d(TAG, "Total Student" + totalStudent);
-            Log.d(TAG, "onClick: できてるよ");
+            teacherNameString = setTeacherName.getText().toString(); //各変数に値を挿入
+            startPointString = setStartPoint.getText().toString();
+            firstDayString = setFirstDay.getText().toString();
+            secondDayString = setSecondDay.getText().toString();
+            thirdDayString = setThirdDay.getText().toString();
+            startTimeString = setStartTime.getText().toString();
+            endTimeString = setEndTime.getText().toString();
+            startBreakTimeString = setStartBreakTime.getText().toString();
+            endBreakTimeString = setEndBreakTime.getText().toString();
 
+            try {
+                totalStudentString = Integer.parseInt(setTotalStudent.getText().toString());
+            } catch (NumberFormatException e) {
+                Toast.makeText(SetUpActivity.this, "記入欄にすべて入力を済ませてから押してください", Toast.LENGTH_SHORT).show();
+                return;
+            }
+            Log.d(TAG, "Teacher Name: " + teacherNameString);
+            Log.d(TAG, "Start Point: " + startPointString);
+            Log.d(TAG, "First Day:" + firstDayString);
+            Log.d(TAG, "Second Day:" + secondDayString);
+            Log.d(TAG, "Third Day:" + thirdDayString);
+            Log.d(TAG, "Start Time" + startTimeString);
+            Log.d(TAG, "End Time" + endTimeString);
+            if (setTenMinute.isChecked()) {                    //ラジオボタンの状態を取得
+                intervalTimeString = "10";
+            } else if (setFifteenMinute.isChecked()) {
+                intervalTimeString = "15";
+            } else if (setThirtyMinute.isChecked()) {
+                intervalTimeString = "30";
+            } else {
+                intervalTimeString = "0";
+            }
+            Log.d(TAG, "Interval Time" + intervalTimeString);
+            Log.d(TAG, "Start Break Time" + startBreakTimeString);
+            Log.d(TAG, "End Break Time" + endBreakTimeString);
+            Log.d(TAG, "Total Student" + totalStudentString);
+            Log.d(TAG, "onClick: できてるよ");
 
             // データベースへの登録処理
             ExecutorService executor = Executors.newSingleThreadExecutor();
@@ -147,19 +152,19 @@ public class SetUpActivity extends FragmentActivity
                 SetUpTableDao setUpTableDao = db.setUpTableDao();
                 // Roomの操作を行う
                 SetUpTable setUpTable = new SetUpTable(
-                        teacherName,
-                        startPoint,
-                        startTime,
-                        endTime,
-                        intervalTime,
-                        startBreakTime,
-                        endBreakTime,
-                        totalStudent,
-                        classId
+                        teacherNameString,
+                        startPointString,
+                        startTimeString,
+                        endTimeString,
+                        intervalTimeString,
+                        startBreakTimeString,
+                        endBreakTimeString,
+                        totalStudentString,
+                        classIdInt
                 );
 
                 // 同じ名前のエントリが存在するかどうかを確認
-                SetUpTable existingSetUpTable = setUpTableDao.findByName(teacherName);
+                SetUpTable existingSetUpTable = setUpTableDao.findByName(teacherNameString);
                 if (existingSetUpTable != null) {
                     // エントリが存在する場合は、そのエントリを更新
                     setUpTable.setId(existingSetUpTable.getId()); // 既存のIDを設定
@@ -175,49 +180,48 @@ public class SetUpActivity extends FragmentActivity
                 SharedPreferences sharedPreferences = getSharedPreferences("visitingDate", MODE_PRIVATE);
                 SharedPreferences.Editor editor = sharedPreferences.edit();
 
-                editor.putString("day1",firstDay);
-                editor.putString("day2",secondDay);
-                editor.putString("day3",thirdDay);
+                editor.putString("day1", firstDayString);
+                editor.putString("day2", secondDayString);
+                editor.putString("day3", thirdDayString);
 
                 editor.apply();
 
             });
 
-
         });
 
         setFirstDay.setOnClickListener(v -> {
-            isDateSelected = 1;
+            isDateSelectedInt = 1;
             showDatePickerDialog(); //DatePickerの表示
         });
 
         setSecondDay.setOnClickListener(v -> {
-            isDateSelected = 2;
+            isDateSelectedInt = 2;
             showDatePickerDialog();
         });
 
         setThirdDay.setOnClickListener(v -> {
-            isDateSelected = 3;
+            isDateSelectedInt = 3;
             showDatePickerDialog();
         });
 
         setStartTimeButton.setOnClickListener(v -> {
-            isStartTimeSelected = 1; //ボタンの判別
+            isStartTimeSelectedInt = 1; //ボタンの判別
             showTimePickerDialog(); //TimePickerの表示
         });
 
         setEndTimeButton.setOnClickListener(v -> {
-            isStartTimeSelected = 2;
+            isStartTimeSelectedInt = 2;
             showTimePickerDialog();
         });
 
         setStartBreakTime.setOnClickListener(v -> {
-            isStartTimeSelected = 3;
+            isStartTimeSelectedInt = 3;
             showTimePickerDialog();
         });
 
         setEndBreakTime.setOnClickListener(v -> {
-            isStartTimeSelected = 4;
+            isStartTimeSelectedInt = 4;
             showTimePickerDialog();
         });
 
@@ -242,30 +246,31 @@ public class SetUpActivity extends FragmentActivity
         });
     }
 
+
     @Override
     public void onDateSet(DatePicker datePicker, int year, int month, int dayOfMonth) { //Dateを成形する
         // DatePickerDialogで選択された日付を処理する
         String str = String.format(Locale.JAPAN, "%02d/%02d", month + 1, dayOfMonth); // TextViewに表示する日付の形式を設定
 
-        if (isDateSelected == 1) {
-            stringYear = String.valueOf(year);                                          //年
-            stringMonth = String.format(Locale.JAPAN, "%02d", month + 1); //月
-            stringDayOfMonth = String.format(Locale.JAPAN, "%02d", dayOfMonth);  //日
-            firstDay = stringYear + stringMonth + stringDayOfMonth;
+        if (isDateSelectedInt == 1) {
+            stringYearString = String.valueOf(year);                                          //年
+            stringMonthString = String.format(Locale.JAPAN, "%02d", month + 1); //月
+            stringDayOfMonthString = String.format(Locale.JAPAN, "%02d", dayOfMonth);  //日
+            firstDayString = stringYearString + stringMonthString + stringDayOfMonthString;
             setFirstDay.setText(str);
-        } else if (isDateSelected == 2) {
-            stringYear = String.valueOf(year);
-            stringMonth = String.format(Locale.JAPAN, "%02d", month + 1);
-            stringDayOfMonth = String.format(Locale.JAPAN, "%02d", dayOfMonth);
-            secondDay = stringYear + stringMonth + stringDayOfMonth;
+        } else if (isDateSelectedInt == 2) {
+            stringYearString = String.valueOf(year);
+            stringMonthString = String.format(Locale.JAPAN, "%02d", month + 1);
+            stringDayOfMonthString = String.format(Locale.JAPAN, "%02d", dayOfMonth);
+            secondDayString = stringYearString + stringMonthString + stringDayOfMonthString;
             setSecondDay.setText(str);
 
 
-        } else if (isDateSelected == 3) {
-            stringYear = String.valueOf(year);
-            stringMonth = String.format(Locale.JAPAN, "%02d", month + 1);
-            stringDayOfMonth = String.format(Locale.JAPAN, "%02d", dayOfMonth);
-            thirdDay = stringYear + stringMonth + stringDayOfMonth;
+        } else if (isDateSelectedInt == 3) {
+            stringYearString = String.valueOf(year);
+            stringMonthString = String.format(Locale.JAPAN, "%02d", month + 1);
+            stringDayOfMonthString = String.format(Locale.JAPAN, "%02d", dayOfMonth);
+            thirdDayString = stringYearString + stringMonthString + stringDayOfMonthString;
             setThirdDay.setText(str);
 
         }
@@ -276,28 +281,28 @@ public class SetUpActivity extends FragmentActivity
     public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
         String str = String.format(Locale.JAPAN, "%02d:%02d", hourOfDay, minute); // Textviewに保存する形式を設定
 
-        if (isStartTimeSelected == 1) {
-            stringHourOfDay = String.format("%02d", hourOfDay);
-            stringMinute = String.format("%02d", minute);
-            startTime = stringHourOfDay + stringMinute;
+        if (isStartTimeSelectedInt == 1) {
+            stringHourOfDayString = String.format("%02d", hourOfDay);
+            stringMinuteString = String.format("%02d", minute);
+            startTimeString = stringHourOfDayString + stringMinuteString;
             setStartTime.setText(str);
 
-        } else if (isStartTimeSelected == 2) {
-            stringHourOfDay = String.format("%02d", hourOfDay);
-            stringMinute = String.format("%02d", minute);
-            endTime = stringHourOfDay + stringMinute;
+        } else if (isStartTimeSelectedInt == 2) {
+            stringHourOfDayString = String.format("%02d", hourOfDay);
+            stringMinuteString = String.format("%02d", minute);
+            endTimeString = stringHourOfDayString + stringMinuteString;
             setEndTime.setText(str);
 
-        } else if (isStartTimeSelected == 3) {
-            stringHourOfDay = String.format("%02d", hourOfDay);
-            stringMinute = String.format("%02d", minute);
-            startBreakTime =stringHourOfDay + stringMinute;
+        } else if (isStartTimeSelectedInt == 3) {
+            stringHourOfDayString = String.format("%02d", hourOfDay);
+            stringMinuteString = String.format("%02d", minute);
+            startBreakTimeString = stringHourOfDayString + stringMinuteString;
             setStartBreakTime.setText("　" + str + "　");
 
-        } else if (isStartTimeSelected == 4) {
-            stringHourOfDay = String.format("%02d", hourOfDay);
-            stringMinute = String.format("%02d", minute);
-            endBreakTime = stringHourOfDay + stringMinute;
+        } else if (isStartTimeSelectedInt == 4) {
+            stringHourOfDayString = String.format("%02d", hourOfDay);
+            stringMinuteString = String.format("%02d", minute);
+            endBreakTimeString = stringHourOfDayString + stringMinuteString;
             setEndBreakTime.setText("　" + str + "　");
         }
     }

app/src/main/java/com/example/oplogy/SetUpTableDao.java

@@ -33,6 +33,8 @@ public interface SetUpTableDao {
     @Query("SELECT endTime FROM SetUpTable")
     String getEndTime();
     //教師名の取得
+    @Query("SELECT teacherName FROM SetUpTable")
+    String getTeacherName();
     @Query("SELECT intervalTime FROM SetUpTable")
     String getIntervalTime();
     @Query("SELECT StartBreakTime FROM SetUpTable")
@@ -42,4 +44,9 @@ public interface SetUpTableDao {
     //クラスIDの取得
     @Query("SELECT classId FROM SetUpTable")
     int getClassId();
+
+    @Query("SELECT startPoint FROM setuptable")
+    String getStartPoint();
+
+
 }

app/src/main/java/com/example/oplogy/SettingView.java

@@ -0,0 +1,190 @@
+package com.example.oplogy;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.room.Room;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+public class SettingView extends AppCompatActivity implements View.OnClickListener {
+    //    formコピー用のURL
+    private static final String URL_TO_COPY = "https://docs.google.com/forms/d/e/1FAIpQLScKI_ca01nO7die7SqZyThiqa7NB7gcucMJtiV_-sc3eZX6KQ/viewform";
+
+    private View backButton;
+    private View creatUUID;
+    private View imageUuid;
+    private View setUp;
+    private View imageSetup;
+    private View formURL;
+    private View imageFormURL;
+    private AlertDialog alertDialog;
+    private int classId;
+    private FirestoreReception_classIdDatabase firestoreReception_classIdDatabase;
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_setting_view);
+
+        // 戻るボタンの処理
+        backButton = findViewById(R.id.BackMain_fromSetting);
+        backButton.setOnClickListener(this);
+
+        //        ID作成用のインテント
+        creatUUID = findViewById(R.id.creatUUID);
+        creatUUID.setOnClickListener(this);
+        imageUuid = findViewById(R.id.imageUuid);
+        imageUuid.setOnClickListener(this);
+
+
+//        セットアップ用のインテント
+        setUp = findViewById(R.id.setUp);
+        setUp.setOnClickListener(this);
+        imageSetup = findViewById(R.id.imageSetup);
+        imageSetup.setOnClickListener(this);
+
+//        formコピー用のインテント
+        formURL = findViewById(R.id.formURL);
+        formURL.setOnClickListener(this);
+        imageFormURL = findViewById(R.id.imageFormURL);
+        imageFormURL.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == backButton) {
+            Intent intent = new Intent(SettingView.this, MainActivity.class);
+            startActivity(intent);
+        }
+        //        ID作成のクリック処理
+        if (view == creatUUID) {
+            showUUIDYesNoDialog();//UUIDを表示するかのダイアログ
+        }
+        if (view == imageUuid) {
+            showUUIDYesNoDialog();//UUIDを表示するかのダイアログ
+        }
+//        セットアップのクリック処理
+        if (view == setUp) {
+            Intent toSetup = new Intent(SettingView.this, SetUpActivity.class);
+            toSetup.putExtra("classId", classId);
+            startActivity(toSetup);
+        }
+        if (view == imageSetup) {
+            Intent toSetup = new Intent(SettingView.this, SetUpActivity.class);
+            startActivity(toSetup);
+        }
+
+//      formコピー用のクリック処理
+        if (view == formURL) {
+            copyUrlToClipboard(URL_TO_COPY);
+        }
+        if (view == imageFormURL) {
+            copyUrlToClipboard(URL_TO_COPY);
+        }
+    }
+
+
+    //ID作成、表示に関する処理
+    private void showUUIDYesNoDialog() {
+        firestoreReception_classIdDatabase = new FirestoreReception_classIdDatabase();
+        List<Integer> classIdList = firestoreReception_classIdDatabase.getAllDocumentsFromClassIdDatabase();
+
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle("ID");
+        builder.setMessage("あなたのIDを表示/もしくは新規で作成しますか？");
+
+        //作成処理
+        builder.setPositiveButton("作成", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                classId = CreateUUID.generateUUID(classIdList);
+                // 生成されたIDを表示するメソッド
+                showClassIdDialog("生成されたID", classId);
+            }
+        });
+        //表示処理
+        builder.setNegativeButton("表示", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                //roomを扱うため非同期処理
+                ExecutorService executor = Executors.newSingleThreadExecutor();
+                executor.execute(() -> {
+                    // 現在のクラスIDを取得
+                    int currentClassId = getCurrentClassIdFromRoom();
+                    if (currentClassId == 0) {
+                        currentClassId = classId;
+                    }
+                    final int showDialogClassId = currentClassId;
+                    runOnUiThread(() -> {
+                        // 現在のクラスIDを表示するダイアログ
+                        showClassIdDialog("現在のID", showDialogClassId);
+                    });
+                });
+                executor.shutdown();
+            }
+        });
+
+        alertDialog = builder.create();
+        alertDialog.show();
+
+    }
+
+    //Roomから現在のクラスIDを取得するメソッド
+    private int getCurrentClassIdFromRoom() {
+        AppDatabase db = getDatabaseInstance();
+        SetUpTableDao setUpTableDao = db.setUpTableDao();
+
+        // 現在のクラスIDを取得
+        return setUpTableDao.getClassId();
+    }
+
+    //クラスIDを表示するダイアログ
+    private void showClassIdDialog(String title, int classId) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle(title);
+        builder.setMessage("ID: " + classId);
+        builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.dismiss();
+            }
+        });
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    //クリップボードにURLをコピーする処理
+    private void copyUrlToClipboard(String url) {
+        try {
+            ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+            ClipData clip = ClipData.newPlainText("URL", url);
+            if (clipboard != null) {
+                clipboard.setPrimaryClip(clip);
+                Toast.makeText(this, "GoogleFormのURLをコピーしました", Toast.LENGTH_SHORT).show();
+            } else {
+                Toast.makeText(this, "エラー コピーできませんでした", Toast.LENGTH_SHORT).show();
+            }
+        } catch (Exception e) {
+            Toast.makeText(this, "Error copying URL: " + e.getMessage(), Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    //  データベースのインスタンスを取得するメソッド
+    private AppDatabase getDatabaseInstance() {
+        return Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "SetUpTable").build();
+    }
+
+}

app/src/main/java/com/example/oplogy/SubmissionActivity.java

@@ -1,23 +1,21 @@
 package com.example.oplogy;
 
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.ImageView;
+import android.widget.Toast;
+
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import android.os.Bundle;
-import android.widget.ImageView;
-
-import com.example.oplogy.databinding.SubmissionBinding;
-
 import java.util.ArrayList;
 import java.util.List;
 
 public class SubmissionActivity extends AppCompatActivity {
+    private final List<SubmissionStudent> studentsList = new ArrayList<>();
     private RecyclerView recyclerView;
     private SubmissionAdapter submissionAdapter;
-    private List<SubmissionStudent> students = new ArrayList<>();
-    ArrayList<Integer> studentNumbers = new ArrayList<>();
-    private int totalStudent = 10;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -26,33 +24,32 @@ public class SubmissionActivity extends AppCompatActivity {
 
         // 戻るボタンの処理
         ImageView backButton = findViewById(R.id.BackMain_fromSubmission);
-        backButton.setOnClickListener(v -> {
-            finish();
-        });
-
-
-        // インテントから提出状況の生徒の数を取得
-        studentNumbers=getIntent().getIntegerArrayListExtra("submissionStudents");
+        backButton.setOnClickListener(v -> finish());
 
+        // RecyclerViewとアダプターの初期化
         recyclerView = findViewById(R.id.recyclerView);
         recyclerView.setLayoutManager(new LinearLayoutManager(this));
-        submissionAdapter = new SubmissionAdapter(students);
+        submissionAdapter = new SubmissionAdapter(studentsList);
         recyclerView.setAdapter(submissionAdapter);
 
         // 生徒のリストを取得
         fetchStudents();
     }
+
     private void fetchStudents() {
         // インテントから生徒のリストを取得
-        ArrayList<SubmissionStudent> submissionStudents = getIntent().getParcelableArrayListExtra("submissionStudents");
+        ArrayList<SubmissionStudent> submissionStudentsList = getIntent().getParcelableArrayListExtra("submissionStudents");
 
-        // 生徒のリストを反復処理し、それをRecyclerViewに表示
-        for (SubmissionStudent student : submissionStudents) {
-            students.add(student);
+        if (submissionStudentsList != null) {
+            Log.d("SubmissionActivity", "Size of submissionStudentsList: " + submissionStudentsList.size());
+
+            studentsList.addAll(submissionStudentsList);
+        } else {
+            Log.e("SubmissionActivity", "submissionStudentsList is null");
+            Toast.makeText(this, "生徒のリストが取得できませんでした", Toast.LENGTH_SHORT).show();
         }
 
         // データが変更されたことをアダプターに通知
         submissionAdapter.notifyDataSetChanged();
     }
 }
-

app/src/main/java/com/example/oplogy/SubmissionAdapter.java

@@ -5,12 +5,58 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.List;
 
 public class SubmissionAdapter extends RecyclerView.Adapter<SubmissionAdapter.StudentViewHolder> {
 
-    private List<SubmissionStudent> students;
+    private final List<SubmissionStudent> studentsList;
+
+    public SubmissionAdapter(List<SubmissionStudent> students) {
+        this.studentsList = students;
+    }
+
+    @NonNull
+    @Override
+    public StudentViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.row_submission, parent, false);
+        return new StudentViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(StudentViewHolder holder, int position) {
+        SubmissionStudent student = studentsList.get(position);
+        holder.studentNumberTextView.setText(String.valueOf(student.getStudentNumber()));
+        updateStatus(holder, student.isSubmitted());
+    }
+
+    @Override
+    public int getItemCount() {
+        return studentsList.size();
+    }
+
+    //真偽値に応じて提出済みか未提出をセットする
+    private void updateStatus(StudentViewHolder holder, boolean isSubmitted) {
+        if (isSubmitted) {
+            holder.statusTextView.setText("提出済み");
+            setColors(holder, Color.BLACK, Color.WHITE);
+        } else {
+            holder.statusTextView.setText("未提出");
+            setColors(holder, Color.RED, Color.WHITE);
+        }
+    }
+
+    //真偽値に応じて色をセットする
+    private void setColors(StudentViewHolder holder, int backgroundColor, int textColor) {
+        holder.statusTextView.setBackgroundColor(backgroundColor);
+        holder.statusTextView.setTextColor(textColor);
+        holder.studentNumberTextView.setBackgroundColor(backgroundColor);
+        holder.studentNumberTextView.setTextColor(textColor);
+    }
 
     public static class StudentViewHolder extends RecyclerView.ViewHolder {
         public TextView studentNumberTextView;
@@ -23,40 +69,4 @@ public class SubmissionAdapter extends RecyclerView.Adapter<SubmissionAdapter.St
             statusTextView = view.findViewById(R.id.statusTextView);
         }
     }
-
-    public SubmissionAdapter(List<SubmissionStudent> students) {
-        this.students = students;
-    }
-
-    @Override
-    public StudentViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(parent.getContext())
-                .inflate(R.layout.row_submission, parent, false);
-        return new StudentViewHolder(view);
-    }
-
-    @Override
-    public void onBindViewHolder(StudentViewHolder holder, int position) {
-        SubmissionStudent student = students.get(position);
-        holder.studentNumberTextView.setText(String.valueOf(student.getStudentNumber()));
-        // 提出済みかどうかで表示を変える
-        if (student.isSubmitted()) {
-            holder.statusTextView.setText("提出済み");
-            holder.statusTextView.setBackgroundColor(Color.BLACK);
-            holder.statusTextView.setTextColor(Color.WHITE);
-            holder.studentNumberTextView.setBackgroundColor(Color.BLACK);
-            holder.studentNumberTextView.setTextColor(Color.WHITE);
-        } else {
-            holder.statusTextView.setText("未提出");
-            holder.statusTextView.setBackgroundColor(Color.RED);
-            holder.statusTextView.setTextColor(Color.WHITE);
-            holder.studentNumberTextView.setBackgroundColor(Color.RED);
-            holder.studentNumberTextView.setTextColor(Color.WHITE);
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return students.size();
-    }
 }

app/src/main/java/com/example/oplogy/SubmissionStudent.java

@@ -3,16 +3,16 @@ import android.os.Parcel;
 import android.os.Parcelable;
 
 public class SubmissionStudent implements Parcelable {
-    private int studentNumber;
+    private int studentNumberInt;
     private boolean submitted;
 
     public SubmissionStudent(int studentNumber, boolean submitted) {
-        this.studentNumber = studentNumber;
+        this.studentNumberInt = studentNumber;
         this.submitted = submitted;
     }
 
     protected SubmissionStudent(Parcel in) {
-        studentNumber = in.readInt();
+        studentNumberInt = in.readInt();
         submitted = in.readByte() != 0;
     }
 
@@ -29,7 +29,7 @@ public class SubmissionStudent implements Parcelable {
     };
 
     public int getStudentNumber() {
-        return studentNumber;
+        return studentNumberInt;
     }
 
     public boolean isSubmitted() {
@@ -43,7 +43,7 @@ public class SubmissionStudent implements Parcelable {
 
     @Override
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeInt(studentNumber);
+        parcel.writeInt(studentNumberInt);
         parcel.writeByte((byte) (submitted ? 1 : 0));
     }
 }

app/src/main/java/com/example/oplogy/TimePick.java

@@ -2,7 +2,6 @@ package com.example.oplogy;
 
 import android.app.Dialog;
 import android.app.TimePickerDialog;
-import android.content.Context;
 import android.os.Bundle;
 import android.widget.TimePicker;
 
@@ -18,14 +17,14 @@ public class TimePick extends DialogFragment implements
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) { // TimePeckerの生成
         final Calendar c = Calendar.getInstance();
-        int hour = c.get(Calendar.HOUR_OF_DAY);
-        int minute = c.get(Calendar.MINUTE);
+        int hourInt = c.get(Calendar.HOUR_OF_DAY);
+        int minuteInt = c.get(Calendar.MINUTE);
 
-        return new TimePickerDialog((Context) getActivity(),
-                (TimePickerDialog.OnTimeSetListener) getActivity(), hour, minute, true);
+        return new TimePickerDialog(getActivity(),
+                (TimePickerDialog.OnTimeSetListener) getActivity(), hourInt, minuteInt, true);
     }
 
     @Override
-    public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
+    public void onTimeSet(TimePicker view, int hourOfDayInt, int minuteInt) {
     }
 }

app/src/main/java/com/example/oplogy/TutorialActivity.java

@@ -1,14 +0,0 @@
-package com.example.oplogy;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.os.Bundle;
-
-public class TutorialActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.tutorial);
-    }
-}

app/src/main/res/layout/activity_setting_view.xml

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:weightSum="13"
+    tools:context=".SettingView">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="2"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:weightSum="10">
+
+        <ImageView
+            android:id="@+id/BackMain_fromSetting"
+            android:layout_width="36dp"
+            android:layout_height="74dp"
+            android:layout_weight="3"
+            android:src="@drawable/back_button" />
+
+        <TextView
+            android:id="@+id/Setting"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="7"
+            android:padding="8dp"
+            android:text="設定"
+            android:textSize="40dp" />
+    </LinearLayout>
+
+    <!--    ID作成のレイアウト-->
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_gravity="center"
+        android:layout_weight="3"
+        android:orientation="horizontal"
+        android:weightSum="2">
+
+        <ImageView
+            android:id="@+id/imageUuid"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="16dp"
+            android:src="@drawable/createid" />
+
+        <TextView
+            android:id="@+id/creatUUID"
+            android:layout_width="99dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:gravity="left"
+            android:text="ID作成"
+            android:textSize="50dp" />
+
+    </LinearLayout>
+
+
+    <!--    セットアップのレイアウト-->
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_gravity="center"
+        android:layout_weight="3"
+        android:orientation="horizontal"
+
+        android:weightSum="2">
+
+        <ImageView
+            android:id="@+id/imageSetup"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="16dp"
+            android:src="@drawable/settingsetup" />
+
+        <TextView
+            android:id="@+id/setUp"
+            android:layout_width="99dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:gravity="left"
+            android:text="家庭訪問情報"
+            android:textSize="36dp"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+    <!--    フォームのURLのレイアウト-->
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:layout_gravity="center"
+        android:layout_weight="3"
+        android:orientation="horizontal"
+        android:weightSum="2">
+
+        <ImageView
+            android:id="@+id/imageFormURL"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:padding="16dp"
+            android:src="@drawable/form" />
+
+        <TextView
+            android:id="@+id/formURL"
+            android:layout_width="99dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:gravity="left"
+            android:text="GoogleformのURL"
+            android:textSize="28dp"
+            android:textStyle="bold" />
+    </LinearLayout>
+
+</LinearLayout>

app/src/main/res/layout/main.xml

@@ -1,146 +1,148 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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"
     android:orientation="vertical"
     android:weightSum="20"
     tools:context=".MainActivity">
+
     <Space
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="2" />
 
 
-<!--    ID作成のレイアウト-->
+    <!--    タイトルのレイアウト-->
+
+
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="400dp"
         android:layout_height="0dp"
-        android:layout_weight="3"
-        android:weightSum="2"
-        android:orientation="horizontal">
+        android:layout_gravity="center"
+        android:layout_weight="4"
+        android:orientation="horizontal"
+        android:weightSum="3">
 
         <ImageView
-            android:id="@+id/imageUuid"
+            android:id="@+id/imageTitle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:src="@drawable/checked_image"
             android:layout_weight="1"
-            />
+            android:src="@drawable/app_icon" />
 
         <TextView
-            android:id="@+id/creatUUID"
+            android:id="@+id/title"
             android:layout_width="99dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_weight="1"
+            android:layout_weight="2"
             android:gravity="left"
-            android:text="ID作成"
-            android:textSize="50dp"
-            />
-
+            android:text="OPLOGY"
+            android:textSize="60dp"
+            android:textStyle="bold" />
     </LinearLayout>
 
-
-<!--    セットアップのレイアウト-->
-    <LinearLayout
+    <Space
         android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_weight="3"
-        android:weightSum="2"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/imageSetup"
-            android:layout_width="0dp"
         android:layout_height="wrap_content"
-            android:src="@drawable/checked_image"
-            android:layout_weight="1"
-            />
-
-        <TextView
-            android:id="@+id/setUp"
-            android:layout_width="99dp"
-            android:layout_height="wrap_content"
-            android:text="セットアップ"
-            android:textSize="40dp"
-            android:textStyle="bold"
-            android:layout_weight="1"
-            android:gravity="left"
-            android:layout_gravity="center"/>
-    </LinearLayout>
-
+        android:layout_weight="2" />
 
 
     <!--    ルート表示のレイアウト-->
     <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>
 
     <Space
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="3"/>
+        android:layout_weight="0.5" />
 
 
     <!--    提出状況のレイアウト-->
     <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>
+
+    <Space
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.5" />
+
+    <!--    諸々の設定のレイアウト-->
+    <LinearLayout
+        android:layout_width="350dp"
+        android:layout_height="0dp"
+        android:layout_gravity="center"
+        android:layout_weight="3"
+        android:orientation="horizontal"
+        android:weightSum="2">
+
+        <ImageView
+            android:id="@+id/imageSetting"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:src="@drawable/setting" />
+
+        <TextView
+            android:id="@+id/setting"
+            android:layout_width="99dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:gravity="left"
+            android:text="設定"
+            android:textSize="40dp"
+            android:textStyle="bold" />
     </LinearLayout>
 
 
-
-
-
-
-
 </LinearLayout>

app/src/main/res/layout/maps.xml

@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:weightSum="10"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     tools:context=".Maps">
 
-    <!--    <fragment xmlns:android="http://schemas.android.com/apk/res/android"-->
-    <!--    xmlns:tools="http://schemas.android.com/tools"-->
-    <!--    xmlns:map="http://schemas.android.com/apk/res-auto"-->
-    <!--    android:layout_width="match_parent"-->
-    <!--    android:layout_height="match_parent"-->
-    <!--    android:id="@+id/map"-->
-    <!--    android:name="com.google.android.gms.maps.SupportMapFragment"/>-->
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -28,17 +20,13 @@
             android:layout_width="40dp"
             android:layout_height="90dp"
             android:src="@drawable/back_button"
-            android:layout_weight="5"
-            />
+            android:layout_weight="3" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="4"
+        <Spinner
             android:id="@+id/date"
-            android:hint="今日の日付"
-            android:textSize="40dp"
-            />
+            android:layout_width="wrap_content"
+            android:layout_height="90dp"
+            android:layout_weight="7" />
     </LinearLayout>
 
     <fragment
@@ -48,14 +36,23 @@
         android:layout_height="0dp"
         android:layout_weight="6"
         tools:context=".Maps" />
-
-
-    <ScrollView
-        android:id="@+id/scrollable"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="3"
-        />
-
+        android:gravity="center"
+        android:orientation="horizontal"
+        >
+    <ScrollView
+        android:id="@+id/scrollable"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+       >
+        <LinearLayout
+            android:id="@+id/locationsName"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical" />
+    </ScrollView>
+</LinearLayout>
 </LinearLayout>
-

app/src/main/res/layout/root_search.xml

@@ -1,9 +0,0 @@
-<?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=".RootSearchActivity">
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/row_submission.xml

@@ -4,7 +4,6 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
-
     <TextView
         android:id="@+id/studentNumberTextView"
         android:layout_width="0dp"
@@ -22,10 +21,10 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="3"
-        android:text="提出状況"
-        android:textSize="36sp"
+        android:background="@android:color/white"
         android:gravity="center_vertical"
         android:paddingStart="8dp"
-        android:background="@android:color/white"
-        android:textColor="@android:color/black" />
+        android:text="提出状況"
+        android:textColor="@android:color/black"
+        android:textSize="36sp" />
 </LinearLayout>

app/src/main/res/layout/submission.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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"
@@ -10,7 +9,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
         android:layout_weight="1"
         android:gravity="center"
         android:orientation="horizontal"
@@ -29,15 +28,15 @@
             android:layout_height="wrap_content"
             android:layout_weight="4"
             android:hint="提出状況"
-            android:textSize="40dp"
             android:padding="8dp"
-            />
+            android:textSize="40dp" />
     </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
+        android:layout_height="0dp"
+        android:layout_weight="9"
+        android:scrollbars="vertical" />
 
 </LinearLayout>

app/src/main/res/layout/tutorial.xml

@@ -1,9 +0,0 @@
-<?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=".TutorialActivity">
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>

app/src/main/res/values/strings.xml

@@ -1,8 +1,9 @@
 <resources>
-    <string name="app_name">oplogy</string>
+    <string name="app_name">Oplogy</string>
+    <string name="maps_api_key">AIzaSyBqLqPm76UFpwbpU8b3oiH0wbkhosrPWpU</string>
     <string name="title_activity_maps">MapsActivity</string>
     <string name="setUp">設定</string>
-    <string name="reset">リセット</string>
+    <string name="reset">データ削除</string>
     <string name="teacherName">担任の名前</string>
     <string name="startPoint">開始地点</string>
     <string name="startTime">開始時刻</string>
@@ -11,7 +12,6 @@
     <string name="breakTime">休憩時間</string>
     <string name="totalStudent">生徒の人数</string>
     <string name="timeSet">時刻設定</string>
-    <string name="Back">🔙</string>
     <string name="startpoint">住所</string>
     <string name="tenMinute">10分</string>
     <string name="fifteenMinute">15分</string>