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

Added trash to inbox button / inbox button config

Browse Source
pull/183/head
M66B 5 years ago
parent c9bc0ed6e7
commit 98457c1c5d
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File

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

@ -1521,7 +1521,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean trash = (move || outbox || debug || boolean trash = (move || outbox || debug ||
message.accountProtocol == EntityAccount.TYPE_POP); message.accountProtocol == EntityAccount.TYPE_POP);
boolean junk = (move && (hasJunk && !inJunk)); boolean junk = (move && (hasJunk && !inJunk));
boolean inbox = (move && (inArchive || inJunk)); boolean inbox = (move && (inArchive || inTrash || inJunk));
final boolean delete = (inTrash || !hasTrash || inJunk || outbox || final boolean delete = (inTrash || !hasTrash || inJunk || outbox ||
message.uid == null || message.accountProtocol == EntityAccount.TYPE_POP); message.uid == null || message.accountProtocol == EntityAccount.TYPE_POP);
@ -1530,6 +1530,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean expand_all = prefs.getBoolean("expand_all", false); boolean expand_all = prefs.getBoolean("expand_all", false);
boolean expand_one = prefs.getBoolean("expand_one", true); boolean expand_one = prefs.getBoolean("expand_one", true);
boolean tools = prefs.getBoolean("message_tools", true); boolean tools = prefs.getBoolean("message_tools", true);
boolean button_inbox = prefs.getBoolean("button_inbox", true);
boolean button_junk = prefs.getBoolean("button_junk", true); boolean button_junk = prefs.getBoolean("button_junk", true);
boolean button_trash = prefs.getBoolean("button_trash", true); boolean button_trash = prefs.getBoolean("button_trash", true);
boolean button_archive = prefs.getBoolean("button_archive", true); boolean button_archive = prefs.getBoolean("button_archive", true);
@ -1551,7 +1552,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibArchive.setVisibility(tools && button_archive && archive ? View.VISIBLE : View.GONE); ibArchive.setVisibility(tools && button_archive && archive ? View.VISIBLE : View.GONE);
ibTrash.setVisibility(outbox || (tools && button_trash && trash) ? View.VISIBLE : View.GONE); ibTrash.setVisibility(outbox || (tools && button_trash && trash) ? View.VISIBLE : View.GONE);
ibJunk.setVisibility(tools && button_junk && junk ? View.VISIBLE : View.GONE); ibJunk.setVisibility(tools && button_junk && junk ? View.VISIBLE : View.GONE);
ibInbox.setVisibility(tools && inbox ? View.VISIBLE : View.GONE); ibInbox.setVisibility(tools && button_inbox && inbox ? View.VISIBLE : View.GONE);
ibMore.setVisibility(tools && !outbox ? View.VISIBLE : View.GONE); ibMore.setVisibility(tools && !outbox ? View.VISIBLE : View.GONE);
ibTools.setImageLevel(tools ? 0 : 1); ibTools.setImageLevel(tools ? 0 : 1);
ibTools.setVisibility(outbox ? View.GONE : View.VISIBLE); ibTools.setVisibility(outbox ? View.GONE : View.VISIBLE);
@ -3738,6 +3739,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean full = properties.getValue("full", message.id); boolean full = properties.getValue("full", message.id);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean button_inbox = prefs.getBoolean("button_inbox", true);
boolean button_junk = prefs.getBoolean("button_junk", true); boolean button_junk = prefs.getBoolean("button_junk", true);
boolean button_trash = prefs.getBoolean("button_trash", true); boolean button_trash = prefs.getBoolean("button_trash", true);
boolean button_archive = prefs.getBoolean("button_archive", true); boolean button_archive = prefs.getBoolean("button_archive", true);
@ -3749,6 +3751,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, ibMore); PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, ibMore);
popupMenu.inflate(R.menu.popup_message_more); popupMenu.inflate(R.menu.popup_message_more);
popupMenu.getMenu().findItem(R.id.menu_button_inbox).setChecked(button_inbox);
popupMenu.getMenu().findItem(R.id.menu_button_junk).setChecked(button_junk); popupMenu.getMenu().findItem(R.id.menu_button_junk).setChecked(button_junk);
popupMenu.getMenu().findItem(R.id.menu_button_trash).setChecked(button_trash); popupMenu.getMenu().findItem(R.id.menu_button_trash).setChecked(button_trash);
popupMenu.getMenu().findItem(R.id.menu_button_archive).setChecked(button_archive); popupMenu.getMenu().findItem(R.id.menu_button_archive).setChecked(button_archive);
@ -3809,6 +3812,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override @Override
public boolean onMenuItemClick(MenuItem target) { public boolean onMenuItemClick(MenuItem target) {
switch (target.getItemId()) { switch (target.getItemId()) {
case R.id.menu_button_inbox:
onMenuButton(message, "inbox", target.isChecked());
return true;
case R.id.menu_button_junk: case R.id.menu_button_junk:
onMenuButton(message, "junk", target.isChecked()); onMenuButton(message, "junk", target.isChecked());
return true; return true;

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

@ -63,27 +63,27 @@
tools:ignore="MissingConstraints" /> tools:ignore="MissingConstraints" />
<ImageButton <ImageButton
android:id="@+id/ibJunk" android:id="@+id/ibInbox"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_spam" android:contentDescription="@string/title_folder_inbox"
android:padding="6dp" android:padding="6dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:tooltipText="@string/title_spam" android:tooltipText="@string/title_folder_inbox"
app:srcCompat="@drawable/baseline_report_problem_24" app:srcCompat="@drawable/baseline_move_to_inbox_24"
tools:ignore="MissingConstraints" /> tools:ignore="MissingConstraints" />
<ImageButton <ImageButton
android:id="@+id/ibInbox" android:id="@+id/ibJunk"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:background="?android:attr/selectableItemBackgroundBorderless" android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_folder_inbox" android:contentDescription="@string/title_spam"
android:padding="6dp" android:padding="6dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:tooltipText="@string/title_folder_inbox" android:tooltipText="@string/title_spam"
app:srcCompat="@drawable/baseline_move_to_inbox_24" app:srcCompat="@drawable/baseline_report_problem_24"
tools:ignore="MissingConstraints" /> tools:ignore="MissingConstraints" />
<ImageButton <ImageButton

4
app/src/main/res/menu/popup_message_more.xml
Unescape View File

@ -4,6 +4,10 @@
android:id="@+id/menu_button" android:id="@+id/menu_button"
android:title="@string/title_buttons"> android:title="@string/title_buttons">
<menu> <menu>
<item
android:id="@+id/menu_button_inbox"
android:checkable="true"
android:title="@string/title_folder_inbox" />
<item <item
android:id="@+id/menu_button_junk" android:id="@+id/menu_button_junk"
android:checkable="true" android:checkable="true"

Write Preview
Loading…
Cancel
Save