From 18f180bfe7b1c406e8646c573eaa0ca5e7579d42 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 28 Feb 2022 13:26:40 +0100 Subject: [PATCH] rename UserItem to ContactsItem to reflect its use case Signed-off-by: Andy Scherzinger --- .../items/{UserItem.java => ContactItem.java} | 39 ++++++------ .../talk/controllers/ContactsController.java | 60 +++++++++---------- 2 files changed, 47 insertions(+), 52 deletions(-) rename app/src/main/java/com/nextcloud/talk/adapters/items/{UserItem.java => ContactItem.java} (87%) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.java similarity index 87% rename from app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java rename to app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.java index af1f6842a..abbc72817 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ContactItem.java @@ -49,8 +49,8 @@ import eu.davidea.flexibleadapter.items.ISectionable; import eu.davidea.flexibleadapter.utils.FlexibleUtils; import eu.davidea.viewholders.FlexibleViewHolder; -public class UserItem extends AbstractFlexibleItem implements - ISectionable, IFilterable { +public class ContactItem extends AbstractFlexibleItem implements + ISectionable, IFilterable { public static final String PARTICIPANT_SOURCE_CIRCLES = "circles"; public static final String PARTICIPANT_SOURCE_GROUPS = "groups"; @@ -61,9 +61,9 @@ public class UserItem extends AbstractFlexibleItem private GenericTextHeaderItem header; public boolean isOnline = true; - public UserItem(Participant participant, - UserEntity userEntity, - GenericTextHeaderItem genericTextHeaderItem) { + public ContactItem(Participant participant, + UserEntity userEntity, + GenericTextHeaderItem genericTextHeaderItem) { this.participant = participant; this.userEntity = userEntity; this.header = genericTextHeaderItem; @@ -71,8 +71,8 @@ public class UserItem extends AbstractFlexibleItem @Override public boolean equals(Object o) { - if (o instanceof UserItem) { - UserItem inItem = (UserItem) o; + if (o instanceof ContactItem) { + ContactItem inItem = (ContactItem) o; return participant.getActorType() == inItem.getModel().getActorType() && participant.getActorId().equals(inItem.getModel().getActorId()); } @@ -98,24 +98,19 @@ public class UserItem extends AbstractFlexibleItem } @Override - public UserItemViewHolder createViewHolder(View view, FlexibleAdapter adapter) { - return new UserItemViewHolder(view, adapter); + public ContactItemViewHolder createViewHolder(View view, FlexibleAdapter adapter) { + return new ContactItemViewHolder(view, adapter); } @SuppressLint("SetTextI18n") @Override - public void bindViewHolder(FlexibleAdapter adapter, UserItemViewHolder holder, int position, List payloads) { + public void bindViewHolder(FlexibleAdapter adapter, ContactItemViewHolder holder, int position, List payloads) { + holder.binding.avatarDraweeView.setController(null); - if (holder.binding.avatarDraweeView != null) { - holder.binding.avatarDraweeView.setController(null); - } - - if (holder.binding.checkedImageView != null) { - if (participant.isSelected()) { - holder.binding.checkedImageView.setVisibility(View.VISIBLE); - } else { - holder.binding.checkedImageView.setVisibility(View.GONE); - } + if (participant.isSelected()) { + holder.binding.checkedImageView.setVisibility(View.VISIBLE); + } else { + holder.binding.checkedImageView.setVisibility(View.GONE); } if (!isOnline) { @@ -227,14 +222,14 @@ public class UserItem extends AbstractFlexibleItem this.header = header; } - static class UserItemViewHolder extends FlexibleViewHolder { + static class ContactItemViewHolder extends FlexibleViewHolder { RvItemContactBinding binding; /** * Default constructor. */ - UserItemViewHolder(View view, FlexibleAdapter adapter) { + ContactItemViewHolder(View view, FlexibleAdapter adapter) { super(view, adapter); binding = RvItemContactBinding.bind(view); } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java index 3adbb0903..2913b76c8 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java @@ -46,7 +46,7 @@ import android.widget.RelativeLayout; import com.bluelinelabs.logansquare.LoganSquare; import com.nextcloud.talk.R; import com.nextcloud.talk.adapters.items.GenericTextHeaderItem; -import com.nextcloud.talk.adapters.items.UserItem; +import com.nextcloud.talk.adapters.items.ContactItem; import com.nextcloud.talk.api.NcApi; import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.controllers.base.BaseController; @@ -550,7 +550,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ userHeaderItems.put(headerTitle, genericTextHeaderItem); } - UserItem newContactItem = new UserItem( + ContactItem newContactItem = new ContactItem( participant, currentUser, userHeaderItems.get(headerTitle) @@ -572,21 +572,21 @@ public class ContactsController extends BaseController implements SearchView.OnQ String firstName; String secondName; - if (o1 instanceof UserItem) { - firstName = ((UserItem) o1).getModel().getDisplayName(); + if (o1 instanceof ContactItem) { + firstName = ((ContactItem) o1).getModel().getDisplayName(); } else { firstName = ((GenericTextHeaderItem) o1).getModel(); } - if (o2 instanceof UserItem) { - secondName = ((UserItem) o2).getModel().getDisplayName(); + if (o2 instanceof ContactItem) { + secondName = ((ContactItem) o2).getModel().getDisplayName(); } else { secondName = ((GenericTextHeaderItem) o2).getModel(); } - if (o1 instanceof UserItem && o2 instanceof UserItem) { - String firstSource = ((UserItem) o1).getModel().getSource(); - String secondSource = ((UserItem) o2).getModel().getSource(); + if (o1 instanceof ContactItem && o2 instanceof ContactItem) { + String firstSource = ((ContactItem) o1).getModel().getSource(); + String secondSource = ((ContactItem) o2).getModel().getSource(); if (firstSource.equals(secondSource)) { return firstName.compareToIgnoreCase(secondName); } @@ -623,24 +623,24 @@ public class ContactsController extends BaseController implements SearchView.OnQ String firstName; String secondName; - if (o1 instanceof UserItem) { - firstName = ((UserItem) o1).getModel().getDisplayName(); + if (o1 instanceof ContactItem) { + firstName = ((ContactItem) o1).getModel().getDisplayName(); } else { firstName = ((GenericTextHeaderItem) o1).getModel(); } - if (o2 instanceof UserItem) { - secondName = ((UserItem) o2).getModel().getDisplayName(); + if (o2 instanceof ContactItem) { + secondName = ((ContactItem) o2).getModel().getDisplayName(); } else { secondName = ((GenericTextHeaderItem) o2).getModel(); } - if (o1 instanceof UserItem && o2 instanceof UserItem) { - if ("groups".equals(((UserItem) o1).getModel().getSource()) && "groups".equals(((UserItem) o2).getModel().getSource())) { + if (o1 instanceof ContactItem && o2 instanceof ContactItem) { + if ("groups".equals(((ContactItem) o1).getModel().getSource()) && "groups".equals(((ContactItem) o2).getModel().getSource())) { return firstName.compareToIgnoreCase(secondName); - } else if ("groups".equals(((UserItem) o1).getModel().getSource())) { + } else if ("groups".equals(((ContactItem) o1).getModel().getSource())) { return -1; - } else if ("groups".equals(((UserItem) o2).getModel().getSource())) { + } else if ("groups".equals(((ContactItem) o2).getModel().getSource())) { return 1; } } @@ -826,12 +826,12 @@ public class ContactsController extends BaseController implements SearchView.OnQ @Override public boolean onItemClick(View view, int position) { - if (adapter.getItem(position) instanceof UserItem) { + if (adapter.getItem(position) instanceof ContactItem) { if (!isNewConversationView && !isAddingParticipantsView) { - UserItem userItem = (UserItem) adapter.getItem(position); + ContactItem contactItem = (ContactItem) adapter.getItem(position); String roomType = "1"; - if ("groups".equals(userItem.getModel().getSource())) { + if ("groups".equals(contactItem.getModel().getSource())) { roomType = "2"; } @@ -841,7 +841,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ currentUser.getBaseUrl(), roomType, null, - userItem.getModel().getActorId(), + contactItem.getModel().getActorId(), null); ncApi.createRoom(credentials, @@ -880,7 +880,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ } }); } else { - Participant participant = ((UserItem) adapter.getItem(position)).getModel(); + Participant participant = ((ContactItem) adapter.getItem(position)).getModel(); participant.setSelected(!participant.isSelected()); if ("groups".equals(participant.getSource())) { @@ -911,10 +911,10 @@ public class ContactsController extends BaseController implements SearchView.OnQ if (CapabilitiesUtil.hasSpreedFeatureCapability(currentUser, "last-room-activity") && !CapabilitiesUtil.hasSpreedFeatureCapability(currentUser, "invite-groups-and-mails") && - "groups".equals(((UserItem) adapter.getItem(position)).getModel().getSource()) && + "groups".equals(((ContactItem) adapter.getItem(position)).getModel().getSource()) && participant.isSelected() && adapter.getSelectedItemCount() > 1) { - List currentItems = adapter.getCurrentItems(); + List currentItems = adapter.getCurrentItems(); Participant internalParticipant; for (int i = 0; i < currentItems.size(); i++) { internalParticipant = currentItems.get(i).getModel(); @@ -960,8 +960,8 @@ public class ContactsController extends BaseController implements SearchView.OnQ List currentItems = adapter.getCurrentItems(); Participant internalParticipant; for (int i = 0; i < currentItems.size(); i++) { - if (currentItems.get(i) instanceof UserItem) { - internalParticipant = ((UserItem) currentItems.get(i)).getModel(); + if (currentItems.get(i) instanceof ContactItem) { + internalParticipant = ((ContactItem) currentItems.get(i)).getModel(); if (internalParticipant.getActorType() == Participant.ActorType.GROUPS && internalParticipant.isSelected()) { internalParticipant.setSelected(false); @@ -972,10 +972,10 @@ public class ContactsController extends BaseController implements SearchView.OnQ } for (int i = 0; i < adapter.getItemCount(); i++) { - if (adapter.getItem(i) instanceof UserItem) { - UserItem userItem = (UserItem) adapter.getItem(i); - if ("groups".equals(userItem.getModel().getSource())) { - userItem.setEnabled(!isPublicCall); + if (adapter.getItem(i) instanceof ContactItem) { + ContactItem contactItem = (ContactItem) adapter.getItem(i); + if ("groups".equals(contactItem.getModel().getSource())) { + contactItem.setEnabled(!isPublicCall); } } }