From bc27676a7ed806f6d7dffc2eec5ffbd836b7dfac Mon Sep 17 00:00:00 2001
From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com>
Date: Fri, 14 Jun 2024 12:49:22 +0900
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=8A=9B=E3=81=97=E3=81=9F=E6=83=85?=
=?UTF-8?q?=E5=A0=B1=E3=82=92=E5=A4=89=E6=95=B0=E3=81=AB=E5=85=A5=E3=82=8C?=
=?UTF-8?q?=E3=82=8B=E6=A9=9F=E8=83=BD=E3=82=92=E4=BD=9C=E6=88=90=E3=81=97?=
=?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F=E3=80=81=E5=BE=8C=E3=81=AFRoom?=
=?UTF-8?q?=E3=81=AB=E5=8F=97=E3=81=91=E6=B8=A1=E3=81=99=E3=81=A0=E3=81=91?=
=?UTF-8?q?=E3=81=A7=E3=81=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/example/oplogy/SetUpActivity.java | 90 ++++++++-----------
app/src/main/res/layout/activity_set_up.xml | 32 +++----
app/src/main/res/values/strings.xml | 5 ++
3 files changed, 58 insertions(+), 69 deletions(-)
diff --git a/app/src/main/java/com/example/oplogy/SetUpActivity.java b/app/src/main/java/com/example/oplogy/SetUpActivity.java
index 4be7990..d2f03d9 100644
--- a/app/src/main/java/com/example/oplogy/SetUpActivity.java
+++ b/app/src/main/java/com/example/oplogy/SetUpActivity.java
@@ -10,13 +10,10 @@ import android.graphics.Paint;
import android.os.Bundle;
import android.app.TimePickerDialog;
import android.util.Log;
-import android.view.View;
import android.widget.Button;
import android.widget.RadioButton;
-import android.widget.RadioGroup;
import android.widget.TextView;
import android.widget.TimePicker;
-import android.widget.Toast;
import java.util.Locale;
@@ -80,66 +77,51 @@ public class SetUpActivity extends FragmentActivity
- setUp.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
-
- teacherName = setTeacherName.getText().toString(); //各変数に値を挿入
- Log.d(TAG, "Teacher Name: " + teacherName);
- startPoint = setStartPoint.getText().toString();
- Log.d(TAG, "Start Point: " + startPoint);
- 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: できてるよ");
-
-
+ 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, "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: できてるよ");
+
+
+
});
- startTimeSetButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- isStartTimeSelected = 1; //ボタンの判別
- showTimePickerDialog(); //TimePeckerの表示
- }
+ startTimeSetButton.setOnClickListener(v -> {
+ isStartTimeSelected = 1; //ボタンの判別
+ showTimePickerDialog(); //TimePeckerの表示
});
- endTimeSetButton.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- isStartTimeSelected = 2;
- showTimePickerDialog();
- }
+ endTimeSetButton.setOnClickListener(v -> {
+ isStartTimeSelected = 2;
+ showTimePickerDialog();
});
- setStartBreakTime.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- isStartTimeSelected = 3;
- showTimePickerDialog();
- }
+ setStartBreakTime.setOnClickListener(v -> {
+ isStartTimeSelected = 3;
+ showTimePickerDialog();
});
- setEndBreakTime.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- isStartTimeSelected = 4;
- showTimePickerDialog();
- }
+ setEndBreakTime.setOnClickListener(v -> {
+ isStartTimeSelected = 4;
+ showTimePickerDialog();
});
}
diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml
index d2dfd4d..ff1c3eb 100644
--- a/app/src/main/res/layout/activity_set_up.xml
+++ b/app/src/main/res/layout/activity_set_up.xml
@@ -15,9 +15,9 @@
android:layout_height="wrap_content"
android:layout_gravity="left"
android:paddingStart="20dp"
- android:text="🔙"
- android:textSize="50dp"
- tools:ignore="RtlCompat" />
+ android:text="@string/Back"
+ android:textSize="50sp"
+ tools:ignore="RtlCompat,RtlHardcoded,RtlSymmetry" />
@@ -91,11 +91,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" "
- android:textSize="20dp"
+ android:textSize="20sp"
android:textAlignment="center"
android:autofillHints=""
android:inputType=""
- tools:ignore="LabelFor"/>
+ tools:ignore="HardcodedText,LabelFor"/>
@@ -176,7 +176,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="15分"
+ android:text="@string/fifteenMinute"
android:paddingEnd="20dp"
tools:ignore="RtlSymmetry" />
@@ -185,7 +185,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:text="30分"
+ android:text="@string/thirtyMinute"
android:paddingEnd="20dp"
tools:ignore="RtlSymmetry" />
@@ -213,7 +213,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:hint=" から "
- android:textSize="20dp"
+ android:textSize="20sp"
android:textAlignment="center"
android:autofillHints=""
android:layout_weight="4"
@@ -224,7 +224,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="~"
- android:textSize="30dp"
+ android:textSize="30sp"
android:paddingStart="30dp"
android:paddingEnd="30dp" />
@@ -232,7 +232,7 @@
android:id="@+id/endBreakTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="20dp"
+ android:textSize="20sp"
android:hint=" まで "
android:textAlignment="center"
android:autofillHints=""
@@ -279,13 +279,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/reset"
- android:layout_marginEnd="100dp"/>
+ android:layout_marginEnd="100dp"
+ style="?android:attr/buttonBarButtonStyle" />
+ android:text="@string/setUp"
+ style="?android:attr/buttonBarButtonStyle" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d5361c3..7d0fc4a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,4 +11,9 @@
休憩時間
生徒の人数
時刻設定
+ 🔙
+ 住所
+ 10分
+ 15分
+ 30分
\ No newline at end of file