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 @@ + 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 @@ - + 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 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