diff --git a/app/src/main/java/com/example/cosmosclient/AddMemberActivity.java b/app/src/main/java/com/example/cosmosclient/AddMemberActivity.java deleted file mode 100644 index 29a1588..0000000 --- a/app/src/main/java/com/example/cosmosclient/AddMemberActivity.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.example.cosmosclient; - -import android.content.Intent; -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; -import android.view.View; -import android.widget.Button; - -public class AddMemberActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_add_member); - - //ここからQRからメンバー追加の画面遷移処理画面を記述 - Button qrButton = findViewById(R.id.addQR); - qrButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent = new Intent(getApplication(), DisplayQRActivity.class); - startActivity(intent); - } - }); - //ここからIDからメンバー追加の画面遷移処理画面を記述 - Button idButton = findViewById(R.id.addID); - idButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent = new Intent(getApplication(), DisplayQRActivity.class); - startActivity(intent); - } - }); - //ここからMailからメンバー追加の画面遷移処理画面を記述 - Button mailButton = findViewById(R.id.addMail); - mailButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Intent intent = new Intent(getApplication(), DisplayQRActivity.class); - startActivity(intent); - } - }); - - } -} diff --git a/app/src/main/java/com/example/cosmosclient/DisplayQRActivity.java b/app/src/main/java/com/example/cosmosclient/DisplayQRActivity.java deleted file mode 100644 index 0552445..0000000 --- a/app/src/main/java/com/example/cosmosclient/DisplayQRActivity.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.cosmosclient; - -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; - -public class DisplayQRActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_display_qr); - } -} diff --git a/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java b/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java new file mode 100644 index 0000000..c1b8f1d --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java @@ -0,0 +1,47 @@ +package com.example.cosmosclient.views; + +import android.content.Intent; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; + +import com.example.cosmosclient.R; + +public class AddMemberActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_add_member); + + //ここからQRからメンバー追加の画面遷移処理画面を記述 + Button qrButton = findViewById(R.id.addQR); + qrButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getApplication(), DisplayQRActivity.class); + startActivity(intent); + } + }); + //ここからIDからメンバー追加の画面遷移処理画面を記述 + Button idButton = findViewById(R.id.addID); + idButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getApplication(), DisplayQRActivity.class); + startActivity(intent); + } + }); + //ここからMailからメンバー追加の画面遷移処理画面を記述 + Button mailButton = findViewById(R.id.addMail); + mailButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(getApplication(), DisplayQRActivity.class); + startActivity(intent); + } + }); + + } +} diff --git a/app/src/main/java/com/example/cosmosclient/views/DisplayQRActivity.java b/app/src/main/java/com/example/cosmosclient/views/DisplayQRActivity.java new file mode 100644 index 0000000..7d2e752 --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/views/DisplayQRActivity.java @@ -0,0 +1,15 @@ +package com.example.cosmosclient.views; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +import com.example.cosmosclient.R; + +public class DisplayQRActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_display_qr); + } +}