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

Reviewed-on: #60

app/src/main/AndroidManifest.xml

@@ -43,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/CreateUUID.java

@@ -21,8 +21,6 @@ public class CreateUUID {
                 //firestoreに挿入処理
                 InsertClassIdforFirebase insertClassIdforFirebase = new InsertClassIdforFirebase();
                 insertClassIdforFirebase.insertClassId(uuidInt);
-                //テスト用
-                uuidInt = 328071;
                 return uuidInt;
             }
         }

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

@@ -27,12 +27,9 @@ public class FirestoreReception {
     //ClassIdを引数にデータの作成を行う
     public void getDocumentsByClassId(int classId) {
         myDataList.clear();
-        //pixel6a
+        CollectionReference collectionRef = db.collection("QuestionForm");
-        CollectionReference collectionRef = db.collection("test0711Data");
+
 
-        //xiaomi
-//        CollectionReference collectionRef = db.collection("testDistinct");
-        // classIdが引数のものを取得する
         collectionRef.whereEqualTo("classId", classId).get()
                 .addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
                     @Override

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

@@ -104,8 +104,22 @@ public class SetUpActivity extends FragmentActivity
         setUp.setOnClickListener(view -> {
 
             teacherNameString = setTeacherName.getText().toString(); //各変数に値を挿入
-            Log.d(TAG, "Teacher Name: " + teacherNameString);
             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);
@@ -124,11 +138,9 @@ public class SetUpActivity extends FragmentActivity
             Log.d(TAG, "Interval Time" + intervalTimeString);
             Log.d(TAG, "Start Break Time" + startBreakTimeString);
             Log.d(TAG, "End Break Time" + endBreakTimeString);
-            totalStudentString = Integer.parseInt(setTotalStudent.getText().toString()); //数値型に変更
             Log.d(TAG, "Total Student" + totalStudentString);
             Log.d(TAG, "onClick: できてるよ");
 
-
             // データベースへの登録処理
             ExecutorService executor = Executors.newSingleThreadExecutor();
 
@@ -176,7 +188,6 @@ public class SetUpActivity extends FragmentActivity
 
             });
 
-
         });
 
         setFirstDay.setOnClickListener(v -> {
@@ -235,6 +246,7 @@ public class SetUpActivity extends FragmentActivity
         });
     }
 
+
     @Override
     public void onDateSet(DatePicker datePicker, int year, int month, int dayOfMonth) { //Dateを成形する
         // DatePickerDialogで選択された日付を処理する

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/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/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/values/strings.xml

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