|
|
@ -970,7 +970,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|
|
|
|
|
|
|
|
|
|
|
vSeparatorBody.setVisibility(View.VISIBLE);
|
|
|
|
vSeparatorBody.setVisibility(View.VISIBLE);
|
|
|
|
|
|
|
|
|
|
|
|
initToolbar();
|
|
|
|
initToolbar(message);
|
|
|
|
|
|
|
|
|
|
|
|
ibFull.setVisibility(View.GONE);
|
|
|
|
ibFull.setVisibility(View.GONE);
|
|
|
|
ibImages.setVisibility(View.GONE);
|
|
|
|
ibImages.setVisibility(View.GONE);
|
|
|
@ -1483,16 +1483,19 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case R.id.ibExpander:
|
|
|
|
case R.id.ibExpander:
|
|
|
|
onToggleToolbar();
|
|
|
|
onToggleToolbar(message);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case R.id.ibFull:
|
|
|
|
case R.id.ibFull:
|
|
|
|
onShowFull(message);
|
|
|
|
onShowFull(message);
|
|
|
|
|
|
|
|
autoToolbar(message);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case R.id.ibImages:
|
|
|
|
case R.id.ibImages:
|
|
|
|
onShowImages(message);
|
|
|
|
onShowImages(message);
|
|
|
|
|
|
|
|
autoToolbar(message);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case R.id.ibDecrypt:
|
|
|
|
case R.id.ibDecrypt:
|
|
|
|
onActionDecrypt(message);
|
|
|
|
onActionDecrypt(message);
|
|
|
|
|
|
|
|
autoToolbar(message);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case R.id.ibReply:
|
|
|
|
case R.id.ibReply:
|
|
|
@ -1500,21 +1503,25 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case R.id.ibForward:
|
|
|
|
case R.id.ibForward:
|
|
|
|
onActionForward(message);
|
|
|
|
onActionForward(message);
|
|
|
|
|
|
|
|
autoToolbar(message);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case R.id.ibArchive:
|
|
|
|
case R.id.ibArchive:
|
|
|
|
if (EntityFolder.JUNK.equals(message.folderType))
|
|
|
|
if (EntityFolder.JUNK.equals(message.folderType))
|
|
|
|
onActionMoveJunk(message);
|
|
|
|
onActionMoveJunk(message);
|
|
|
|
else
|
|
|
|
else
|
|
|
|
onActionArchive(message);
|
|
|
|
onActionArchive(message);
|
|
|
|
|
|
|
|
autoToolbar(message);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case R.id.ibMove:
|
|
|
|
case R.id.ibMove:
|
|
|
|
if (EntityFolder.OUTBOX.equals(message.folderType))
|
|
|
|
if (EntityFolder.OUTBOX.equals(message.folderType))
|
|
|
|
onActionMoveOutbox(message);
|
|
|
|
onActionMoveOutbox(message);
|
|
|
|
else
|
|
|
|
else
|
|
|
|
onActionMove(message, false);
|
|
|
|
onActionMove(message, false);
|
|
|
|
|
|
|
|
autoToolbar(message);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case R.id.ibDelete:
|
|
|
|
case R.id.ibDelete:
|
|
|
|
onActionDelete(message);
|
|
|
|
onActionDelete(message);
|
|
|
|
|
|
|
|
autoToolbar(message);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case R.id.ibMore:
|
|
|
|
case R.id.ibMore:
|
|
|
|
onActionMore(message);
|
|
|
|
onActionMore(message);
|
|
|
@ -1882,18 +1889,18 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|
|
|
bindExpanded(message);
|
|
|
|
bindExpanded(message);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void onToggleToolbar() {
|
|
|
|
private void onToggleToolbar(TupleMessageEx message) {
|
|
|
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
|
|
|
boolean toolbar = !properties.getValue("toolbar", message.id);
|
|
|
|
boolean toolbar = prefs.getBoolean("toolbar", true);
|
|
|
|
properties.setValue("toolbar", message.id, toolbar);
|
|
|
|
prefs.edit().putBoolean("toolbar", !toolbar).apply();
|
|
|
|
initToolbar(message);
|
|
|
|
initToolbar();
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void initToolbar() {
|
|
|
|
private void initToolbar(TupleMessageEx message) {
|
|
|
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
|
|
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
|
|
|
boolean toolbar = prefs.getBoolean("toolbar", true);
|
|
|
|
|
|
|
|
boolean cards = prefs.getBoolean("cards", true);
|
|
|
|
boolean cards = prefs.getBoolean("cards", true);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
boolean toolbar = properties.getValue("toolbar", message.id);
|
|
|
|
|
|
|
|
|
|
|
|
ConstraintLayout.LayoutParams lparam = (ConstraintLayout.LayoutParams) ibExpander.getLayoutParams();
|
|
|
|
ConstraintLayout.LayoutParams lparam = (ConstraintLayout.LayoutParams) ibExpander.getLayoutParams();
|
|
|
|
lparam.setMarginEnd(cards ? 0 : Helper.dp2pixels(ibExpander.getContext(), 6));
|
|
|
|
lparam.setMarginEnd(cards ? 0 : Helper.dp2pixels(ibExpander.getContext(), 6));
|
|
|
|
ibExpander.setLayoutParams(lparam);
|
|
|
|
ibExpander.setLayoutParams(lparam);
|
|
|
@ -1924,6 +1931,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void autoToolbar(TupleMessageEx message) {
|
|
|
|
|
|
|
|
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
|
|
|
|
|
|
|
boolean autotoolbar = prefs.getBoolean("autotoolbar", false);
|
|
|
|
|
|
|
|
if (autotoolbar) {
|
|
|
|
|
|
|
|
properties.setValue("toolbar", message.id, false);
|
|
|
|
|
|
|
|
initToolbar(message);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void expand(View view, boolean cards) {
|
|
|
|
private void expand(View view, boolean cards) {
|
|
|
|
int dp6 = Helper.dp2pixels(view.getContext(), 6);
|
|
|
|
int dp6 = Helper.dp2pixels(view.getContext(), 6);
|
|
|
|
int dp36 = Helper.dp2pixels(view.getContext(), 36);
|
|
|
|
int dp36 = Helper.dp2pixels(view.getContext(), 36);
|
|
|
@ -2140,6 +2156,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|
|
|
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
|
|
|
|
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public boolean onMenuItemClick(MenuItem target) {
|
|
|
|
public boolean onMenuItemClick(MenuItem target) {
|
|
|
|
|
|
|
|
autoToolbar(message);
|
|
|
|
switch (target.getItemId()) {
|
|
|
|
switch (target.getItemId()) {
|
|
|
|
case R.id.menu_reply_to_sender:
|
|
|
|
case R.id.menu_reply_to_sender:
|
|
|
|
onMenuReply(message, "reply");
|
|
|
|
onMenuReply(message, "reply");
|
|
|
@ -2381,6 +2398,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|
|
|
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
|
|
|
|
popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public boolean onMenuItemClick(MenuItem target) {
|
|
|
|
public boolean onMenuItemClick(MenuItem target) {
|
|
|
|
|
|
|
|
autoToolbar(message);
|
|
|
|
switch (target.getItemId()) {
|
|
|
|
switch (target.getItemId()) {
|
|
|
|
case R.id.menu_editasnew:
|
|
|
|
case R.id.menu_editasnew:
|
|
|
|
onMenuEditAsNew(message);
|
|
|
|
onMenuEditAsNew(message);
|
|
|
|