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 92cc9ec..0446342 100644
--- a/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java
@@ -15,6 +15,8 @@
import android.widget.TextView;
import com.example.cosmosclient.R;
+import com.example.cosmosclient.app.Cosmos;
+import com.example.cosmosclient.entities.Group;
public class AddMemberActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
@@ -35,7 +37,13 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_add_member);
-
+ /*ここからグループ名表示*/
+ TextView groupName = findViewById(R.id.groupName);
+ //現在のグループ情報を格納しているものからgIdを取得
+ Cosmos app = (Cosmos) getApplication();
+ Group curentGroup = app.getCurentGroup();
+ groupName.setText(curentGroup.getName());
+ /*終了*/
// ListViewのインスタンスを生成
ListView listView = findViewById(R.id.list_view);
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 09cc020..c078659 100644
--- a/app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java
@@ -21,7 +21,7 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_display_group_id);
-
+ TextView groupName = findViewById(R.id.groupName);
EditText groupID = (EditText)findViewById(R.id.groupID);
// ボタンを設定
Button copyButton = findViewById(R.id.copy_Button);
@@ -30,6 +30,8 @@
// //現在のグループ情報を格納しているものからgIdを取得
Cosmos app = (Cosmos) getApplication();
Group curentGroup = app.getCurentGroup();
+ groupName.setText(curentGroup.getName());
+
// //元となるgIdを取得完了
final String gId = curentGroup.getgId();
// final String gId = "vrehngortis";
diff --git a/app/src/main/java/com/example/cosmosclient/views/DisplayQRActivity.java b/app/src/main/java/com/example/cosmosclient/views/DisplayQRActivity.java
index 6daa9d1..ab24efc 100644
--- a/app/src/main/java/com/example/cosmosclient/views/DisplayQRActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/DisplayQRActivity.java
@@ -5,6 +5,7 @@
import android.os.Bundle;
import android.util.AndroidRuntimeException;
import android.widget.ImageView;
+import android.widget.TextView;
import com.example.cosmosclient.R;
import com.example.cosmosclient.app.Cosmos;
@@ -19,9 +20,12 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_display_qr);
+ TextView groupName = findViewById(R.id.groupName);
//現在のグループ情報を格納しているものからgIdを取得
Cosmos app = (Cosmos) getApplication();
Group curentGroup = app.getCurentGroup();
+ groupName.setText(curentGroup.getName());
+
//元となるgIdを取得完了
String data = curentGroup.getgId();
diff --git a/app/src/main/java/com/example/cosmosclient/views/MemberListActivity.java b/app/src/main/java/com/example/cosmosclient/views/MemberListActivity.java
index d2ab01a..ad97c66 100644
--- a/app/src/main/java/com/example/cosmosclient/views/MemberListActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/MemberListActivity.java
@@ -14,6 +14,7 @@
import android.widget.BaseAdapter;
import android.widget.Button;
import android.widget.ListView;
+import android.widget.TextView;
import android.widget.Toast;
import com.example.cosmosclient.R;
@@ -43,6 +44,8 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_member_list);
+ /*ここからグループ名表示*/
+ TextView groupName = findViewById(R.id.groupName);
//メンバー追加ボタン処理
FloatingActionButton fab = findViewById(R.id.addrequest_button);
@@ -57,6 +60,9 @@
//app/CosmosにGETメソッドに必要なデータを取得
Cosmos app = (Cosmos) getApplication();
+ //現在のグループ情報を格納しているものからgIdを取得
+ Group curentGroup = app.getCurentGroup();
+ groupName.setText(curentGroup.getName());
final String token = app.getToken();
final String gId = app.getCurentGroup().getgId();
diff --git a/app/src/main/res/layout/activity_add_member.xml b/app/src/main/res/layout/activity_add_member.xml
index 242f8aa..3e218c9 100644
--- a/app/src/main/res/layout/activity_add_member.xml
+++ b/app/src/main/res/layout/activity_add_member.xml
@@ -12,7 +12,7 @@
android:layout_height="75dp"
android:background="#e6eae3"
android:gravity="center"
- android:text="家族用 グループ"
+ android:text=""
android:textSize="24sp"
app:layout_constraintTop_toTopOf="parent"
tools:layout_editor_absoluteX="0dp" />
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 8f17cde..bc5af51 100644
--- a/app/src/main/res/layout/activity_display_group_id.xml
+++ b/app/src/main/res/layout/activity_display_group_id.xml
@@ -12,7 +12,7 @@
android:layout_height="75dp"
android:background="#e6eae3"
android:gravity="center"
- android:text="家族用 グループ"
+ android:text=""
android:textSize="24sp"
app:layout_constraintTop_toTopOf="parent"
tools:layout_editor_absoluteX="16dp" />
diff --git a/app/src/main/res/layout/activity_display_qr.xml b/app/src/main/res/layout/activity_display_qr.xml
index 32a602e..fd64cdc 100644
--- a/app/src/main/res/layout/activity_display_qr.xml
+++ b/app/src/main/res/layout/activity_display_qr.xml
@@ -12,7 +12,7 @@
android:layout_height="75dp"
android:background="#e6eae3"
android:gravity="center"
- android:text="家族用 グループ"
+ android:text=""
android:textSize="24sp"
app:layout_constraintTop_toTopOf="parent"
tools:layout_editor_absoluteX="16dp" />
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 9f744f2..bb755b3 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
@@ -16,13 +16,14 @@
android:digits="abcdefghijklmnopqrstuvwxyz1234567890-"
android:ems="10"
android:gravity="start|top"
+ android:hint="IDを入力してください"
android:inputType="textEmailAddress"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/button"
- app:layout_constraintHorizontal_bias="0.765"
+ app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView7"
- app:layout_constraintVertical_bias="0.441" />
+ app:layout_constraintVertical_bias="0.233" />
@@ -42,12 +43,12 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
- android:layout_marginTop="192dp"
+ android:layout_marginTop="160dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:textSize="24sp"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.445"
+ app:layout_constraintHorizontal_bias="0.465"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/inputGroupID" />
@@ -66,11 +67,10 @@
android:id="@+id/Addbutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="40dp"
- android:layout_marginRight="40dp"
+ android:layout_marginTop="60dp"
android:text="グループに入る"
android:visibility="invisible"
- app:layout_constraintBottom_toBottomOf="@+id/IDresult"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="@+id/IDresult" />
+ app:layout_constraintEnd_toEndOf="@+id/IDresult"
+ app:layout_constraintStart_toStartOf="@+id/IDresult"
+ app:layout_constraintTop_toBottomOf="@+id/IDresult" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_member_list.xml b/app/src/main/res/layout/activity_member_list.xml
index 591d3be..81b0f8a 100644
--- a/app/src/main/res/layout/activity_member_list.xml
+++ b/app/src/main/res/layout/activity_member_list.xml
@@ -34,7 +34,7 @@
android:layout_height="75dp"
android:background="#e6eae3"
android:gravity="center"
- android:text="家族用 グループ"
+ android:text=""
android:textSize="24sp"
app:layout_constraintTop_toTopOf="parent"
tools:layout_editor_absoluteX="0dp" />
diff --git a/app/src/main/res/layout/activity_qrcode_reading.xml b/app/src/main/res/layout/activity_qrcode_reading.xml
index 82e66d2..0b0d88a 100644
--- a/app/src/main/res/layout/activity_qrcode_reading.xml
+++ b/app/src/main/res/layout/activity_qrcode_reading.xml
@@ -5,13 +5,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".views.QRcodeReadingActivity">
+
@@ -46,12 +47,10 @@
android:id="@+id/Addbutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="16dp"
- android:layout_marginRight="16dp"
+ android:layout_marginTop="76dp"
android:text="グループに入る"
- app:layout_constraintBottom_toBottomOf="@+id/QRcodeResult"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="@+id/QRcodeResult"
- app:layout_constraintVertical_bias="0.437" />
+ app:layout_constraintEnd_toEndOf="@+id/QRcodeResult"
+ app:layout_constraintStart_toStartOf="@+id/QRcodeResult"
+ app:layout_constraintTop_toBottomOf="@+id/QRcodeResult" />
\ No newline at end of file