diff --git a/.idea/misc.xml b/.idea/misc.xml
index 860da66..d5d35ec 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java
index bc0ef19..c17b9fb 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/Login/LoginScreenActivity.java
@@ -6,12 +6,15 @@
 import android.os.Bundle;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import org.ntlab.acanthus_client.R;
 import org.ntlab.acanthus_client.entities.AccountTokenJson;
 import org.ntlab.acanthus_client.resources.accounts.AccountsRest;
 import org.ntlab.acanthus_client.views.MainActivity;
 
+import java.util.ArrayList;
+
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -22,9 +25,28 @@
 // ログイン画面
 public class LoginScreenActivity extends AppCompatActivity {
 
-    EditText editEmailTextView;
-    EditText editPasswordTextView;
-    Button loginButton;
+    //-----------------------------------------------------------------
+    // 各Viewの列挙型
+    public enum EditTexts {
+        emailForm(0), passwordForm(1), loginButton(2);
+
+        private int textId;
+
+        //-----------------------------------------------------------------
+        private EditTexts(int textId) {
+            this.textId = textId;
+        }
+
+        //-----------------------------------------------------------------
+        // getter
+        public int getTextId() {
+            return this.textId;
+        }
+    }
+
+    //-----------------------------------------------------------------
+    //
+    private ArrayList<TextView> views = new ArrayList<>();
 
     //-----------------------------------------------------------------
     //
@@ -43,26 +65,31 @@
         onClicked(accountsRest);
 
     }
+
     //-----------------------------------------------------------------
     //
-    private void initView(){
-        EditText editEmailTextView = findViewById(R.id.editTextTextLoginEmail);
-        EditText editPasswordTextView = findViewById(R.id.editTextTextLoginPassword);
-        Button loginButton = (Button) findViewById(R.id.buttonLoginLogin);
+    private void initView() {
+        views.add(findViewById(R.id.editTextTextLoginEmail));
+        views.add(findViewById(R.id.editTextTextLoginPassword));
+        views.add(findViewById(R.id.buttonLoginLogin));
     }
+
     //-----------------------------------------------------------------
     // ログイン成功時の処理
-    private void succeedLogin(){
+    private void succeedLogin() {
         Intent intent = new Intent(getApplication(), MainActivity.class);
         startActivity(intent);
         finish();
     }
+
     //-----------------------------------------------------------------
     // ログインボタン押下時の処理
     private void onClicked(AccountsRest accountsRest) {
+        Button loginButton = (Button) views.get(EditTexts.loginButton.getTextId());
+
         loginButton.setOnClickListener(v -> {
-            String emailStr = editEmailTextView.getText().toString();
-            String password = editPasswordTextView.getText().toString();
+            String emailStr = views.get(EditTexts.emailForm.getTextId()).getText().toString();
+            String password = views.get(EditTexts.passwordForm.getTextId()).getText().toString();
 
             // ログイン
             Call<AccountTokenJson> call = accountsRest.issueLoginToken(emailStr, password);
diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/SignUp/SignUpActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/SignUp/SignUpActivity.java
index 1954c13..ac43df1 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/SignUp/SignUpActivity.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/SignUp/SignUpActivity.java
@@ -3,24 +3,68 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.os.Bundle;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.TextView;
 
 import org.ntlab.acanthus_client.R;
 import org.ntlab.acanthus_client.resources.accounts.AccountsRest;
 
+import java.util.ArrayList;
+
 import retrofit2.Retrofit;
 import retrofit2.converter.jackson.JacksonConverterFactory;
 
+//-----------------------------------------------------------------
+//
 public class SignUpActivity extends AppCompatActivity {
+    //-----------------------------------------------------------------
+    // 各Viewの列挙型
+    public enum EditTexts {
+        nameForm(0),emailForm(1), passwordForm(2), loginButton(3);
 
+        private int textId;
+
+        //-----------------------------------------------------------------
+        private EditTexts(int textId) {
+            this.textId = textId;
+        }
+
+        //-----------------------------------------------------------------
+        // getter
+        public int getTextId() {
+            return this.textId;
+        }
+    }
+    //-----------------------------------------------------------------
+    private ArrayList<TextView> views = new ArrayList<>();
+
+    //-----------------------------------------------------------------
+    //
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sign_up);
+        initView();
         Retrofit retrofit = new Retrofit.Builder()
                 .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/")
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
         final AccountsRest accountsRest = retrofit.create(AccountsRest.class);
 
+
     }
+    //-----------------------------------------------------------------
+    //
+    private void initView(){
+        views.add(findViewById(R.id.editTextTextSignUpPersonName));
+        views.add(findViewById(R.id.editTextTextLoginEmail));
+        views.add(findViewById(R.id.editTextTextLoginPassword));
+        views.add(findViewById(R.id.buttonSignUpRegister));
+    }
+    //-----------------------------------------------------------------
+    //
+
+    //-----------------------------------------------------------------
+
 }
\ No newline at end of file