diff --git a/.idea/misc.xml b/.idea/misc.xml
index 93ad3a1..9683fc7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,6 +7,7 @@
+
diff --git a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
index 337fea7..e0b32ce 100644
--- a/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
@@ -34,12 +34,17 @@
// Fragmentを作成します
DrawingCardFragment fragment = new DrawingCardFragment();
+ GamePlayerListFragment RedPlayerList = new GamePlayerListFragment("r");
+ GamePlayerListFragment BluePlayerList = new GamePlayerListFragment("b");
// Fragmentの追加や削除といった変更を行う際は、Transactionを利用します
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
// 新しく追加を行うのでaddを使用します
// 他にも、よく使う操作で、replace removeといったメソッドがあります
// メソッドの1つ目の引数は対象のViewGroupのID、2つ目の引数は追加するfragment
transaction.add(R.id.container, fragment);
+ transaction.add(R.id.RedPlayerListContainer, RedPlayerList);
+ transaction.add(R.id.BluePlayerListContainer,BluePlayerList);
+
// 最後にcommitを使用することで変更を反映します
transaction.commit();
diff --git a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
index 6bc6df1..31e3212 100644
--- a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
+++ b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
@@ -11,23 +11,35 @@
public class GamePlayerListFragment extends Fragment {
+ private String myteam;
- public static GamePlayerListFragment newInstance(String str){
+ public GamePlayerListFragment(String team)
+ {
+ myteam = team;
+ }
+ public static DrawingCardFragment newInstance(String str){
// インスタンス生成
- GamePlayerListFragment fragment = new GamePlayerListFragment();
+ DrawingCardFragment fragment = new DrawingCardFragment();
return fragment;
}
@Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) {
super.onCreateView(inflater, container, savedInstanceState);
- View view = inflater.inflate(R.layout.fragment_card_drawing, container, false);
+ Resources resources = getResources();
+ View view = inflater.inflate(R.layout.fragment_game_player_list, container, false);
return view;
}
//赤チームのプレイヤー全員を表示
//青チームのプレイヤー全員を表示
+ private String Checkteam(String team){
+ if(team.equals("r")){
+ return "赤チーム";
+ }else{
+ return "青チーム";
+ }
+ }
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_game_master.xml b/app/src/main/res/layout/activity_game_master.xml
index e55a2f4..196d2f2 100644
--- a/app/src/main/res/layout/activity_game_master.xml
+++ b/app/src/main/res/layout/activity_game_master.xml
@@ -16,30 +16,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/timeTextView" />
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_game_player_list.xml b/app/src/main/res/layout/fragment_game_player_list.xml
index 0e535d3..4f45b5e 100644
--- a/app/src/main/res/layout/fragment_game_player_list.xml
+++ b/app/src/main/res/layout/fragment_game_player_list.xml
@@ -9,17 +9,13 @@