diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b754089..0be2f1f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,27 +2,32 @@ + + - android:hardwareAccelerated="true" - - - - + + - - + tools:replace="screenOrientation" /> @@ -31,13 +36,17 @@ - + - - + android:theme="@style/AppTheme.NoActionBar" /> + + parent, View v, + int position, long id) { + + + Intent intent = null; + // clickされたpositionのtextとphotoのID + String selectedText = scenes[position]; + if(selectedText.contains("QR")==true){ + intent = new Intent(this.getApplicationContext(), QRcodeReadingActivity.class); + }else if(selectedText.contains("ID")==true){ + intent = new Intent(this.getApplicationContext(), JoinGroupByIDActivity.class); + }else{ + intent = new Intent(this.getApplicationContext(), QRcodeReadingActivity.class); + } + +// Intent intent = new Intent(this.getApplicationContext(), DisplayQRActivity.class); + // SubActivityへ遷移 + startActivity(intent); + } +} diff --git a/app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java b/app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java new file mode 100644 index 0000000..b861a8e --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java @@ -0,0 +1,32 @@ +package com.example.cosmosclient.views; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.TextView; + +import com.example.cosmosclient.R; + +public class JoinGroupByIDActivity extends AppCompatActivity { + private String GroupID=null; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_join_group_by_id); + //テストでグループIDを出力 + final TextView result = (TextView)findViewById(R.id.IDresult); + //buttonを取得 + Button btn = (Button)findViewById(R.id.button); + btn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + //ボタンを押されると入力されたグループIDを取得 + EditText inputGroupID = (EditText)findViewById(R.id.inputGroupID); + GroupID = inputGroupID.getText().toString(); + result.setText(GroupID); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_add_member.xml b/app/src/main/res/layout/activity_add_member.xml index 44839a0..7274a61 100644 --- a/app/src/main/res/layout/activity_add_member.xml +++ b/app/src/main/res/layout/activity_add_member.xml @@ -7,17 +7,6 @@ tools:context=".views.AddMemberActivity"> - - - - + app:layout_constraintVertical_bias="0.405" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_join_group_actions.xml b/app/src/main/res/layout/activity_join_group_actions.xml new file mode 100644 index 0000000..1fb2b70 --- /dev/null +++ b/app/src/main/res/layout/activity_join_group_actions.xml @@ -0,0 +1,24 @@ + + + + + + diff --git a/app/src/main/res/layout/activity_join_group_by_id.xml b/app/src/main/res/layout/activity_join_group_by_id.xml new file mode 100644 index 0000000..0ec48a6 --- /dev/null +++ b/app/src/main/res/layout/activity_join_group_by_id.xml @@ -0,0 +1,62 @@ + + + + + + + +