diff --git a/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java b/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java index 5ef1453..174c8e7 100644 --- a/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java @@ -19,8 +19,8 @@ public class AddMemberActivity extends AppCompatActivity implements AdapterView.OnItemClickListener { private static final String[] scenes = { - "QRコードで追加", - "IDで追加", + "QRコードで招待", + "IDで招待", "LINEで招待" }; @@ -64,11 +64,10 @@ if(selectedText.contains("QR")==true){ intent = new Intent(this.getApplicationContext(), DisplayQRActivity.class); }else if(selectedText.contains("ID")==true){ - intent = new Intent(this.getApplicationContext(), DisplayQRActivity.class); - }else{ + intent = new Intent(this.getApplicationContext(), DisplayGroupIDActivity.class); + }else if(selectedText.contains("LINE")==true){ // intent = new Intent(this.getApplicationContext(), DisplayQRActivity.class); - Intent i = new Intent(Intent.ACTION_VIEW, Uri.parse("line://msg/text/?GroupID")); - startActivity(i); + intent = new Intent(Intent.ACTION_VIEW, Uri.parse("line://msg/text/?GroupID")); } // Intent intent = new Intent(this.getApplicationContext(), DisplayQRActivity.class); diff --git a/app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java b/app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java new file mode 100644 index 0000000..ae27d18 --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java @@ -0,0 +1,33 @@ +package com.example.cosmosclient.views; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.widget.EditText; +import android.widget.TextView; + +import com.example.cosmosclient.R; +import com.example.cosmosclient.app.Cosmos; +import com.example.cosmosclient.entities.Group; + +public class DisplayGroupIDActivity extends AppCompatActivity { + + + // EditText.set; + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_display_group_id); + + //読み取り専用にする設定 + EditText groupID = (EditText)findViewById(R.id.groupID); + +// //現在のグループ情報を格納しているものからgIdを取得 +// Cosmos app = (Cosmos) getApplication(); +// Group curentGroup = app.getCurentGroup(); +// //元となるgIdを取得完了 +// String gId = curentGroup.getgId(); + String gId = "vrehngortis"; + groupID.setText(gId); + + } +} diff --git a/app/src/main/res/layout/activity_add_member.xml b/app/src/main/res/layout/activity_add_member.xml index 7274a61..242f8aa 100644 --- a/app/src/main/res/layout/activity_add_member.xml +++ b/app/src/main/res/layout/activity_add_member.xml @@ -18,8 +18,8 @@ tools:layout_editor_absoluteX="0dp" /> + + + + + + +