diff --git a/app/src/main/java/com/example/cosmosclient/AddMemberActivity.java b/app/src/main/java/com/example/cosmosclient/AddMemberActivity.java index 679eb5b..29a1588 100644 --- a/app/src/main/java/com/example/cosmosclient/AddMemberActivity.java +++ b/app/src/main/java/com/example/cosmosclient/AddMemberActivity.java @@ -1,13 +1,45 @@ -package com.example.cosmosclient; - -import android.support.v7.app.AppCompatActivity; -import android.os.Bundle; - -public class AddMemberActivity extends AppCompatActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_add_member); - } -} +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 new file mode 100644 index 0000000..0552445 --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/DisplayQRActivity.java @@ -0,0 +1,13 @@ +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/res/drawable/qr_code_ex.png b/app/src/main/res/drawable/qr_code_ex.png new file mode 100644 index 0000000..9ad8000 --- /dev/null +++ b/app/src/main/res/drawable/qr_code_ex.png Binary files differ diff --git a/app/src/main/res/drawable/white.png b/app/src/main/res/drawable/white.png new file mode 100644 index 0000000..15f8d06 --- /dev/null +++ b/app/src/main/res/drawable/white.png Binary files differ diff --git a/app/src/main/res/layout/activity_add_member.xml b/app/src/main/res/layout/activity_add_member.xml index 7c199b7..7cdfb7d 100644 --- a/app/src/main/res/layout/activity_add_member.xml +++ b/app/src/main/res/layout/activity_add_member.xml @@ -5,49 +5,49 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".AddMemberActivity"> + + +