diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 56c3abd..0a5abc1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,6 +34,11 @@
android:screenOrientation="landscape"
android:exported="true" >
+
+
\ No newline at end of file
diff --git a/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java
index 19d8314..0892581 100644
--- a/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java
@@ -3,7 +3,12 @@
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
+import android.content.Intent;
import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageButton;
public class EnterRoomActivity extends AppCompatActivity {
@@ -17,5 +22,32 @@
actionBar.hide();
}
+ ImageButton imageButton = (ImageButton) findViewById(R.id.backButton); // view経由でimageButtonを探す
+ imageButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+ Intent i = new Intent(v.getContext(), MainActivity.class);
+ startActivity(i);
+ }
+ });
+
+ Button nextButton = findViewById(R.id.EntryRoomButton);
+ EditText text0 = (EditText) findViewById(R.id.nicknameEditText);
+ EditText text1 = (EditText) findViewById(R.id.roomidEditText);
+ nextButton.setOnClickListener(new View.OnClickListener() {
+ public void onClick(View v) {
+
+ //ニックネームが入力されていない場合エラーメッセージを表示する
+ if (text0.getText().toString().isEmpty() || text1.getText().toString().isEmpty()) {
+ text0.setError("ニックネームを入力されていません");
+ text1.setError("部屋番号を入力されていません");
+
+ //ニックネームが入力されていれば次の画面へ
+ } else {
+ Intent intent = new Intent(EnterRoomActivity.this,OwnerRoomActivity.class);
+ startActivity(intent);
+ }
+ }
+ });
+
}
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_enter_room.xml b/app/src/main/res/layout/activity_enter_room.xml
index cbbf45e..2256c75 100644
--- a/app/src/main/res/layout/activity_enter_room.xml
+++ b/app/src/main/res/layout/activity_enter_room.xml
@@ -74,4 +74,18 @@
app:layout_constraintTop_toBottomOf="@+id/roomidTextView"
app:layout_constraintVertical_bias="0.172" />
+
+
\ No newline at end of file