diff --git a/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java b/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java index eee7e44..d1092f7 100644 --- a/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java +++ b/app/src/main/java/org/ntlab/irisclient/MemberListAdapter.java @@ -6,6 +6,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; +import android.widget.ImageView; import android.widget.TextView; import org.ntlab.irisclient.models.Member; @@ -17,6 +18,7 @@ static class ViewHolder { TextView textView; + ImageView imageView; } private LayoutInflater inflater; private final int itemLayoutId; @@ -52,6 +54,7 @@ // ViewHolder を生成 holder = new ViewHolder(); holder.textView = convertView.findViewById(R.id.textView); + holder.imageView = convertView.findViewById(R.id.star); convertView.setTag(holder); @@ -79,6 +82,16 @@ convertView.setBackgroundColor(grayColor); } + + holder.imageView.setVisibility(View.GONE); + for(int i = 0 ; i < dcList.size();i++){ + if(dcList.get(i).getMaster()) { + holder.imageView.setVisibility(View.VISIBLE); + }else{ + holder.imageView.setVisibility(View.GONE); + } + } + } else { holder = (ViewHolder) convertView.getTag(); diff --git a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java index c39bae3..79cca26 100644 --- a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java @@ -156,13 +156,7 @@ randomButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - - Retrofit retrofit = new Retrofit.Builder() - .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris/") - .addConverterFactory(JacksonConverterFactory.create()) - .build(); - final RoomsRest roomsRest = retrofit.create(RoomsRest.class); - + roomViewModel.randomTeam(roomId,myName); } }); diff --git a/app/src/main/res/drawable/star.png b/app/src/main/res/drawable/star.png new file mode 100644 index 0000000..8a04eea --- /dev/null +++ b/app/src/main/res/drawable/star.png Binary files differ diff --git a/app/src/main/res/layout/activity_owner_room.xml b/app/src/main/res/layout/activity_owner_room.xml index 78046f0..d3df172 100644 --- a/app/src/main/res/layout/activity_owner_room.xml +++ b/app/src/main/res/layout/activity_owner_room.xml @@ -60,6 +60,7 @@ android:layout_width="295dp" android:layout_height="370dp" android:layout_marginEnd="24dp" + android:visibility="visible" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/beBlueMaster" app:layout_constraintHorizontal_bias="0.961" diff --git a/app/src/main/res/layout/member_list_layout.xml b/app/src/main/res/layout/member_list_layout.xml index 9aaf809..e65f4c1 100644 --- a/app/src/main/res/layout/member_list_layout.xml +++ b/app/src/main/res/layout/member_list_layout.xml @@ -1,18 +1,29 @@ + android:layout_height="match_parent" + android:gravity="center_vertical" + android:orientation="horizontal" + android:visibility="visible" + tools:visibility="visible"> - - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="25sp" - android:textColor="#000" - xmlns:android="http://schemas.android.com/apk/res/android"> + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="#000" + android:textSize="25sp"> + +