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

Back to the future

Browse Source
pull/207/head
M66B 3 years ago
parent 0e25b3922a
commit a485290956
2 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File

45
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -291,6 +291,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
private FloatingActionButton fabMore; private FloatingActionButton fabMore;
private TextView tvSelectedCount; private TextView tvSelectedCount;
private CardView cardMore; private CardView cardMore;
private ImageButton ibInbox;
private ImageButton ibArchive; private ImageButton ibArchive;
private ImageButton ibJunk; private ImageButton ibJunk;
private ImageButton ibTrash; private ImageButton ibTrash;
@ -556,6 +557,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
fabMore = view.findViewById(R.id.fabMore); fabMore = view.findViewById(R.id.fabMore);
tvSelectedCount = view.findViewById(R.id.tvSelectedCount); tvSelectedCount = view.findViewById(R.id.tvSelectedCount);
cardMore = view.findViewById(R.id.cardMore); cardMore = view.findViewById(R.id.cardMore);
ibInbox = view.findViewById(R.id.ibInbox);
ibArchive = view.findViewById(R.id.ibArchive); ibArchive = view.findViewById(R.id.ibArchive);
ibJunk = view.findViewById(R.id.ibJunk); ibJunk = view.findViewById(R.id.ibJunk);
ibTrash = view.findViewById(R.id.ibTrash); ibTrash = view.findViewById(R.id.ibTrash);
@ -1285,6 +1287,13 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
} }
}); });
ibInbox.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
onActionMoveSelection(EntityFolder.INBOX, false);
}
});
ibArchive.setOnClickListener(new View.OnClickListener() { ibArchive.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@ -5759,10 +5768,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
protected Boolean[] onExecute(Context context, Bundle args) { protected Boolean[] onExecute(Context context, Bundle args) {
long[] ids = args.getLongArray("ids"); long[] ids = args.getLongArray("ids");
Boolean[] result = new Boolean[3]; Boolean[] result = new Boolean[4];
result[0] = false; result[0] = false;
result[1] = false; result[1] = false;
result[2] = false; result[2] = false;
result[3] = false;
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
@ -5771,31 +5781,43 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (message == null) if (message == null)
continue; continue;
EntityAccount account = db.account().getAccount(message.account);
if (account == null || account.protocol != EntityAccount.TYPE_IMAP)
continue;
EntityFolder folder = db.folder().getFolder(message.folder); EntityFolder folder = db.folder().getFolder(message.folder);
if (folder == null) if (folder == null)
continue; continue;
if (!result[0] && if (!result[0] &&
(EntityFolder.ARCHIVE.equals(folder.type) ||
EntityFolder.JUNK.equals(folder.type) ||
EntityFolder.TRASH.equals(folder.type))) {
EntityFolder inbox = db.folder().getFolderByType(message.account, EntityFolder.INBOX);
result[0] = (inbox != null && inbox.selectable);
}
if (!result[1] &&
!EntityFolder.ARCHIVE.equals(folder.type)) { !EntityFolder.ARCHIVE.equals(folder.type)) {
EntityFolder archive = db.folder().getFolderByType(message.account, EntityFolder.ARCHIVE); EntityFolder archive = db.folder().getFolderByType(message.account, EntityFolder.ARCHIVE);
result[0] = (archive != null && archive.selectable); result[1] = (archive != null && archive.selectable);
} }
if (!result[1] && if (!result[2] &&
!EntityFolder.JUNK.equals(folder.type) && !EntityFolder.JUNK.equals(folder.type) &&
!EntityFolder.DRAFTS.equals(folder.type)) { !EntityFolder.DRAFTS.equals(folder.type)) {
EntityFolder junk = db.folder().getFolderByType(message.account, EntityFolder.JUNK); EntityFolder junk = db.folder().getFolderByType(message.account, EntityFolder.JUNK);
result[1] = (junk != null && junk.selectable); result[2] = (junk != null && junk.selectable);
} }
if (!result[2] && if (!result[3] &&
!EntityFolder.TRASH.equals(folder.type) && !EntityFolder.TRASH.equals(folder.type) &&
!EntityFolder.JUNK.equals(folder.type)) { !EntityFolder.JUNK.equals(folder.type)) {
EntityFolder trash = db.folder().getFolderByType(message.account, EntityFolder.TRASH); EntityFolder trash = db.folder().getFolderByType(message.account, EntityFolder.TRASH);
result[2] = (trash != null && trash.selectable); result[3] = (trash != null && trash.selectable);
} }
if (result[0] && result[1] && result[2]) if (result[0] && result[1] && result[2] || result[3])
break; break;
} }
@ -5804,11 +5826,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
@Override @Override
protected void onExecuted(Bundle args, Boolean[] result) { protected void onExecuted(Bundle args, Boolean[] result) {
ibArchive.setVisibility(result[0] ? View.VISIBLE : View.GONE); ibInbox.setVisibility(result[0] ? View.VISIBLE : View.GONE);
ibJunk.setVisibility(result[1] ? View.VISIBLE : View.GONE); ibArchive.setVisibility(result[1] ? View.VISIBLE : View.GONE);
ibTrash.setVisibility(result[2] ? View.VISIBLE : View.GONE); ibJunk.setVisibility(result[2] ? View.VISIBLE : View.GONE);
ibTrash.setVisibility(result[3] ? View.VISIBLE : View.GONE);
cardMore.setVisibility(fabMore.isOrWillBeShown() && cardMore.setVisibility(fabMore.isOrWillBeShown() &&
(result[0] || result[1] || result[2]) (result[1] || result[2] || result[3] || result[4])
? View.VISIBLE : View.GONE); ? View.VISIBLE : View.GONE);
} }

16
app/src/main/res/layout/fragment_messages.xml
Unescape View File

@ -516,6 +516,20 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="6dp"> android:paddingHorizontal="6dp">
<eu.faircode.email.FixedImageButton
android:id="@+id/ibInbox"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_folder_inbox"
android:padding="6dp"
android:scaleType="fitCenter"
android:tint="@color/action_foreground"
android:tooltipText="@string/title_folder_inbox"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/twotone_inbox_24" />
<eu.faircode.email.FixedImageButton <eu.faircode.email.FixedImageButton
android:id="@+id/ibArchive" android:id="@+id/ibArchive"
android:layout_width="48dp" android:layout_width="48dp"
@ -526,7 +540,7 @@
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:tint="@color/action_foreground" android:tint="@color/action_foreground"
android:tooltipText="@string/title_archive" android:tooltipText="@string/title_archive"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@id/ibInbox"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/twotone_archive_24" /> app:srcCompat="@drawable/twotone_archive_24" />

Write Preview
Loading…
Cancel
Save