awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

show a-z letters in the leftmost column of the ContactActivities

Browse Source
This commit is contained in:
B. Petersen
2018-09-21 17:14:19 +02:00
parent 64f6e9a5f7
commit c734a79ef1
2 changed files with 78 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/ConversationAdapter.java
+10 -10
View File
@@ -66,8 +66,8 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
private static final int MAX_CACHE_SIZE = 40;
private static final String TAG = ConversationAdapter.class.getSimpleName();
private final Map<Integer,SoftReference<DcMsg>> messageRecordCache =
Collections.synchronizedMap(new LRUCache<Integer,SoftReference<DcMsg>>(MAX_CACHE_SIZE)); // TODO: use the cache
private final Map<Integer,SoftReference<DcMsg>> recordCache =
Collections.synchronizedMap(new LRUCache<Integer,SoftReference<DcMsg>>(MAX_CACHE_SIZE));
private static final int MESSAGE_TYPE_OUTGOING = 0;
private static final int MESSAGE_TYPE_INCOMING = 1;
@@ -123,17 +123,17 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
return new DcMsg(0);
}
final SoftReference<DcMsg> reference = messageRecordCache.get(position);
final SoftReference<DcMsg> reference = recordCache.get(position);
if (reference != null) {
final DcMsg msgFromCache = reference.get();
if (msgFromCache != null) {
return msgFromCache;
final DcMsg fromCache = reference.get();
if (fromCache != null) {
return fromCache;
}
}
final DcMsg msgFromDb = dcContext.getMsg(dcMsgList[dcMsgList.length-1-position]);
messageRecordCache.put(position, new SoftReference<>(msgFromDb));
return msgFromDb;
final DcMsg fromDb = dcContext.getMsg(dcMsgList[dcMsgList.length-1-position]);
recordCache.put(position, new SoftReference<>(fromDb));
return fromDb;
}
@@ -385,7 +385,7 @@ public class ConversationAdapter <V extends View & BindableConversationItem>
public void reloadData() {
// should be called when some items in a message are changed, eg. seen-state
messageRecordCache.clear();
recordCache.clear();
notifyDataSetChanged();
}
src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java
+68 -70
View File
@@ -18,21 +18,15 @@ package org.thoughtcrime.securesms.contacts;
import android.content.Context;
import android.content.res.TypedArray;
import android.database.Cursor;
import android.provider.ContactsContract;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.RecyclerView;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.b44t.messenger.DcChatlist;
import com.b44t.messenger.DcContact;
import org.thoughtcrime.securesms.R;
@@ -42,10 +36,14 @@ import org.thoughtcrime.securesms.connect.DcContactsLoader;
import org.thoughtcrime.securesms.connect.DcHelper;
import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter.HeaderViewHolder;
import org.thoughtcrime.securesms.mms.GlideRequests;
import org.thoughtcrime.securesms.util.LRUCache;
import org.thoughtcrime.securesms.util.StickyHeaderDecoration.StickyHeaderAdapter;
import org.thoughtcrime.securesms.util.Util;
import java.lang.ref.SoftReference;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
/**
@@ -65,6 +63,11 @@ public class ContactSelectionListAdapter extends RecyclerView.Adapter
private final static int STYLE_ATTRIBUTES[] = new int[]{R.attr.contact_selection_push_user,
R.attr.contact_selection_lay_user};
private static final int MAX_CACHE_SIZE = 100;
private final Map<Integer,SoftReference<DcContact>> recordCache =
Collections.synchronizedMap(new LRUCache<Integer,SoftReference<DcContact>>(MAX_CACHE_SIZE));
private final @NonNull Context context;
private final @NonNull ApplicationDcContext dcContext;
private @NonNull int[] dcContactList = new int[0];
@@ -76,6 +79,30 @@ public class ContactSelectionListAdapter extends RecyclerView.Adapter
private final GlideRequests glideRequests;
private final Set<String> selectedContacts = new HashSet<>(); // TODO: maybe better use contact-id here
@Override
public int getItemCount() {
return dcContactList.length;
}
private
@NonNull DcContact getContact(int position) {
if(position<0 || position>=dcContactList.length) {
return new DcContact(0);
}
final SoftReference<DcContact> reference = recordCache.get(position);
if (reference != null) {
final DcContact fromCache = reference.get();
if (fromCache != null) {
return fromCache;
}
}
final DcContact fromDb = dcContext.getContact(dcContactList[position]);
recordCache.put(position, new SoftReference<>(fromDb));
return fromDb;
}
public abstract static class ViewHolder extends RecyclerView.ViewHolder {
public ViewHolder(View itemView) {
@@ -158,24 +185,6 @@ public class ContactSelectionListAdapter extends RecyclerView.Adapter
this.clickListener = clickListener;
}
@Override
public int getItemCount() {
return dcContactList.length;
}
@Override
public long getHeaderId(int i) {
return -1;
/* TODO: what should be done here?
if (!isActiveCursor()) return -1;
int contactType = getContactType(i);
if (contactType == ContactsDatabase.DIVIDER_TYPE) return -1;
return Util.hashCode(getHeaderString(i), getContactType(i));
*/
}
@Override
public ContactSelectionListAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
if (viewType == VIEW_TYPE_CONTACT) {
@@ -214,7 +223,7 @@ public class ContactSelectionListAdapter extends RecyclerView.Adapter
name = context.getString(R.string.contact_selection_list__new_verified_group);
}
else {
dcContact = dcContext.getContact(id);
dcContact = getContact(i);
name = dcContact.getDisplayName();
addr = dcContact.getAddr();
}
@@ -230,16 +239,6 @@ public class ContactSelectionListAdapter extends RecyclerView.Adapter
return VIEW_TYPE_CONTACT;
}
@Override
public HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent) {
return new HeaderViewHolder(LayoutInflater.from(context).inflate(R.layout.contact_selection_recyclerview_header, parent, false));
}
@Override
public void onBindHeaderViewHolder(HeaderViewHolder viewHolder, int position) {
((TextView)viewHolder.itemView).setText(getSpannedHeaderString(position));
}
@Override
public CharSequence getBubbleText(int position) {
return getHeaderString(position);
@@ -249,48 +248,47 @@ public class ContactSelectionListAdapter extends RecyclerView.Adapter
return selectedContacts;
}
private CharSequence getSpannedHeaderString(int position) {
final String headerString = getHeaderString(position);
/* TODO: what should be done here?
if (isPush(position)) {
SpannableString spannable = new SpannableString(headerString);
spannable.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.signal_primary)), 0, headerString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
return spannable;
} else*/ {
return headerString;
}
}
private @NonNull String getHeaderString(int position) {
return " ";
/* TODO: what should be done here?
int contactType = getContactType(position);
if (contactType == ContactsDatabase.RECENT_TYPE || contactType == ContactsDatabase.DIVIDER_TYPE) {
return " ";
}
Cursor cursor = getCursorAtPositionOrThrow(position);
String letter = cursor.getString(cursor.getColumnIndexOrThrow(ContactsDatabase.NAME_COLUMN));
if (!TextUtils.isEmpty(letter)) {
String firstChar = letter.trim().substring(0, 1).toUpperCase();
if (Character.isLetterOrDigit(firstChar.codePointAt(0))) {
return firstChar;
}
}
return "#";
*/
}
public interface ItemClickListener {
void onItemClick(ContactSelectionListItem item);
}
@Override
public long getHeaderId(int position) {
if (position < 0 || position >= getItemCount()) {
return -1;
}
return Util.hashCode(getHeaderString(position));
}
private @NonNull String getHeaderString(int position) {
DcContact dcContact = getContact(position);
String name = dcContact.getDisplayName();
if (!TextUtils.isEmpty(name)) {
String firstChar = name.trim().substring(0, 1).toUpperCase();
if (Character.isLetterOrDigit(firstChar.codePointAt(0))) {
return firstChar;
}
}
return "";
}
@Override
public HeaderViewHolder onCreateHeaderViewHolder(ViewGroup parent) {
return new HeaderViewHolder(LayoutInflater.from(context).inflate(R.layout.contact_selection_recyclerview_header, parent, false));
}
@Override
public void onBindHeaderViewHolder(HeaderViewHolder viewHolder, int position) {
((TextView)viewHolder.itemView).setText(getHeaderString(position));
}
public void changeData(DcContactsLoader.Ret loaderRet) {
this.dcContactList = loaderRet==null? new int[0] : loaderRet.ids;
this.query = loaderRet==null? null : loaderRet.query;
recordCache.clear();
notifyDataSetChanged();
}
}