diff --git a/.idea/misc.xml b/.idea/misc.xml index 9683fc7..a65c3ba 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,6 +7,8 @@ + + diff --git a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java index 79ef6b7..cef66aa 100644 --- a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java +++ b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java @@ -26,30 +26,31 @@ { myTeam = team; } - public static DrawingCardFragment newInstance(String str){ - // インスタンス生成 - DrawingCardFragment fragment = new DrawingCardFragment(); - return fragment; - } @Override public View onCreateView(LayoutInflater inflater, ViewGroup container,Bundle savedInstanceState) { super.onCreateView(inflater, container, savedInstanceState); - Resources resources = getResources(); View view = inflater.inflate(R.layout.fragment_game_player_list, container, false); Checkteam(view); - ArrayList viewPlayers = new ArrayList<>(); - List gMembers = new ArrayList<>(); + //irisからプレイヤーの一覧を取得 + Iris iris = (Iris)this.getActivity().getApplication(); + List players = iris.getMemberList(); //テスト用 - viewPlayers.add("test0"); - viewPlayers.add("test1"); + Member test2 = new Member("test2"); + Member test3 = new Member("test3"); + players.add(test2); + players.add(test3); + + //memberのリストから名前(string)だけを抽出 + ArrayList viewPlayers = new ArrayList<>(); + players.forEach(m -> viewPlayers.add(m.getNickname())); ListView playersList = (ListView) view.findViewById(R.id.PlayersList); - BaseAdapter adapter = new MemberListAdapter(this.getActivity().getApplicationContext(), R.layout.member_list_layout, viewPlayers, gMembers); + BaseAdapter adapter = new MemberListAdapter(this.getActivity().getApplicationContext(), R.layout.member_list_layout, viewPlayers, players); playersList.setAdapter(adapter); @@ -61,12 +62,10 @@ //青チームのプレイヤー全員を表示 private String Checkteam(View view){ if(myTeam.equals("r")){ - TextView teamtext = (TextView) view.findViewById(R.id.textView5); - teamtext.setText("赤"); + return "赤チーム"; }else{ - TextView teamtext = (TextView) view.findViewById(R.id.textView5); - teamtext.setText("青"); + return "青チーム"; } } diff --git a/app/src/main/res/layout/activity_game_master.xml b/app/src/main/res/layout/activity_game_master.xml index 196d2f2..badeb26 100644 --- a/app/src/main/res/layout/activity_game_master.xml +++ b/app/src/main/res/layout/activity_game_master.xml @@ -100,7 +100,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" /> \ 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 5fb7438..67af562 100644 --- a/app/src/main/res/layout/fragment_game_player_list.xml +++ b/app/src/main/res/layout/fragment_game_player_list.xml @@ -7,24 +7,11 @@ android:layout_height="match_parent" tools:context=".GamePlayerListFragment"> - - + android:layout_width="412dp" + android:layout_height="731dp" + tools:layout_editor_absoluteX="-2dp" + tools:layout_editor_absoluteY="-1dp" /> \ No newline at end of file