msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Added contact disabled state

Browse Source
pull/153/head
M66B 7 years ago
parent 4b4350e05f
commit c5b90389ee
4 changed files with 131 additions and 117 deletions
Show Stats Download Patch File Download Diff File

60
app/src/main/java/eu/faircode/email/AdapterContact.java
Unescape View File

@ -49,13 +49,12 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
private int colorAccent; private int colorAccent;
private int textColorSecondary; private int textColorSecondary;
private List<EntityContact> all = new ArrayList<>(); private List<EntityContact> items = new ArrayList<>();
private List<EntityContact> filtered = new ArrayList<>();
private static NumberFormat nf = NumberFormat.getNumberInstance(); private static NumberFormat nf = NumberFormat.getNumberInstance();
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener { public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
private View itemView; private View view;
private ImageView ivType; private ImageView ivType;
private ImageView ivAvatar; private ImageView ivAvatar;
private TextView tvName; private TextView tvName;
@ -67,7 +66,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
ViewHolder(View itemView) { ViewHolder(View itemView) {
super(itemView); super(itemView);
this.itemView = itemView; view = itemView.findViewById(R.id.clItem);
ivType = itemView.findViewById(R.id.ivType); ivType = itemView.findViewById(R.id.ivType);
ivAvatar = itemView.findViewById(R.id.ivAvatar); ivAvatar = itemView.findViewById(R.id.ivAvatar);
tvName = itemView.findViewById(R.id.tvName); tvName = itemView.findViewById(R.id.tvName);
@ -78,16 +77,18 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
} }
private void wire() { private void wire() {
itemView.setOnClickListener(this); view.setOnClickListener(this);
itemView.setOnLongClickListener(this); view.setOnLongClickListener(this);
} }
private void unwire() { private void unwire() {
itemView.setOnClickListener(null); view.setOnClickListener(null);
itemView.setOnLongClickListener(null); view.setOnLongClickListener(null);
} }
private void bindTo(EntityContact contact) { private void bindTo(EntityContact contact) {
view.setAlpha(contact.state == 2 ? Helper.LOW_LIGHT : 1.0f);
if (contact.type == EntityContact.TYPE_FROM) if (contact.type == EntityContact.TYPE_FROM)
ivType.setImageResource(R.drawable.baseline_mail_24); ivType.setImageResource(R.drawable.baseline_mail_24);
else if (contact.type == EntityContact.TYPE_TO) else if (contact.type == EntityContact.TYPE_TO)
@ -106,8 +107,10 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
tvLast.setText(contact.last_contacted == null ? null tvLast.setText(contact.last_contacted == null ? null
: DateUtils.getRelativeTimeSpanString(context, contact.last_contacted)); : DateUtils.getRelativeTimeSpanString(context, contact.last_contacted));
ivFavorite.setImageResource(contact.favorite ? R.drawable.baseline_star_24 : R.drawable.baseline_star_border_24); ivFavorite.setImageResource(contact.state == 1 ? R.drawable.baseline_star_24 : R.drawable.baseline_star_border_24);
ivFavorite.setImageTintList(ColorStateList.valueOf(contact.favorite ? colorAccent : textColorSecondary)); ivFavorite.setImageTintList(ColorStateList.valueOf(contact.state == 1 ? colorAccent : textColorSecondary));
view.requestLayout();
} }
@Override @Override
@ -116,20 +119,22 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
if (pos == RecyclerView.NO_POSITION) if (pos == RecyclerView.NO_POSITION)
return; return;
EntityContact contact = filtered.get(pos); EntityContact contact = items.get(pos);
contact.state = ++contact.state % 3;
notifyItemChanged(pos);
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("id", contact.id); args.putLong("id", contact.id);
args.putBoolean("favorite", !contact.favorite); args.putInt("state", contact.state);
new SimpleTask<Void>() { new SimpleTask<Void>() {
@Override @Override
protected Void onExecute(Context context, Bundle args) { protected Void onExecute(Context context, Bundle args) {
long id = args.getLong("id"); long id = args.getLong("id");
boolean favorite = args.getBoolean("favorite"); int state = args.getInt("state");
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
db.contact().setContactFavorite(id, favorite); db.contact().setContactState(id, state);
return null; return null;
} }
@ -143,7 +148,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
protected void onException(Bundle args, Throwable ex) { protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(context, owner, ex); Helper.unexpectedError(context, owner, ex);
} }
}.execute(context, owner, args, "contact:favorite"); }.execute(context, owner, args, "contact:state");
} }
@Override @Override
@ -152,7 +157,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
if (pos == RecyclerView.NO_POSITION) if (pos == RecyclerView.NO_POSITION)
return false; return false;
EntityContact contact = filtered.get(pos); EntityContact contact = items.get(pos);
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("id", contact.id); args.putLong("id", contact.id);
@ -196,13 +201,11 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
public void set(@NonNull List<EntityContact> contacts) { public void set(@NonNull List<EntityContact> contacts) {
Log.i("Set contacts=" + contacts.size()); Log.i("Set contacts=" + contacts.size());
all = contacts; DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(items, contacts));
DiffUtil.DiffResult diff = DiffUtil.calculateDiff(new DiffCallback(filtered, all));
filtered.clear(); items = contacts;
filtered.addAll(all);
diff.dispatchUpdatesTo(this);
diff.dispatchUpdatesTo(new ListUpdateCallback() { diff.dispatchUpdatesTo(new ListUpdateCallback() {
@Override @Override
public void onInserted(int position, int count) { public void onInserted(int position, int count) {
@ -224,16 +227,15 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
Log.i("Changed @" + position + " #" + count); Log.i("Changed @" + position + " #" + count);
} }
}); });
diff.dispatchUpdatesTo(this);
} }
private class DiffCallback extends DiffUtil.Callback { private class DiffCallback extends DiffUtil.Callback {
private List<EntityContact> prev; private List<EntityContact> prev = new ArrayList<>();
private List<EntityContact> next; private List<EntityContact> next = new ArrayList<>();
DiffCallback(List<EntityContact> prev, List<EntityContact> next) { DiffCallback(List<EntityContact> prev, List<EntityContact> next) {
this.prev = prev; this.prev.addAll(prev);
this.next = next; this.next.addAll(next);
} }
@Override @Override
@ -263,12 +265,12 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
@Override @Override
public long getItemId(int position) { public long getItemId(int position) {
return filtered.get(position).id; return items.get(position).id;
} }
@Override @Override
public int getItemCount() { public int getItemCount() {
return filtered.size(); return items.size();
} }
@Override @Override
@ -280,7 +282,7 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
@Override @Override
public void onBindViewHolder(@NonNull ViewHolder holder, int position) { public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
holder.unwire(); holder.unwire();
EntityContact contact = filtered.get(position); EntityContact contact = items.get(position);
holder.bindTo(contact); holder.bindTo(contact);
holder.wire(); holder.wire();
} }

10
app/src/main/java/eu/faircode/email/DaoContact.java
Unescape View File

@ -35,10 +35,14 @@ public interface DaoContact {
List<EntityContact> getContacts(); List<EntityContact> getContacts();
@Query("SELECT * FROM contact" + @Query("SELECT * FROM contact" +
" ORDER BY favorite DESC, times_contacted DESC, last_contacted DESC") " ORDER BY" +
" CASE WHEN favorite = 1 THEN 0 ELSE 1 END" +
", times_contacted DESC" +
", last_contacted DESC")
LiveData<List<EntityContact>> liveContacts(); LiveData<List<EntityContact>> liveContacts();
@Query("SELECT * FROM contact" + @Query("SELECT * FROM contact" +
" WHERE favorite <> 2" +
" ORDER BY favorite DESC, times_contacted DESC, last_contacted DESC" + " ORDER BY favorite DESC, times_contacted DESC, last_contacted DESC" +
" LIMIT :count") " LIMIT :count")
List<EntityContact> getFrequentlyContacted(int count); List<EntityContact> getFrequentlyContacted(int count);
@ -66,8 +70,8 @@ public interface DaoContact {
@Update @Update
int updateContact(EntityContact contact); int updateContact(EntityContact contact);
@Query("UPDATE contact SET favorite = :favorite WHERE id = :id") @Query("UPDATE contact SET favorite = :state WHERE id = :id")
int setContactFavorite(long id, boolean favorite); int setContactState(long id, int state);
@Query("DELETE FROM contact WHERE id= :id") @Query("DELETE FROM contact WHERE id= :id")
int deleteContact(long id); int deleteContact(long id);

14
app/src/main/java/eu/faircode/email/EntityContact.java
Unescape View File

@ -27,6 +27,7 @@ import java.util.Objects;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.room.ColumnInfo;
import androidx.room.Entity; import androidx.room.Entity;
import androidx.room.Index; import androidx.room.Index;
import androidx.room.PrimaryKey; import androidx.room.PrimaryKey;
@ -64,7 +65,8 @@ public class EntityContact implements Serializable {
public Integer times_contacted; public Integer times_contacted;
public Long last_contacted; public Long last_contacted;
@NonNull @NonNull
public Boolean favorite = false; @ColumnInfo(name = "favorite")
public Integer state = 0;
public JSONObject toJSON() throws JSONException { public JSONObject toJSON() throws JSONException {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
@ -75,7 +77,7 @@ public class EntityContact implements Serializable {
json.put("avatar", avatar); json.put("avatar", avatar);
json.put("times_contacted", times_contacted); json.put("times_contacted", times_contacted);
json.put("last_contacted", last_contacted); json.put("last_contacted", last_contacted);
json.put("favorite", favorite); json.put("state", state);
return json; return json;
} }
@ -100,7 +102,9 @@ public class EntityContact implements Serializable {
contact.last_contacted = json.getLong("last_contacted"); contact.last_contacted = json.getLong("last_contacted");
if (json.has("favorite")) if (json.has("favorite"))
contact.favorite = json.getBoolean("favorite"); contact.state = (json.getBoolean("favorite") ? 1 : 0);
if (json.has("state"))
contact.state = json.getInt("state");
return contact; return contact;
} }
@ -113,9 +117,9 @@ public class EntityContact implements Serializable {
this.email.equals(other.email) && this.email.equals(other.email) &&
Objects.equals(this.name, other.name) && Objects.equals(this.name, other.name) &&
Objects.equals(this.avatar, other.avatar) && Objects.equals(this.avatar, other.avatar) &&
this.times_contacted == other.times_contacted && this.times_contacted.equals(other.times_contacted) &&
Objects.equals(this.last_contacted, other.last_contacted) && Objects.equals(this.last_contacted, other.last_contacted) &&
this.favorite == other.favorite); this.state.equals(other.state));
} else } else
return false; return false;

12
app/src/main/res/layout/item_contact.xml
Unescape View File

@ -1,7 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/clItem"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="3dp"> android:padding="3dp">
@ -80,10 +84,10 @@
android:id="@+id/ivFavorite" android:id="@+id/ivFavorite"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/baseline_star_24" android:src="@drawable/baseline_star_24"
android:visibility="visible" android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@+id/ivAvatar" app:layout_constraintBottom_toBottomOf="@+id/ivAvatar"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/ivAvatar" /> app:layout_constraintTop_toTopOf="@+id/ivAvatar" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
Write Preview
Loading…
Cancel
Save