empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Remove circle from group member row.

Browse source
This commit is contained in:
Alex Hart 2021-11-12 09:56:13 -04:00
parent 68e0a30c92
commit 573de99840
2 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
app/src/main/java/org/thoughtcrime/securesms/groups/ui/GroupMemberListAdapter.java
View file

@ -87,32 +87,37 @@ final class GroupMemberListAdapter extends LifecycleRecyclerAdapter<GroupMemberL
recipientClickListener,
recipientLongClickListener,
adminActionsListener,
selectionChangeListener);
selectionChangeListener,
selectable);
case OWN_INVITE_PENDING:
return new OwnInvitePendingMemberViewHolder(LayoutInflater.from(parent.getContext())
.inflate(R.layout.group_recipient_list_item, parent, false),
recipientClickListener,
recipientLongClickListener,
adminActionsListener,
selectionChangeListener);
selectionChangeListener,
selectable);
case OTHER_INVITE_PENDING_COUNT:
return new UnknownPendingMemberCountViewHolder(LayoutInflater.from(parent.getContext())
.inflate(R.layout.group_recipient_list_item, parent, false),
adminActionsListener,
selectionChangeListener);
selectionChangeListener,
selectable);
case NEW_GROUP_CANDIDATE:
return new NewGroupInviteeViewHolder(LayoutInflater.from(parent.getContext())
.inflate(R.layout.group_new_candidate_recipient_list_item, parent, false),
recipientClickListener,
recipientLongClickListener,
selectionChangeListener);
selectionChangeListener,
selectable);
case REQUESTING_MEMBER:
return new RequestingMemberViewHolder(LayoutInflater.from(parent.getContext())
.inflate(R.layout.group_recipient_requesting_list_item, parent, false),
recipientClickListener,
recipientLongClickListener,
adminActionsListener,
selectionChangeListener);
selectionChangeListener,
selectable);
default:
throw new AssertionError();
@ -181,12 +186,14 @@ final class GroupMemberListAdapter extends LifecycleRecyclerAdapter<GroupMemberL
@Nullable final RecipientClickListener recipientClickListener;
@Nullable final AdminActionsListener adminActionsListener;
@Nullable final RecipientLongClickListener recipientLongClickListener;
final boolean selectable;
ViewHolder(@NonNull View itemView,
@Nullable RecipientClickListener recipientClickListener,
@Nullable RecipientLongClickListener recipientLongClickListener,
@Nullable AdminActionsListener adminActionsListener,
@NonNull SelectionChangeListener selectionChangeListener)
@NonNull SelectionChangeListener selectionChangeListener,
boolean selectable)
{
super(itemView);
@ -204,6 +211,7 @@ final class GroupMemberListAdapter extends LifecycleRecyclerAdapter<GroupMemberL
this.recipientLongClickListener = recipientLongClickListener;
this.adminActionsListener = adminActionsListener;
this.selectionChangeListener = selectionChangeListener;
this.selectable = selectable;
}
void bindRecipient(@NonNull Recipient recipient) {
@ -266,6 +274,11 @@ final class GroupMemberListAdapter extends LifecycleRecyclerAdapter<GroupMemberL
});
selected.setChecked(isSelected);
if (!selectable && !isSelected) {
selected.setVisibility(View.GONE);
} else {
selected.setVisibility(View.VISIBLE);
}
}
void hideMenu() {
@ -285,9 +298,10 @@ final class GroupMemberListAdapter extends LifecycleRecyclerAdapter<GroupMemberL
@Nullable RecipientClickListener recipientClickListener,
@Nullable RecipientLongClickListener recipientLongClickListener,
@Nullable AdminActionsListener adminActionsListener,
@NonNull SelectionChangeListener selectionChangeListener)
@NonNull SelectionChangeListener selectionChangeListener,
boolean selectable)
{
super(itemView, recipientClickListener, recipientLongClickListener, adminActionsListener, selectionChangeListener);
super(itemView, recipientClickListener, recipientLongClickListener, adminActionsListener, selectionChangeListener, selectable);
}
@Override
@ -311,9 +325,10 @@ final class GroupMemberListAdapter extends LifecycleRecyclerAdapter<GroupMemberL
NewGroupInviteeViewHolder(@NonNull View itemView,
@Nullable RecipientClickListener recipientClickListener,
@Nullable RecipientLongClickListener recipientLongClickListener,
@NonNull SelectionChangeListener selectionChangeListener)
@NonNull SelectionChangeListener selectionChangeListener,
boolean selectable)
{
super(itemView, recipientClickListener, recipientLongClickListener, null, selectionChangeListener);
super(itemView, recipientClickListener, recipientLongClickListener, null, selectionChangeListener, selectable);
smsContact = itemView.findViewById(R.id.sms_contact);
smsWarning = itemView.findViewById(R.id.sms_warning);
@ -339,9 +354,10 @@ final class GroupMemberListAdapter extends LifecycleRecyclerAdapter<GroupMemberL
@Nullable RecipientClickListener recipientClickListener,
@Nullable RecipientLongClickListener recipientLongClickListener,
@Nullable AdminActionsListener adminActionsListener,
@NonNull SelectionChangeListener selectionChangeListener)
@NonNull SelectionChangeListener selectionChangeListener,
boolean selectable)
{
super(itemView, recipientClickListener, recipientLongClickListener, adminActionsListener, selectionChangeListener);
super(itemView, recipientClickListener, recipientLongClickListener, adminActionsListener, selectionChangeListener, selectable);
}
@Override
@ -371,9 +387,10 @@ final class GroupMemberListAdapter extends LifecycleRecyclerAdapter<GroupMemberL
UnknownPendingMemberCountViewHolder(@NonNull View itemView,
@Nullable AdminActionsListener adminActionsListener,
@NonNull SelectionChangeListener selectionChangeListener)
@NonNull SelectionChangeListener selectionChangeListener,
boolean selectable)
{
super(itemView, null, null, adminActionsListener, selectionChangeListener);
super(itemView, null, null, adminActionsListener, selectionChangeListener, selectable);
}
@Override
@ -420,9 +437,10 @@ final class GroupMemberListAdapter extends LifecycleRecyclerAdapter<GroupMemberL
@Nullable RecipientClickListener recipientClickListener,
@Nullable RecipientLongClickListener recipientLongClickListener,
@Nullable AdminActionsListener adminActionsListener,
@NonNull SelectionChangeListener selectionChangeListener)
@NonNull SelectionChangeListener selectionChangeListener,
boolean selectable)
{
super(itemView, recipientClickListener, recipientLongClickListener, adminActionsListener, selectionChangeListener);
super(itemView, recipientClickListener, recipientLongClickListener, adminActionsListener, selectionChangeListener, selectable);
approveRequest = itemView.findViewById(R.id.request_approve);
denyRequest = itemView.findViewById(R.id.request_deny);

3
app/src/main/res/layout/group_recipient_list_item.xml
View file

@ -38,6 +38,7 @@
android:button="@null"
android:clickable="false"
android:focusable="false"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/recipient_avatar"
app:layout_constraintEnd_toEndOf="@+id/recipient_avatar"
tools:checked="true" />
@ -89,12 +90,12 @@
android:textAppearance="@style/TextAppearance.Signal.Body2"
android:textColor="@color/signal_text_secondary"
android:visibility="gone"
app:layout_goneMarginEnd="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/popupMenuProgressContainer"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toEndOf="@+id/recipient_name"
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginEnd="0dp"
tools:visibility="visible" />
<FrameLayout