Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

Refactor existing adapters into a generic superclass

Browse Source 
This commit also moves various blog classes into their own packages and
makes the required visibility changes.
This commit is contained in:
Torsten Grote
2016-10-03 19:29:14 -03:00
parent 9112d17a4b
commit b2fa039474
29 changed files with 305 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-android/src/org/briarproject/android/sharing/BlogInvitationAdapter.java
View File

@@ -15,7 +15,9 @@ class BlogInvitationAdapter extends InvitationAdapter {
@Override
public void onBindViewHolder(InvitationsViewHolder ui, int position) {
super.onBindViewHolder(ui, position);
InvitationItem item = getItem(position);
InvitationItem item = getItemAt(position);
if (item == null) return;
Blog blog = (Blog) item.getShareable();
ui.avatar.setAuthorAvatar(blog.getAuthor());
@@ -28,7 +30,8 @@ class BlogInvitationAdapter extends InvitationAdapter {
}
}
int compareInvitations(InvitationItem o1, InvitationItem o2) {
@Override
public int compare(InvitationItem o1, InvitationItem o2) {
return String.CASE_INSENSITIVE_ORDER
.compare(((Blog) o1.getShareable()).getAuthor().getName(),
((Blog) o2.getShareable()).getAuthor().getName());

15
briar-android/src/org/briarproject/android/sharing/ContactSelectorAdapter.java
View File

@@ -9,7 +9,6 @@ import android.widget.TextView;
import org.briarproject.R;
import org.briarproject.android.contact.BaseContactListAdapter;
import org.briarproject.android.contact.ContactListItem;
import org.briarproject.api.contact.ContactId;
import java.util.ArrayList;
@@ -41,7 +40,8 @@ class ContactSelectorAdapter
super.onBindViewHolder(ui, position);
SelectableContactListItem item =
(SelectableContactListItem) getItem(position);
(SelectableContactListItem) getItemAt(position);
if (item == null) return;
if (item.isSelected()) {
ui.checkBox.setChecked(true);
@@ -64,9 +64,9 @@ class ContactSelectorAdapter
Collection<ContactId> getSelectedContactIds() {
Collection<ContactId> selected = new ArrayList<>();
for (int i = 0; i < contacts.size(); i++) {
for (int i = 0; i < items.size(); i++) {
SelectableContactListItem item =
(SelectableContactListItem) contacts.get(i);
(SelectableContactListItem) items.get(i);
if (item.isSelected()) selected.add(item.getContact().getId());
}
@@ -79,7 +79,7 @@ class ContactSelectorAdapter
private final CheckBox checkBox;
private final TextView shared;
SelectableContactHolder(View v) {
private SelectableContactHolder(View v) {
super(v);
checkBox = (CheckBox) v.findViewById(R.id.checkBox);
@@ -87,11 +87,6 @@ class ContactSelectorAdapter
}
}
@Override
public int compareContactListItems(ContactListItem c1, ContactListItem c2) {
return compareByName(c1, c2);
}
private void grayOutItem(SelectableContactHolder ui, boolean gray) {
float alpha = gray ? 0.25f : 1f;
ui.avatar.setAlpha(alpha);

7
briar-android/src/org/briarproject/android/sharing/ForumInvitationAdapter.java
View File

@@ -14,7 +14,9 @@ class ForumInvitationAdapter extends InvitationAdapter {
@Override
public void onBindViewHolder(InvitationsViewHolder ui, int position) {
super.onBindViewHolder(ui, position);
InvitationItem item = getItem(position);
InvitationItem item = getItemAt(position);
if (item == null) return;
Forum forum = (Forum) item.getShareable();
ui.avatar.setText(forum.getName().substring(0, 1));
@@ -23,7 +25,8 @@ class ForumInvitationAdapter extends InvitationAdapter {
ui.name.setText(forum.getName());
}
int compareInvitations(InvitationItem o1, InvitationItem o2) {
@Override
public int compare(InvitationItem o1, InvitationItem o2) {
return String.CASE_INSENSITIVE_ORDER
.compare(((Forum) o1.getShareable()).getName(),
((Forum) o2.getShareable()).getName());

95
briar-android/src/org/briarproject/android/sharing/InvitationAdapter.java
View File

@@ -1,7 +1,6 @@
package org.briarproject.android.sharing;
import android.content.Context;
import android.support.v7.util.SortedList;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
@@ -10,6 +9,7 @@ import android.widget.Button;
import android.widget.TextView;
import org.briarproject.R;
import org.briarproject.android.util.BriarAdapter;
import org.briarproject.android.view.TextAvatarView;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.sharing.InvitationItem;
@@ -22,16 +22,12 @@ import static android.view.View.GONE;
import static android.view.View.VISIBLE;
abstract class InvitationAdapter extends
RecyclerView.Adapter<InvitationAdapter.InvitationsViewHolder> {
BriarAdapter<InvitationItem, InvitationAdapter.InvitationsViewHolder> {
protected final Context ctx;
private final AvailableForumClickListener listener;
private final SortedList<InvitationItem> invitations =
new SortedList<>(InvitationItem.class,
new SortedListCallBacks());
InvitationAdapter(Context ctx, AvailableForumClickListener listener) {
this.ctx = ctx;
super(ctx, InvitationItem.class);
this.listener = listener;
}
@@ -46,7 +42,8 @@ abstract class InvitationAdapter extends
@Override
public void onBindViewHolder(InvitationsViewHolder ui, int position) {
final InvitationItem item = getItem(position);
final InvitationItem item = getItemAt(position);
if (item == null) return;
Collection<String> names = new ArrayList<>();
for (Contact c : item.getNewSharers())
@@ -75,40 +72,28 @@ abstract class InvitationAdapter extends
}
@Override
public int getItemCount() {
return invitations.size();
public boolean areContentsTheSame(InvitationItem oldItem,
InvitationItem newItem) {
return oldItem.isSubscribed() == newItem.isSubscribed() &&
oldItem.getNewSharers().equals(newItem.getNewSharers());
}
public InvitationItem getItem(int position) {
return invitations.get(position);
}
public void add(InvitationItem item) {
invitations.add(item);
}
public void addAll(Collection<InvitationItem> list) {
invitations.addAll(list);
}
public void remove(InvitationItem item) {
invitations.remove(item);
}
public void clear() {
invitations.clear();
@Override
public boolean areItemsTheSame(InvitationItem oldItem,
InvitationItem newItem) {
return oldItem.getShareable().equals(newItem.getShareable());
}
static class InvitationsViewHolder extends RecyclerView.ViewHolder {
final TextAvatarView avatar;
final TextView name;
final TextView sharedBy;
private final TextView sharedBy;
final TextView subscribed;
final Button accept;
final Button decline;
private final Button accept;
private final Button decline;
InvitationsViewHolder(View v) {
private InvitationsViewHolder(View v) {
super(v);
avatar = (TextAvatarView) v.findViewById(R.id.avatarView);
@@ -120,52 +105,6 @@ abstract class InvitationAdapter extends
}
}
abstract int compareInvitations(InvitationItem o1, InvitationItem o2);
private class SortedListCallBacks
extends SortedList.Callback<InvitationItem> {
@Override
public int compare(InvitationItem o1,
InvitationItem o2) {
return compareInvitations(o1, o2);
}
@Override
public void onInserted(int position, int count) {
notifyItemRangeInserted(position, count);
}
@Override
public void onRemoved(int position, int count) {
notifyItemRangeRemoved(position, count);
}
@Override
public void onMoved(int fromPosition, int toPosition) {
notifyItemMoved(fromPosition, toPosition);
}
@Override
public void onChanged(int position, int count) {
notifyItemRangeChanged(position, count);
}
@Override
public boolean areContentsTheSame(InvitationItem oldItem,
InvitationItem newItem) {
return oldItem.isSubscribed() == newItem.isSubscribed() &&
oldItem.getNewSharers().equals(newItem.getNewSharers());
}
@Override
public boolean areItemsTheSame(InvitationItem oldItem,
InvitationItem newItem) {
return oldItem.getShareable().equals(newItem.getShareable());
}
}
interface AvailableForumClickListener {
void onItemClick(InvitationItem item, boolean accept);
}

6
briar-android/src/org/briarproject/android/sharing/SharingStatusAdapter.java
View File

@@ -7,7 +7,6 @@ import android.view.ViewGroup;
import org.briarproject.R;
import org.briarproject.android.contact.BaseContactListAdapter;
import org.briarproject.android.contact.ContactListItem;
class SharingStatusAdapter
extends BaseContactListAdapter<BaseContactListAdapter.BaseContactHolder> {
@@ -24,9 +23,4 @@ class SharingStatusAdapter
return new BaseContactHolder(v);
}
@Override
public int compareContactListItems(ContactListItem c1, ContactListItem c2) {
return compareByName(c1, c2);
}
}