From 4808e7a761217d4b4ea949ecf27b1dfc9546ec54 Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Fri, 5 Jul 2024 12:50:53 +0900
Subject: [PATCH] =?UTF-8?q?=E5=BF=85=E9=A0=88=E9=A0=85=E7=9B=AE=E3=81=8C?=
 =?UTF-8?q?=E8=A8=98=E5=85=A5=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84=E3=81=AA?=
 =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=9F=E3=82=89=E3=80=82Toast=E3=81=A7?=
 =?UTF-8?q?=E3=81=9D=E3=81=AE=E7=8A=B6=E6=85=8B=E3=82=92=E7=9F=A5=E3=82=89?=
 =?UTF-8?q?=E3=81=9B=E3=82=8B=E3=83=97=E3=83=AD=E3=82=B0=E3=83=A9=E3=83=A0?=
 =?UTF-8?q?=E3=82=92=E4=BD=9C=E6=88=90=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/oplogy/SetUpActivity.java     | 23 ++++++++++++++++++-
 app/src/main/res/layout/activity_set_up.xml   |  6 ++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
index 12060e4..24dcdd9 100644
--- a/app/src/main/java/com/example/oplogy/SetUpActivity.java
+++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java
@@ -10,6 +10,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.graphics.Paint;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Button;
 import android.widget.DatePicker;
@@ -131,10 +132,25 @@ public class SetUpActivity extends FragmentActivity
             Log.d(TAG, "Interval Time" + intervalTime);
             Log.d(TAG, "Start Break Time" + startBreakTime);
             Log.d(TAG, "End Break Time" + endBreakTime);
-            totalStudent = Integer.parseInt(textViewTotalStudent.getText().toString()); //数値型に変更
             Log.d(TAG, "Total Student" + totalStudent);
             Log.d(TAG, "onClick: できてるよ");
 
+            // クラスの人数を数値に変換して取得
+            try {
+                totalStudent = Integer.parseInt(textViewTotalStudent.getText().toString());
+            } catch (NumberFormatException e) {
+                totalStudent = 0; // デフォルト値を設定するか、エラー処理を追加することも考慮する必要があります
+            }
+
+            // 入力データのバリデーション
+            if (TextUtils.isEmpty(teacherName) || TextUtils.isEmpty(startPoint) || TextUtils.isEmpty(startTime)
+                    || TextUtils.isEmpty(firstDay) || TextUtils.isEmpty(secondDay) || TextUtils.isEmpty(thirdDay)
+                    || TextUtils.isEmpty(endTime) || TextUtils.isEmpty(intervalTime) || TextUtils.isEmpty(startBreakTime)
+                    || TextUtils.isEmpty(endBreakTime) || totalStudent <= 0) {
+                Toast.makeText(SetUpActivity.this, "必須項目を入力してください", Toast.LENGTH_SHORT).show();
+                return;
+            }
+
 
             // データベースへの登録処理
             ExecutorService executor = Executors.newSingleThreadExecutor();
@@ -229,9 +245,14 @@ public class SetUpActivity extends FragmentActivity
         reset.setOnClickListener(v -> { //テキストとラジオボタンの選択を消去
             textViewTeacherName.setText("");
             textViewStartPoint.setText("");
+            buttonFirstDay.setText("");
+            buttonSecondDay.setText("");
+            buttonThirdDay.setText("");
             radioButtonTenMinute.setChecked(false);
             radioButtonFifteenMinute.setChecked(false);
             radioButtonThirtyMinute.setChecked(false);
+            textViewStartTime.setText("");
+            textViewEndTime.setText("");
             textViewStartBreakTime.setText("");
             textViewEndBreakTime.setText("");
             textViewTotalStudent.setText("");
diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml
index 966ccbc..bc037db 100644
--- a/app/src/main/res/layout/activity_set_up.xml
+++ b/app/src/main/res/layout/activity_set_up.xml
@@ -109,7 +109,7 @@
             android:id="@+id/setFirstDayButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/firstDay"
+            android:hint="@string/firstDay"
             android:layout_marginStart="7sp"
             android:layout_marginEnd="7sp"
             tools:ignore="DuplicateIds" />
@@ -118,7 +118,7 @@
             android:id="@+id/setSecondDayButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/secondDay"
+            android:hint="@string/secondDay"
             android:layout_marginStart="7sp"
             android:layout_marginEnd="7sp"
             tools:ignore="DuplicateIds" />
@@ -127,7 +127,7 @@
             android:id="@+id/setThirdDayButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/threeDay"
+            android:hint="@string/threeDay"
             android:layout_marginStart="7sp"
             android:layout_marginEnd="7sp"
             tools:ignore="DuplicateIds" />