diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 694e8e9..690e18f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
-
+
+
+ android:label="グループ作成" />
@@ -34,7 +38,7 @@
+ tools:replace="screenOrientation" />
@@ -49,7 +53,7 @@
android:theme="@style/AppTheme.NoActionBar" />
+ android:theme="@style/Base.Theme.AppCompat" />
@@ -63,14 +67,14 @@
android:label="@string/title_activity_add_request" />
+ android:label="QRコード表示" />
+ android:theme="@style/AppTheme.NoActionBar" />
\ No newline at end of file
diff --git a/app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java b/app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java
index ae27d18..f3b1841 100644
--- a/app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java
@@ -1,33 +1,50 @@
package com.example.cosmosclient.views;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.os.Build;
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 android.widget.Toast;
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);
-
+ // ボタンを設定
+ Button copyButton = findViewById(R.id.copy_Button);
+ //読み取り専用にする設定
+ groupID.setEnabled(false);
// //現在のグループ情報を格納しているものからgIdを取得
// Cosmos app = (Cosmos) getApplication();
// Group curentGroup = app.getCurentGroup();
// //元となるgIdを取得完了
// String gId = curentGroup.getgId();
- String gId = "vrehngortis";
+ final String gId = "vrehngortis";
groupID.setText(gId);
+ copyButton.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ ClipboardManager clipboard
+ = (ClipboardManager) getSystemService(
+ Context.CLIPBOARD_SERVICE);
+ clipboard.setPrimaryClip(ClipData.newPlainText("", gId));
+ }
+ });
+
}
+
}
diff --git a/app/src/main/res/layout/activity_display_group_id.xml b/app/src/main/res/layout/activity_display_group_id.xml
index 43bd3ae..e0bf2c3 100644
--- a/app/src/main/res/layout/activity_display_group_id.xml
+++ b/app/src/main/res/layout/activity_display_group_id.xml
@@ -21,8 +21,8 @@
android:id="@+id/groupID"
android:layout_width="207dp"
android:layout_height="45dp"
- android:layout_marginStart="56dp"
- android:layout_marginLeft="56dp"
+ android:layout_marginStart="76dp"
+ android:layout_marginLeft="76dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:ems="10"
@@ -32,21 +32,18 @@
app:layout_constraintEnd_toStartOf="@+id/copy_Button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/groupName"
- app:layout_constraintVertical_bias="0.378" />
+ app:layout_constraintVertical_bias="0.436" />
+ app:layout_constraintStart_toEndOf="@+id/groupID"
+ app:layout_constraintTop_toTopOf="@+id/groupID" />
\ No newline at end of file
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
index 0ec48a6..1a45ac7 100644
--- a/app/src/main/res/layout/activity_join_group_by_id.xml
+++ b/app/src/main/res/layout/activity_join_group_by_id.xml
@@ -19,10 +19,10 @@
android:inputType="textEmailAddress"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/button"
- app:layout_constraintHorizontal_bias="0.785"
+ app:layout_constraintHorizontal_bias="0.765"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView7"
- app:layout_constraintVertical_bias="0.27" />
+ app:layout_constraintVertical_bias="0.441" />