Added bottom trash icon

pull/178/head
M66B 6 years ago
parent f7d38e4861
commit aa9be6e077

@ -409,6 +409,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private TextView tvNoInternetBody; private TextView tvNoInternetBody;
private ImageButton ibDownloading; private ImageButton ibDownloading;
private Group grpDownloading; private Group grpDownloading;
private ImageButton ibTrashBottom;
private ImageButton ibSeen; private ImageButton ibSeen;
private Flow flow; private Flow flow;
@ -602,6 +603,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvNoInternetBody = vsBody.findViewById(R.id.tvNoInternetBody); tvNoInternetBody = vsBody.findViewById(R.id.tvNoInternetBody);
ibDownloading = vsBody.findViewById(R.id.ibDownloading); ibDownloading = vsBody.findViewById(R.id.ibDownloading);
grpDownloading = vsBody.findViewById(R.id.grpDownloading); grpDownloading = vsBody.findViewById(R.id.grpDownloading);
ibTrashBottom = vsBody.findViewById(R.id.ibTrashBottom);
ibSeen = vsBody.findViewById(R.id.ibSeen); ibSeen = vsBody.findViewById(R.id.ibSeen);
flow = vsBody.findViewById(R.id.flow); flow = vsBody.findViewById(R.id.flow);
@ -681,6 +683,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibMore.setOnClickListener(this); ibMore.setOnClickListener(this);
ibDownloading.setOnClickListener(this); ibDownloading.setOnClickListener(this);
ibTrashBottom.setOnClickListener(this);
ibSeen.setOnClickListener(this); ibSeen.setOnClickListener(this);
tvBody.setOnTouchListener(this); tvBody.setOnTouchListener(this);
@ -754,6 +757,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibMore.setOnClickListener(null); ibMore.setOnClickListener(null);
ibDownloading.setOnClickListener(null); ibDownloading.setOnClickListener(null);
ibTrashBottom.setOnClickListener(null);
ibSeen.setOnClickListener(null); ibSeen.setOnClickListener(null);
tvBody.setOnTouchListener(null); tvBody.setOnTouchListener(null);
@ -1200,6 +1204,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
pbBody.setVisibility(View.GONE); pbBody.setVisibility(View.GONE);
grpAction.setVisibility(View.GONE); grpAction.setVisibility(View.GONE);
clearActions(); clearActions();
ibTrashBottom.setVisibility(View.GONE);
ibSeen.setVisibility(View.GONE); ibSeen.setVisibility(View.GONE);
} }
@ -1495,6 +1500,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
pbBody.setVisibility(View.GONE); pbBody.setVisibility(View.GONE);
grpAction.setVisibility(View.GONE); grpAction.setVisibility(View.GONE);
clearActions(); clearActions();
ibTrashBottom.setVisibility(View.GONE);
ibSeen.setVisibility(View.GONE); ibSeen.setVisibility(View.GONE);
db.attachment().liveAttachments(message.id).observe(cowner, new Observer<List<EntityAttachment>>() { db.attachment().liveAttachments(message.id).observe(cowner, new Observer<List<EntityAttachment>>() {
@ -1592,6 +1598,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibTrash.setVisibility(trash && button_archive_trash ? View.VISIBLE : View.GONE); ibTrash.setVisibility(trash && button_archive_trash ? View.VISIBLE : View.GONE);
ibJunk.setVisibility(junk || unjunk ? View.VISIBLE : View.GONE); ibJunk.setVisibility(junk || unjunk ? View.VISIBLE : View.GONE);
ibTrashBottom.setVisibility(trash && button_archive_trash ? View.VISIBLE : View.GONE);
bindBody(message, scroll); bindBody(message, scroll);
} }
@ -2640,6 +2648,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
onActionArchive(message); onActionArchive(message);
break; break;
case R.id.ibTrash: case R.id.ibTrash:
case R.id.ibTrashBottom:
onActionTrash(message, (Boolean) ibTrash.getTag()); onActionTrash(message, (Boolean) ibTrash.getTag());
break; break;
case R.id.ibJunk: case R.id.ibJunk:

@ -112,6 +112,19 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvBody" /> app:layout_constraintTop_toBottomOf="@id/tvBody" />
<ImageButton
android:id="@+id/ibTrashBottom"
android:layout_width="36dp"
android:layout_height="36dp"
android:background="?attr/selectableItemBackground"
android:contentDescription="@string/title_trash"
android:padding="6dp"
android:scaleType="fitCenter"
android:tint="?attr/colorSeparator"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/wvBody"
app:srcCompat="@drawable/baseline_delete_24" />
<ImageButton <ImageButton
android:id="@+id/ibSeen" android:id="@+id/ibSeen"
android:layout_width="36dp" android:layout_width="36dp"

Loading…
Cancel
Save