From 8e8916c47b32a962fb9c99143b3ecd7b84ae844c Mon Sep 17 00:00:00 2001
From: nemukemo <hiroaka201432@gmail.com>
Date: Tue, 18 Jun 2024 19:24:58 +0900
Subject: [PATCH] Revert "revert 25bc379d25822b3dfd8c6907ae017ed2296dc8cd"

This reverts commit 4ba64373572fe9b750889e666c565c5a142ef896.
---
 .idea/gradle.xml                                         | 1 +
 .idea/misc.xml                                           | 2 +-
 .../main/java/com/example/oplogy/FirestoreReception.java | 9 +++++++++
 .../oplogy/{SetupActivity.java => SetUpActivity.java}    | 0
 4 files changed, 11 insertions(+), 1 deletion(-)
 rename app/src/main/java/com/example/oplogy/{SetupActivity.java => SetUpActivity.java} (100%)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a2d7c21..ae388c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 773fe0f..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/example/oplogy/FirestoreReception.java b/app/src/main/java/com/example/oplogy/FirestoreReception.java
index f8a71aa..164e52f 100644
--- a/app/src/main/java/com/example/oplogy/FirestoreReception.java
+++ b/app/src/main/java/com/example/oplogy/FirestoreReception.java
@@ -19,6 +19,9 @@ public class FirestoreReception {
         db = FirebaseFirestore.getInstance();
     }
 
+    //firestoreから受け取ったデータを束ねるためのマップ
+    public Map<String, Object> firestoreData;
+
     //ClassIdを引数にデータの作成を行う
     public void getDocumentsByClassId(int classId, MainActivity context) {
         CollectionReference collectionRef = db.collection("QuestionnaireForms");
@@ -36,11 +39,17 @@ public class FirestoreReception {
                                 // CreateRootクラスのインスタンスを作成し、dataを引数として渡す
                                 GeoCoder geoCoder = new GeoCoder();
                                 geoCoder.processData(data, context);
+
+                                // firestoreDataにdataを追加
+                                firestoreData = data;
+
                             }
                         } else {
                             Log.w("FirestoreReception", "Error getting documents.", task.getException());
                         }
+                        Log.w ("FirestoreReception", "firestoreData: " + firestoreData.size());
                     }
                 });
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/oplogy/SetupActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
similarity index 100%
rename from app/src/main/java/com/example/oplogy/SetupActivity.java
rename to app/src/main/java/com/example/oplogy/SetUpActivity.java